* [PR PATCH] retroarch: update to 1.9.0
@ 2020-08-10 4:23 amak79
2020-08-10 4:27 ` ericonr
` (20 more replies)
0 siblings, 21 replies; 22+ messages in thread
From: amak79 @ 2020-08-10 4:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 546 bytes --]
There is a new pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 5355 bytes --]
From ab7bb6a47fc98ad7f3f7a4e81a2ac1b2b1fee7a9 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Sun, 9 Aug 2020 17:45:50 +1000
Subject: [PATCH] retroarch: update to 1.9.0
---
common/shlibs | 1 +
.../retroarch/patches/conflicting-types.patch | 13 ++++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 12 +++++++
srcpkgs/retroarch/template | 31 ++++++++++---------
4 files changed, 42 insertions(+), 15 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/common/shlibs b/common/shlibs
index 1ff9acf93be..69d7922085d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..63a265272f0
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,13 @@
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..4c5b05bcb66
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,12 @@
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..8f6b733821e 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,35 +1,36 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel libxml2-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.libretro.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan x11"
build_options_default="ffmpeg"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
+ i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" glslang opengl pulseaudio sdl2 vulkan x11";;
armv[67]*)
makedepends+=" rpi-userland-devel"
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
@ 2020-08-10 4:27 ` ericonr
2020-08-10 4:32 ` [PR REVIEW] " ericonr
` (19 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-10 4:27 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 194 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24190#issuecomment-671156484
Comment:
Great! The shlibs change should be a separate commit.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
2020-08-10 4:27 ` ericonr
@ 2020-08-10 4:32 ` ericonr
2020-08-10 5:02 ` [PR PATCH] [Updated] " amak79
` (18 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-08-10 4:32 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 382 bytes --]
New review comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24190#discussion_r467682917
Comment:
Since we are at this, @q66 do you think we can remove this whole case and just use the same options for all platforms?
The other option is making `rpi` a build option, not set by default, to build retropie with `rpi-userland-devel`.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
2020-08-10 4:27 ` ericonr
2020-08-10 4:32 ` [PR REVIEW] " ericonr
@ 2020-08-10 5:02 ` amak79
2020-08-10 6:06 ` amak79
` (17 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-10 5:02 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 5617 bytes --]
From 428240bfdb98bd2fb8485bd3f0a0529d22de5a08 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 1ff9acf93be..69d7922085d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 5eb789a7bfdf89937d94db81e2aa3b01c5f5a9cb Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 13 ++++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 12 +++++++
srcpkgs/retroarch/template | 33 ++++++++++---------
3 files changed, 42 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..63a265272f0
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,13 @@
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..4c5b05bcb66
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,12 @@
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..4fa5550f0ba 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,35 +1,36 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel libxml2-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.libretro.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan x11"
build_options_default="ffmpeg"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
+ i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" glslang opengl pulseaudio sdl2 vulkan x11";;
armv[67]*)
makedepends+=" rpi-userland-devel"
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (2 preceding siblings ...)
2020-08-10 5:02 ` [PR PATCH] [Updated] " amak79
@ 2020-08-10 6:06 ` amak79
2020-08-10 13:19 ` amak79
` (16 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-10 6:06 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 5868 bytes --]
From 428240bfdb98bd2fb8485bd3f0a0529d22de5a08 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 1ff9acf93be..69d7922085d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From d518209af86b54a85507b4d91e826480269cf602 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 +++++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 +++++++++
srcpkgs/retroarch/template | 33 ++++++++++---------
3 files changed, 48 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..4fa5550f0ba 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,35 +1,36 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel libxml2-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.libretro.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan x11"
build_options_default="ffmpeg"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
+ i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" glslang opengl pulseaudio sdl2 vulkan x11";;
armv[67]*)
makedepends+=" rpi-userland-devel"
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (3 preceding siblings ...)
2020-08-10 6:06 ` amak79
@ 2020-08-10 13:19 ` amak79
2020-08-10 23:49 ` [PR REVIEW] " q66
` (15 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-10 13:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 551 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 5911 bytes --]
From 428240bfdb98bd2fb8485bd3f0a0529d22de5a08 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 1ff9acf93be..69d7922085d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From dbc7c468c9f1aa5d5ed6cb90c8f01e1c9fbd9ff1 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 +++++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 +++++++++
srcpkgs/retroarch/template | 33 ++++++++++---------
3 files changed, 48 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..0a6bb49ea9f 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,35 +1,36 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.libretro.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
build_options_default="ffmpeg"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
+ i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" glslang opengl pulseaudio sdl2 vulkan wayland x11";;
armv[67]*)
makedepends+=" rpi-userland-devel"
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (4 preceding siblings ...)
2020-08-10 13:19 ` amak79
@ 2020-08-10 23:49 ` q66
2020-08-11 11:53 ` [PR PATCH] [Updated] " amak79
` (14 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: q66 @ 2020-08-10 23:49 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 217 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/24190#discussion_r468246782
Comment:
yeah, just drop it
we shouldn't have any unmarked rpi-specific packages
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (5 preceding siblings ...)
2020-08-10 23:49 ` [PR REVIEW] " q66
@ 2020-08-11 11:53 ` amak79
2020-08-11 12:20 ` amak79
` (13 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-11 11:53 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Added a `wayland` build option.
- Removed the `libxml2-devel` dependency. RetroArch wasn't linking against it.
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 5911 bytes --]
From 428240bfdb98bd2fb8485bd3f0a0529d22de5a08 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 1ff9acf93be..69d7922085d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From d0ef23a81937b621e54edc9a760eba711875d874 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 +++++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 +++++++++
srcpkgs/retroarch/template | 33 ++++++++++---------
3 files changed, 48 insertions(+), 16 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..0a6bb49ea9f 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,35 +1,36 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
homepage="http://www.libretro.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
build_options_default="ffmpeg"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
+ i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" glslang opengl pulseaudio sdl2 vulkan wayland x11";;
armv[67]*)
makedepends+=" rpi-userland-devel"
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (6 preceding siblings ...)
2020-08-11 11:53 ` [PR PATCH] [Updated] " amak79
@ 2020-08-11 12:20 ` amak79
2020-08-25 11:19 ` amak79
` (12 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-11 12:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 664 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Added a `wayland` build option.
- Removed the `libxml2-devel` dependency. RetroArch wasn't linking against it.
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 5949 bytes --]
From c6813dad3c2a1f58f025a5f9834d86844fb06f7d Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index af19d9eb500..d65bddb6cb9 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3528,6 +3528,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 14572288fe27b3f592027e84bd022f5507200a5c Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 +++++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 ++++++++
srcpkgs/retroarch/template | 35 ++++++++++---------
3 files changed, 49 insertions(+), 17 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..f9c8b821774 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,35 +1,36 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
build_options_default="ffmpeg"
case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
+ i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" glslang opengl pulseaudio sdl2 vulkan wayland x11";;
armv[67]*)
makedepends+=" rpi-userland-devel"
LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (7 preceding siblings ...)
2020-08-11 12:20 ` amak79
@ 2020-08-25 11:19 ` amak79
2020-08-25 13:04 ` amak79
` (11 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-25 11:19 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 694 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `wayland` build option.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 6857 bytes --]
From 44beaf245f45a9df89d2e91154cf3c2c746910ce Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 676eb94366b..ef696fce42d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3526,6 +3526,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 9ea8a717c0744eb07dd20e3563827d2fe0617e3c Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 ++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 ++++++
srcpkgs/retroarch/template | 53 ++++++++-----------
3 files changed, 52 insertions(+), 32 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..2fc4932ba37 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,44 +1,37 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_if opengl '--enable-opengl_core --enable-opengles --enable-opengles3 --enable-kms --enable-egl')
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
-
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg glslang opengl sdl2 vulkan wayland x11"
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
@@ -46,12 +39,8 @@ do_configure() {
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
ppc64*) configure_args+=" --enable-threads";;
aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ armv6*) configure_args+=" --disable-neon";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (8 preceding siblings ...)
2020-08-25 11:19 ` amak79
@ 2020-08-25 13:04 ` amak79
2020-08-26 0:46 ` amak79
` (10 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-25 13:04 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 694 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `wayland` build option.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 6868 bytes --]
From 44beaf245f45a9df89d2e91154cf3c2c746910ce Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 676eb94366b..ef696fce42d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3526,6 +3526,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 32ed84952d950b44f901569f81f20f92f064f86a Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 ++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 ++++++
srcpkgs/retroarch/template | 53 ++++++++-----------
3 files changed, 52 insertions(+), 32 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..536705f523b 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,44 +1,37 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_if opengl '--enable-opengl_core --enable-opengles --enable-opengles3 --enable-kms --enable-egl')
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
-
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg glslang opengl pulseaudio sdl2 vulkan wayland x11"
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
@@ -46,12 +39,8 @@ do_configure() {
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
ppc64*) configure_args+=" --enable-threads";;
aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ armv6*) configure_args+=" --disable-neon";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (9 preceding siblings ...)
2020-08-25 13:04 ` amak79
@ 2020-08-26 0:46 ` amak79
2020-08-26 5:43 ` amak79
` (9 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-26 0:46 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 694 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `wayland` build option.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 6868 bytes --]
From 4190731d4c980337ad0de69d9a6144a644adfb8e Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index b28d158df83..25c5f450442 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3526,6 +3526,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From b642365f3fa71db94d29514b4ad7e08945abbd6e Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 ++++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 ++++++
srcpkgs/retroarch/template | 53 ++++++++-----------
3 files changed, 52 insertions(+), 32 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..536705f523b 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,44 +1,37 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_if opengl '--enable-opengl_core --enable-opengles --enable-opengles3 --enable-kms --enable-egl')
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if opengl MesaLib-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
-
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+build_options="ffmpeg glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg glslang opengl pulseaudio sdl2 vulkan wayland x11"
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
@@ -46,12 +39,8 @@ do_configure() {
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
ppc64*) configure_args+=" --enable-threads";;
aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ armv6*) configure_args+=" --disable-neon";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (10 preceding siblings ...)
2020-08-26 0:46 ` amak79
@ 2020-08-26 5:43 ` amak79
2020-08-26 7:59 ` [PR REVIEW] " q66
` (8 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-26 5:43 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `wayland` build option.
- Use common build options for all platforms.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 7822 bytes --]
From 6e912a060ebba16dd2a7b2ec70fe19f0d73f38c8 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index b28d158df83..25c5f450442 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3526,6 +3526,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 4c3ba9d28bd9115aa2d42256e8d7e73319974999 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 ++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 ++++
srcpkgs/retroarch/template | 88 ++++++++++++-------
3 files changed, 88 insertions(+), 31 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..5e5407486dc 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,44 +1,74 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
+build_options="ffmpeg gles2 glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg gles2 glslang opengl pulseaudio sdl2 vulkan wayland x11"
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+if [ "$build_option_gles2" ]; then
+ configure_args+=" --enable-opengles --enable-opengles3"
+else
+ configure_args+=" --disable-opengles --disable-opengles3"
+fi
+
+if [ "$build_option_opengl" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+ fi
+ configure_args+=" --enable-opengl_core"
+else
+ configure_args+=" --disable-opengl_core"
+fi
+
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+ configure_args+=" --enable-egl --enable-kms"
+ makedepends+=" MesaLib-devel"
+fi
+
+if [ "$build_option_vulkan" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n"
+ fi
+fi
+
+if [ "$build_option_wayland" ]; then
+ if [ -z "$build_option_gles2" -o -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
+
+if [ "$build_option_x11" ]; then
+ if [ -z "$build_option_gles2" -o -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
@@ -46,12 +76,8 @@ do_configure() {
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
ppc64*) configure_args+=" --enable-threads";;
aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ armv6*) configure_args+=" --disable-neon";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR REVIEW] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (11 preceding siblings ...)
2020-08-26 5:43 ` amak79
@ 2020-08-26 7:59 ` q66
2020-08-26 9:35 ` [PR PATCH] [Updated] " amak79
` (7 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: q66 @ 2020-08-26 7:59 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 351 bytes --]
New review comment by q66 on void-packages repository
https://github.com/void-linux/void-packages/pull/24190#discussion_r477108623
Comment:
It'd probably be reasonable to enable threads on aarch64 too, and leave NEON on, and enable threads on ppc32; do that by changing the `ppc64*` case to `ppc*|aarch64*`, then drop the standalone `aarch64*` case
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (12 preceding siblings ...)
2020-08-26 7:59 ` [PR REVIEW] " q66
@ 2020-08-26 9:35 ` amak79
2020-08-26 10:16 ` amak79
` (6 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-26 9:35 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `wayland` build option.
- Use common build options for all platforms.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 7931 bytes --]
From 09dc93919983322ac9fe3ee9f936e3ee84862f0e Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index b28d158df83..25c5f450442 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3526,6 +3526,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 212ff4360b3e49abd4840666042af583b4f13935 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 ++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 +++
srcpkgs/retroarch/template | 92 ++++++++++++-------
3 files changed, 90 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..78238b5e2da 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,57 +1,83 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
+build_options="ffmpeg gles2 glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg gles2 glslang opengl pulseaudio sdl2 vulkan wayland x11"
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+if [ "$build_option_gles2" ]; then
+ configure_args+=" --enable-opengles --enable-opengles3"
+else
+ configure_args+=" --disable-opengles --disable-opengles3"
+fi
+
+if [ "$build_option_opengl" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+ fi
+ configure_args+=" --enable-opengl_core"
+else
+ configure_args+=" --disable-opengl_core"
+fi
+
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+ configure_args+=" --enable-egl --enable-kms"
+ makedepends+=" MesaLib-devel"
+fi
+
+if [ "$build_option_vulkan" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n"
+ fi
+fi
+
+if [ "$build_option_wayland" ]; then
+ if [ -z "$build_option_gles2" -o -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
+
+if [ "$build_option_x11" ]; then
+ if [ -z "$build_option_gles2" -o -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
- ppc64*) configure_args+=" --enable-threads";;
- aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ ppc*) configure_args+=" --enable-threads";;
+ aarch64*) configure_args+=" --disable-neon --enable-threads";;
+ armv6*) configure_args+=" --disable-neon";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (13 preceding siblings ...)
2020-08-26 9:35 ` [PR PATCH] [Updated] " amak79
@ 2020-08-26 10:16 ` amak79
2020-09-03 12:03 ` amak79
` (5 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-08-26 10:16 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `wayland` build option.
- Use common build options for all platforms.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 7929 bytes --]
From 09dc93919983322ac9fe3ee9f936e3ee84862f0e Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index b28d158df83..25c5f450442 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3526,6 +3526,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From bdc8735b5d5ffa56f9a56cf6bc72e32f4813294d Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 ++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 +++
srcpkgs/retroarch/template | 92 ++++++++++++-------
3 files changed, 90 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..fe8caae980b 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,57 +1,83 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config python unzip wayland-devel wayland-protocols"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
+build_options="ffmpeg gles2 glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg gles2 glslang opengl pulseaudio sdl2 vulkan wayland x11"
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+if [ "$build_option_gles2" ]; then
+ configure_args+=" --enable-opengles --enable-opengles3"
+else
+ configure_args+=" --disable-opengles --disable-opengles3"
+fi
+
+if [ "$build_option_opengl" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+ fi
+ configure_args+=" --enable-opengl_core"
+else
+ configure_args+=" --disable-opengl_core"
+fi
+
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+ configure_args+=" --enable-egl --enable-kms"
+ makedepends+=" MesaLib-devel"
+fi
+
+if [ "$build_option_vulkan" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n"
+ fi
+fi
+
+if [ "$build_option_wayland" ]; then
+ if [ -z "$build_option_gles2" -o -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
+
+if [ "$build_option_x11" ]; then
+ if [ -z "$build_option_gles2" -o -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
- ppc64*) configure_args+=" --enable-threads";;
- aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ ppc*) configure_args+=" --enable-threads";;
+ aarch64*) configure_args+=" --disable-neon --enable-threads";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
+ arm*) configure_args+=" --disable-neon";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (14 preceding siblings ...)
2020-08-26 10:16 ` amak79
@ 2020-09-03 12:03 ` amak79
2020-09-04 6:55 ` amak79
` (4 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-09-03 12:03 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `wayland` build option.
- Use common build options for all platforms.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 7994 bytes --]
From c5454caf2d0e2ae7befb693828e0008964a41a22 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index daf2b80acbb..d34ca109dff 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3532,6 +3532,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 2efb71cadb65d6342920a031431465a2138ff059 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 ++++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 +++
srcpkgs/retroarch/template | 94 ++++++++++++-------
3 files changed, 93 insertions(+), 32 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..68797f25ffc 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,57 +1,87 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2) $(vopt_enable vulkan)
+ $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libflac-devel
+ libxkbcommon-devel mbedtls-devel miniupnpc-devel zlib-devel
+ $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel')
+ $(vopt_if jack jack-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
+build_options="ffmpeg gles2 glslang jack opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg gles2 glslang opengl pulseaudio sdl2 vulkan wayland x11"
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+if [ "$build_option_gles2" ]; then
+ configure_args+=" --enable-opengles --enable-opengles3"
+else
+ configure_args+=" --disable-opengles --disable-opengles3"
+fi
+
+if [ "$build_option_opengl" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+ fi
+ configure_args+=" --enable-opengl_core"
+else
+ configure_args+=" --disable-opengl_core"
+fi
+
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+ configure_args+=" --enable-egl --enable-kms"
+ makedepends+=" MesaLib-devel"
+fi
+
+if [ "$build_option_vulkan" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n"
+ fi
+fi
+
+if [ "$build_option_wayland" ]; then
+ if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+ fi
+ makedepends+=" wayland-devel wayland-protocols"
+ if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" wayland-devel wayland-protocols"
+ fi
+fi
+
+if [ "$build_option_x11" ]; then
+ if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
- ppc64*) configure_args+=" --enable-threads";;
- aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ ppc*) configure_args+=" --enable-threads";;
+ aarch64*) configure_args+=" --disable-neon --enable-threads";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
+ arm*) configure_args+=" --disable-neon";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (15 preceding siblings ...)
2020-09-03 12:03 ` amak79
@ 2020-09-04 6:55 ` amak79
2020-09-06 5:05 ` amak79
` (3 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-09-04 6:55 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 741 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `wayland` build option.
- Use common build options for all platforms.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 8250 bytes --]
From 2b265dad078ee52a9c1625ad107f63190bf1ab53 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index 514d89fd05c..0bf7d680b8f 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3531,6 +3531,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 36e437733464c383dadbb60098368b4fd0fa4ee9 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 +++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 +++
srcpkgs/retroarch/template | 99 ++++++++++++-------
3 files changed, 97 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..0714f27fc5f 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,57 +1,90 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable miniupnpc) $(vopt_enable pulseaudio pulse) $(vopt_enable sdl2)
+ $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+ mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
+ $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
+ $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+desc_option_glslang="Enable support for GLSL shaders"
+desc_option_miniupnpc="Enable support for NAT traversal"
+
+if [ "$build_option_gles2" ]; then
+ configure_args+=" --enable-opengles --enable-opengles3"
+else
+ configure_args+=" --disable-opengles --disable-opengles3"
+fi
+
+if [ "$build_option_opengl" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+ fi
+ configure_args+=" --enable-opengl_core"
+else
+ configure_args+=" --disable-opengl_core"
+fi
+
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+ configure_args+=" --enable-egl --enable-kms"
+ makedepends+=" MesaLib-devel"
+fi
+
+if [ "$build_option_vulkan" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n"
+ fi
+fi
+
+if [ "$build_option_wayland" ]; then
+ if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+ fi
+ makedepends+=" wayland-devel wayland-protocols"
+ if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" wayland-devel wayland-protocols"
+ fi
+fi
+
+if [ "$build_option_x11" ]; then
+ if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
- ppc64*) configure_args+=" --enable-threads";;
- aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ ppc*) configure_args+=" --enable-threads";;
+ aarch64*) configure_args+=" --disable-neon --enable-threads";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
+ arm*) configure_args+=" --disable-neon";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Updated] retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (16 preceding siblings ...)
2020-09-04 6:55 ` amak79
@ 2020-09-06 5:05 ` amak79
2020-09-29 2:23 ` ericonr
` (2 subsequent siblings)
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-09-06 5:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 787 bytes --]
There is an updated pull request by amak79 against master on the void-packages repository
https://github.com/amak79/void-packages retroarch
https://github.com/void-linux/void-packages/pull/24190
retroarch: update to 1.9.0
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `flac`, `gles2`, `glslang`, `miniupnpc`, and `wayland` build options.
- Use common build options for all platforms.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
A patch file from https://github.com/void-linux/void-packages/pull/24190.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-24190.patch --]
[-- Type: text/x-diff, Size: 8388 bytes --]
From 1ac4d16f14235f278fdedfd6c889f907a8c1e0b9 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:00:16 +1000
Subject: [PATCH 1/2] common/shlibs: add libHLSL.so
---
common/shlibs | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/shlibs b/common/shlibs
index bea5b504701..4b5edec895d 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -3533,6 +3533,7 @@ libbelr.so.1 belr-0.1.3_1
libbelcard.so.1 belcard-1.0.2_1
libshaderc_shared.so.1 shaderc-2018.0_1
libglslang.so glslang-6.2.2596_1
+libHLSL.so glslang-8.13.3743_1
libSPIRV.so glslang-6.2.2596_1
libmaxminddb.so.0 libmaxminddb-1.3.2_1
libmysqlpp.so.3 mysql++-3.2.5_1
From 4f1451bcdeedcf0e8f3d3dc226d4342ce30999e1 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
Date: Mon, 10 Aug 2020 15:01:50 +1000
Subject: [PATCH 2/2] retroarch: update to 1.9.0
---
.../retroarch/patches/conflicting-types.patch | 16 +++
srcpkgs/retroarch/patches/musl-time_h.patch | 15 +++
srcpkgs/retroarch/template | 105 ++++++++++++------
3 files changed, 103 insertions(+), 33 deletions(-)
create mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch
create mode 100644 srcpkgs/retroarch/patches/musl-time_h.patch
diff --git a/srcpkgs/retroarch/patches/conflicting-types.patch b/srcpkgs/retroarch/patches/conflicting-types.patch
new file mode 100644
index 00000000000..d089b1dc761
--- /dev/null
+++ b/srcpkgs/retroarch/patches/conflicting-types.patch
@@ -0,0 +1,16 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11171
+
+diff --git a/gfx/drivers_context/vc_egl_ctx.c b/gfx/drivers_context/vc_egl_ctx.c
+index 3c52edb96a..dba0e038f4 100644
+--- gfx/drivers_context/vc_egl_ctx.c
++++ gfx/drivers_context/vc_egl_ctx.c
+@@ -81,6 +81,8 @@ typedef struct
+ /* TODO/FIXME - static globals */
+ static enum gfx_ctx_api vc_api = GFX_CTX_NONE;
+
++static bool gfx_ctx_vc_bind_api(void *, enum gfx_ctx_api, unsigned, unsigned);
++
+ static INLINE bool gfx_ctx_vc_egl_query_extension(vc_ctx_data_t *vc, const char *ext)
+ {
+ const char *str = (const char*)eglQueryString(vc->egl.dpy, EGL_EXTENSIONS);
diff --git a/srcpkgs/retroarch/patches/musl-time_h.patch b/srcpkgs/retroarch/patches/musl-time_h.patch
new file mode 100644
index 00000000000..bf0ae3b7c0d
--- /dev/null
+++ b/srcpkgs/retroarch/patches/musl-time_h.patch
@@ -0,0 +1,15 @@
+This patch has been merged upstream and shouldn't be needed for 1.9.1:
+https://github.com/libretro/RetroArch/pull/11170
+
+diff --git a/libretro-common/file/nbio/nbio_linux.c b/libretro-common/file/nbio/nbio_linux.c
+index 70e3a98..0c2d857 100644
+--- libretro-common/file/nbio/nbio_linux.c
++++ libretro-common/file/nbio/nbio_linux.c
+@@ -36,6 +36,7 @@
+ #include <fcntl.h>
+ #include <sys/syscall.h>
+ #include <linux/aio_abi.h>
++#include <time.h>
+
+ struct nbio_linux_t
+ {
diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template
index 0ad83d12b94..ac9283bbb63 100644
--- a/srcpkgs/retroarch/template
+++ b/srcpkgs/retroarch/template
@@ -1,57 +1,96 @@
# Template file for 'retroarch'
pkgname=retroarch
-version=1.8.4
+version=1.9.0
revision=1
wrksrc="RetroArch-$version"
build_style=configure
-configure_args="--prefix=/usr --sysconfdir=/etc --enable-udev
- --enable-networking
- $(vopt_enable ffmpeg) $(vopt_enable jack) $(vopt_enable pulseaudio pulse)
- $(vopt_enable sdl2) $(vopt_enable x11) $(vopt_enable vulkan)"
+configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking
+ --enable-udev --disable-builtinflac --disable-builtinglslang
+ --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib
+ $(vopt_enable ffmpeg) $(vopt_enable flac) $(vopt_enable glslang) $(vopt_enable jack)
+ $(vopt_enable miniupnpc) $(vopt_enable pulseaudio pulse) $(vopt_enable qt5 qt)
+ $(vopt_enable sdl2) $(vopt_enable vulkan) $(vopt_enable wayland) $(vopt_enable x11)"
conf_files="/etc/retroarch.cfg"
-hostmakedepends="pkg-config python unzip"
-makedepends="zlib-devel libxml2-devel freetype-devel libxkbcommon-devel
- alsa-lib-devel eudev-libudev-devel $(vopt_if opengl MesaLib-devel)
- $(vopt_if pulseaudio pulseaudio-devel) $(vopt_if jack jack-devel)
- $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if sdl2 SDL2-devel)
- $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')
- $(vopt_if vulkan 'vulkan-loader')
- $(vopt_if qt5 'qt5-devel')"
+hostmakedepends="pkg-config"
+makedepends="alsa-lib-devel eudev-libudev-devel freetype-devel libxkbcommon-devel
+ mbedtls-devel zlib-devel $(vopt_if ffmpeg ffmpeg-devel) $(vopt_if flac libflac-devel)
+ $(vopt_if glslang 'glslang-devel SPIRV-Tools-devel') $(vopt_if jack jack-devel)
+ $(vopt_if miniupnpc miniupnpc-devel) $(vopt_if pulseaudio pulseaudio-devel)
+ $(vopt_if qt5 qt5-devel) $(vopt_if sdl2 SDL2-devel) $(vopt_if vulkan vulkan-loader)
+ $(vopt_if x11 'libXext-devel libXinerama-devel libXv-devel libXxf86vm-devel')"
depends="$(vopt_if vulkan 'vulkan-loader')"
short_desc="Official reference frontend for the libretro API"
maintainer="Orphaned <orphan@voidlinux.org>"
license="GPL-3.0-or-later"
-homepage="http://www.libretro.com/"
+homepage="https://www.retroarch.com/"
distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz"
-checksum=027e9eb243488da1b8532116eab2a79932fcf2dcb96bcc4be9a12b329a2a9c52
-build_options="ffmpeg opengl jack pulseaudio sdl2 x11 vulkan qt5"
+checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a
-build_options_default="ffmpeg"
+build_options="ffmpeg flac gles2 glslang jack miniupnpc opengl pulseaudio qt5 sdl2 vulkan wayland x11"
+build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"
-case "$XBPS_TARGET_MACHINE" in
- i686*|x86_64*|ppc64*|aarch64*) build_options_default+=" opengl pulseaudio sdl2 x11 vulkan";;
- armv[67]*)
- makedepends+=" rpi-userland-devel"
- LDFLAGS="-L${XBPS_CROSS_BASE}/opt/vc/lib -lbcm_host"
- ;;
-esac
+desc_option_glslang="Enable support for GLSL shaders"
+desc_option_miniupnpc="Enable support for NAT traversal"
+
+if [ "$build_option_gles2" ]; then
+ configure_args+=" --enable-opengles --enable-opengles3"
+else
+ configure_args+=" --disable-opengles --disable-opengles3"
+fi
+
+if [ "$build_option_opengl" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'opengl' option requires 'glslang'.\n"
+ fi
+ configure_args+=" --enable-opengl_core"
+else
+ configure_args+=" --disable-opengl_core"
+fi
+
+if [ "$build_option_gles2" -o "$build_option_opengl" ]; then
+ configure_args+=" --enable-egl --enable-kms"
+ makedepends+=" MesaLib-devel"
+fi
+
+if [ "$build_option_qt5" ]; then
+ if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" qt5-host-tools"
+ fi
+fi
+
+if [ "$build_option_vulkan" ]; then
+ if [ -z "$build_option_glslang" ]; then
+ msg_error "$pkgname: 'vulkan' option requires 'glslang'.\n"
+ fi
+fi
+
+if [ "$build_option_wayland" ]; then
+ if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'wayland' option requires 'gles2' or 'opengl'.\n"
+ fi
+ makedepends+=" wayland-devel wayland-protocols"
+ if [ "$CROSS_BUILD" ]; then
+ hostmakedepends+=" wayland-devel wayland-protocols"
+ fi
+fi
+
+if [ "$build_option_x11" ]; then
+ if [ -z "$build_option_gles2" -a -z "$build_option_opengl" ]; then
+ msg_error "$pkgname: 'x11' option requires 'gles2' or 'opengl'.\n"
+ fi
+fi
do_configure() {
if [ "$CROSS_BUILD" ]; then
- mkdir -p /opt/vc/lib
configure_args+=" --host=${XBPS_CROSS_TRIPLET}"
fi
case "$XBPS_TARGET_MACHINE" in
i686*|x86_64*) configure_args+=" --enable-sse --enable-threads";;
- ppc64*) configure_args+=" --enable-threads";;
- aarch64*) configure_args+=" --disable-neon";;
- armv6*) configure_args+=" --disable-neon"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
- armv7*) configure_args+=" --disable-neon --enable-threads"
- CFLAGS+=" -I${XBPS_CROSS_BASE}/opt/vc/include"
- LDFLAGS+=" -L${XBPS_CROSS_BASE}/opt/vc/lib -Wl,-R /opt/vc/lib";;
+ ppc*) configure_args+=" --enable-threads";;
+ aarch64*) configure_args+=" --disable-neon --enable-threads";;
+ armv7*) configure_args+=" --disable-neon --enable-threads";;
+ arm*) configure_args+=" --disable-neon";;
esac
./configure ${configure_args}
}
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (17 preceding siblings ...)
2020-09-06 5:05 ` amak79
@ 2020-09-29 2:23 ` ericonr
2020-09-29 3:20 ` amak79
2020-09-30 19:17 ` [PR PATCH] [Closed]: " Piraty
20 siblings, 0 replies; 22+ messages in thread
From: ericonr @ 2020-09-29 2:23 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 161 bytes --]
New comment by ericonr on void-packages repository
https://github.com/void-linux/void-packages/pull/24190#issuecomment-700386880
Comment:
@amak79 ok to merge?
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (18 preceding siblings ...)
2020-09-29 2:23 ` ericonr
@ 2020-09-29 3:20 ` amak79
2020-09-30 19:17 ` [PR PATCH] [Closed]: " Piraty
20 siblings, 0 replies; 22+ messages in thread
From: amak79 @ 2020-09-29 3:20 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 155 bytes --]
New comment by amak79 on void-packages repository
https://github.com/void-linux/void-packages/pull/24190#issuecomment-700401909
Comment:
Yes it's ready.
^ permalink raw reply [flat|nested] 22+ messages in thread
* Re: [PR PATCH] [Closed]: retroarch: update to 1.9.0
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
` (19 preceding siblings ...)
2020-09-29 3:20 ` amak79
@ 2020-09-30 19:17 ` Piraty
20 siblings, 0 replies; 22+ messages in thread
From: Piraty @ 2020-09-30 19:17 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 631 bytes --]
There's a closed pull request on the void-packages repository
retroarch: update to 1.9.0
https://github.com/void-linux/void-packages/pull/24190
Description:
- Use system flac, glslang, mbedtls, miniupnpc and zlib.
- Add `libHLSL.so` to `common/shlibs`. Needed when building with system glslang.
- Add patch for missing include on musl libc.
- Add patch for conflicting types build error.
- Add `flac`, `gles2`, `glslang`, `miniupnpc`, and `wayland` build options.
- Use common build options for all platforms.
- Remove `libxml2-devel` dependency. It was removed by upstream: https://github.com/libretro/RetroArch/pull/8486
^ permalink raw reply [flat|nested] 22+ messages in thread
end of thread, other threads:[~2020-09-30 19:18 UTC | newest]
Thread overview: 22+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2020-08-10 4:23 [PR PATCH] retroarch: update to 1.9.0 amak79
2020-08-10 4:27 ` ericonr
2020-08-10 4:32 ` [PR REVIEW] " ericonr
2020-08-10 5:02 ` [PR PATCH] [Updated] " amak79
2020-08-10 6:06 ` amak79
2020-08-10 13:19 ` amak79
2020-08-10 23:49 ` [PR REVIEW] " q66
2020-08-11 11:53 ` [PR PATCH] [Updated] " amak79
2020-08-11 12:20 ` amak79
2020-08-25 11:19 ` amak79
2020-08-25 13:04 ` amak79
2020-08-26 0:46 ` amak79
2020-08-26 5:43 ` amak79
2020-08-26 7:59 ` [PR REVIEW] " q66
2020-08-26 9:35 ` [PR PATCH] [Updated] " amak79
2020-08-26 10:16 ` amak79
2020-09-03 12:03 ` amak79
2020-09-04 6:55 ` amak79
2020-09-06 5:05 ` amak79
2020-09-29 2:23 ` ericonr
2020-09-29 3:20 ` amak79
2020-09-30 19:17 ` [PR PATCH] [Closed]: " Piraty
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).