Fix win32 taglib linking

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

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 4fb18fecc7d437a9b982511db97189471894d877..d6be119820fcf064c8990148b809f4d794eb22d3 100644 (file)
--- 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 (file)
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