summaryrefslogtreecommitdiff
path: root/games/retroarch/files
diff options
context:
space:
mode:
Diffstat (limited to 'games/retroarch/files')
-rw-r--r--games/retroarch/files/patch-audio_common_alsa.c10
-rw-r--r--games/retroarch/files/patch-audio_drivers_alsa.c11
-rw-r--r--games/retroarch/files/patch-audio_drivers_alsathread.c11
-rw-r--r--games/retroarch/files/patch-audio_drivers_pipewire.c20
-rw-r--r--games/retroarch/files/patch-fix-ffmpeg897
-rw-r--r--games/retroarch/files/patch-qb_config.libs.sh6
6 files changed, 35 insertions, 120 deletions
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 '' true
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-20 03:48:52 +0000