maj de chromium-6#6.0.472.63-1

1 files changed, 52 insertions, 30 deletions

diff --git a/extra/chromium/Pkgfile b/extra/chromium/Pkgfile
index b33376683..0ba91f152 100644
--- a/extra/chromium/Pkgfile
+++ b/extra/chromium/Pkgfile
@@ -2,15 +2,15 @@
 # URL: http://www.google.com
 # Maintainer: NuTyX core team
 # Packager: sibelle at free dot fr
-# Depends on: python, perl, gperf, mesa, yasm, nss, gconf, alsa-lib, xdg-utils, hicolor-icon-theme, bzip2, libevent
+# Depends on: pythion, perl, gperf, yasm, mesa3d, libgnome-keyring, nss, gconf, alsa-lib, xdg-utils, hicolor-icon-theme, bzip2, libevent, xorg-libxscrnsaver, libjpeg, libpng, cups, zlib
 
 name=chromium
-version=5.0.375.127
+version=6.0.472.63
 release=1
 
 source=(http://build.chromium.org/buildbot/official/$name-$version.tar.bz2 \
 	chromium.desktop chromium.sh \
-	ffmpeg_branding_mime.patch drop_sse2.patch libpng-1.4.patch)
+	gyp-make.patch)
 
 build() {
 
@@ -22,53 +22,75 @@ build() {
 	# workaround for gcc 4.5
   	# see http://code.google.com/p/chromium/issues/detail?id=41887
 	export CFLAGS="${CFLAGS} -fno-ipa-cp"
-	patch -p1 -i $SRC/ffmpeg_branding_mime.patch
-	[ "${CARCH}" == 'i686' ] && (patch -p1 -i $SRC/drop_sse2.patch)
-	patch -p1 -i $SRC/libpng-1.4.patch
+
+	patch -p0 -i $SRC/gyp-make.patch
 
 ### Configure
 	build/gyp_chromium -f make build/all.gyp --depth=. \
-	    -Dgcc_version=45 \
-	    -Dno_strict_aliasing=1 \
-	    -Dwerror= \
-	    -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
-	    -Dlinux_strip_binary=1 \
-	    -Drelease_extra_cflags="${CFLAGS}" \
-	    -Dffmpeg_branding=Chrome \
-	    -Duse_system_libjpeg=1 \
-	    -Duse_system_libxslt=0 \
-	    -Duse_system_libxml=0 \
-	    -Duse_system_bzip2=1 \
-	    -Duse_system_zlib=1 \
-	    -Duse_system_libpng=1 \
-	    -Duse_system_ffmpeg=0 \
-	    -Duse_system_yasm=1 \
-	    -Duse_system_libevent=1 \
-	    -Duse_system_ssl=0
+		-Dgcc_version=45 \
+    		-Dno_strict_aliasing=1 \
+    		-Dwerror= \
+    		-Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \
+    		-Dlinux_strip_binary=1 \
+    		-Drelease_extra_cflags="${CFLAGS}" \
+    		-Dffmpeg_branding=Chrome \
+    		-Dproprietary_codecs=1 \
+		-Duse_cups=1 \
+		-Dlinux_link_gnome_keyring=1 \
+    		-Duse_system_libjpeg=1 \
+    		-Duse_system_libxslt=0 \
+    		-Duse_system_libxml=0 \
+    		-Duse_system_bzip2=1 \
+    		-Duse_system_zlib=1 \
+    		-Duse_system_libpng=1 \
+    		-Duse_system_ffmpeg=0 \
+    		-Duse_system_yasm=1 \
+    		-Duse_system_libevent=1 \
+    		-Duse_system_ssl=0 \
+		-Dtarget_arch=ia32 \
+		-Denable_gpu=0 \
+		-Dlinux_use_tcmalloc=0 \
+		-Dv8_use_snapshot=0 \
+    		$([ "${CARCH}" == 'i686' ] && echo '-Ddisable_sse2=1')
 
 
         make  chrome chrome_sandbox BUILDTYPE=Release  
 
 	cd $SRC/$name-$version
 
-        install -m 0755 -D out/Release/chrome $PKG/usr/lib/chromium/chromium
-        install -m 4555 -o root -g root -D out/Release/chrome_sandbox $PKG/usr/lib/chromium/chromium-sandbox
-        install -m 0644 -D out/Release/chrome.pak $PKG/usr/lib/chromium/chrome.pak
-
+        install -m 0755 -D out/Release/chrome \
+		$PKG/usr/lib/chromium/chromium
+        install -m 4555 -o root -g root -D out/Release/chrome_sandbox \
+		$PKG/usr/lib/chromium/chromium-sandbox
+        install -m 0644 -D out/Release/chrome.pak \
+		$PKG/usr/lib/chromium/chrome.pak
+	install -m 0644 -D out/Release/resources.pak \
+    		$PKG/usr/lib/chromium/resources.pak
+  	install -m 0755 -D out/Release/libffmpegsumo.so \
+    		$PKG/usr/lib/chromium/libffmpegsumo.so
+	
+	# these links are only needed when building with system ffmpeg
         ln -s /usr/lib/libavcodec.so.52 $PKG/usr/lib/chromium/libavcodec.so.52
         ln -s /usr/lib/libavformat.so.52 $PKG/usr/lib/chromium/libavformat.so.52
         ln -s /usr/lib/libavutil.so.50 $PKG/usr/lib/chromium/libavutil.so.50
-        cp -a out/Release/locales out/Release/resources $PKG/usr/lib/chromium/
+
+        cp -a out/Release/locales out/Release/resources \
+		$PKG/usr/lib/chromium/
+
         find $PKG/usr/lib/chromium/ -name '*.d' -type f -delete
-        install -m 0644 -D out/Release/chrome.1 $PKG/usr/share/man/man1/chromium.1
 
-        install -m 0644 -D ../chromium.desktop $PKG/usr/share/applications/chromium.desktop
+        install -m 0644 -D out/Release/chrome.1 \
+		$PKG/usr/share/man/man1/chromium.1
+
+        install -m 0644 -D ../chromium.desktop \
+		$PKG/usr/share/applications/chromium.desktop
 
         for size in 16 32 48 256; do
                 install -m 0644 -D \
                         chrome/app/theme/chromium/product_logo_${size}.png \
                         $PKG/usr/share/icons/hicolor/${size}x${size}/apps/chromium.png
         done
+
         install -m 0755 -D ../chromium.sh $PKG/usr/bin/chromium
 
         install -m 0644 -D LICENSE $PKG/usr/share/licenses/chromium/LICENSE