[vlc-devel] commit: Win32: Use CDDB without iconv (Jean-Baptiste Kempf )

[git version control]

vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Tue Oct 27 00:28:53 2009 +0100| [d19ae91cac74f769e270fe7ad86d1ae4175ab21c] | committer: Jean-Baptiste Kempf 

Win32: Use CDDB without iconv

This makes the plugin stay at a reasonable size (120kB vs 1090kB stripped)
This might not be optimal though...

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

 extras/contrib/src/Makefile                    |    3 ++-
 extras/contrib/src/Patches/libcddb-cross.patch |   10 ++++++++++
 2 files changed, 12 insertions(+), 1 deletions(-)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 151f62d..af4d44e 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1430,10 +1430,11 @@ libcddb: libcddb-$(CDDB_VERSION).tar.bz2
 
 ifdef HAVE_WIN32
 .cddb: libcddb .regex
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --without-iconv CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
 else
 .cddb: libcddb
-endif
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)
+endif
 	touch $@
 
 CLEAN_FILE += .cddb
diff --git a/extras/contrib/src/Patches/libcddb-cross.patch b/extras/contrib/src/Patches/libcddb-cross.patch
index b5215dd..5c91f01 100644
--- a/extras/contrib/src/Patches/libcddb-cross.patch
+++ b/extras/contrib/src/Patches/libcddb-cross.patch
@@ -27,3 +27,13 @@
 -Libs: -L${libdir} -lcddb @LIBICONV@
 +Libs: -L${libdir} -lcddb ${libdir}/libregex.a @LIBICONV@
  Cflags: -I${includedir}
+--- include/cddb/cddb_ni.h.orig	2009-10-25 21:58:20.000000000 +0100
++++ include/cddb/cddb_ni.h	2009-10-25 21:58:46.000000000 +0100
+@@ -35,6 +35,7 @@
+ #  include <iconv.h>
+ #else
+    typedef void *iconv_t;       /* for code uniformity */
++   #define ICONV_CONST const
+ #endif
+ 
+ #ifdef HAVE_WINDOWS_H