updated self-build-{ffmpeg,gpac,vlc}-vl.spec

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

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

@@ -1,4 +1,4 @@
-#TODO: Build with openjpeg
+#TODO: Build with openjpeg, opencore-amr
 #TODO: add make test to %%check section
 
 #% define svndate	20100625
@@ -12,8 +12,8 @@
 
 Summary:	Digital VCR and streaming server
 Name:		ffmpeg
-Version:	0.6.1
-Release:	2%{?svndate:.%svndate}%{?_dist_release}
+Version:	0.6.2
+Release:	1%{?svndate:.%svndate}%{?_dist_release}
 Source:		http://ffmpeg.org/releases/%{name}-%{?svndate:%svndate}%{!?svndate:%version}.tar.bz2
 Source1:        %{name}-snapshot.sh
 
@@ -206,6 +206,9 @@ export RPM_OPT_FLAGS="$RPM_OPT_FLAGS -mlongcall"
 
 
 %changelog
+* Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.2-1
+- new upstream release
+
 * Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.1-2
 - required latest x264 build
 - added BuildRequires: librtmp-devel >= 2.3

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

@@ -6,9 +6,9 @@
 
 %define pkgname ffmpeg
 %define name	self-build-%{pkgname}
-%define version 0.6.1
+%define version 0.6.2
 #% define svndate	20110326
-%define release	2%{?svndate:.%svndate}%{?_dist_release}
+%define release	1%{?svndate:.%svndate}%{?_dist_release}
 
 %define sourceurl0	http://ffmpeg.org/releases/%{pkgname}-%{version}.tar.bz2
 
@@ -187,6 +187,9 @@ Rebuild_gpac_$LOCALE
 %{_datadir}/%{name}
 
 %changelog
+* Tue Apr 05 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.2-1
+- new upstream release
+
 * Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.6.1-2
 - required latest x264 build
 - added BuildRequires: librtmp-devel >= 2.3

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

@@ -3,7 +3,7 @@
 Name:        gpac
 Summary:     MPEG-4 multimedia framework
 Version:     0.4.5
-Release:     10%{?_dist_release}
+Release:     11%{?_dist_release}
 License:     LGPLv2+
 Group:       System Environment/Libraries
 URL:         http://gpac.sourceforge.net/
@@ -32,7 +32,7 @@ BuildRequires:  libjpeg-devel
 BuildRequires:  libpng-devel >= 1.2.5
 BuildRequires:  libxml2-devel
 BuildRequires:  openssl-devel
-BuildRequires:  openjpeg-devel
+#BuildRequires:  openjpeg-devel
 BuildRequires:  pulseaudio-libs-devel
 BuildRequires:  zlib-devel
 BuildRequires:  libogg-devel libvorbis-devel libtheora-devel
@@ -106,7 +106,7 @@ Static library for gpac.
 %ifarch x86_64
 %patch3 -p1 -b .lib64
 %endif
-%patch4 -p1 -b .openjpeg
+#%patch4 -p1 -b .openjpeg
 %patch6 -p1 -b .shared
 %patch7 -p1 -b .libxml2
 %patch8 -p1 -b .ppc64
@@ -123,15 +123,15 @@ Static library for gpac.
 # popd
 
 # Fix encoding warnings
-cp -p Changelog Changelog.origine
+%__cp -p Changelog Changelog.origine
 iconv -f ISO-8859-1 -t UTF8 Changelog.origine >  Changelog
 touch -r Changelog.origine Changelog
-rm -rf Changelog.origine
+%__rm -rf Changelog.origine
 
-cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
+%__cp -p doc/ipmpx_syntax.bt doc/ipmpx_syntax.bt.origine
 iconv -f ISO-8859-1 -t UTF8 doc/ipmpx_syntax.bt.origine >  doc/ipmpx_syntax.bt
 touch -r doc/ipmpx_syntax.bt.origine doc/ipmpx_syntax.bt
-rm -rf doc/ipmpx_syntax.bt.origine
+%__rm -rf doc/ipmpx_syntax.bt.origine
 
 
 # executable ./configure
@@ -139,16 +139,16 @@ chmod +x configure
 
 %build
 %configure \
-    --enable-debug \
     --X11-path=%{_prefix} \
