new upstream release

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

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

@@ -8,20 +8,14 @@
 
 #% define enable_avconv 1
 
-%define use_prebuilt_man 1
-
-%global major_version 0.11
+%global major_version 1.1
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	%{major_version}.2
+Version:	%{major_version}.3
 Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 
-# pre-built man files
-#$ tar Jcvf ~/rpm/SOURCES/ffmpeg/ffmpeg-0.10-doc.tar.xz ffmpeg-0.10/doc/*.html ffmpeg-0.10/doc/*.pod ffmpeg-0.10/doc/*.1
-%{?use_prebuilt_man:Source90:       ffmpeg-%{version}-doc.tar.xz}
-
 %if 0%{?_with_amr:1}
 License:        GPLv3+
 %else
@@ -32,8 +26,10 @@ URL:		http://ffmpeg.org/
 
 BuildRequires:  bzip2-devel
 BuildRequires:  celt-devel
-##BuildRequires:  dirac-devel
+##BuildRequires: dirac-devel
 BuildRequires:  freetype2-devel
+##BuildRequires: frei0r-devel
+BuildRequires:  gnutls-devel
 BuildRequires:	gsm-devel
 BuildRequires:	imlib2-devel
 BuildRequires:	libdc1394-devel
@@ -48,7 +44,7 @@ BuildRequires:	libtheora-devel
 %{?with_vaapi:BuildRequires:libva-devel >= 0.31.0}
 BuildRequires:  libvdpau-devel
 BuildRequires:	libvorbis-devel
-%{?with_libvpx:BuildRequires:  libvpx-devel >= 0.9.6}
+%{?with_libvpx:BuildRequires:  libvpx-devel >= 0.9.7}
 BuildRequires:  libXvMC-devel
 %{?_with_opencore_amr:BuildRequires: opencore-amr-devel vo-amrwbenc-devel}
 %{!?_without_openal:BuildRequires: openal-soft-devel}
@@ -57,7 +53,7 @@ BuildRequires:  libXvMC-devel
 ##BuildRequires:  schroedinger-devel
 BuildRequires:	SDL-devel
 BuildRequires:  speex-devel
-%{!?use_prebuilt_man:BuildRequires:	texi2html}
+##BuildRequires:	texi2html
 BuildRequires:	zlib-devel 
 BuildRequires:	yasm
 # *-devel packages provided by other self-build-* should only be listed
@@ -110,7 +106,6 @@ This package contains development files for %{name}.
 
 %prep
 %setup -q -n %{name}-%{?svndate:%svndate}%{!?svndate:%version}
-%{?use_prebuilt_man:tar -C .. -xf %{SOURCE90}}
 
 %build
 %ifarch ppc
@@ -167,7 +162,7 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
     --disable-static \
     --enable-shared \
     --enable-gpl \
-    %{?use_prebuilt_man:--disable-doc} \
+    --disable-doc \
     --disable-debug \
     --disable-stripping \
     \
@@ -187,7 +182,7 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 ## install man
 %__mkdir_p $RPM_BUILD_ROOT%{_mandir}/man1/
-%__install -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
+#%__install -m0644 doc/*.1 $RPM_BUILD_ROOT%{_mandir}/man1/
 
 
 %clean
@@ -206,11 +201,11 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 %{_bindir}/ffprobe
 %{_bindir}/ffserver
 %{_bindir}/qt-faststart
-%{?enable_avconv:%{_mandir}/man1/avconv.1*}
-%{_mandir}/man1/ffmpeg.1*
-%{_mandir}/man1/ffplay.1*
-%{_mandir}/man1/ffprobe.1*
-%{_mandir}/man1/ffserver.1*
+# %{?enable_avconv:%{_mandir}/man1/avconv.1*}
+# %{_mandir}/man1/ffmpeg.1*
+# %{_mandir}/man1/ffplay.1*
+# %{_mandir}/man1/ffprobe.1*
+# %{_mandir}/man1/ffserver.1*
 %{_datadir}/ffmpeg
 
 
