[vlc-commits] commit: Contribs: fix libcaca-beta17 linkage on Win32 (Jean-Baptiste Kempf )

[git at videolan.org]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Aug 24 19:30:29 2010 +0200| [5ae2d4713fc82170beb38bf8fac4a2d930989905] | committer: Jean-Baptiste Kempf 

Contribs: fix libcaca-beta17 linkage on Win32

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

 extras/contrib/src/Makefile                        |    4 ++++
 .../contrib/src/Patches/libcaca-win32-static.patch |   11 +++++++++++
 2 files changed, 15 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 61d5ee7..e887917 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1323,6 +1323,10 @@ ifdef HAVE_DARWIN_OS
 	patch -p0 < Patches/libcaca-osx-sdkofourchoice.patch
 	(cd $@; sed -e 's%/Developer/SDKs/MacOSX10.4u.sdk%$(MACOSX_SDK)%' -i.orig  configure)
 endif
+ifdef HAVE_WIN32
+	patch -p0 < Patches/libcaca-win32-static.patch
+endif
+
 
 .caca: libcaca
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-imlib2 --disable-doc --disable-ruby --disable-csharp --disable-cxx && cd caca && make && make install)
diff --git a/extras/contrib/src/Patches/libcaca-win32-static.patch b/extras/contrib/src/Patches/libcaca-win32-static.patch
new file mode 100644
index 0000000..87cd4e1
--- /dev/null
+++ b/extras/contrib/src/Patches/libcaca-win32-static.patch
@@ -0,0 +1,11 @@
+--- libcaca/caca/caca.h	2010-02-08 13:34:28.000000000 +0100
++++ libcaca.new/caca/caca.h	2010-08-24 19:27:39.000000000 +0200
+@@ -31,7 +31,7 @@
+ #if defined _DOXYGEN_SKIP_ME
+ #elif defined _WIN32 && defined __LIBCACA__ && defined DLL_EXPORT
+ #   define __extern extern __declspec(dllexport)
+-#elif defined _WIN32 && !defined __LIBCACA__
++#elif defined _WIN32 && !defined __LIBCACA__ && defined __NULL
+ #   define __extern extern __declspec(dllimport)
+ #else
+ #   define __extern extern