[Pkg-chromium-commit] [SCM] Git repository for pkg-chromium branch, experimental, updated. debian/21.0.1180.57_r148591-1-4-g2bb621a
Shawn Landden
shawnlandden at gmail.com
Wed Aug 8 21:00:00 UTC 2012
The following commit has been merged in the experimental branch:
commit 70a5d8bb55a88ba38ca543b4cac123a168f875db
Author: Shawn Landden <shawnlandden at gmail.com>
Date: Fri Jul 6 17:47:26 2012 -0700
update vpx patch to use system headers (fixes FTBFS on armel) (Closes: 674728)
Note: I was using binutils-gold, which has been reverted (why?)
diff --git a/debian/patches/vpx.patch b/debian/patches/vpx.patch
index b53044b..6658ca1 100644
--- a/debian/patches/vpx.patch
+++ b/debian/patches/vpx.patch
@@ -11,3 +11,31 @@ Index: exp/src/remoting/remoting.gyp
'../third_party/protobuf/protobuf.gyp:protobuf_lite',
'../third_party/zlib/zlib.gyp:zlib',
'../media/media.gyp:yuv_convert',
+Index: exp/src/third_party/libvpx/libvpx.gyp
+===================================================================
+--- exp.orig/src/third_party/libvpx/libvpx.gyp 2012-05-29 19:07:29.000000000 +0200
++++ exp/src/third_party/libvpx/libvpx.gyp 2012-05-29 19:08:06.717826578 +0200
+@@ -281,11 +281,17 @@
+ {
+ 'target_name': 'libvpx_include',
+ 'type': 'none',
+- 'direct_dependent_settings': {
+- 'include_dirs': [
+- 'source/libvpx',
+- ],
+- },
++ 'conditions': [
++ ['_toolset=="target"', {
++ 'link_settings': {
++ 'ldflags': [
++ '<!@(pkg-config --libs-only-L --libs-only-other vpx)',
++ ],
++ 'libraries': [
++ '<!@(pkg-config --libs-only-l vpx)',
++ ],
++ },
++ }]]
+ },
+ {
+ 'target_name': 'libvpx_lib',
+
--
Git repository for pkg-chromium
More information about the Pkg-chromium-commit
mailing list