[vlc-commits] Contribs: vpx: add patch to fix build failure on OSX 10.8.

Konstantin Pavlov git at videolan.org
Tue Sep 25 22:21:23 CEST 2012


vlc/vlc-2.0 | branch: master | Konstantin Pavlov <thresh at videolan.org> | Thu Aug 16 22:56:20 2012 +0400| [e43cde9a0f7880d6d2b8e8c2032eb8e3ea5e5fbf] | committer: Felix Paul Kühne

Contribs: vpx: add patch to fix build failure on OSX 10.8.
(cherry picked from commit eba83a2a77b7896eb6b2fd90ec9fb1f20da0e966)

Signed-off-by: Felix Paul Kühne <fkuehne at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=e43cde9a0f7880d6d2b8e8c2032eb8e3ea5e5fbf
---

 contrib/src/vpx/libvpx-mac-mountain-lion.patch |   11 +++++++++++
 contrib/src/vpx/rules.mak                      |    1 +
 2 files changed, 12 insertions(+)

diff --git a/contrib/src/vpx/libvpx-mac-mountain-lion.patch b/contrib/src/vpx/libvpx-mac-mountain-lion.patch
new file mode 100644
index 0000000..6c77391
--- /dev/null
+++ b/contrib/src/vpx/libvpx-mac-mountain-lion.patch
@@ -0,0 +1,11 @@
+--- libvpx/build/make/gen_asm_deps.sh.orig	2012-07-18 23:43:18.000000000 +0200
++++ libvpx.patched/build/make/gen_asm_deps.sh	2012-07-18 23:45:52.000000000 +0200
+@@ -42,7 +42,7 @@
+ 
+ [ -n "$srcfile" ] || show_help
+ sfx=${sfx:-asm}
+-includes=$(egrep -i "include +\"?+[a-z0-9_/]+\.${sfx}" $srcfile |
++includes=$(egrep -i "include +\"?[a-z0-9_/]+\.${sfx}" $srcfile |
+            perl -p -e "s;.*?([a-z0-9_/]+.${sfx}).*;\1;")
+ #" restore editor state
+ for inc in ${includes}; do
diff --git a/contrib/src/vpx/rules.mak b/contrib/src/vpx/rules.mak
index ec6b138..a0955ea 100644
--- a/contrib/src/vpx/rules.mak
+++ b/contrib/src/vpx/rules.mak
@@ -20,6 +20,7 @@ libvpx: libvpx-$(VPX_VERSION).tar.bz2 .sum-vpx
 	$(APPLY) $(SRC)/vpx/libvpx-no-abi.patch
 ifdef HAVE_MACOSX
 	$(APPLY) $(SRC)/vpx/libvpx-mac.patch
+	$(APPLY) $(SRC)/vpx/libvpx-mac-mountain-lion.patch
 endif
 	$(PATCH_BASH_LOCATION)
 	$(MOVE)



More information about the vlc-commits mailing list