packages: mjpegtools/mjpegtools.spec, mjpegtools/mjpegtools-opt.patch (NEW)...

qboosh qboosh at pld-linux.org
Sat Dec 18 12:14:51 CET 2010


Author: qboosh                       Date: Sat Dec 18 11:14:51 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- more docs
- updated deps, dropped obsolete MPEG Z/Alpha comment
- added opt patch to disable unwanted -mcpu=/-march=/-mtune= (already handled by rpmc*flags)

---- Files affected:
packages/mjpegtools:
   mjpegtools.spec (1.49 -> 1.50) , mjpegtools-opt.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/mjpegtools/mjpegtools.spec
diff -u packages/mjpegtools/mjpegtools.spec:1.49 packages/mjpegtools/mjpegtools.spec:1.50
--- packages/mjpegtools/mjpegtools.spec:1.49	Fri Dec 17 20:49:18 2010
+++ packages/mjpegtools/mjpegtools.spec	Sat Dec 18 12:14:46 2010
@@ -2,8 +2,7 @@
 #
 # Conditional build:
 %bcond_without	quicktime	# without Quicktime playback/recording support
-# TODO
-# - configure:   - MPEG Z/Alpha                  : false
+#
 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
@@ -14,15 +13,18 @@
 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
 URL:		http://mjpeg.sourceforge.net/
 BuildRequires:	SDL-devel >= 1.1.3
+BuildRequires:	SDL_gfx-devel
 BuildRequires:	autoconf >= 2.57
 BuildRequires:	automake >= 1:1.7
 BuildRequires:	gtk+2-devel >= 2:2.4.0
 BuildRequires:	libdv-devel >= 0.9.5
 BuildRequires:	libjpeg-devel
 BuildRequires:	libpng-devel
-%{?with_quicktime:BuildRequires:	libquicktime-devel >= 0.9.4}
+%{?with_quicktime:BuildRequires:	libquicktime-devel >= 0.9.7}
+BuildRequires:	libstdc++-devel
 BuildRequires:	libtool >= 2:1.5
 BuildRequires:	pkgconfig
 BuildRequires:	xorg-lib-libX11-devel
@@ -52,6 +54,7 @@
 Summary:	MJPEG-tools shared libraries
 Summary(pl.UTF-8):	Biblioteki współdzielone MJPEG-tools
 Group:		Libraries
+Requires:	libquicktime >= 0.9.7
 
 %description libs
 MJPEG-tools shared libraries.
@@ -66,7 +69,7 @@
 Requires:	%{name}-libs = %{version}-%{release}
 Obsoletes:	libmjpegtools0-devel
 # libmjpegutils has no additional deps
-# liblavfile R: libquicktime-devel libdv-devel
+# liblavfile R: libquicktime-devel >= 0.9.7 libdv-devel
 # liblavjpeg R: libjpeg-devel
 # liblavplay R: SDL-devel xorg-lib-libX11-devel +liblavfile,liblavjpeg
 # liblavrec R: +liblavfile,liblavjpeg
@@ -96,6 +99,7 @@
 %prep
 %setup -q
 %patch0 -p1
+%patch1 -p1
 
 %build
 %{__libtoolize}
@@ -133,6 +137,7 @@
 
 %files
 %defattr(644,root,root,755)
+%doc README.glav README.lavpipe README.transist
 %attr(755,root,root) %{_bindir}/anytovcd.sh
 %attr(755,root,root) %{_bindir}/glav
 %attr(755,root,root) %{_bindir}/jpeg2yuv
@@ -171,7 +176,7 @@
 
 %files libs
 %defattr(644,root,root,755)
-%doc AUTHORS BUGS CHANGES HINTS PLANS README TODO
+%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.*.*.*
@@ -223,6 +228,11 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.50  2010/12/18 11:14:46  qboosh
+- more docs
+- updated deps, dropped obsolete MPEG Z/Alpha comment
+- added opt patch to disable unwanted -mcpu=/-march=/-mtune= (already handled by rpmc*flags)
+
 Revision 1.49  2010/12/17 19:49:18  qboosh
 - more verbose files
 

================================================================
Index: packages/mjpegtools/mjpegtools-opt.patch
diff -u /dev/null packages/mjpegtools/mjpegtools-opt.patch:1.1
--- /dev/null	Sat Dec 18 12:14:51 2010
+++ packages/mjpegtools/mjpegtools-opt.patch	Sat Dec 18 12:14:46 2010
@@ -0,0 +1,12 @@
+--- 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)
================================================================

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



More information about the pld-cvs-commit mailing list