[Frugalware-git] frugalware-current: chromium-browser-6.0.472.14-2-i686 * removing usles patch, ffmpeg is enough recent

[Devil505]

Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=60ac4c5abb35014d64deb4e9539d9c24525c1f1c

commit 60ac4c5abb35014d64deb4e9539d9c24525c1f1c
Author: Devil505 <devil505linux at gmail.com>
Date:   Sun Aug 1 13:23:15 2010 +0200

chromium-browser-6.0.472.14-2-i686
* removing usles patch, ffmpeg is enough recent

diff --git a/source/gnome-extra/chromium-browser/FrugalBuild b/source/gnome-extra/chromium-browser/FrugalBuild
index 0452434..e8ff7a9 100644
--- a/source/gnome-extra/chromium-browser/FrugalBuild
+++ b/source/gnome-extra/chromium-browser/FrugalBuild
@@ -3,7 +3,7 @@

pkgname=chromium-browser
pkgver=6.0.472.14
-pkgrel=1
+pkgrel=2
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' \
@@ -17,15 +17,14 @@ 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 chromium-disable-vp8-r1.patch)
+        $pkgname.desktop $pkgname.sh)
sha1sums=('4b4343ff01eca34a5cfc7b2a0bb3056de1bed451' \
'78ed8913b8a598de6a9e45d206973a846dbe8a51' \
-          'e06de4aee77b3deb77e3b08ebb175ec02da42ced' \
-          '7e104772a645f50449432d4c970d52ffc3555c8a')
+          'e06de4aee77b3deb77e3b08ebb175ec02da42ced')

build() {
Fcd
-	Fpatchall
+	#Fpatchall
build/gyp_chromium -f make build/all.gyp --depth=. \
-Dgcc_version=45 \
-Dno_strict_aliasing=1 \
diff --git a/source/gnome-extra/chromium-browser/chromium-disable-vp8-r1.patch b/source/gnome-extra/chromium-browser/chromium-disable-vp8-r1.patch
deleted file mode 100644
index e996afe..0000000
--- a/source/gnome-extra/chromium-browser/chromium-disable-vp8-r1.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- 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" }
- };
-