* finally fixed CDDB contrib

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 1823f09f2f82544ce9f08dacd41d07311f8a4a48..e57f1cf9a6bcc934fd844c5ddf892de5348964f3 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -55,7 +55,7 @@ all: .autoconf .libtool .automake .iconv .intl .pkgcfg .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .openslp \
        .dvdcss .dvdread .dvdnav .dvbpsi .live .goom2k4 .caca .mod \
-       .png .gpgerror .gcrypt .gnutls .daap .cdio .vcdimager
+       .png .gpgerror .gcrypt .gnutls .daap .cddb .cdio .vcdimager
 endif
 ifeq ($(SYS),BEOS)
 all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
@@ -880,7 +880,7 @@ libcddb: libcddb-$(CDDB_VERSION).tar.gz
        patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
-       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="-liconv" && make && make install)
        touch $@
 
 CLEAN_FILE += .cddb

diff --git a/extras/contrib/src/Patches/libcddb.patch b/extras/contrib/src/Patches/libcddb.patch
new file mode 100644 (file)
index 0000000..52bc559
--- /dev/null
+++ b/extras/contrib/src/Patches/libcddb.patch
@@ -0,0 +1,13 @@
+diff -ruN libcddb.orig/include/cddb/cddb_regex.h libcddb/include/cddb/cddb_regex.h
+--- libcddb.orig/include/cddb/cddb_regex.h     Fri Oct 15 21:42:08 2004
++++ libcddb/include/cddb/cddb_regex.h  Tue Jan 18 01:57:50 2005
+@@ -30,9 +30,7 @@
+ #include <cddb/cddb_config.h>
+ #include <stdlib.h>
+ 
+-#ifdef CDDB_NEED_UNISTD_H
+ #include <unistd.h>
+-#endif
+ #include <regex.h>
+ 
+ /**

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index e56bc280d5ac2aac0fa39f0e5f47165fa3ec1930..111a8641e6644b075de36ab5e6139be99d07b86a 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -101,7 +101,7 @@ MODPLUG_VERSION=0.7
 MODPLUG_URL=$(VIDEOLAN)/testing/contrib/libmodplug-$(MODPLUG_VERSION).tar.gz
 MASH_VERSION=5.2
 MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
-CDDB_VERSION=0.9.5
+CDDB_VERSION=0.9.6
 CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.gz
 VCDIMAGER_VERSION=0.7.21
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz