* [PR PATCH] retroarch: update to 1.9.1
@ 2021-04-06 5:05 amak79
2021-04-06 5:10 ` [PR PATCH] [Merged]: " ericonr
0 siblings, 1 reply; 2+ messages in thread
From: amak79 @ 2021-04-06 5:05 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1588 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/30033
retroarch: update to 1.9.1
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
A patch file from https://github.com/void-linux/void-packages/pull/30033.patch is attached
[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: github-pr-retroarch-30033.patch --]
[-- Type: text/x-diff, Size: 3673 bytes --]
From 76510a118c43c3e4a4c15a575b21cbf7094295e3 Mon Sep 17 00:00:00 2001
From: amak <amak.git@outlook.com>
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 <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 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 <orphan@voidlinux.org>"
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"
^ permalink raw reply [flat|nested] 2+ messages in thread
* Re: [PR PATCH] [Merged]: retroarch: update to 1.9.1
2021-04-06 5:05 [PR PATCH] retroarch: update to 1.9.1 amak79
@ 2021-04-06 5:10 ` ericonr
0 siblings, 0 replies; 2+ messages in thread
From: ericonr @ 2021-04-06 5:10 UTC (permalink / raw)
To: ml
[-- Attachment #1: Type: text/plain, Size: 1437 bytes --]
There's a merged pull request on the void-packages repository
retroarch: update to 1.9.1
https://github.com/void-linux/void-packages/pull/30033
Description:
<!-- Mark items with [x] where applicable -->
#### General
- [ ] This is a new package and it conforms to the [quality requirements](https://github.com/void-linux/void-packages/blob/master/Manual.md#quality-requirements)
#### Have the results of the proposed changes been tested?
- [x] I use the packages affected by the proposed changes on a regular basis and confirm this PR works for me
- [ ] I generally don't use the affected packages but briefly tested this PR
<!--
If GitHub CI cannot be used to validate the build result (for example, if the
build is likely to take several hours), make sure to
[skip CI](https://github.com/void-linux/void-packages/blob/master/CONTRIBUTING.md#continuous-integration).
When skipping CI, uncomment and fill out the following section.
Note: for builds that are likely to complete in less than 2 hours, it is not
acceptable to skip CI.
-->
<!--
#### Does it build and run successfully?
(Please choose at least one native build and, if supported, at least one cross build. More are better.)
- [ ] I built this PR locally for my native architecture, (ARCH-LIBC)
- [ ] I built this PR locally for these architectures (if supported. mark crossbuilds):
- [ ] aarch64-musl
- [ ] armv7l
- [ ] armv6l-musl
-->
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-04-06 5:10 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2021-04-06 5:05 [PR PATCH] retroarch: update to 1.9.1 amak79
2021-04-06 5:10 ` [PR PATCH] [Merged]: " ericonr
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).