updated to 19.0.1084.50

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

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

@@ -1,23 +1,28 @@
 Name:           chromium-ffmpeg
 Summary:        The ffmpeg lib for Google's opens source browser Chromium
 Summary(ja):    Google オープンソースブラウザ Chromium 用 ffmpeg ライブラリ
-Version:        17.0.963.54
+Version:        19.0.1084.50
 Release:        1%{?_dist_release}
 License:        BSD
 Group:          Applications/Internet
 # use the official tarball: 
 Source0:        http://gsdview.appspot.com/chromium-browser-official/chromium-%{version}.tar.bz2
+Patch0:         chromium-ffmpeg-19.0.1084.50-drop-dependencies-base-gyp.patch
 
+Requires:	chromium >= %{version}
 BuildRequires:	zlib-devel
-Requires:	chromium
 
 BuildRoot:      %{_tmppath}/%{name}-%{version}-root
 
 %description
 FFMPEG library built from the chromium sources. 
 
+%description -l ja
+chromium のソースから FFMPEG ライブラリをビルドします。
+
 %prep
 %setup -q -c %{name}-%{version}
+%patch0 -p1 -b .vine
 
 %build
 
@@ -27,12 +32,15 @@ pushd chromium-%{version}
 ##NOTE: Use --depth as a workaround
 ./build/gyp_chromium -f make third_party/ffmpeg/ffmpeg.gyp \
     -Dffmpeg_branding=Chrome \
+    -Dlinux_use_gold_flags=0 \
+    -Dlinux_use_gold_binary=0 \
+    -Ddisable_nacl=1 \
     -Dlinux_fpic=1 \
+    -Ddisable_sse2=1 \
     %ifarch %{ix86}
         -Dtarget_arch=ia32 \
     %endif
     %ifarch x86_64
-        -Ddisable_sse2=1 \
         -Dtarget_arch=x64 \
     %endif
     %if %{?_dist_release} == "vl6"
@@ -44,7 +52,7 @@ pushd chromium-%{version}
 
 #%__make -r %{?_smp_mflags} ffmpeg BUILDTYPE=Release V=1
 cd third_party/ffmpeg
-%__make -r %{?_smp_mflags} -f ffmpeg.Makefile BUILDTYPE=Release V=1
+%__make -r %{?_smp_mflags} -f ffmpeg.Makefile BUILDTYPE=Release V=1 disable_nacl=1
 
 popd
 
@@ -65,6 +73,10 @@ popd
 %{_libdir}/chromium/libffmpegsumo.so
 
 %changelog
+* Tue May 22 2012 Munehiro Yamamoto <munepi@vinelinux.org> 19.0.1084.50-1
+- updated to 19.0.1084.50
+- applied chromium-ffmpeg-19.0.1084.50-drop-dependencies-base-gyp.patch
+
 * Sun Feb 12 2012 Munehiro Yamamoto <munepi@vinelinux.org> 17.0.963.54-1
 - updated to 17.0.963.54
 

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

@@ -1,6 +1,6 @@
 %define pkgname chromium-ffmpeg
 %define name    self-build-%{pkgname}
-%define version 17.0.963.54
+%define version 19.0.1084.50
 %define release 1%{?_dist_release}
 
 %define sourceurl0	http://gsdview.appspot.com/chromium-browser-official/chromium-%{version}.tar.bz2
@@ -11,6 +11,7 @@ Name:		%{name}
 Version:	%{version}
 Release: 	%{release}
 Source0:	%{pkgname}-vl.spec
+Source100:	chromium-ffmpeg-19.0.1084.50-drop-dependencies-base-gyp.patch
 
 License:        BSD
 Group:		Restricted Software
@@ -18,7 +19,7 @@ Group:		Restricted Software
 Requires(post):		self-build-setup >= 0.9.9
 
 # (build)requies of target package.
-Requires:	chromium
+Requires:	chromium >= %{version}
 Requires(post):		zlib-devel
 
 BuildArch:	noarch
@@ -94,6 +95,7 @@ chromium のソースから FFMPEG ライブラリをビルドします。
 %{__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
@@ -107,5 +109,9 @@ chromium のソースから FFMPEG ライブラリをビルドします。
 %{_datadir}/%{name}/*
 
 %changelog
+* Tue May 22 2012 Munehiro Yamamoto <munepi@vinelinux.org> 19.0.1084.50-1
+- updated to 19.0.1084.50
+- applied chromium-ffmpeg-19.0.1084.50-drop-dependencies-base-gyp.patch
+
 * Sun Feb 12 2012 Munehiro Yamamoto <munepi@vinelinux.org> 17.0.963.54-1
 - initial build