[bug#66724] [PATCH 0/4] gnu: retroarch: Update to 1.16.0.3

[bug#66724] [PATCH 0/4] gnu: retroarch: Update to 1.16.0.3

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

Hello list, here is an update for RetroArch.


Sou Bunnbu (宋文武) (4):
  gnu: retroarch: Update to 1.16.0.3.
  gnu: retroarch: Use more system libraries.
  gnu: retroarch: Use latest ffmpeg.
  gnu: retroarch: Remove input labels.

 gnu/packages/emulators.scm | 52 +++++++++++++++++++++++---------------
 1 file changed, 31 insertions(+), 21 deletions(-)


base-commit: 7383d15641f17af5a8c656a4ad592138abc7d5ec
-- 
2.41.0

[bug#66724] [PATCH 1/4] gnu: retroarch: Update to 1.16.0.3.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/emulators.scm (retroarch): Update to 1.16.0.3.

Change-Id: Ied17b92bb416bd7e237ef883793015c96b01d2f8
---
 gnu/packages/emulators.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 0cb947c58a..e7ec4b4f9b 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1431,7 +1431,7 @@ (define-public libretro-lowresnx
 (define-public retroarch
   (package
     (name "retroarch")
-    (version "1.15.0")
+    (version "1.16.0.3")
     (source
      (origin
        (method git-fetch)
@@ -1440,7 +1440,7 @@ (define-public retroarch
              (commit (string-append "v" version))))
        (file-name (git-file-name name version))
        (sha256
-        (base32 "1ii31mc7wfd386rzyxqk8nmx5a13f9iqz47991z4zx0d8gqcchzg"))))
+        (base32 "1nvvd78hx1s73nif7g02pqms29b9v072mxnld0vmsh78236qngq5"))))
     (build-system gnu-build-system)
     (arguments
      `(#:tests? #f                      ; no tests
-- 
2.41.0

[bug#66724] [PATCH 2/4] gnu: retroarch: Use more system libraries.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/emulators.scm (retroarch)[inputs]: Add flac, glslang,
mbedtls-apache, openssl, spirv-headers and spirv-tools.
[arguments]: Add configure flags to disable bundled libraries.

Change-Id: I2a833da5e5b28469e4677b3c24608e71949308a7
---
 gnu/packages/emulators.scm | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index e7ec4b4f9b..20a0caf469 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1471,22 +1471,32 @@ (define-public retroarch
                  ;; Non-free software are available through the core updater,
                  ;; disable it.  See <https://issues.guix.gnu.org/38360>.
                  "--disable-update_cores"
-                 "--disable-builtinzlib")))))))
+                 "--disable-builtinmbedtls"
+                 "--disable-builtinbearssl"
+                 "--disable-builtinzlib"
+                 "--disable-builtinflac"
+                 "--disable-builtinglslang")))))))
     (inputs
      `(("alsa-lib" ,alsa-lib)
        ("ffmpeg" ,ffmpeg-4)
+       ("flac" ,flac)
        ("freetype" ,freetype)
+       ("glslang" ,glslang)
        ("libxinerama" ,libxinerama)
        ("libxkbcommon" ,libxkbcommon)
        ("libxml2" ,libxml2)
        ("libxrandr" ,libxrandr)
        ("libxv" ,libxv)
+       ("mbedtls-apache" ,mbedtls-apache)
        ("mesa" ,mesa)
        ("openal" ,openal)
+       ("openssl" ,openssl)
        ("pulseaudio" ,pulseaudio)
        ("python" ,python)
        ("qtbase" ,qtbase-5)
        ("sdl" ,sdl2)
+       ("spirv-headers" ,spirv-headers)
+       ("spirv-tools" ,spirv-tools)
        ("udev" ,eudev)
        ("vulkan-loader" ,vulkan-loader)
        ("wayland" ,wayland)
-- 
2.41.0

[bug#66724] [PATCH 3/4] gnu: retroarch: Use latest ffmpeg.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/emulators.scm (retroarch)[inputs]: Replace ffmpeg-4 with ffmpeg.

Change-Id: I8b2772e139fd884caa6b411afdcf1ccb849dbc28
---
 gnu/packages/emulators.scm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index 20a0caf469..e0a532636e 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1478,7 +1478,7 @@ (define-public retroarch
                  "--disable-builtinglslang")))))))
     (inputs
      `(("alsa-lib" ,alsa-lib)
-       ("ffmpeg" ,ffmpeg-4)
+       ("ffmpeg" ,ffmpeg)
        ("flac" ,flac)
        ("freetype" ,freetype)
        ("glslang" ,glslang)
-- 
2.41.0

[bug#66724] [PATCH 4/4] gnu: retroarch: Remove input labels.

[iyzsong--- via Guix-patches via]

From: 宋文武 <iyzsong@member.fsf.org>

* gnu/packages/emulators.scm (retroarch)[inputs]: Remove labels.

Change-Id: Ia536f4b529260dc8c0f91618e0fd1e207984942f
---
 gnu/packages/emulators.scm | 48 +++++++++++++++++++-------------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/gnu/packages/emulators.scm b/gnu/packages/emulators.scm
index e0a532636e..0729feb071 100644
--- a/gnu/packages/emulators.scm
+++ b/gnu/packages/emulators.scm
@@ -1477,30 +1477,30 @@ (define-public retroarch
                  "--disable-builtinflac"
                  "--disable-builtinglslang")))))))
     (inputs
-     `(("alsa-lib" ,alsa-lib)
-       ("ffmpeg" ,ffmpeg)
-       ("flac" ,flac)
-       ("freetype" ,freetype)
-       ("glslang" ,glslang)
-       ("libxinerama" ,libxinerama)
-       ("libxkbcommon" ,libxkbcommon)
-       ("libxml2" ,libxml2)
-       ("libxrandr" ,libxrandr)
-       ("libxv" ,libxv)
-       ("mbedtls-apache" ,mbedtls-apache)
-       ("mesa" ,mesa)
-       ("openal" ,openal)
-       ("openssl" ,openssl)
-       ("pulseaudio" ,pulseaudio)
-       ("python" ,python)
-       ("qtbase" ,qtbase-5)
-       ("sdl" ,sdl2)
-       ("spirv-headers" ,spirv-headers)
-       ("spirv-tools" ,spirv-tools)
-       ("udev" ,eudev)
-       ("vulkan-loader" ,vulkan-loader)
-       ("wayland" ,wayland)
-       ("zlib" ,zlib)))
+     (list alsa-lib
+           eudev
+           ffmpeg
+           flac
+           freetype
+           glslang
+           libxinerama
+           libxkbcommon
+           libxml2
+           libxrandr
+           libxv
+           mbedtls-apache
+           mesa
+           openal
+           openssl
+           pulseaudio
+           python
+           qtbase-5
+           sdl2
+           spirv-headers
+           spirv-tools
+           vulkan-loader
+           wayland
+           zlib))
     (native-inputs
      (list pkg-config wayland-protocols which))
     (native-search-paths
-- 
2.41.0

bug#66724: [PATCH 0/4] gnu: retroarch: Update to 1.16.0.3

[Christopher Baines]

[-- Attachment #1: Type: text/plain, Size: 720 bytes --]


iyzsong--- via Guix-patches via <guix-patches@gnu.org> writes:

> From: 宋文武 <iyzsong@member.fsf.org>
>
> Hello list, here is an update for RetroArch.
>
>
> Sou Bunnbu (宋文武) (4):
>   gnu: retroarch: Update to 1.16.0.3.
>   gnu: retroarch: Use more system libraries.
>   gnu: retroarch: Use latest ffmpeg.
>   gnu: retroarch: Remove input labels.
>
>  gnu/packages/emulators.scm | 52 +++++++++++++++++++++++---------------
>  1 file changed, 31 insertions(+), 21 deletions(-)
>
>
> base-commit: 7383d15641f17af5a8c656a4ad592138abc7d5ec

This patch series looks to have been pushed to master as
c03a44f7555768fcb8614883eb06b11b759ba1ca.

It also looks good to me :)

Marking as done.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 987 bytes --]