gentoo resync : 03.09.2021

8 files changed, 58 insertions, 155 deletions

diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index ec67ae0271e6..e8d5d0b8646f 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest
index ff7332014ee7..a593859dc861 100644
--- a/media-video/mjpegtools/Manifest
+++ b/media-video/mjpegtools/Manifest
@@ -1,6 +1,3 @@
-AUX mjpegtools-2.1.0-no_format.patch 2800 BLAKE2B fd608ca5b9700fc0ab216f99be79fe438b68eb3c62804c24285862af7a2ab93a06d4f8029da9a1a2dc7817fb55eeddeded100968066b6e6d152856c14e9034cb SHA512 234c02625898f67994261e00ca940bbd597c60d2060507ee1e7391ea61353e00906325aec608d2ba545a7b4725d1ad645bd9d2cd33d23669490de3646998005b
-AUX mjpegtools-2.1.0-pic.patch 2298 BLAKE2B 9babd547b6c631845964e7ab6cb929d0b704700782ff3118c44e6434585b66a21ae713b544e57d33beae6193b7ff499fc6be1ddb9147cf93cc3c00ccec676f76 SHA512 d90c30e097f3f2694f611b3e52d76834f9f6e1c9020680e87cc353b28492d36dfb49a7a1167792450cb6f7ed88c20ed891b9282693be9d8583e4948fd998802c
-AUX mjpegtools-2.1.0-sdl-cflags.patch 387 BLAKE2B ad8065afdf164335e77adf972b21c6fd7108dba3f21a56006eede02a650f7f0728950c36f9e73dbedd9713eb69f8dab010c547c472c02abd8642dc518cc43621 SHA512 67b43ab22d1358755a6e109b8eaf21b14058c6a4f4dc511e27162c4205274eacbe4fb9016a5c8a3938ca071f6d4f1898801ed3ab0571b011aab170771a1b7602
 DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f
 EBUILD mjpegtools-2.2.0-r1.ebuild 2679 BLAKE2B 5f67591a0b27b85095b1522d1de4efe1373f1ba67a552cab271d5a933c7da6d5e42f3f53ab8daaf9a84c522ac71bc1cddf13869ffce7fe4b7a2f14adee1decea SHA512 58a9ae7d7a37ccfce311668a532b98aa0c28fc86b05cc41369f5f983e74413f3feaa360af57ff20ad62ed4f94f76f2cdaf7b6cf2dae95b0e28c3024df73ec609
 MISC metadata.xml 537 BLAKE2B 9a038894ff7da6df6f8746be16e0a0f9e0586321eba052a95afd038d2625110d7dbcd2961ac8de8c14ab2fd74ccb2eb3881d64c8b96c97936e92173e2b62a67b SHA512 f3360892e77c064d2062bb963b91f031587ebed6a31b8ba2c698d969cf88998daec9ef910689f477e36921df60d2aa8bdfbe569dda701b0e375d75acfd31d79d
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch
deleted file mode 100644
index 20ed99628fb6..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch
+++ /dev/null
@@ -1,70 +0,0 @@
---- ./lavtools/lav_io.c.orig	2014-07-27 17:48:21.474622974 +0100
-+++ ./lavtools/lav_io.c	2014-07-27 17:48:48.838881166 +0100
-@@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi
-             strcat(errmsg, ", quicktime");
- #endif
- 	    strcat(errmsg, ").\n");
--            fprintf(stderr, errmsg);
-+        fprintf(stderr, "%s", errmsg);
- 	    free(lav_fd);
- 	    internal_error = ERROR_FORMAT; /* Format not recognized */
- 	    return 0;
---- ./lavtools/lavtrans.c.orig	2014-07-27 17:58:09.410282056 +0100
-+++ ./lavtools/lavtrans.c	2014-07-27 17:59:24.769016140 +0100
-@@ -275,7 +275,7 @@ int main(int argc, char ** argv)
-    if (process_image_frame != -1)
-    {
-       nv = el_get_video_frame(vbuff, process_image_frame, &el);
--      sprintf(imgfname,outfile);
-+      sprintf(imgfname, "%s", outfile);
-       imgfd = fopen(imgfname,"wb");
-       if (imgfd==0) system_error("opening image file","fopen");
-       res = fwrite(vbuff,nv,1,imgfd);
---- ./lavtools/jpeg2yuv.c.orig	2014-07-27 18:00:55.600900476 +0100
-+++ ./lavtools/jpeg2yuv.c	2014-07-27 18:01:36.848301893 +0100
-@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
-            
-            if (firstjpeg) {
-                p = firstjpeg;
--               sprintf(jpegname, firstjpeg);
-+               sprintf(jpegname, "%s", firstjpeg);
-                firstjpeg = NULL;
-            }
-            else {
---- ./mplex/main.cpp.orig	2014-07-27 18:11:38.282143657 +0100
-+++ ./mplex/main.cpp	2014-07-27 18:06:40.352252415 +0100
-@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun
-                 if( flag_table[flag].longname != 0 )
-                     message += sep;
-             }
--            mjpeg_error( message.c_str() );
-+            mjpeg_error( "%s", message.c_str() );
-             return false;
-         }
- 
---- ./yuvfilters/yuvkineco.c.orig	2014-07-27 18:15:01.476097522 +0100
-+++ ./yuvfilters/yuvkineco.c	2014-07-27 18:15:29.540366245 +0100
-@@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha
-     } else {
- #ifdef MJPEGTOOLS
-       buf[n] = '\0';
--      mjpeg_debug(buf);
-+      mjpeg_debug("%s", buf);
- #else
-       fputs(buf, stderr);
- #endif
---- ./yuvfilters/yuvfilters.h.orig	2014-07-27 18:37:02.712645244 +0100
-+++ ./yuvfilters/yuvfilters.h	2014-07-27 19:13:28.156101800 +0100
-@@ -34,9 +34,9 @@ extern "C" {
- 
- #ifdef MJPEGTOOLS
- # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno))
--# define WERROR(MSG) mjpeg_error(MSG)
--# define WERRORL(MSG) mjpeg_error(MSG)
--# define WWARN(MSG) mjpeg_warn(MSG)
-+# define WERROR(MSG) mjpeg_error("%s", MSG)
-+# define WERRORL(MSG) mjpeg_error("%s", MSG)
-+# define WWARN(MSG) mjpeg_warn("%s", MSG)
- #else
- # define WERROR(MSG) write(2, MSG "\n", sizeof MSG)
- # define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } while (0)
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
deleted file mode 100644
index 0fda6c73c26f..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Index: y4mdenoise/Makefile.am
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v
-retrieving revision 1.12
-retrieving revision 1.13
-diff -u -r1.12 -r1.13
---- a/y4mdenoise/Makefile.am	1 Apr 2012 08:44:49 -0000	1.12
-+++ b/y4mdenoise/Makefile.am	28 Nov 2013 22:39:41 -0000	1.13
-@@ -4,8 +4,8 @@
- 
- EXTRA_DIST = implementation.html
- 
--AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
--AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@
-+AM_CFLAGS = -DNDEBUG -finline-functions
-+AM_CXXFLAGS = -DNDEBUG -finline-functions
- 
- INCLUDES =  -I$(top_srcdir) -I$(top_srcdir)/utils
- 
-Index: y4munsharp/Makefile.am
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v
-retrieving revision 1.2
-retrieving revision 1.3
-diff -u -r1.2 -r1.3
---- a/y4munsharp/Makefile.am	16 Jun 2005 17:09:38 -0000	1.2
-+++ b/y4munsharp/Makefile.am	28 Nov 2013 22:39:41 -0000	1.3
-@@ -4,7 +4,7 @@
- 
- INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir)
- 
--y4munharp_CFLAGS=@PROGRAM_NOPIC@
-+y4munharp_CFLAGS=
- 
- bin_PROGRAMS = y4munsharp
- 
-Index: y4mutils/Makefile.am
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v
-retrieving revision 1.7
-retrieving revision 1.8
-diff -u -r1.7 -r1.8
---- a/y4mutils/Makefile.am	1 Apr 2012 08:44:49 -0000	1.7
-+++ b/y4mutils/Makefile.am	28 Nov 2013 22:39:41 -0000	1.8
-@@ -2,7 +2,7 @@
- 
- MAINTAINERCLEANFILES = Makefile.in
- 
--AM_CFLAGS   = @PROGRAM_NOPIC@
-+AM_CFLAGS   =
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils
- 
- LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la
-Index: yuvscaler/Makefile.am
-===================================================================
-RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v
-retrieving revision 1.5
-retrieving revision 1.6
-diff -u -r1.5 -r1.6
---- a/yuvscaler/Makefile.am	1 Apr 2012 08:44:49 -0000	1.5
-+++ b/yuvscaler/Makefile.am	28 Nov 2013 22:39:41 -0000	1.6
-@@ -18,6 +18,6 @@
- 
- EXTRA_DIST = yuvscaler_implementation.txt
- 
--yuvscaler_CFLAGS=@PROGRAM_NOPIC@
-+yuvscaler_CFLAGS=
- yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c
- yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch
deleted file mode 100644
index 3bb7563caaa3..000000000000
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff a/y4mutils/Makefile.am b/y4mutils/Makefile.am
---- a/y4mutils/Makefile.am
-+++ b/y4mutils/Makefile.am
-@@ -44,6 +44,7 @@ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
- 
- y4mhist_SOURCES = y4mhist.c
- y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS)
-+y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS)
- 
- y4mblack_SOURCES = y4mblack.c
- y4mblack_LDADD = $(LIBMJPEGUTILS)
diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest
index e029210f9bda..bdd4ba9814c5 100644
--- a/media-video/vlc/Manifest
+++ b/media-video/vlc/Manifest
@@ -9,10 +9,11 @@ AUX vlc-3.0.13-srt-1.3.0.patch 446 BLAKE2B e02bad6bcc81508fd8d28a2b10f1760339c6a
 AUX vlc-3.0.14-fix-live-address-api.patch 2233 BLAKE2B 50b40430978996e5302b08bcb8a68e5f106fe43f4fd66ad69dd1e6c1e8097abc32c671cdfc8dc87b7526cabadf847bf359f81927919ff3ab8ea7a80274bc7075 SHA512 d79e03677e404ef853499ac7b72977f1d6368d003720ce663581a5527b5b6327b36d5b240bec0aa2d4c3bff4c1b04ce1c4dc904fc648c98498ba2f88f1acd82a
 AUX vlc-3.0.6-fdk-aac-2.0.0.patch 3436 BLAKE2B 022201ed10fef189feeb36f44ab4194ab7994e4fdd8bad922070b54688d34d051fac28177a0e648d55670e0b9f0c6b45f9a05650476b0ae12ebfe759dd561e28 SHA512 68964adda04cd88e80b586984f1af0cfdccff5dbf8529070d5ab985b23402dfb7380b5d39eacfea433c1ba03434139e4f394c1c25d6b426489883d3a42cb7b5b
 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-3.0.14.tar.gz 34355555 BLAKE2B e8182229da1fe4f73b640fad8005ec3fc49da70f289bd32c33fcec51bf81d393b067a795626bad57c87499e8de181ac3ce159e572431e794586753c4a7c32597 SHA512 6d366c0f17a8bda7f588ab1818d985bccd076dd821bc83dd7d06827d463931e56cb06ca934622ee2cda4a76b0fbe265a66e4566e9307abc768b76174020f0150
 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298
 EBUILD vlc-3.0.14-r6.ebuild 13811 BLAKE2B c7bfa970ce2ed6474b08486cc80d781b71a8149184fe3a61a655417440f530198d2eedceb0f022b54b25f720453925a34fabb41cf539dafb532162614311596e SHA512 e838d26950efa98ba4b39c171c5246beb61d57a25005ed6d04899ccff8c37c0f37081e9545b8ff6d70bbe2b7ab3dff804f4c49fc762178ff05352b66a3a98fe9
 EBUILD vlc-3.0.16-r6.ebuild 13947 BLAKE2B 9159aee81de28beb081bd2522e26fa311b7ac372518c0726c1e029b2b1422718e0e203521d05465c2691a22d3bee4cc8fab63c664d497ecf632bb48c34ba4c0c SHA512 4d80bfd4c2f8e69f71b460383e8fb702b4aff07fbbfe58020e27fac6a57e4161e61e7303c81d65f5485b66134ac541cc99832b99f132020a783e192078434ba6
 EBUILD vlc-3.0.9999.ebuild 13484 BLAKE2B 4af596070d8b9a4f4c22d14540863221725a591d34d26979b1b60c06d24923963dd3f1279c8de4f9adefc90b87bf08a88267d1a42324988099c4d656f2a3f843 SHA512 f5cf094b7eb9ce67b10a71719b476f9a960086587dfdb469d09c58e5c449fc1a06aea8532f479d51478d095dd0b92cb04e015d036752c56ad7e188e1ec8b2ade
