SPECS: nuvtools.spec - tried with svn, still fails

[glen]

Author: glen                         Date: Tue Nov 22 23:11:22 2005 GMT
Module: SPECS                         Tag: HEAD
---- Log message:
- tried with svn, still fails

---- Files affected:
SPECS:
   nuvtools.spec (1.1 -> 1.2) 

---- Diffs:

================================================================
Index: SPECS/nuvtools.spec
diff -u SPECS/nuvtools.spec:1.1 SPECS/nuvtools.spec:1.2
--- SPECS/nuvtools.spec:1.1	Tue Nov 22 21:17:45 2005
+++ SPECS/nuvtools.spec	Wed Nov 23 00:11:17 2005
@@ -1,27 +1,77 @@
 # $Revision$, $Date$
+# TODO
+# - find (make) system librtjpeg package and use it
+#
+# Conditional build:
+%bcond_with	system_ffmpeg	# use system ffmpeg (bundled one doesn't compile under amd64)
+#
 Summary:	MythTV nuv video file conversion script
 Name:		nuvtools
-Version:	0.0.2
-Release:	0.1
+Version:	0.0.3
+%define	_snap 20051122
+Release:	0.%{_snap}.1
 License:	GPL v2
 Group:		Applications/Multimedia
-Source0:	http://mythtv.beirdo.ca/files/%{name}-%{version}.tar.gz
-# Source0-md5:	f2b207666c5af83ac4a6d0726076068d
+#Source0:	http://mythtv.beirdo.ca/files/%{name}-%{version}.tar.gz
+Source0:	%{name}-%{_snap}.tar.bz2
+# Source0-md5:	850c9499b2fcfee18658f511e33f0a0f
+Patch0:		%{name}-optflags.patch
+Patch1:		%{name}-ffmpeg.patch
 URL:		http://mythtv.beirdo.ca/nuvtools/
+BuildRequires:	autoconf
+BuildRequires:	automake
+%if %{with system_ffmpeg}
+BuildRequires:	ffmpeg-devel
+%else
+BuildRequires:	lame-libs-devel
+BuildRequires:	xvid-devel
+%endif
 BuildRoot:	%{tmpdir}/%{name}-%{version}-root-%(id -u -n)
 
 %description
-nuvtools includes: 
+nuvtools includes:
 - nuvscan - shows the contents of every frame in the NUV file (very
   verbose)
 - nuv2avi - converts NUV files to AVI with minimal recoding
 
 %prep
-%setup -q
+%setup -q %{?_snap:-n %{name}}
+%patch0 -p1
+%if %{with system_ffmpeg}
+%patch1 -p1
+rm -rf ffmpeg
+%endif
 
 %build
-%{__make} -C libavcodec CC="%{__cc}" OPTFLAGS="%{rpmcflags}"
-%{__make} CC="%{__cc}" CFLAGS="%{rpmcflags}"
+%if %{without system_ffmpeg}
+cd ffmpeg
+%configure \
+	--enable-pthreads \
+	--enable-gpl \
+	--enable-mp3lame \
+	--enable-xvid \
+	--disable-vhook \
+	--disable-zlib \
+	--cc="%{__cc}" \
+	--extra-cflags="%{rpmcflags} -fomit-frame-pointer" \
+	--extra-ldflags="%{rpmldflags}" \
+	--disable-debug \
+	--disable-opts \
+	--tune=generic
+cd ..
+%endif
+
+cd librtjpeg
+%{__aclocal}
+%{__autoheader}
+%{__automake}
+%{__autoconf}
+%configure
+cd ..
+
+%{__make} \
+	CC="%{__cc}" \
+	OPTFLAGS="%{rpmcflags}"
 
 %install
 rm -rf $RPM_BUILD_ROOT
@@ -39,6 +89,9 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.2  2005/11/22 23:11:17  glen
+- tried with svn, still fails
+
 Revision 1.1  2005/11/22 20:17:45  glen
 - new, nfy
 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/SPECS/nuvtools.spec?r1=1.1&r2=1.2&f=u