+    %{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
+    --enable-pic \
+    --disable-static \
+    --disable-wx \
     --extra-cflags="$RPM_OPT_FLAGS -D_FILE_OFFSET_BITS=64 -D_LARGE_FILES -D_LARGEFILE_SOURCE=1 -D_GNU_SOURCE=1" \
     --disable-oss-audio \
-    %{?_with_mozilla:--mozdir=%{_libdir}/mozilla/plugins} \
-    %{?_with_amr:--enable-amr} \
     --use-js=no \
-    --disable-static \
-    --disable-wx
-
+    --use-openjpeg=local \
+    ;
 
 # Parallele build will fail
 %__make all OPTFLAGS="$RPM_OPT_FLAGS -fPIC -DPIC" 
@@ -162,17 +162,17 @@ chmod +x configure
 # popd
 
 %install
-rm -rf $RPM_BUILD_ROOT
-make DESTDIR=$RPM_BUILD_ROOT install install-lib
+%__rm -rf $RPM_BUILD_ROOT
+%__make DESTDIR=$RPM_BUILD_ROOT install install-lib
 
 ## kwizart - rpmlint gpac no-ldconfig-symlink
-ln -sf  libgpac.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
-ln -sf  libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
+%__ln_s -f libgpac.so.%{version} $RPM_BUILD_ROOT%{_libdir}/libgpac.so.0
+%__ln_s -f libgpac.so.0 $RPM_BUILD_ROOT%{_libdir}/libgpac.so
 
 #Install generated sggen binaries
 for b in MPEG4 SVG X3D; do
   pushd applications/generators/${b}
-    install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
+    %__install -pm 0755 ${b}Gen $RPM_BUILD_ROOT%{_bindir}
   popd
 done
 
@@ -181,7 +181,7 @@ done
 
 
 %clean
-rm -rf $RPM_BUILD_ROOT
+%__rm -rf $RPM_BUILD_ROOT
 
 %post libs -p /sbin/ldconfig
 
@@ -203,7 +203,6 @@ rm -rf $RPM_BUILD_ROOT
 
 %files devel
 %doc doc/CODING_STYLE doc/ipmpx_syntax.bt
-%doc doc/html/*
 %defattr(-,root,root)
 %{_includedir}/gpac/
 %{_libdir}/libgpac.so
@@ -218,6 +217,11 @@ rm -rf $RPM_BUILD_ROOT
 
 
 %changelog
+* Mon Apr 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-11
+- rebuilt with internal openjpeg
+  - added --use-openjpeg=local in configure options
+- added --enable-pic in configure options
+
 * Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-10
 - rebuild
 

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

@@ -1,7 +1,7 @@
 %define pkgname gpac
 %define name	self-build-%{pkgname}
 %define version 0.4.5
-%define release	10%{?_dist_release}
+%define release	11%{?_dist_release}
 
 %define sourceurl0	http://prdownloads.sourceforge.net/gpac/%{pkgname}-%{version}.tar.gz
 #% define sourceurl0	http://dl.sourceforge.net/sourceforge/gpac/%{pkgname}-%{version}.tar.gz
@@ -166,6 +166,9 @@ for MP4 and 3GPP(2) files and many tools for scene descriptions
 %{_datadir}/%{name}
 
 %changelog
+* Mon Apr 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-11
+- rebuilt with internal openjpeg
+
 * Sat Mar 26 2011 Munehiro Yamamoto <munepi@vinelinux.org> 0.4.5-10
 - rebuild
 

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

@@ -1,7 +1,7 @@
 %define pkgname vlc
 %define name    self-build-%{pkgname}
 %define version 1.1.9
-%define release 1%{?_dist_release}
+%define release 2%{?_dist_release}
 
 %define with_mozilla	 		0
 %define with_dc1394			0
@@ -35,6 +35,7 @@ Group:		Restricted Software
 
 Requires(post):		self-build-setup >= 0.9.9
 
+Requires(post):	unzip
 Requires(post):	desktop-file-utils
 Requires(post):	gettext
 Requires(post):	gettext-devel
@@ -274,6 +275,9 @@ mp3, ogg など）だけでなく，DVD や VCD，様々なストリーミング
 
 
 %changelog
+* Mon Apr 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.9-2
+- added Requires(post): unzip
+
 * Sun Apr 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.9-1
 - new upstream release
 - applied vlc_patch_0.02/vlc118.diff in up0617.zip on 2sen.dip.jp/dtv

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

@@ -14,7 +14,7 @@
 Summary:	Multi-platform MPEG, DVD, and DivX player
 Name:		vlc
 Version:	1.1.9
-Release:	1%{?_dist_release}
+Release:	2%{?_dist_release}
 License:	GPLv2+
 Group:		Applications/Multimedia
 URL:		http://www.videolan.org/
@@ -36,6 +36,7 @@ Patch50:	vlc-1.1.7-revert-pulse-c.patch
 
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root
 
+BuildRequires:	unzip
 BuildRequires:	desktop-file-utils
 BuildRequires:	gettext
 #BuildRequires:  prelink
@@ -476,6 +477,9 @@ fi || :
 
 
 %changelog
+* Mon Apr 18 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.9-2
+- added BuildRequires: unzip
+
 * Sun Apr 17 2011 Munehiro Yamamoto <munepi@vinelinux.org> 1.1.9-1
 - new upstream release