Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=wipv.git;a=commitdiff;h=7f4eefecd57dfd670be781c8ead738835b598a7e
commit 7f4eefecd57dfd670be781c8ead738835b598a7e Author: Devil505 <[email protected]> Date: Sun Aug 1 07:45:43 2010 +0200 chromium-browser-6.0.472.14-1-i686 * version bump * removing usless patches * added patch to disable vp8 diff --git a/source/gnome-extra/chromium-browser/FrugalBuild b/source/gnome-extra/chromium-browser/FrugalBuild index d525fe0..0452434 100644 --- a/source/gnome-extra/chromium-browser/FrugalBuild +++ b/source/gnome-extra/chromium-browser/FrugalBuild @@ -2,13 +2,13 @@ # Maintainer: Devil505 <[email protected]> pkgname=chromium-browser -pkgver=5.0.375.47 +pkgver=6.0.472.14 pkgrel=1 pkgdesc='An open-source browser project that aims to build a safer, faster, and more stable way for all users to experience the web' url='http://www.chromium.org/' depends=('nss' 'gconf' 'alsa-lib' 'hicolor-icon-theme' 'libxslt' 'ffmpeg' \ 'libevent' 'libxscrnsaver' 'libpng>=1.4.1') -makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl') +makedepends=('python' 'perl' 'gperf' 'yasm' 'libgl' 'libgnome-keyring' 'cups') license=('BSD') groups=('gnome-extra') archs=('i686' 'x86_64') @@ -17,14 +17,11 @@ Finclude gnome-scriptlet _F_archive_name="chromium" up2date="Flasttar http://build.chromium.org/buildbot/official/"; source=(http://build.chromium.org/buildbot/official/$_F_archive_name-$pkgver.tar.bz2 \ - $pkgname.desktop $pkgname.sh \ - drop_sse2.patch ffmpeg_branding_mime.patch libpng-1.4.patch) -sha1sums=('1912ad52931b8c78ea891fd4cc7c8443d0b2b8c1' \ + $pkgname.desktop $pkgname.sh chromium-disable-vp8-r1.patch) +sha1sums=('4b4343ff01eca34a5cfc7b2a0bb3056de1bed451' \ '78ed8913b8a598de6a9e45d206973a846dbe8a51' \ 'e06de4aee77b3deb77e3b08ebb175ec02da42ced' \ - '2b7de8f697e62678f53051dbebabb4a2470b5ce5' \ - 'dcf0bcd9da6e5e81787095d64ccfc8c1cb6ba02e' \ - '06eb55ef616525be7b6186e38231656e5af27255') + '7e104772a645f50449432d4c970d52ffc3555c8a') build() { Fcd @@ -34,19 +31,26 @@ build() { -Dno_strict_aliasing=1 \ -Dwerror= \ -Dlinux_sandbox_path=/usr/lib/chromium/chromium-sandbox \ + -Dlinux_sandbox_chrome_path=/usr/lib/chromium/chrome \ -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_ffmpeg=1 \ -Duse_system_yasm=1 \ -Duse_system_libevent=1 \ - -Duse_system_ssl=0 + -Dproprietary_codecs=1 \ + -Duse_cups=1 \ + -Denable_gpu=0 \ + -Dv8_use_snapshot=0 \ + -Dlinux_use_tcmalloc=0 \ + -Duse_system_target_arch=ia32 + if [ "$CARCH" == "x86_64" ]; then + export -Duse_system_target_arch=x64 + fi make chrome chrome_sandbox BUILDTYPE=Release || Fdie @@ -55,6 +59,7 @@ build() { Finstallrel 4555 out/Release/chrome_sandbox usr/lib/chromium/chromium-sandbox Ffileschown usr/lib/chromium/chromium-sandbox root root Finstallrel 644 out/Release/chrome.pak usr/lib/chromium/chrome.pak + Finstallrel 644 out/Release/resources.pak usr/lib/chromium/resources.pak Fln /usr/lib/libavcodec.so.52 /usr/lib/chromium/libavcodec.so.52 Fln /usr/lib/libavformat.so.52 /usr/lib/chromium/libavformat.so.52 @@ -77,4 +82,3 @@ build() { Fdocrel LICENSE Fbuild_gnome_scriptlet } - diff --git a/source/gnome-extra/chromium-browser/chromium-disable-vp8-r1.patch b/source/gnome-extra/chromium-browser/chromium-disable-vp8-r1.patch new file mode 100644 index 0000000..e996afe --- /dev/null +++ b/source/gnome-extra/chromium-browser/chromium-disable-vp8-r1.patch @@ -0,0 +1,33 @@ +--- media/filters/ffmpeg_demuxer.cc.orig 2010-06-10 12:28:10.000000000 +0200 ++++ media/filters/ffmpeg_demuxer.cc 2010-06-10 12:29:13.000000000 +0200 +@@ -413,9 +413,8 @@ + CodecType codec_type = codec_context->codec_type; + if (codec_type == CODEC_TYPE_AUDIO || codec_type == CODEC_TYPE_VIDEO) { + AVStream* stream = format_context_->streams[i]; +- // WebM is currently strictly VP8 and Vorbis. +- if (kDemuxerIsWebm && (stream->codec->codec_id != CODEC_ID_VP8 && +- stream->codec->codec_id != CODEC_ID_VORBIS)) { ++ // WebM is currently strictly Vorbis. ++ if (kDemuxerIsWebm && (stream->codec->codec_id != CODEC_ID_VORBIS)) { + packet_streams_.push_back(NULL); + continue; + } +--- net/base/mime_util.cc.orig 2010-06-10 12:30:13.000000000 +0200 ++++ net/base/mime_util.cc 2010-06-10 12:30:38.000000000 +0200 +@@ -227,7 +227,6 @@ + #endif + "theora", + "vorbis", +- "vp8" + }; + + // Note: does not include javascript types list (see supported_javascript_types) +@@ -297,7 +296,7 @@ + }; + + static const MediaFormatStrict format_codec_mappings[] = { +- { "video/webm", "vorbis,vp8,vp8.0" }, ++ { "video/webm", "vorbis" }, + { "audio/webm", "vorbis" } + }; + diff --git a/source/gnome-extra/chromium-browser/drop_sse2.patch b/source/gnome-extra/chromium-browser/drop_sse2.patch deleted file mode 100644 index fb0e32b..0000000 --- a/source/gnome-extra/chromium-browser/drop_sse2.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- src/build/common.gypi 2010-02-11 19:30:43.000000000 +0100 -+++ src/build/common.gypi 2010-02-11 21:07:58.505011143 +0100 -@@ -881,15 +881,6 @@ - # used during computation does not change depending on how the - # compiler optimized the code, since the value is always kept - # in its specified precision. -- 'conditions': [ -- ['branding=="Chromium"', { -- 'cflags': [ -- '-march=pentium4', -- '-msse2', -- '-mfpmath=sse', -- ], -- }], -- ], - # -mmmx allows mmintrin.h to be used for mmx intrinsics. - # video playback is mmx and sse2 optimized. - 'cflags': [ - - '-m32', -- '-mmmx', - ], - 'ldflags': [ - '-m32', diff --git a/source/gnome-extra/chromium-browser/ffmpeg_branding_mime.patch b/source/gnome-extra/chromium-browser/ffmpeg_branding_mime.patch deleted file mode 100644 index 083026e..0000000 --- a/source/gnome-extra/chromium-browser/ffmpeg_branding_mime.patch +++ /dev/null @@ -1,29 +0,0 @@ ---- src/net/base/mime_util.cc 2010-02-11 20:07:33.939537145 +0100 -+++ src/net/base/mime_util.cc 2010-02-11 20:07:33.955373468 +0100 -@@ -188,7 +188,6 @@ - "audio/ogg", - "application/ogg", - --#if defined(GOOGLE_CHROME_BUILD) - // MPEG-4. - "video/mp4", - "video/x-m4v", -@@ -199,7 +198,6 @@ - "audio/mp3", - "audio/x-mp3", - "audio/mpeg", --#endif - }; - - // List of supported codecs when passed in with <source type="...">. -@@ -207,10 +205,8 @@ - // Refer to http://wiki.whatwg.org/wiki/Video_type_parameters#Browser_Support - // for more information. - static const char* const supported_media_codecs[] = { --#if defined(GOOGLE_CHROME_BUILD) - "avc1", - "mp4a", --#endif - "theora", - "vorbis", - }; diff --git a/source/gnome-extra/chromium-browser/libpng-1.4.patch b/source/gnome-extra/chromium-browser/libpng-1.4.patch deleted file mode 100644 index e0e9895..0000000 --- a/source/gnome-extra/chromium-browser/libpng-1.4.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- src/third_party/WebKit/WebCore/platform/image-encoders/skia/orig/PNGImageEncoder.cpp 2009-11-19 13:39:07.000000000 -0800 -+++ src/third_party/WebKit/WebCore/platform/image-encoders/skia/PNGImageEncoder.cpp 2009-11-19 13:39:25.000000000 -0800 -@@ -130,9 +130,9 @@ - } - - png_struct* pngPtr = png_create_write_struct(PNG_LIBPNG_VER_STRING, -- png_voidp_NULL, -- png_error_ptr_NULL, -- png_error_ptr_NULL); -+ NULL, -+ NULL, -+ NULL); - if (!pngPtr) - return false; - _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