-EBUILD vlc-9999.ebuild 13505 BLAKE2B 29f331ef011e705ff842f6c79fe0feb6c91a53ae2a476f36ecc23d7e10f1bb5a17626fd0e808d5aa5e99cb0e19810bdf1c5a926db01875333fbc654f03eec694 SHA512 8393e4cb2b4b6ec1d4d7bba05333ce15306b040eef3812112266cb8d1e32edd18779c3e44ab78d48faaf6c0ef13371f80ee21369fc5267fc1762d5f5901d7f8a
+EBUILD vlc-9999.ebuild 13496 BLAKE2B 34f910ff15c32ccd8394a2ff55743e242ad89a81188f3f14a064c35825f6bec3cfeb5a07921e3e90aa84a4e4a7f69e9c0e1f3a921335ca64e57200a11461f02d SHA512 1b6da672d51b83c8fab3adca52c4b77cbb731f9d4d0158f41009230cfb384e9c1e0541dad652c5af325df5cf3ac0a612e4f6774e42ff6a44259109f9c2b25d16
 MISC metadata.xml 4911 BLAKE2B 689cbaf21ee9adbae82ea670b575286cecfe49865aaff92a92d1cb78305c26306a72d9b010e052955c79e0c39723f03301f7a858de198948759ec228e90e7baf SHA512 62442acac34bf27c40e5cf41313c2f9ed3efd54cfb9c0dc42ca0ba3b37cb8e23690e88f04a3629bbe62b774c2bc6740a33f7336d371589982c8b2578050f13d1
