vlc | branch: master | Felix Paul Kühne <[email protected]> | Sun Aug 19 15:09:35 2012 +0200| [dfb4fa14a2624885422906176dd0f513cf8a6677] | committer: Felix Paul Kühne
contrib/caca: fixed compilation with llvm-gcc by disabling some inline ASM > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=dfb4fa14a2624885422906176dd0f513cf8a6677 --- contrib/src/caca/caca-fix-compilation-llvmgcc.patch | 14 ++++++++++++++ contrib/src/caca/rules.mak | 1 + 2 files changed, 15 insertions(+) diff --git a/contrib/src/caca/caca-fix-compilation-llvmgcc.patch b/contrib/src/caca/caca-fix-compilation-llvmgcc.patch new file mode 100644 index 0000000..76dfebb --- /dev/null +++ b/contrib/src/caca/caca-fix-compilation-llvmgcc.patch @@ -0,0 +1,14 @@ +diff -ru caca/caca/dither.c caca/caca/dither.c +--- caca/caca/dither.c 2010-02-08 13:34:28.000000000 +0100 ++++ caca/caca/dither.c 2012-08-21 17:39:49.000000000 +0200 +@@ -26,6 +26,10 @@ + # include <string.h> + #endif + ++#if defined(__APPLE__) && defined(__llvm__) ++#undef HAVE_FLDLN2 ++#endif ++ + #include "caca.h" + #include "caca_internals.h" + diff --git a/contrib/src/caca/rules.mak b/contrib/src/caca/rules.mak index 5a9a2ce..e6a9df2 100644 --- a/contrib/src/caca/rules.mak +++ b/contrib/src/caca/rules.mak @@ -16,6 +16,7 @@ caca: libcaca-$(CACA_VERSION).tar.gz .sum-caca $(UNPACK) ifdef HAVE_MACOSX $(APPLY) $(SRC)/caca/caca-osx-sdkofourchoice.patch + $(APPLY) $(SRC)/caca/caca-fix-compilation-llvmgcc.patch endif $(APPLY) $(SRC)/caca/caca-llvm-weak-alias.patch _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
