* [gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/files/
@ 2021-09-01 20:28 Conrad Kostecki
0 siblings, 0 replies; only message in thread
From: Conrad Kostecki @ 2021-09-01 20:28 UTC (permalink / raw
To: gentoo-commits
commit: 2811fd636a5435d72ac0c5e97e7eac9bfe4c1456
Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Wed Sep 1 13:45:39 2021 +0000
Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
CommitDate: Wed Sep 1 20:27:55 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2811fd63
media-video/mjpegtools: remove unused patch(es)
Closes: https://github.com/gentoo/gentoo/pull/22180
Package-Manager: Portage-3.0.22, Repoman-3.0.3
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
.../files/mjpegtools-2.1.0-no_format.patch | 70 ----------------------
.../mjpegtools/files/mjpegtools-2.1.0-pic.patch | 69 ---------------------
.../files/mjpegtools-2.1.0-sdl-cflags.patch | 11 ----
3 files changed, 150 deletions(-)
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 20ed99628fb..00000000000
--- 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 0fda6c73c26..00000000000
--- 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 3bb7563caaa..00000000000
--- 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)
^ permalink raw reply related [flat|nested] only message in thread
only message in thread, other threads:[~2021-09-01 20:28 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-09-01 20:28 [gentoo-commits] repo/gentoo:master commit in: media-video/mjpegtools/files/ Conrad Kostecki
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox