gentoo resync : 03.09.2021

4 files changed, 0 insertions, 153 deletions

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)