Browse Source

update to the latest upstream commit

git-svn-id: http://trac.vinelinux.org/repos/projects/specs@6411 ec354946-7b23-47d6-9f5a-488ba84defc7
munepi 12 years ago
parent
commit
1755486dd0

+ 10 - 3
nonfree/self-build-ffmpeg2theora/ffmpeg2theora-vl.spec

@@ -1,9 +1,12 @@
+%global posttag svn18423
 Name:		ffmpeg2theora
 Version:	0.28
-Release: 	1%{?_dist_release}
+Release: 	2%{?posttag:.%{posttag}}%{?_dist_release}
 Summary:	Convert any file that ffmpeg can decode to theora
 Summary(ja): 	ffmpeg がデコード可能なファイルを theora に変換するツール
 Source0:	http://www.v2v.cc/~j/ffmpeg2theora/downloads/%{name}-%{version}.tar.bz2
+Source10:	ffmpeg2theora-snapshot.sh
+Patch0:		ffmpeg2theora-0.28+%{posttag}.patch
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.v2v.cc/~j/ffmpeg2theora/
@@ -15,7 +18,7 @@ BuildRequires:	libvorbis-devel
 ### *-devel pacages provided by other self-build-* should only be listed
 ### in self-build-%{name}.spec as PreReq.
 #
-# BuildRequires:	ffmpeg-devel >= 0.6.1
+# BuildRequires:	ffmpeg-devel >= 0.10
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
 
 
@@ -33,9 +36,9 @@ ffmpeg2theora を使えば ffmpeg がデコードできるどんな種類のフ
 
 
 %prep
-
 %setup -q
 
+%patch0 -p1 -b .orig
 
 %build
 scons APPEND_CCFLAGS="$RPM_OPT_FLAGS"
@@ -60,6 +63,10 @@ scons install destdir=$RPM_BUILD_ROOT prefix=%{_prefix}
 %{_mandir}/man1/ffmpeg2theora.1.gz
 
 %changelog
+* Sat Jun 23 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.28-2.svn18423
+- update to the latest upstream commit
+  - for ffmpeg 0.10 compatibility
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.28-1
 - new upstream release
 - License: GPLv2+

+ 9 - 1
nonfree/self-build-ffmpeg2theora/self-build-ffmpeg2theora-vl.spec

@@ -1,7 +1,8 @@
+%global posttag svn18423
 %define pkgname ffmpeg2theora
 %define name	self-build-%{pkgname}
 %define version	0.28
-%define release	1%{?_dist_release}
+%define release	2%{?posttag:.%{posttag}}%{?_dist_release}
 
 %define sourceurl	http://www.v2v.cc/~j/ffmpeg2theora/downloads/%{pkgname}-%{version}.tar.bz2
 
@@ -11,6 +12,8 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
+Source10:	ffmpeg2theora-snapshot.sh
+Source100:	ffmpeg2theora-0.28+%{posttag}.patch
 License:	GPLv2+
 Group:		Restricted Software
 
@@ -98,6 +101,7 @@ ffmpeg2theora は ffmpeg がデコードできるファイルを theora 形式
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
+%{__install} -m 644 %{SOURCE100} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 
 
 %clean
@@ -112,6 +116,10 @@ ffmpeg2theora は ffmpeg がデコードできるファイルを theora 形式
 %{_datadir}/%{name}
 
 %changelog
+* Sat Jun 23 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.28-2.svn18423
+- update to the latest upstream commit
+  - for ffmpeg 0.10 compatibility
+
 * Sun Dec 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.28-1
 - new upstream release
 - License: GPLv2+