[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, master, updated. debian/22.0.1229.94_r161065-1-1-geab9323

[Michael Gilbert]

The following commit has been merged in the master branch:
commit eab93232f01ec98314510491499d46b8429d3156
Author: Michael Gilbert <mgilbert at debian.org>
Date:   Sun Oct 28 17:36:29 2012 -0400

    Use system vpx

diff --git a/debian/changelog b/debian/changelog
index 82220e6..9fd9736 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,16 @@
+chromium-browser (22.0.1229.94~r161065-3) unstable; urgency=medium
+
+  * Use system vpx library again (resolves armel build failures).
+
+ -- Michael Gilbert <mgilbert at debian.org>  Sun, 28 Oct 2012 00:55:58 -0400
+
+chromium-browser (22.0.1229.94~r161065-2) unstable; urgency=medium
+
+  * [574d76c] Override the lintian flag: embedded-library
+     usr/lib/chromium/libffmpegsumo.so: libavcodec
+
+ -- Giuseppe Iuculano <iuculano at debian.org>  Tue, 23 Oct 2012 17:51:56 +0200
+
 chromium-browser (22.0.1229.94~r161065-1) unstable; urgency=medium
 
   * New stable release:
diff --git a/debian/chromium.install b/debian/chromium.install
index 0fb8905..3366d3c 100644
--- a/debian/chromium.install
+++ b/debian/chromium.install
@@ -8,7 +8,6 @@ debian/tmp/usr/lib/chromium/locales/*
 #debian/tmp/usr/lib/chromium/ffmpegsumo_nolink
 #debian/tmp/usr/lib/chromium/libppGoogleNaClPluginChrome.so
 debian/tmp/usr/lib/chromium/libffmpegsumo.so
-debian/tmp/usr/lib/chromium/libvpx_obj_int_extract
 #debian/tmp/usr/lib/chromium/ssl_false_start_blacklist_process
 #debian/tmp/usr/lib/chromium/nacl_irt_*
 debian/tmp/usr/lib/chromium/pseudo_locales/fake-bidi.pak
diff --git a/debian/chromium.lintian-overrides b/debian/chromium.lintian-overrides
index 7ef8e1d..b18be94 100644
--- a/debian/chromium.lintian-overrides
+++ b/debian/chromium.lintian-overrides
@@ -1,3 +1,5 @@
 chromium: embedded-library usr/lib/chromium/chromium: sqlite
+chromium: embedded-library usr/lib/chromium/libffmpegsumo.so: libavcodec
+chromium: embedded-library usr/lib/chromium/libffmpegsumo.so: libavutil
 chromium: statically-linked-binary usr/lib/chromium/nacl_irt_x86_64.nexe
 chromium: statically-linked-binary usr/lib/chromium/nacl_irt_x86_32.nexe
diff --git a/debian/patches/series b/debian/patches/series
index ef60839..dd6f193 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -19,7 +19,7 @@ cups1.5.patch
 #system_v8.patch
 #protobuf.patch
 arm-no-float-abi.patch
-#vpx.patch
+vpx.patch
 gcc4.7.patch
 arm.patch
 icon.patch
diff --git a/debian/patches/vpx.patch b/debian/patches/vpx.patch
index 41cf28c..a56f4ca 100644
--- a/debian/patches/vpx.patch
+++ b/debian/patches/vpx.patch
@@ -1,13 +1,48 @@
-Index: sid/src/remoting/remoting.gyp
+Index: chromium-browser/src/third_party/libvpx/libvpx.gyp
 ===================================================================
---- sid.orig/src/remoting/remoting.gyp	2012-09-26 11:12:57.802698559 +0200
-+++ sid/src/remoting/remoting.gyp	2012-09-26 16:58:35.194257270 +0200
-@@ -1139,7 +1139,7 @@
-         '../ui/ui.gyp:ui',
-         '../net/net.gyp:net',
-         '../skia/skia.gyp:skia',
--        '../third_party/libvpx/libvpx.gyp:libvpx',
-+        '../third_party/libvpx/libvpx.gyp:libvpx_include',
-         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-         '../third_party/zlib/zlib.gyp:zlib',
-         '../media/media.gyp:yuv_convert',
+--- chromium-browser.orig/src/third_party/libvpx/libvpx.gyp	2012-10-28 00:39:46.934324915 -0400
++++ chromium-browser/src/third_party/libvpx/libvpx.gyp	2012-10-28 00:53:45.566289134 -0400
+@@ -3,6 +3,11 @@
+ # found in the LICENSE file.
+ {
+   'variables': {
++   'use_system_vpx%': 0,
++   },
++   'conditions': [
++   ['use_system_vpx==0',{
++    'variables':{
+     'conditions': [
+       ['os_posix==1', {
+         'asm_obj_extension': 'o',
+@@ -458,6 +463,31 @@
+       ]
+     },
+   ],
++  },{ # use_system_vpx==1
++    'targets': [
++      {
++        'target_name':'libvpx',
++        'type':'none',
++        'direct_dependent_settings': {
++          'cflags': [
++          '<!@(pkg-config --cflags vpx)',
++        ],
++        'defines': [
++          'USE_SYSTEM_VPX',
++        ],
++      },
++      'link_settings': {
++        'ldflags': [
++          '<!@(pkg-config --libs-only-L --libs-only-other vpx)',
++        ],
++        'libraries': [
++          '<!@(pkg-config --libs-only-l vpx)',
++        ],
++      },
++    },
++  ],
++ }],
++ ],
+ }
+ 
+ # Local Variables:

-- 
Git repository for pkg-chromium