media-video/vlc: rebase live patches

Closes: https://bugs.gentoo.org/901995
Signed-off-by: Sam James <sam@gentoo.org>

3 files changed, 36 insertions, 13 deletions

diff --git a/media-video/vlc/files/vlc-configure_lua_version.patch b/media-video/vlc/files/vlc-9999-configure-lua-version.patch
index 2628075535a6..d0ac9493a0fd 100644
--- a/media-video/vlc/files/vlc-configure_lua_version.patch
+++ b/media-video/vlc/files/vlc-9999-configure-lua-version.patch
@@ -1,10 +1,12 @@
-Only look for one single version of Lua: the one pointed to by the
-pkgconfig package 'lua'. The wrapper set up by lua eclasses will take care
-of the rest.
+From 543ae8e4118dd902e5ec9464caf315213e317089 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 27 May 2023 03:14:49 +0100
+Subject: [PATCH 2/2] foo3
 
---- a/configure.ac	2021-06-11 12:20:01.222417096 +0200
-+++ b/configure.ac	2021-06-11 12:21:00.257419197 +0200
-@@ -1907,44 +1907,10 @@
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -1847,43 +1847,10 @@ AC_ARG_ENABLE([lua],
      [disable LUA scripting support (default enabled)]))
  if test "${enable_lua}" != "no"
  then
@@ -45,11 +47,13 @@ of the rest.
 -     AS_IF([test "${have_lua_lib}" = "yes"], [
 -       AC_CHECK_HEADERS([lua.h lauxlib.h lualib.h], [ have_lua=yes ], []) ])
 -  ])
--
 +  PKG_CHECK_MODULES(LUA, lua,
 +    [ have_lua=yes ],
 +    [ have_lua=no ]
-+    )
-   if test "x${have_lua}" != "xyes" ;  then
++  )
+ 
+   if test "${have_lua}" != "yes" ;  then
        AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
-   fi
+-- 
+2.40.1
+
diff --git a/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch b/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch
new file mode 100644
index 000000000000..690cb73acfc4
--- /dev/null
+++ b/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch
@@ -0,0 +1,20 @@
+From 9f8193bd55f7b75c213a60a48a3302f009bdf054 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 27 May 2023 03:13:38 +0100
+Subject: [PATCH 1/2] foo1
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/modules/codec/Makefile.am
++++ b/modules/codec/Makefile.am
+@@ -332,7 +332,7 @@ codec_LTLIBRARIES += $(LTLIBdaala)
+ libtremor_plugin_la_SOURCES = codec/vorbis.c
+ libtremor_plugin_la_CPPFLAGS = $(AM_CPPFLAGS) -DPLUGIN_TREMOR
+ libtremor_plugin_la_LDFLAGS = $(AM_LDFLAGS) -rpath '$(codecdir)'
+-libtremor_plugin_la_LIBADD = -lvorbisdec -logg
++libtremor_plugin_la_LIBADD = $(VORBIS_LIBS) $(OGG_LIBS)
+ EXTRA_LTLIBRARIES += libtremor_plugin.la
+ codec_LTLIBRARIES += $(LTLIBtremor)
+ 
+-- 
+2.40.1
+
diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index d46d85184e77..f27bd375a84e 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -230,9 +230,8 @@ DEPEND="${RDEPEND}
 "
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system
-	"${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164
-	"${FILESDIR}"/${PN}-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-9999-fix-libtremor-libs.patch # build system
+	"${FILESDIR}"/${PN}-9999-configure-lua-version.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README.md doc/fortunes.txt )