diff --git a/media-video/vlc/files/vlc-configure_lua_version.patch b/media-video/vlc/files/vlc-configure_lua_version.patch
new file mode 100644
index 000000000000..2628075535a6
--- /dev/null
+++ b/media-video/vlc/files/vlc-configure_lua_version.patch
@@ -0,0 +1,55 @@
+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 @@
+     [disable LUA scripting support (default enabled)]))
+ if test "${enable_lua}" != "no"
+ then
+-  PKG_CHECK_MODULES(LUA, lua5.2, [ have_lua=yes ], [:])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+-    AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua 5.1 instead])
+-    PKG_CHECK_MODULES(LUA, lua5.1, [ have_lua=yes ], [:]) ])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+-    AC_MSG_WARN([${LUA_PKG_ERRORS}, trying lua >= 5.1 instead])
+-    PKG_CHECK_MODULES(LUA, lua >= 5.1, [ have_lua=yes ], [:]) ])
+-
+-  AS_IF([test "${have_lua}" != "yes"], [
+-     AC_MSG_WARN([${LUA_PKG_ERRORS}, trying manual detection instead])
+-     have_lua_lib=no
+-     AC_CHECK_LIB( lua5.2 , luaL_newstate, [
+-       LUA_LIBS="-llua5.2"
+-       have_lua_lib=yes], [])
+-
+-     AS_IF([test "${have_lua_lib}" != "yes"], [
+-       AC_CHECK_LIB( lua5.1 , luaL_newstate, [
+-         LUA_LIBS="-llua5.1"
+-         have_lua_lib=yes], [] ) ])
+-
+-     AS_IF([test "${have_lua_lib}" != "yes"], [
+-       AC_CHECK_LIB( lua51 , luaL_newstate, [
+-         LUA_LIBS="-llua51"
+-         have_lua_lib=yes], [] ) ])
+-
+-     AS_IF([test "${have_lua_lib}" != "yes"], [
+-       AC_CHECK_LIB( lua , luaL_newstate,
+-         [LUA_LIBS="-llua"
+-          have_lua_lib=yes],
+-         [ have_lua=no ], [-lm] ) ])
+-
+-     dnl If we found any lib, check that we have the headers too
+-     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
+       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/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild
index 09a8d54ca6e7..88345ff41a5f 100644
--- a/media-video/vlc/vlc-9999.ebuild
+++ b/media-video/vlc/vlc-9999.ebuild
@@ -233,7 +233,7 @@ 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}-3.0.11.1-configure_lua_version.patch
+	"${FILESDIR}"/${PN}-configure_lua_version.patch
 )
 
 DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt )