Date: Mon, 15 Dec 2025 01:58:33 +0000 Message-ID: <693f6b49.3531e.7a200542@gitrepo.freebsd.org>
index | next in thread | raw e-mail
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=81e35dbe6311b12d7dd4df5a90cb365879694d07 commit 81e35dbe6311b12d7dd4df5a90cb365879694d07 Author: Tilde Joy <tilde@ultros.pro> AuthorDate: 2025-12-15 01:47:21 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2025-12-15 01:47:21 +0000 games/retroarch: Update 1.21.0 => 1.22.2 Changelog: https://github.com/libretro/RetroArch/blob/v1.22.2/CHANGES.md - Fix build with ALSA option, upstream issue: https://github.com/libretro/RetroArch/issues/18501 - Switch to tarball from upstream: excludes a bunch of packaging scripts and config, some wii specific code and a load of libretro example programs, plist is identical, distfile is smaller in 5 times. PR: 291534 Approved by: Daniel Menelkir <dmenelkir@gmail.com> (maintainer, implicit - inactive from ~2024.08) --- games/retroarch/Makefile | 9 +- games/retroarch/distinfo | 6 +- games/retroarch/files/patch-audio_common_alsa.c | 10 +++ games/retroarch/files/patch-audio_drivers_alsa.c | 11 +++ .../files/patch-audio_drivers_alsathread.c | 11 +++ .../retroarch/files/patch-audio_drivers_pipewire.c | 20 ----- games/retroarch/files/patch-fix-ffmpeg8 | 97 ---------------------- games/retroarch/files/patch-qb_config.libs.sh | 6 +- 8 files changed, 43 insertions(+), 127 deletions(-) diff --git a/games/retroarch/Makefile b/games/retroarch/Makefile index 4b817bddc1e8..e80c12c678b4 100644 --- a/games/retroarch/Makefile +++ b/games/retroarch/Makefile @@ -1,7 +1,9 @@ PORTNAME= RetroArch DISTVERSIONPREFIX= v -DISTVERSION= 1.21.0 +DISTVERSION= 1.22.2 CATEGORIES= games emulators +MASTER_SITES= https://github.com/libretro/${PORTNAME}/releases/download/v${DISTVERSION}/ +DISTNAME= ${PORTNAME:tl}-sourceonly-${DISTVERSION} MAINTAINER= dmenelkir@gmail.com COMMENT= Cross-platform entertainment system based on libretro API @@ -20,10 +22,9 @@ LIB_DEPENDS= libass.so:multimedia/libass \ RUN_DEPENDS= retroarch-assets>0:games/retroarch-assets \ libretro-core-info>0:games/libretro-core-info -USES= compiler:c++11-lib cpe gmake pkgconfig python shebangfix ssl +USES= compiler:c++11-lib cpe gmake pkgconfig python shebangfix ssl \ + tar:xz CPE_VENDOR= libretro -USE_GITHUB= yes -GH_ACCOUNT= libretro SHEBANG_FILES= libretro-common/glsym/glgen.py libretro-common/glsym/rglgen.py \ tools/cg2glsl.py tools/vulkan_loader_generator.py diff --git a/games/retroarch/distinfo b/games/retroarch/distinfo index 5e60e57c8902..cf6c75e87c74 100644 --- a/games/retroarch/distinfo +++ b/games/retroarch/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1751263047 -SHA256 (libretro-RetroArch-v1.21.0_GH0.tar.gz) = 9da17918c10d91d4ebfde9ff402dba0b1ad6660fdbce7656d32f0c0182b3a538 -SIZE (libretro-RetroArch-v1.21.0_GH0.tar.gz) = 70961877 +TIMESTAMP = 1765674121 +SHA256 (retroarch-sourceonly-1.22.2.tar.xz) = 2a8b1713f7f4d2b53bad3e2297e48d78f5666098cf00d583d3e08f3c213f8aa6 +SIZE (retroarch-sourceonly-1.22.2.tar.xz) = 13564476 diff --git a/games/retroarch/files/patch-audio_common_alsa.c b/games/retroarch/files/patch-audio_common_alsa.c new file mode 100644 index 000000000000..9023664d8b07 --- /dev/null +++ b/games/retroarch/files/patch-audio_common_alsa.c @@ -0,0 +1,10 @@ +--- audio/common/alsa.c.orig 2025-11-20 00:17:08 UTC ++++ audio/common/alsa.c +@@ -17,7 +17,6 @@ + #include <string/stdstring.h> + + #include <alsa/asoundlib.h> +-#include <asm-generic/errno.h> + + #include "alsa.h" + diff --git a/games/retroarch/files/patch-audio_drivers_alsa.c b/games/retroarch/files/patch-audio_drivers_alsa.c new file mode 100644 index 000000000000..c6a00faf8447 --- /dev/null +++ b/games/retroarch/files/patch-audio_drivers_alsa.c @@ -0,0 +1,11 @@ +--- audio/drivers/alsa.c.orig 2025-11-20 00:17:08 UTC ++++ audio/drivers/alsa.c +@@ -22,7 +22,7 @@ + + #include <alsa/asoundlib.h> + #include <alsa/pcm.h> +-#include <asm-generic/errno.h> ++#include <errno.h> + + #include "../audio_driver.h" + #include "../common/alsa.h" diff --git a/games/retroarch/files/patch-audio_drivers_alsathread.c b/games/retroarch/files/patch-audio_drivers_alsathread.c new file mode 100644 index 000000000000..1d1cd5487c1a --- /dev/null +++ b/games/retroarch/files/patch-audio_drivers_alsathread.c @@ -0,0 +1,11 @@ +--- audio/drivers/alsathread.c.orig 2025-11-20 00:17:08 UTC ++++ audio/drivers/alsathread.c +@@ -24,7 +24,7 @@ + #include <rthreads/rthreads.h> + #include <queues/fifo_queue.h> + #include <string/stdstring.h> +-#include <asm-generic/errno.h> ++#include <errno.h> + + #include "../audio_driver.h" + #include "../common/alsa.h" /* For some common functions/types */ diff --git a/games/retroarch/files/patch-audio_drivers_pipewire.c b/games/retroarch/files/patch-audio_drivers_pipewire.c deleted file mode 100644 index dee89af57e77..000000000000 --- a/games/retroarch/files/patch-audio_drivers_pipewire.c +++ /dev/null @@ -1,20 +0,0 @@ ---- audio/drivers/pipewire.c.orig 2025-05-01 00:17:50 UTC -+++ audio/drivers/pipewire.c -@@ -157,7 +157,7 @@ static const struct pw_registry_events registry_events - .global = registry_event_global, - }; - --static void *pipewire_init(const char *device, unsigned rate, -+static void *_pipewire_init(const char *device, unsigned rate, - unsigned latency, - unsigned block_frames, - unsigned *new_rate) -@@ -443,7 +443,7 @@ audio_driver_t audio_pipewire = { - } - - audio_driver_t audio_pipewire = { -- pipewire_init, -+ _pipewire_init, - pipewire_write, - pipewire_stop, - pipewire_start, diff --git a/games/retroarch/files/patch-fix-ffmpeg8 b/games/retroarch/files/patch-fix-ffmpeg8 deleted file mode 100644 index 148e4d47957f..000000000000 --- a/games/retroarch/files/patch-fix-ffmpeg8 +++ /dev/null @@ -1,97 +0,0 @@ -From 21776a2e59f5f5899ff2198c0df25a95b5020012 Mon Sep 17 00:00:00 2001 -From: libretroadmin <reallibretroretroarch@gmail.com> -Date: Fri, 12 Sep 2025 01:44:51 +0200 -Subject: [PATCH] Attempt to fix ffmpeg 8.0 build errors - ---- - cores/libretro-ffmpeg/ffmpeg_core.c | 14 ++++++++++++++ - record/drivers/record_ffmpeg.c | 17 +++++++++++++++++ - 2 files changed, 31 insertions(+) - -diff --git cores/libretro-ffmpeg/ffmpeg_core.c cores/libretro-ffmpeg/ffmpeg_core.c -index af1a9c6ac76..90272e8e2e2 100644 ---- cores/libretro-ffmpeg/ffmpeg_core.c -+++ cores/libretro-ffmpeg/ffmpeg_core.c -@@ -101,6 +101,9 @@ static tpool_t *tpool; - #define FFMPEG3 ((LIBAVUTIL_VERSION_INT < (56, 6, 100)) || \ - (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100))) - #endif -+#ifndef FFMPEG8 -+#define FFMPEG8 (LIBAVCODEC_VERSION_MAJOR >= 62) -+#endif - - #if ENABLE_HW_ACCEL - static enum AVHWDeviceType hw_decoder; -@@ -2093,17 +2096,28 @@ void CORE_PREFIX(retro_unload_game)(void) - - for (i = 0; i < MAX_STREAMS; i++) - { -+#if FFMPEG8 -+ if (sctx[i]) -+ avcodec_free_context(&sctx[i]); -+ if (actx[i]) -+ avcodec_free_context(&actx[i]); -+#else - if (sctx[i]) - avcodec_close(sctx[i]); - if (actx[i]) - avcodec_close(actx[i]); -+#endif - sctx[i] = NULL; - actx[i] = NULL; - } - - if (vctx) - { -+#if FFMPEG8 -+ avcodec_free_context(&vctx); -+#else - avcodec_close(vctx); -+#endif - vctx = NULL; - } - -diff --git record/drivers/record_ffmpeg.c record/drivers/record_ffmpeg.c -index 1c97c66886c..41063495c88 100644 ---- record/drivers/record_ffmpeg.c -+++ record/drivers/record_ffmpeg.c -@@ -73,6 +73,15 @@ extern "C" { - #define FFMPEG3 ((LIBAVUTIL_VERSION_INT < (56, 6, 100)) || \ - (LIBAVCODEC_VERSION_INT < AV_VERSION_INT(58, 10, 100))) - #endif -+ -+#ifndef FFMPEG8 -+#define FFMPEG8 (LIBAVCODEC_VERSION_MAJOR >= 62) -+#endif -+ -+#ifndef AV_INPUT_BUFFER_MIN_SIZE -+#define AV_INPUT_BUFFER_MIN_SIZE 16384 -+#endif -+ - #define HAVE_CH_LAYOUT (LIBAVUTIL_VERSION_INT >= AV_VERSION_INT(57, 28, 100)) - - struct ff_video_info -@@ -952,7 +961,11 @@ static void ffmpeg_free(void *data) - - if (handle->audio.codec) - { -+#if FFMPEG8 -+ avcodec_free_context(&handle->audio.codec); -+#else - avcodec_close(handle->audio.codec); -+#endif - av_free(handle->audio.codec); - } - -@@ -960,7 +973,11 @@ static void ffmpeg_free(void *data) - - if (handle->video.codec) - { -+#if FFMPEG8 -+ avcodec_free_context(&handle->video.codec); -+#else - avcodec_close(handle->video.codec); -+#endif - av_free(handle->video.codec); - } - diff --git a/games/retroarch/files/patch-qb_config.libs.sh b/games/retroarch/files/patch-qb_config.libs.sh index 732a8e228973..e85f1bae2a1c 100644 --- a/games/retroarch/files/patch-qb_config.libs.sh +++ b/games/retroarch/files/patch-qb_config.libs.sh @@ -1,4 +1,4 @@ ---- qb/config.libs.sh.orig 2025-05-01 00:17:50 UTC +--- qb/config.libs.sh.orig 2025-12-09 00:02:20 UTC +++ qb/config.libs.sh @@ -269,8 +269,10 @@ check_val '' PULSE -lpulse '' libpulse '' '' false check_pkgconf ROAR libroar 1.0.12 @@ -8,6 +8,6 @@ check_val '' PIPEWIRE -lpipewire-0.3 '' libpipewire-0.3 '' '' false check_val '' PIPEWIRE_STABLE -lpipewire-0.3 '' libpipewire-0.3 1.0.0 '' false +fi - check_val '' SDL -lSDL SDL sdl 1.2.10 '' false - check_val '' SDL2 -lSDL2 SDL2 sdl2 2.0.0 '' false + check_val '' SDL -lSDL SDL sdl 1.2.10 '' true + check_val '' SDL2 -lSDL2 SDL2 sdl2 2.0.0 '' truehelp
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?693f6b49.3531e.7a200542>