[packages/mjpegtools] - up to 2.1.0
arekm
arekm at pld-linux.org
Thu Oct 31 17:54:08 CET 2013
commit 9ec3c10d3fbd0c9d9d501fb86b0ed1ccfc8f5e01
Author: Arkadiusz Miśkiewicz <arekm at maven.pl>
Date: Thu Oct 31 17:54:04 2013 +0100
- up to 2.1.0
mjpegtools-config.h.patch | 10 -----
mjpegtools-sec.patch | 96 +++++++++++++++++++++++++++++++++++++++++++++++
mjpegtools.spec | 32 ++++++++--------
3 files changed, 112 insertions(+), 26 deletions(-)
---
diff --git a/mjpegtools.spec b/mjpegtools.spec
index de5f9fc..a81ba9e 100644
--- a/mjpegtools.spec
+++ b/mjpegtools.spec
@@ -5,15 +5,15 @@
Summary: Tools for recording, editing, playing back and MPEG-encoding video under Linux
Summary(pl.UTF-8): Narzędzia do nagrywania, edycji, odtwarzania i kodowania do MPEG obrazu
Name: mjpegtools
-Version: 2.0.0
-Release: 3
+Version: 2.1.0
+Release: 1
License: GPL v2+
Group: Applications/Graphics
Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
-# Source0-md5: 903e1e3b967eebcc5fe5626d7517dc46
+# Source0-md5: 57bf5dd78976ca9bac972a6511b236f3
Patch0: %{name}-opt.patch
Patch1: %{name}-pthread.patch
-Patch2: %{name}-config.h.patch
+Patch2: %{name}-sec.patch
URL: http://mjpeg.sourceforge.net/
BuildRequires: SDL-devel >= 1.1.3
BuildRequires: SDL_gfx-devel
@@ -178,18 +178,18 @@ rm -rf $RPM_BUILD_ROOT
%files libs
%defattr(644,root,root,755)
%doc AUTHORS BUGS CHANGES HINTS PLANS README README.DV README.avilib TODO
-%attr(755,root,root) %{_libdir}/liblavfile-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblavfile-2.0.so.0
-%attr(755,root,root) %{_libdir}/liblavjpeg-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblavjpeg-2.0.so.0
-%attr(755,root,root) %{_libdir}/liblavplay-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblavplay-2.0.so.0
-%attr(755,root,root) %{_libdir}/libmjpegutils-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmjpegutils-2.0.so.0
-%attr(755,root,root) %{_libdir}/libmpeg2encpp-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmpeg2encpp-2.0.so.0
-%attr(755,root,root) %{_libdir}/libmplex2-2.0.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmplex2-2.0.so.0
+%attr(755,root,root) %{_libdir}/liblavfile-2.1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblavfile-2.1.so.0
+%attr(755,root,root) %{_libdir}/liblavjpeg-2.1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblavjpeg-2.1.so.0
+%attr(755,root,root) %{_libdir}/liblavplay-2.1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblavplay-2.1.so.0
+%attr(755,root,root) %{_libdir}/libmjpegutils-2.1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmjpegutils-2.1.so.0
+%attr(755,root,root) %{_libdir}/libmpeg2encpp-2.1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpeg2encpp-2.1.so.0
+%attr(755,root,root) %{_libdir}/libmplex2-2.1.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmplex2-2.1.so.0
%{_mandir}/man5/yuv4mpeg.5*
%files devel
diff --git a/mjpegtools-config.h.patch b/mjpegtools-config.h.patch
deleted file mode 100644
index 5cc8e6d..0000000
--- a/mjpegtools-config.h.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- mjpegtools-2.0.0/mplex/stream_params.hpp~ 2010-03-13 14:05:07.000000000 +0100
-+++ mjpegtools-2.0.0/mplex/stream_params.hpp 2012-02-12 23:46:33.883399235 +0100
-@@ -23,7 +23,6 @@
- #ifndef __STREAM_PARAMS_HH__
- #define __STREAM_PARAMS_HH__
-
--#include <config.h>
- #include <mjpeg_types.h>
- class LpcmParams
- {
diff --git a/mjpegtools-sec.patch b/mjpegtools-sec.patch
new file mode 100644
index 0000000..e416089
--- /dev/null
+++ b/mjpegtools-sec.patch
@@ -0,0 +1,96 @@
+From: Reinhard Tartler
+Subject: Avoid format security warning and build breakage
+
+---
+ lavtools/jpeg2yuv.c | 2 +-
+ lavtools/lav_io.c | 2 +-
+ lavtools/lavtrans.c | 4 ++--
+ mplex/main.cpp | 2 +-
+ yuvfilters/main.c | 4 ++--
+ yuvfilters/yuvkineco.c | 2 +-
+ 6 files changed, 8 insertions(+), 8 deletions(-)
+
+--- mjpegtools.orig/lavtools/lav_io.c
++++ mjpegtools/lavtools/lav_io.c
+@@ -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;
+--- mjpegtools.orig/lavtools/lavtrans.c
++++ mjpegtools/lavtools/lavtrans.c
+@@ -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);
+@@ -307,7 +307,7 @@ int main(int argc, char ** argv)
+ break;
+
+ case 'i':
+- sprintf(imgfname,outfile,nframe);
++ sprintf(imgfname,"%s%d",outfile,nframe);
+ imgfd = fopen(imgfname,"wb");
+ if (imgfd==0) system_error("opening image file","fopen");
+ res = fwrite(vbuff,nv,1,imgfd);
+--- mjpegtools.orig/lavtools/jpeg2yuv.c
++++ mjpegtools/lavtools/jpeg2yuv.c
+@@ -451,7 +451,7 @@ static int generate_YUV4MPEG(parameters_
+
+ if (firstjpeg) {
+ p = firstjpeg;
+- sprintf(jpegname, firstjpeg);
++ sprintf(jpegname, "%s", firstjpeg);
+ firstjpeg = NULL;
+ }
+ else {
+--- mjpegtools.orig/mplex/main.cpp
++++ mjpegtools/mplex/main.cpp
+@@ -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;
+ }
+
+--- mjpegtools.orig/yuvfilters/yuvkineco.c
++++ mjpegtools/yuvfilters/yuvkineco.c
+@@ -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
+--- mjpegtools.orig/yuvfilters/main.c
++++ mjpegtools/yuvfilters/main.c
+@@ -53,7 +53,7 @@ usage(char **argv)
+ char buf[1024];
+
+ sprintf(buf, "Usage: %s %s", argv[0], (*MODULE.usage)());
+- WERRORL(buf);
++ mjpeg_error("%s", buf);
+ }
+
+ int
+@@ -91,7 +91,7 @@ main(int argc, char **argv)
+ if (ret == Y4M_ERR_EOF)
+ ret = Y4M_OK;
+ if (ret != Y4M_OK)
+- WERRORL(y4m_strerr(ret));
++ mjpeg_error("%s", y4m_strerr(ret));
+
+ FINI:
+ for (h = hreader; h; h = hreader) {
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/mjpegtools.git/commitdiff/9ec3c10d3fbd0c9d9d501fb86b0ed1ccfc8f5e01
More information about the pld-cvs-commit
mailing list