updated to 19.0.1084.50

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

c/chromium/chromium18-vl.spec → c/chromium/chromium19-vl.spec

@@ -28,23 +28,20 @@
 
 %global chrome_sandbox %{_prefix}/lib/chrome_sandbox
 
-#Name:           chromium18
+#Name:           chromium19
 Name:           chromium
 Summary:        Google's opens source browser project
 Summary(ja):    Googleのオープンソースウェブブラウザ
 #'
-Version:        18.0.1025.166
+Version:        19.0.1084.50
 Release:        1%{?_dist_release}
 License:        BSD-3-Clause, LGPL-2.1+
 Group:          Applications/Internet
 Source0:        %{pkgname}-%{version}.tar.xz
 # Script used to create the %{pkgname}-%{version}.tar.xz archive from 
 # a official tarball: 
-# http://gsdview.appspot.com/chromium-browser-official/chromium-18.0.1025.XXX.tar.bz2
-Source3:        pack_chromium18_source-vine.sh
-# Official ffmpeg headers
-Source8:        ffmpeg-0.6-headers.tar.xz
-#Source8:        ffmpeg-0.9-headers.tar.xz
+# http://gsdview.appspot.com/chromium-browser-official/chromium-19.0.1084.XXX.tar.bz2
+Source3:        pack_chromium19_source-vine.sh
 # Patch template which adds vendor to user agent
 ##!!Source20:       chromium-vendor.patch.in
 Source20:       chromium-vendor-vine.patch.in
@@ -87,9 +84,9 @@ Patch32:        chromium-7.0.542.0-system-libvpx.patch
 Patch62:        chromium-norpath.patch
 Patch63:        chromium-6.0.406.0-system-gyp-v8.patch
 Patch64:        chromium-more-codec-aliases.patch
-#Patch65:        chromium-new-glib.patch
 Patch66:        chromium-sandbox-pie.patch
 
+
 # Vine
 #Patch100:       chromium-15.0.874.116-no-tests.patch
 
@@ -217,7 +214,7 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
 %patch14 -p1
 %patch17 -p1
 %patch18 -p1
-%patch20 -p1
+%{?with_system_ffmpeg:%patch20 -p1}
 #%patch25 -p1
 %patch26 -p1
 %patch28 -p1
@@ -225,20 +222,6 @@ xz -dc %{SOURCE0} | %__tar -xf - || exit 1
 %patch66 -p1
 
 
-pushd src/third_party/ffmpeg/
-%__tar xf %{SOURCE8} || exit 1
-## built header file: avconfig.h
-[ -f ffmpeg-0.6-headers/libavutil/avconfig.h ] && exit 1
-cat > ffmpeg-0.6-headers/libavutil/avconfig.h <<EOF
-/* Generated by ffconf */
-#ifndef AVUTIL_AVCONFIG_H
-#define AVUTIL_AVCONFIG_H
-#define AV_HAVE_BIGENDIAN 0
-#define AV_HAVE_FAST_UNALIGNED 1
-#endif /* AVUTIL_AVCONFIG_H */
-EOF
-popd
-
 # apply vendor patch after substitution
 %__sed "s:RPM_VERSION:%{version}-%{release}:" %{SOURCE20} | patch -p0
 
@@ -268,7 +251,7 @@ pushd src
     -Duse_openssl=0 \
     %{?with_system_ffmpeg:-Duse_system_ffmpeg=1} \
     %{!?with_system_ffmpeg:-Duse_system_ffmpeg=0} \
-    -Dbuild_ffmpegsumo=0 \
+    -Dbuild_ffmpegsumo=1 \
     -Duse_system_zlib=1 \
     -Duse_system_libpng=1 \
     -Duse_system_bzip2=1 \
@@ -288,6 +271,8 @@ pushd src
     %{?_with_shared_library:-Dlibrary=shared_library} \
     -Dproprietary_codecs=1 \
     -Ddisable_nacl=1 \
+    -Dlinux_use_gold_flags=0 \
+    -Dlinux_use_gold_binary=0 \
     -Djavascript_engine=v8 \
     -Dlinux_fpic=1 \
     -Ddisable_sse2=1 \
@@ -410,6 +395,12 @@ fi || :
 %attr(4755,root,root) %{chrome_sandbox}
 
 %changelog
+* Tue May 22 2012 Munehiro Yamamoto <munepi@vinelinux.org> 19.0.1084.50-1
+- updated to 19.0.1084.50
+
+* Tue May  8 2012 Munehiro Yamamoto <munepi@vinelinux.org> 18.0.1025.169-1
+- updated to 18.0.1025.169
+
 * Sat Apr 28 2012 Munehiro Yamamoto <munepi@vinelinux.org> 18.0.1025.166-1
 - updated to 18.0.1025.166
 

c/chromium/pack_chromium18_source-vine.sh → c/chromium/pack_chromium19_source-vine.sh

@@ -33,7 +33,8 @@ version="`cat $chromium_svn_dir/chrome/VERSION | cut -f2 -d= |while read i; do e
 echo "Version: $version"
 #echo "Revision: $revision"
 
-xz="`which xz 2>/dev/null`"
+#xz="`which xz 2>/dev/null`"
+xz="`which pxz 2>/dev/null`"
 lzma="`which lzma 2>/dev/null`"
 
 
@@ -64,10 +65,9 @@ cp -ra $chromium_svn_dir ${chromium_tgt_dir}/src
 # remove big bad ffmpeg binaries.
 echo "Removing ffmpeg binaries/sources"
 cd $chromium_tgt_dir/src/third_party/ffmpeg/
-rm -rf binaries/
-rm -rf patched-ffmpeg-mt/*.c patched-ffmpeg-mt/*.h patched-ffmpeg-mt/doc patched-ffmpeg-mt/ffpresets patched-ffmpeg-mt/mt-work 
-rm -rf patched-ffmpeg-mt/libavformat/*.c patched-ffmpeg-mt/libavcodec/*.c patched-ffmpeg-mt/tools patched-ffmpeg-mt/tests
-rm -rf patched-ffmpeg-mt/libavutil/*.c patched-ffmpeg-mt/libavfilter/*.c patched-ffmpeg-mt/libavdevice/*.c patched-ffmpeg-mt/libpostproc/*.c patched-ffmpeg-mt/libswscale/*.c
+rm -rf binaries/ chromium/binaries/
+rm -rf doc ffpresets mt-work tools tests
+find -type f -name "*.c" | xargs rm -f 
 echo "Removing courgette sources"
 cd $chromium_tgt_dir/src/
 rm -rf courgette/