gentoo auto-resync : 27:05:2023 - 09:11:36

4 files changed, 22 insertions, 16 deletions

diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index c83db59d4e89..79e66501784c 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -4,11 +4,12 @@ AUX vlc-2.2.8-libupnp-slot-1.8.patch 725 BLAKE2B eb217ef57f0709fa1d0bdf164461058
 AUX vlc-3.0.11.1-configure_lua_version.patch 1598 BLAKE2B 589c90d0c805ff516b7957e9b9fc6931674bc23a8aac15eb27351e9bae00aa55bffb3e62a87813714d8f0d64effa16c06680f10d00ecbe4207d5b26d37c4e5ac SHA512 0f24f54add360164417e01b2899ead07cc9f37cdc872387c7a9c350890f55c6fbec35f99e1e85a96309d7154359ffb99bc2ab7c8151adb080bb1531f88d987e6
 AUX vlc-3.0.18-flac-crc.patch 4105 BLAKE2B 1d5d9103a5fe538f35be2f1a6a248e5d4312f75958e63f667c24abfe5d9f217d85fc79963f092041e300f8ab76363dc623a2d02b90827acba4e5ae0e3f2ced4e SHA512 8f9db986a72d0112b065699cd7459eaeae6270ff4f416b4490a11e100592ddff67adc28ebdc4c97a13433a506bbc5c6225f556545fcdb9c9c31a2524e57a1630
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
+AUX vlc-9999-configure-lua-version.patch 1840 BLAKE2B 1b9f11c05ed58e12616732c73a8418917870515f9612467b2839e8414f553ba3d0d9ede4c38e15957cc9b271aecae9364961103dafd72b80c6088a826f18777b SHA512 fa6350a02a92b65e5cc1c7b8e65e14045ca279d9d6f3f1ae255ab2a8ac88b3b3ff16102aa7e91e51e65e2500712bd7fccbdc987e760a5753581098afb1259eb9
+AUX vlc-9999-fix-libtremor-libs.patch 480 BLAKE2B 86102dc088705f546185023b2f941520b5435f852e0b0e7cdb8763e15df645cdc794087c188fb17ee331be7ba4d953311276583886e3fe0f93d6de32e63e3207 SHA512 93893a0accecc3470f33e505ef2ce86aeb5f2a3a6524adc7de354366bb8e51def2d67957be4ea705ff20c1510e7274691e587e70740d4b3657b35f5c91de7280
 AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bcfddee004e4e8469e1526a6a38fb5cc11a24a19888443e5f9062d7145665d594e142c12f3a9693967f195bab3b33ada38 SHA512 dd3375997a1935d3a227231785f35e300e3f992034da6a9c3019e28c68c1f005cbdd67190672264b342abc719e69005f965599f7af975e2bbd4cfccd89e3770d
-AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99
 DIST vlc-3.0.18.tar.xz 26631372 BLAKE2B 73d80615d5b4789ca980bd631db248e74de13d466e5f19b66a170ca785b46f281a1a242c6fdf14686cfb224aba3ddfeda16ffce11edbef3255c4bbdff36c517d SHA512 6fc8fdaa7e8862ad7133d69b3dab99ab9cd3945846a6ce5e2379b7f68ee9accd385c53b8573fc7c82f732c24678b4932b1154d2ad8accf06305f2f578d6fcd8e
 EBUILD vlc-3.0.18-r1.ebuild 13566 BLAKE2B c2c111844d6c5e3044c7b826052e687c08dee032c16022d23f61a011a1f106b6e36e52a595b20666fb4d21495e7ab5d0826dc512a94b2e8162da80d2ce097ffb SHA512 eadf848ffad433211ee3b1914018f453284ad1e2404711e5cfd1c9c0df4bbd319895873af8ac4a6badaca6226d4c0cecafca150f9c4b2d6c3dbd70152b5894d2
 EBUILD vlc-3.0.18.ebuild 13526 BLAKE2B 2b49edb906c471bd08cba2d7d06e2223f7619537301c84e9047edee0faaa8f330881ae2f60013addf133312e4ad7d0ef4c79758ecb05076645f6fff9fd6b32e8 SHA512 a815bea94b0d0f777e318077ee4f32cbac128bf1e67dcf288ddf63c342052bc8b77f60c065cf389d50dccd33cb51bdf1b20f301fa4b50aaac5916f63bc243c8a
 EBUILD vlc-3.0.9999.ebuild 13531 BLAKE2B 9aeb78cb8803031fd478b26a1d78a1c52ff3074412dd39431d9ab75a1a2e89408f1d5f60531d54894d2bb9b740811ef7e1305882faa9bfe2b47b7e5f0c6e7734 SHA512 e564c7e63ca43c23de37cf26c8a45881ca5b4e311b7df6f132cbbbcfbbd1d7472b32158c66d6fa8efb5853ccd52369528aa766be0704a2a2d3836ed27b612fc0
-EBUILD vlc-9999.ebuild 13492 BLAKE2B 25f8b1cab6a68567643f2af1683b8ff6e22f57bc576fb652119ee94e155d4b7fffe2d76fab2646baf4f8ab69ea587576e4b9298055deb10980258a2f511fb63d SHA512 023cf0839d473f1296c91c38fd32cb6058a637ce1005965a235ab1d33ddb627756224c4b51782a5d25703a2e431be4a0b9eadb944b9f74857d540587ecc12c56
+EBUILD vlc-9999.ebuild 13440 BLAKE2B 7817ed88c45768e7c4114c1a2896992fc1ffb00dd165c2a20ad93934281690ecfd345b9c2c269383aec111f7c25968de61338b26752f8df19b124ef678061f78 SHA512 cae3fa84fa59a6923633398faa4fa4600e8cc371398bdfb99b15c73bed816b0a2f9f08e514e11a986a16581f51be9f3e2e64844486007bba218377f330111b1e
 MISC metadata.xml 4923 BLAKE2B b115bd6bc666f1da6a0ba4d5b6237fedfff4baada406e56eff9c0f9574968177490c456e2d8f0ad07cf73b8e52bcc122931ae9f800d6a29e41cbfdd4ed6780fe SHA512 4b953a8662e31a66af1fb710e166316106b393d136fca7c1c5b61e78bd285bc578037fc11b7ae07202a6fae2a4a6e43f7f6560400bab8d92457012a4fa7e3045
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..223841de8a3c 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,6 @@
-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.
-
---- 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 @@
+--- 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 +41,10 @@ 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
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..3703cea1f10d
--- /dev/null
+++ b/media-video/vlc/files/vlc-9999-fix-libtremor-libs.patch
@@ -0,0 +1,11 @@
+--- 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)
+ 
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 )