* reverted my update of libcddb from 0.9.6 to 1.2.1 since it breaks cddax on...

* reverted my update of libcddb from 0.9.6 to 1.2.1 since it breaks cddax on OSX (refs #357). The previously applied patch for 0.9.6 doesn't seem to be necessary, since it compiles fine without it (at least using GCC 4.0)

extras/contrib/src/Makefile

@@ -1009,11 +1009,11 @@ DISTCLEAN_PKG += libmodplug-$(MODPLUG_VERSION).tar.gz
 # libcddb
 # ***************************************************************************
 
-libcddb-$(CDDB_VERSION).tar.bz2:
+libcddb-$(CDDB_VERSION).tar.gz:
 	$(WGET) $(CDDB_URL)
 
-libcddb: libcddb-$(CDDB_VERSION).tar.bz2
-	$(EXTRACT_BZ2)
+libcddb: libcddb-$(CDDB_VERSION).tar.gz
+	$(EXTRACT_GZ)
 
 .cddb: libcddb
 	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)
@@ -1021,7 +1021,7 @@ libcddb: libcddb-$(CDDB_VERSION).tar.bz2
 
 CLEAN_FILE += .cddb
 CLEAN_PKG += libcddb
-DISTCLEAN_PKG += libcddb-$(CDDB_VERSION).tar.bz2
+DISTCLEAN_PKG += libcddb-$(CDDB_VERSION).tar.gz
 
 # ***************************************************************************
 # vcdimager

extras/contrib/src/packages.mak

@@ -106,8 +106,8 @@ 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=1.2.1
-CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.bz2
+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
 CDIO_VERSION=0.72