+++ /dev/null
---- mjpegtools-2.1.0/y4mutils/Makefile.am.orig 2012-04-01 10:43:35.000000000 +0200
-+++ mjpegtools-2.1.0/y4mutils/Makefile.am 2017-07-13 21:32:08.502982119 +0200
-@@ -43,6 +43,7 @@
- y4mspatialfilter_LDADD = $(LIBMJPEGUTILS) $(LIBM_LIBS)
-
- y4mhist_SOURCES = y4mhist.c
-+y4mhist_CPPFLAGS = $(AM_CPPFLAGS) $(SDL_CFLAGS)
- y4mhist_LDADD = $(SDL_LIBS) $(SDLgfx_LIBS) $(LIBMJPEGUTILS)
-
- y4mblack_SOURCES = y4mblack.c
+++ /dev/null
---- mjpegtools-1.9.0/configure.ac.orig 2009-01-06 07:33:48.000000000 +0100
-+++ mjpegtools-1.9.0/configure.ac 2010-12-18 10:31:59.570115231 +0100
-@@ -426,7 +426,8 @@
- dnl correctly is complex and lengthy (about as long as the entire configure.ac
- dnl file).
-
--if test x$have_x86cpu = xtrue -o x$have_ppccpu = xtrue; then
-+ARCHFLAGS=
-+if false; then
- if test x$host_alias != x; then
- dnl This is to allow cross compiling
- AC_MSG_CHECKING(sub-architecture settings)
y4mdenoise_SOURCES = main.c newdenoise.cc
-y4mdenoise_LDADD = $(LIBMJPEGUTILS)
-+y4mdenoise_LDADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@
++y4mdenoise_LDADD = $(LIBMJPEGUTILS) $(PTHREAD_LIBS)
+++ /dev/null
-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) {
#
# Conditional build:
%bcond_without quicktime # without Quicktime playback/recording support
+%bcond_with simd # MMX/SSE/Altivec instructions
#
+%ifarch pentium3 pentium4 %{x8664} x32
+%define with_simd 1
+%endif
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.1.0
-Release: 4
+Version: 2.2.1
+Release: 1
License: GPL v2+
Group: Applications/Graphics
-Source0: http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
-# Source0-md5: 57bf5dd78976ca9bac972a6511b236f3
-Patch0: %{name}-opt.patch
-Patch1: %{name}-pthread.patch
-Patch2: %{name}-sec.patch
-Patch3: x32.patch
-Patch4: %{name}-SDL_gfx.patch
-URL: http://mjpeg.sourceforge.net/
+Source0: https://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
+# Source0-md5: 168e0131c0b8a2e31df7a73eb602fc32
+Patch0: %{name}-pthread.patch
+Patch1: x32.patch
+URL: https://mjpeg.sourceforge.io/
BuildRequires: SDL-devel >= 1.1.3
BuildRequires: SDL_gfx-devel
BuildRequires: autoconf >= 2.57
# only checked for, not used for anything
#BuildRequires: xorg-lib-libXxf86dga-devel
Requires: %{name}-libs = %{version}-%{release}
-Obsoletes: libmjpegtools0
+Obsoletes: libmjpegtools0 < 2
BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n)
%description
Summary(pl.UTF-8): Pliki nagłówkowe mjpegtools
Group: Development/Libraries
Requires: %{name}-libs = %{version}-%{release}
-Obsoletes: libmjpegtools0-devel
+Obsoletes: libmjpegtools0-devel < 2
# libmjpegutils has no additional deps
# liblavfile R: libquicktime-devel >= 0.9.7 libdv-devel
# liblavjpeg R: libjpeg-devel
%setup -q
%patch0 -p1
%patch1 -p1
-%patch2 -p1
-%patch3 -p1
-%patch4 -p1
%build
%{__libtoolize}
%configure \
PTHREAD_LIBS="-lpthread" \
%{!?with_quicktime:--without-libquicktime} \
-%ifarch ppc
+%if %{without simd}
--disable-simd-accel
%endif
%files
%defattr(644,root,root,755)
-%doc README.glav README.lavpipe README.transist
+%doc README.lavpipe README.transist
%attr(755,root,root) %{_bindir}/anytovcd.sh
%attr(755,root,root) %{_bindir}/glav
%attr(755,root,root) %{_bindir}/jpeg2yuv
%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.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
+%attr(755,root,root) %{_libdir}/liblavfile-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblavfile-2.2.so.0
+%attr(755,root,root) %{_libdir}/liblavjpeg-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblavjpeg-2.2.so.0
+%attr(755,root,root) %{_libdir}/liblavplay-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/liblavplay-2.2.so.0
+%attr(755,root,root) %{_libdir}/libmjpegutils-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmjpegutils-2.2.so.0
+%attr(755,root,root) %{_libdir}/libmpeg2encpp-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmpeg2encpp-2.2.so.0
+%attr(755,root,root) %{_libdir}/libmplex2-2.2.so.*.*.*
+%attr(755,root,root) %ghost %{_libdir}/libmplex2-2.2.so.0
%{_mandir}/man5/yuv4mpeg.5*
%files devel
static int x86_accel (void)
{
-+#if defined(__ILP32__)
++#if defined(__x86_64__) && defined(__ILP32__)
+ long long eax, ebx, ecx, edx;
+#else
long eax, ebx, ecx, edx;
by gcc for PIC offset table and frame pointer */
-#if defined(__LP64__) || defined(_LP64)
-+#if defined(__LP64__) || defined(_LP64) || defined(__ILP32__)
++#if defined(__x86_64__) /* also x32 */
# define REG_b "rbx"
# define REG_S "rsi"
#else
projects / packages / mjpegtools.git / commitdiff