@@ -227,6 +222,15 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Tue Mar 12 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.3-1
+- new upstream release
+
+* Sun Feb  3 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-2
+- libvpx >= 0.9.7
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-1
+- new upstream release /x264-0.129
+
 * Thu Sep 27 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.11.2-1
 - new upstream release
 

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

@@ -6,8 +6,8 @@
 
 %global pkgname ffmpeg
 %global name	self-build-%{pkgname}
-%global major_version 0.11
-%global version %{major_version}.2
+%global major_version 1.1
+%global version %{major_version}.3
 #% define svndate	20110326
 %global release	1%{?svndate:.%svndate}%{?_dist_release}
 
@@ -19,8 +19,6 @@
 
 #% define enable_avconv 1
 
-%define use_prebuilt_man 1
-
 Summary:	Package to automatically build %{pkgname} rpm package
 Summary(ja): 	%{pkgname} の rpm パッケージを自動作成するパッケージ
 Name:		%{name}
@@ -28,8 +26,6 @@ Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
 #Source1:	%{pkgname}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
-# pre-built man files
-%{?use_prebuilt_man:Source90:       ffmpeg-%{version}-doc.tar.xz}
 
 License:	GPLv2+
 Group:		Restricted Software
@@ -45,6 +41,7 @@ Requires(post):  bzip2-devel
 Requires(post):  celt-devel
 ##Requires(post):  dirac-devel
 Requires(post):  freetype2-devel
+Requires(post):  gnutls-devel
 Requires(post):	gsm-devel
 Requires(post):	imlib2-devel
 Requires(post):	libdc1394-devel
@@ -59,7 +56,7 @@ Requires(post):	libtheora-devel
 %{?with_vaapi:Requires(post):	libva-devel >= 0.31.0}
 Requires(post):  libvdpau-devel
 Requires(post):	libvorbis-devel
-%{?with_libvpx:Requires(post):  libvpx-devel >= 0.9.6}
+%{?with_libvpx:Requires(post):  libvpx-devel >= 0.9.7}
 Requires(post):  libXvMC-devel
 %{?_with_opencore_amr:Requires(post):  opencore-amr-devel vo-amrwbenc-devel}
 %{!?_without_openal:Requires(post):  openal-soft-devel}
@@ -77,7 +74,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.120
+Requires(post):		self-build-x264 >= 0.129
 Requires(post):		self-build-xvidcore
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-root
@@ -157,13 +154,12 @@ MPEG4, h263, ac3, asf, avi, real, mjpeg, flash を含む
 %{__rm} -rf ${RPM_BUILD_ROOT}
 %{__install} -d ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
 %{__install} -m 644 %{SOURCE0} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}
-%{?use_prebuilt_man:%{__install} -m 644 %{SOURCE90} ${RPM_BUILD_ROOT}/%{_datadir}/%{name}}
 
 %clean
 %{__rm} -rf ${RPM_BUILD_ROOT}
 
 %posttrans
-/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 123000
+/usr/lib/rpm/self-build-rpm.sh %{name} %{pkgname}-vl.spec "%{sourceurl0}" 86000
 /usr/lib/rpm/pre-allocate-rpm.sh %{pkgname}-%{version}-%{release} \
                                  %{pkgname}-libs-%{version}-%{release} \
                                  %{pkgname}-devel-%{version}-%{release}
@@ -194,6 +190,15 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Tue Mar 12 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.3-1
+- new upstream release
+
+* Sun Feb  3 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-2
+- libvpx >= 0.9.7
+
+* Sun Jan 20 2013 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.1-1
+- new upstream release /x264-0.129
+
 * Thu Sep 27 2012 Munehiro Yamamoto <munepi@vinelinux.org> 0.11.2-1
 - new upstream release