vlc | branch: master | Konstantin Pavlov <[email protected]> | Thu Aug 16 22:56:20 2012 +0400| [eba83a2a77b7896eb6b2fd90ec9fb1f20da0e966] | committer: Konstantin Pavlov
Contribs: vpx: add patch to fix build failure on OSX 10.8. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=eba83a2a77b7896eb6b2fd90ec9fb1f20da0e966 --- 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 7f291ec..9950bab 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) _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
