[vlc-devel] commit: Fix win32 taglib linking (Christophe Mutricy )

[git version control]

vlc | branch: master | Christophe Mutricy <xtophe at videolan.org> | Sun Apr 13 18:48:34 2008 +0100| [9d98ad6a2c546d5e8f7278db25c8c12d91c56061]

Fix win32 taglib linking

Don't use the export things in taglib as we don't need it and it's buggy

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

 extras/contrib/src/Makefile             |    7 +++++--
 extras/contrib/src/Patches/taglib.patch |   15 +++++++++++++++
 2 files changed, 20 insertions(+), 2 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4fb18fe..d6be119 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2310,12 +2310,15 @@ taglib-$(TAGLIB_VERSION).tar.gz:
 
 taglib: taglib-$(TAGLIB_VERSION).tar.gz
 	$(EXTRACT_GZ)
+ifdef HAVE_WIN32
+	patch -p0 < Patches/taglib.patch
+endif
 ifdef HAVE_CYGWIN
-	patch -p0 <Patches/taglib-cygwin.patch
+	patch -p0 < Patches/taglib-cygwin.patch
 endif
 
 .tag: taglib
-	(cd $<; $(HOSTCC) CXXFLAGS="-DMAKE_TAGLIB_LIB" ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+	(cd $<; $(HOSTCC)  ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
diff --git a/extras/contrib/src/Patches/taglib.patch b/extras/contrib/src/Patches/taglib.patch
new file mode 100644
index 0000000..23bc5d9
--- /dev/null
+++ b/extras/contrib/src/Patches/taglib.patch
@@ -0,0 +1,15 @@
+diff -ru taglib-1.5/taglib/taglib_export.h taglib/taglib/taglib_export.h
+--- taglib-1.5/taglib/taglib_export.h	2008-02-04 15:14:46.000000000 +0000
++++ taglib/taglib/taglib_export.h	2008-04-13 18:25:29.000000000 +0100
+@@ -28,9 +28,9 @@
+ 
+ #if defined(_WIN32) || defined(_WIN64)
+ #ifdef MAKE_TAGLIB_LIB
+-#define TAGLIB_EXPORT __declspec(dllexport)
++#define TAGLIB_EXPORT 
+ #else
+-#define TAGLIB_EXPORT __declspec(dllimport)
++#define TAGLIB_EXPORT 
+ #endif
+ #else
+ #define TAGLIB_EXPORT