| 1 |
commit: 2811fd636a5435d72ac0c5e97e7eac9bfe4c1456 |
| 2 |
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> |
| 3 |
AuthorDate: Wed Sep 1 13:45:39 2021 +0000 |
| 4 |
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 1 20:27:55 2021 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2811fd63 |
| 7 |
|
| 8 |
media-video/mjpegtools: remove unused patch(es) |
| 9 |
|
| 10 |
Closes: https://github.com/gentoo/gentoo/pull/22180 |
| 11 |
Package-Manager: Portage-3.0.22, Repoman-3.0.3 |
| 12 |
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> |
| 13 |
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> |
| 14 |
|
| 15 |
.../files/mjpegtools-2.1.0-no_format.patch | 70 ---------------------- |
| 16 |
.../mjpegtools/files/mjpegtools-2.1.0-pic.patch | 69 --------------------- |
| 17 |
.../files/mjpegtools-2.1.0-sdl-cflags.patch | 11 ---- |
| 18 |
3 files changed, 150 deletions(-) |
| 19 |
|
| 20 |
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 |
| 21 |
deleted file mode 100644 |
| 22 |
index 20ed99628fb..00000000000 |
| 23 |
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-no_format.patch |
| 24 |
+++ /dev/null |
| 25 |
@@ -1,70 +0,0 @@ |
| 26 |
---- ./lavtools/lav_io.c.orig 2014-07-27 17:48:21.474622974 +0100 |
| 27 |
-+++ ./lavtools/lav_io.c 2014-07-27 17:48:48.838881166 +0100 |
| 28 |
-@@ -926,7 +926,7 @@ lav_file_t *lav_open_input_file(char *fi |
| 29 |
- strcat(errmsg, ", quicktime"); |
| 30 |
- #endif |
| 31 |
- strcat(errmsg, ").\n"); |
| 32 |
-- fprintf(stderr, errmsg); |
| 33 |
-+ fprintf(stderr, "%s", errmsg); |
| 34 |
- free(lav_fd); |
| 35 |
- internal_error = ERROR_FORMAT; /* Format not recognized */ |
| 36 |
- return 0; |
| 37 |
---- ./lavtools/lavtrans.c.orig 2014-07-27 17:58:09.410282056 +0100 |
| 38 |
-+++ ./lavtools/lavtrans.c 2014-07-27 17:59:24.769016140 +0100 |
| 39 |
-@@ -275,7 +275,7 @@ int main(int argc, char ** argv) |
| 40 |
- if (process_image_frame != -1) |
| 41 |
- { |
| 42 |
- nv = el_get_video_frame(vbuff, process_image_frame, &el); |
| 43 |
-- sprintf(imgfname,outfile); |
| 44 |
-+ sprintf(imgfname, "%s", outfile); |
| 45 |
- imgfd = fopen(imgfname,"wb"); |
| 46 |
- if (imgfd==0) system_error("opening image file","fopen"); |
| 47 |
- res = fwrite(vbuff,nv,1,imgfd); |
| 48 |
---- ./lavtools/jpeg2yuv.c.orig 2014-07-27 18:00:55.600900476 +0100 |
| 49 |
-+++ ./lavtools/jpeg2yuv.c 2014-07-27 18:01:36.848301893 +0100 |
| 50 |
-@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_ |
| 51 |
- |
| 52 |
- if (firstjpeg) { |
| 53 |
- p = firstjpeg; |
| 54 |
-- sprintf(jpegname, firstjpeg); |
| 55 |
-+ sprintf(jpegname, "%s", firstjpeg); |
| 56 |
- firstjpeg = NULL; |
| 57 |
- } |
| 58 |
- else { |
| 59 |
---- ./mplex/main.cpp.orig 2014-07-27 18:11:38.282143657 +0100 |
| 60 |
-+++ ./mplex/main.cpp 2014-07-27 18:06:40.352252415 +0100 |
| 61 |
-@@ -614,7 +614,7 @@ bool CmdLineMultiplexJob::ParseWorkaroun |
| 62 |
- if( flag_table[flag].longname != 0 ) |
| 63 |
- message += sep; |
| 64 |
- } |
| 65 |
-- mjpeg_error( message.c_str() ); |
| 66 |
-+ mjpeg_error( "%s", message.c_str() ); |
| 67 |
- return false; |
| 68 |
- } |
| 69 |
- |
| 70 |
---- ./yuvfilters/yuvkineco.c.orig 2014-07-27 18:15:01.476097522 +0100 |
| 71 |
-+++ ./yuvfilters/yuvkineco.c 2014-07-27 18:15:29.540366245 +0100 |
| 72 |
-@@ -48,7 +48,7 @@ buf_debug(char *buf, FILE *fp, const cha |
| 73 |
- } else { |
| 74 |
- #ifdef MJPEGTOOLS |
| 75 |
- buf[n] = '\0'; |
| 76 |
-- mjpeg_debug(buf); |
| 77 |
-+ mjpeg_debug("%s", buf); |
| 78 |
- #else |
| 79 |
- fputs(buf, stderr); |
| 80 |
- #endif |
| 81 |
---- ./yuvfilters/yuvfilters.h.orig 2014-07-27 18:37:02.712645244 +0100 |
| 82 |
-+++ ./yuvfilters/yuvfilters.h 2014-07-27 19:13:28.156101800 +0100 |
| 83 |
-@@ -34,9 +34,9 @@ extern "C" { |
| 84 |
- |
| 85 |
- #ifdef MJPEGTOOLS |
| 86 |
- # define perror(MSG) mjpeg_error("%s: %s", MSG, strerror(errno)) |
| 87 |
--# define WERROR(MSG) mjpeg_error(MSG) |
| 88 |
--# define WERRORL(MSG) mjpeg_error(MSG) |
| 89 |
--# define WWARN(MSG) mjpeg_warn(MSG) |
| 90 |
-+# define WERROR(MSG) mjpeg_error("%s", MSG) |
| 91 |
-+# define WERRORL(MSG) mjpeg_error("%s", MSG) |
| 92 |
-+# define WWARN(MSG) mjpeg_warn("%s", MSG) |
| 93 |
- #else |
| 94 |
- # define WERROR(MSG) write(2, MSG "\n", sizeof MSG) |
| 95 |
- # define WERRORL(MSG) do { write(2, MSG, strlen(MSG)); write(2, "\n", 1); } while (0) |
| 96 |
|
| 97 |
diff --git a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch b/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch |
| 98 |
deleted file mode 100644 |
| 99 |
index 0fda6c73c26..00000000000 |
| 100 |
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-pic.patch |
| 101 |
+++ /dev/null |
| 102 |
@@ -1,69 +0,0 @@ |
| 103 |
-Index: y4mdenoise/Makefile.am |
| 104 |
-=================================================================== |
| 105 |
-RCS file: /cvsroot/mjpeg/mjpeg_play/y4mdenoise/Makefile.am,v |
| 106 |
-retrieving revision 1.12 |
| 107 |
-retrieving revision 1.13 |
| 108 |
-diff -u -r1.12 -r1.13 |
| 109 |
---- a/y4mdenoise/Makefile.am 1 Apr 2012 08:44:49 -0000 1.12 |
| 110 |
-+++ b/y4mdenoise/Makefile.am 28 Nov 2013 22:39:41 -0000 1.13 |
| 111 |
-@@ -4,8 +4,8 @@ |
| 112 |
- |
| 113 |
- EXTRA_DIST = implementation.html |
| 114 |
- |
| 115 |
--AM_CFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@ |
| 116 |
--AM_CXXFLAGS = -DNDEBUG -finline-functions @PROGRAM_NOPIC@ |
| 117 |
-+AM_CFLAGS = -DNDEBUG -finline-functions |
| 118 |
-+AM_CXXFLAGS = -DNDEBUG -finline-functions |
| 119 |
- |
| 120 |
- INCLUDES = -I$(top_srcdir) -I$(top_srcdir)/utils |
| 121 |
- |
| 122 |
-Index: y4munsharp/Makefile.am |
| 123 |
-=================================================================== |
| 124 |
-RCS file: /cvsroot/mjpeg/mjpeg_play/y4munsharp/Makefile.am,v |
| 125 |
-retrieving revision 1.2 |
| 126 |
-retrieving revision 1.3 |
| 127 |
-diff -u -r1.2 -r1.3 |
| 128 |
---- a/y4munsharp/Makefile.am 16 Jun 2005 17:09:38 -0000 1.2 |
| 129 |
-+++ b/y4munsharp/Makefile.am 28 Nov 2013 22:39:41 -0000 1.3 |
| 130 |
-@@ -4,7 +4,7 @@ |
| 131 |
- |
| 132 |
- INCLUDES = -I $(top_srcdir)/utils -I $(top_srcdir) |
| 133 |
- |
| 134 |
--y4munharp_CFLAGS=@PROGRAM_NOPIC@ |
| 135 |
-+y4munharp_CFLAGS= |
| 136 |
- |
| 137 |
- bin_PROGRAMS = y4munsharp |
| 138 |
- |
| 139 |
-Index: y4mutils/Makefile.am |
| 140 |
-=================================================================== |
| 141 |
-RCS file: /cvsroot/mjpeg/mjpeg_play/y4mutils/Makefile.am,v |
| 142 |
-retrieving revision 1.7 |
| 143 |
-retrieving revision 1.8 |
| 144 |
-diff -u -r1.7 -r1.8 |
| 145 |
---- a/y4mutils/Makefile.am 1 Apr 2012 08:44:49 -0000 1.7 |
| 146 |
-+++ b/y4mutils/Makefile.am 28 Nov 2013 22:39:41 -0000 1.8 |
| 147 |
-@@ -2,7 +2,7 @@ |
| 148 |
- |
| 149 |
- MAINTAINERCLEANFILES = Makefile.in |
| 150 |
- |
| 151 |
--AM_CFLAGS = @PROGRAM_NOPIC@ |
| 152 |
-+AM_CFLAGS = |
| 153 |
- AM_CPPFLAGS = -I$(top_srcdir) -I$(top_srcdir)/utils |
| 154 |
- |
| 155 |
- LIBMJPEGUTILS = $(top_builddir)/utils/libmjpegutils.la |
| 156 |
-Index: yuvscaler/Makefile.am |
| 157 |
-=================================================================== |
| 158 |
-RCS file: /cvsroot/mjpeg/mjpeg_play/yuvscaler/Makefile.am,v |
| 159 |
-retrieving revision 1.5 |
| 160 |
-retrieving revision 1.6 |
| 161 |
-diff -u -r1.5 -r1.6 |
| 162 |
---- a/yuvscaler/Makefile.am 1 Apr 2012 08:44:49 -0000 1.5 |
| 163 |
-+++ b/yuvscaler/Makefile.am 28 Nov 2013 22:39:41 -0000 1.6 |
| 164 |
-@@ -18,6 +18,6 @@ |
| 165 |
- |
| 166 |
- EXTRA_DIST = yuvscaler_implementation.txt |
| 167 |
- |
| 168 |
--yuvscaler_CFLAGS=@PROGRAM_NOPIC@ |
| 169 |
-+yuvscaler_CFLAGS= |
| 170 |
- yuvscaler_SOURCES = yuvscaler.c yuvscaler_resample.c yuvscaler_bicubic.c |
| 171 |
- yuvscaler_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) |
| 172 |
|
| 173 |
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 |
| 174 |
deleted file mode 100644 |
| 175 |
index 3bb7563caaa..00000000000 |
| 176 |
--- a/media-video/mjpegtools/files/mjpegtools-2.1.0-sdl-cflags.patch |
| 177 |
+++ /dev/null |
| 178 |
@@ -1,11 +0,0 @@ |
| 179 |
-diff a/y4mutils/Makefile.am b/y4mutils/Makefile.am |
| 180 |
---- a/y4mutils/Makefile.am |
| 181 |
-+++ b/y4mutils/Makefile.am |
| 182 |
-@@ -44,6 +44,7 @@ y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS) |
| 183 |
- |
| 184 |
- y4mhist_SOURCES = y4mhist.c |
| 185 |
- y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS) |
| 186 |
-+y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS) |
| 187 |
- |
| 188 |
- y4mblack_SOURCES = y4mblack.c |
| 189 |
- y4mblack_LDADD = $(LIBMJPEGUTILS) |
Archives