packages: mjpegtools/mjpegtools.spec, mjpegtools/mjpegtools-pthread.patch (...

[arekm]

Author: arekm                        Date: Fri Feb 10 19:25:36 2012 GMT
Module: packages                      Tag: HEAD
---- Log message:
- up to 2.0.0

---- Files affected:
packages/mjpegtools:
   mjpegtools.spec (1.52 -> 1.53) , mjpegtools-pthread.patch (NONE -> 1.1)  (NEW), mjpegtools-1.9.0-glibc-2.10.patch (1.1 -> NONE)  (REMOVED)

---- Diffs:

================================================================
Index: packages/mjpegtools/mjpegtools.spec
diff -u packages/mjpegtools/mjpegtools.spec:1.52 packages/mjpegtools/mjpegtools.spec:1.53
--- packages/mjpegtools/mjpegtools.spec:1.52	Tue Feb  7 23:04:40 2012
+++ packages/mjpegtools/mjpegtools.spec	Fri Feb 10 20:25:31 2012
@@ -6,14 +6,14 @@
 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:	1.9.0
-Release:	8
+Version:	2.0.0
+Release:	1
 License:	GPL
 Group:		Applications/Graphics
 Source0:	http://downloads.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz
-# Source0-md5:	309a6fcf0900a010d6a9c1e91afc2f5c
-Patch0:		%{name}-1.9.0-glibc-2.10.patch
-Patch1:		%{name}-opt.patch
+# Source0-md5:	903e1e3b967eebcc5fe5626d7517dc46
+Patch0:		%{name}-opt.patch
+Patch1:		%{name}-pthread.patch
 URL:		http://mjpeg.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.1.3
 BuildRequires:	SDL_gfx-devel
@@ -108,6 +108,7 @@
 %{__autoheader}
 %{__automake}
 %configure \
+	PTHREAD_LIBS="-lpthread" \
 	%{!?with_quicktime:--without-libquicktime} \
 %ifarch ppc
 	--disable-simd-accel
@@ -154,7 +155,6 @@
 %attr(755,root,root) %{_bindir}/pnmtoy4m
 %attr(755,root,root) %{_bindir}/ppmtoy4m
 %attr(755,root,root) %{_bindir}/qttoy4m
-%attr(755,root,root) %{_bindir}/testrec
 %attr(755,root,root) %{_bindir}/transist.flt
 %attr(755,root,root) %{_bindir}/y4m*
 %attr(755,root,root) %{_bindir}/ypipe
@@ -177,20 +177,18 @@
 %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-1.9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblavfile-1.9.so.0
-%attr(755,root,root) %{_libdir}/liblavjpeg-1.9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblavjpeg-1.9.so.0
-%attr(755,root,root) %{_libdir}/liblavplay-1.9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblavplay-1.9.so.0
-%attr(755,root,root) %{_libdir}/liblavrec-1.9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/liblavrec-1.9.so.0
-%attr(755,root,root) %{_libdir}/libmjpegutils-1.9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmjpegutils-1.9.so.0
-%attr(755,root,root) %{_libdir}/libmpeg2encpp-1.9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmpeg2encpp-1.9.so.0
-%attr(755,root,root) %{_libdir}/libmplex2-1.9.so.*.*.*
-%attr(755,root,root) %ghost %{_libdir}/libmplex2-1.9.so.0
+%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
 %{_mandir}/man5/yuv4mpeg.5*
 
 %files devel
@@ -198,14 +196,12 @@
 %attr(755,root,root) %{_libdir}/liblavfile.so
 %attr(755,root,root) %{_libdir}/liblavjpeg.so
 %attr(755,root,root) %{_libdir}/liblavplay.so
-%attr(755,root,root) %{_libdir}/liblavrec.so
 %attr(755,root,root) %{_libdir}/libmjpegutils.so
 %attr(755,root,root) %{_libdir}/libmpeg2encpp.so
 %attr(755,root,root) %{_libdir}/libmplex2.so
 %{_libdir}/liblavfile.la
 %{_libdir}/liblavjpeg.la
 %{_libdir}/liblavplay.la
-%{_libdir}/liblavrec.la
 %{_libdir}/libmjpegutils.la
 %{_libdir}/libmpeg2encpp.la
 %{_libdir}/libmplex2.la
@@ -217,7 +213,6 @@
 %{_libdir}/liblavfile.a
 %{_libdir}/liblavjpeg.a
 %{_libdir}/liblavplay.a
-%{_libdir}/liblavrec.a
 %{_libdir}/libmjpegutils.a
 %{_libdir}/libmpeg2encpp.a
 %{_libdir}/libmplex2.a
@@ -228,6 +223,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.53  2012/02/10 19:25:31  arekm
+- up to 2.0.0
+
 Revision 1.52  2012/02/07 22:04:40  arekm
 - release 8
 

================================================================
Index: packages/mjpegtools/mjpegtools-pthread.patch
diff -u /dev/null packages/mjpegtools/mjpegtools-pthread.patch:1.1
--- /dev/null	Fri Feb 10 20:25:36 2012
+++ packages/mjpegtools/mjpegtools-pthread.patch	Fri Feb 10 20:25:31 2012
@@ -0,0 +1,8 @@
+--- mjpegtools-2.0.0/y4mdenoise/Makefile.am~	2011-05-21 14:08:44.000000000 +0200
++++ mjpegtools-2.0.0/y4mdenoise/Makefile.am	2012-02-10 20:21:11.918302086 +0100
+@@ -41,4 +41,4 @@
+ regiontest_SOURCES = regiontest.cc
+ 
+ y4mdenoise_SOURCES = main.c newdenoise.cc
+-y4mdenoise_LDADD = $(LIBMJPEGUTILS)
++y4mdenoise_LDADD = $(LIBMJPEGUTILS) @PTHREAD_LIBS@
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/mjpegtools/mjpegtools.spec?r1=1.52&r2=1.53&f=u