updated self-build-ffmpeg: updated source to v0.9.1

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@5396 ec354946-7b23-47d6-9f5a-488ba84defc7

nonfree/self-build-ffmpeg/ffmpeg-vl.spec

@@ -6,11 +6,13 @@
 %define with_vaapi 1
 %define with_libvpx 1
 
+#% define enable_avconv 1
+
 %define use_prebuilt_man 1
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	0.9
+Version:	0.9.1
 Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 Source1:        %{name}-snapshot.sh
@@ -58,7 +60,7 @@ BuildRequires:	yasm
 #BuildRequires: faac-devel
 #BuildRequires: lame-devel
 #BuildRequires: libdca-devel
-#BuildRequires: x264-devel >= 0.0.0-15.20110322
+#BuildRequires: x264-devel >= 0.0.0-18.20111216
 #BuildRequires: xvidcore-devel
 
 Requires:	%{name}-libs = %{version}-%{release}
@@ -155,14 +157,12 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     %{?use_prebuilt_man:--disable-doc} \
     --disable-debug \
     --disable-stripping \
+    \
+    %{?enable_avconv:--enable-avconv} \
     ;
 
 %__make %{?_smp_mflags}
 
-%if %{!use_prebuilt_man}
-%__make documentation
-%endif
-
 %__make alltools
 
 
@@ -172,11 +172,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 ## install tool/qt-faststart
 %__install -pm755 tools/qt-faststart $RPM_BUILD_ROOT%{_bindir}
 
-# ## install man
-%if %{!use_prebuilt_man}
+## install man
 %__mkdir_p $RPM_BUILD_ROOT%{_mandir}/man1/
 %__install -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
-%endif
 
 
 %clean
@@ -189,13 +187,13 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 %files
 %defattr(-,root,root,-)
 %doc COPYING.* CREDITS Changelog README doc/ffserver.conf
-%{_bindir}/avconv
+%{?enable_avconv:%{_bindir}/avconv}
 %{_bindir}/ffmpeg
 %{_bindir}/ffplay
 %{_bindir}/ffprobe
 %{_bindir}/ffserver
 %{_bindir}/qt-faststart
-%{_mandir}/man1/avconv.1*
+%{?enable_avconv:%{_mandir}/man1/avconv.1*}
 %{_mandir}/man1/ffmpeg.1*
 %{_mandir}/man1/ffplay.1*
 %{_mandir}/man1/ffprobe.1*
@@ -216,6 +214,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Wed Jan 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.9.1-1
+- new upstream release
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.9-1
 - new upstream release
 - enable CELT decoding via libcelt

nonfree/self-build-ffmpeg/self-build-ffmpeg-vl.spec

@@ -6,7 +6,7 @@
 
 %global pkgname ffmpeg
 %global name	self-build-%{pkgname}
-%global version 0.9
+%global version 0.9.1
 #% define svndate	20110326
 %global release	1%{?svndate:.%svndate}%{?_dist_release}
 
@@ -28,6 +28,7 @@ Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 #Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 Source2:        %{pkgname}-snapshot.sh
+# pre-built man files
 Source90:       ffmpeg-%{version}-doc.tar.xz
 
 License:	GPLv2+
@@ -65,7 +66,7 @@ Requires(post):		self-build-faac
 Requires(post):		self-build-faad2
 Requires(post):		self-build-lame 
 Requires(post):		self-build-libdca
-Requires(post):		self-build-x264 >= 0.0.0-15.20110322
+Requires(post):		self-build-x264 >= 0.0.0-18.20111216
 Requires(post):		self-build-xvidcore
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -183,6 +184,9 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Wed Jan 11 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.9.1-1
+- new upstream release
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.9-1
 - new upstream release
 - enable CELT decoding via libcelt