Author: qboosh Date: Tue Oct 11 08:36:01 2005 GMT Module: SPECS Tag: HEAD ---- Log message: - updated link patch, removed obsolete moreshared,acam,gcc34 patches - updated BRs (gtk+2 instead of gtk+, libquicktime instead of quicktime4linux)
---- Files affected: SPECS: mjpegtools.spec (1.28 -> 1.29) ---- Diffs: ================================================================ Index: SPECS/mjpegtools.spec diff -u SPECS/mjpegtools.spec:1.28 SPECS/mjpegtools.spec:1.29 --- SPECS/mjpegtools.spec:1.28 Sun Oct 9 15:46:25 2005 +++ SPECS/mjpegtools.spec Tue Oct 11 10:35:56 2005 @@ -1,7 +1,9 @@ # $Revision$, $Date$ +# +# Conditional build: +%bcond_without quicktime # without Quicktime playback/recording support # TODO # - configure: - MPEG Z/Alpha : false -# - configure: - Quicktime playback/recording : false Summary: Tools for recording, editing, playing back and MPEG-encoding video under Linux Summary(pl): Narzędzia do nagrywania, edycji, odtwarzania i kodowania do MPEG obrazu Name: mjpegtools @@ -11,25 +13,23 @@ Group: Applications/Graphics Source0: http://dl.sourceforge.net/mjpeg/%{name}-%{version}.tar.gz # Source0-md5: 6fd98362310480bdaf7171e9659f165f -Patch0: %{name}-moreshared.patch -Patch1: %{name}-acam.patch -Patch2: %{name}-link.patch -Patch3: %{name}-gcc34.patch +Patch0: %{name}-link.patch URL: http://mjpeg.sourceforge.net/ BuildRequires: SDL-devel >= 1.1.3 BuildRequires: XFree86-devel -BuildRequires: autoconf -BuildRequires: automake -BuildRequires: gtk+-devel >= 1.2.0 +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: libmovtar-devel >= 0.0.2 BuildRequires: libpng-devel +%{?with_quicktime:BuildRequires: libquicktime-devel >= 0.9.4} BuildRequires: libtool >= 2:1.5 -BuildRequires: quicktime4linux-devel >= 1.4 +BuildRequires: pkgconfig Requires: %{name}-libs = %{version}-%{release} -BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) Obsoletes: libmjpegtools0 +BuildRoot: %{tmpdir}/%{name}-%{version}-root-%(id -u -n) %description The MJPEG-tools are a basic set of utilities for recording, editing, @@ -87,19 +87,17 @@ %prep %setup -q -#%patch0 -p1 -#%patch1 -p1 -#%patch2 -p1 -#%patch3 -p1 +%patch0 -p1 %build %{__libtoolize} %{__aclocal} %{__autoconf} +%{__autoheader} %{__automake} %configure \ --with-dv=/usr \ - --with-quicktime=%{_includedir}/quicktime \ + %{!?with_quicktime:--without-libquicktime} \ %ifnarch i686 athlon --disable-cmov-extension \ %endif @@ -173,6 +171,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.29 2005/10/11 08:35:56 qboosh +- updated link patch, removed obsolete moreshared,acam,gcc34 patches +- updated BRs (gtk+2 instead of gtk+, libquicktime instead of quicktime4linux) + Revision 1.28 2005/10/09 13:46:25 glen - add todo ================================================================ ---- CVS-web: http://cvs.pld-linux.org/SPECS/mjpegtools.spec?r1=1.28&r2=1.29&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
