From 76510a118c43c3e4a4c15a575b21cbf7094295e3 Mon Sep 17 00:00:00 2001 From: amak Date: Tue, 6 Apr 2021 14:34:03 +1000 Subject: [PATCH] retroarch: update to 1.9.1 --- .../retroarch/patches/conflicting-types.patch | 16 ---------------- srcpkgs/retroarch/patches/musl-time_h.patch | 15 --------------- srcpkgs/retroarch/template | 7 ++++--- 3 files changed, 4 insertions(+), 34 deletions(-) delete mode 100644 srcpkgs/retroarch/patches/conflicting-types.patch delete 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 deleted file mode 100644 index d089b1dc761d..000000000000 --- a/srcpkgs/retroarch/patches/conflicting-types.patch +++ /dev/null @@ -1,16 +0,0 @@ -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 deleted file mode 100644 index bf0ae3b7c0d7..000000000000 --- a/srcpkgs/retroarch/patches/musl-time_h.patch +++ /dev/null @@ -1,15 +0,0 @@ -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 - #include - #include -+#include - - struct nbio_linux_t - { diff --git a/srcpkgs/retroarch/template b/srcpkgs/retroarch/template index 87301c2c9efa..8b2d3fb445f4 100644 --- a/srcpkgs/retroarch/template +++ b/srcpkgs/retroarch/template @@ -1,12 +1,13 @@ # Template file for 'retroarch' pkgname=retroarch -version=1.9.0 -revision=2 +version=1.9.1 +revision=1 wrksrc="RetroArch-$version" build_style=configure configure_args="--prefix=/usr --sysconfdir=/etc --enable-networking --enable-udev --disable-builtinflac --disable-builtinglslang --disable-builtinmbedtls --disable-builtinminiupnpc --disable-builtinzlib + --disable-git_version $(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)" @@ -24,7 +25,7 @@ maintainer="Orphaned " license="GPL-3.0-or-later" homepage="https://www.retroarch.com/" distfiles="https://github.com/libretro/RetroArch/archive/v$version.tar.gz" -checksum=39d7ad9298c9487fb4848cd6a257c23a95ee85f83c75302f97bcc4797f154b6a +checksum=153f7057cecd22441904f557302d50f969d199c4b6ff263bfe87d9cf4a9bab75 build_options="ffmpeg flac gles2 glslang jack miniupnpc neon opengl pulseaudio qt5 sdl2 vulkan wayland x11" build_options_default="ffmpeg flac gles2 glslang miniupnpc opengl pulseaudio sdl2 vulkan wayland x11"