[vlc-commits] contrib/caca: fixed compilation with llvm-gcc by disabling some inline ASM

[Felix Paul Kühne]

vlc/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Aug 19 15:09:35 2012 +0200| [361134fa2472a58b04a81ab0148d4cf2065a9716] | committer: Felix Paul Kühne

contrib/caca: fixed compilation with llvm-gcc by disabling some inline ASM
(cherry picked from commit dfb4fa14a2624885422906176dd0f513cf8a6677)

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

 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 7477675..f24040a 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