* Update the CDDB version from 0.9.6 to 1.2.1

extras/contrib/src/Makefile

@@ -1192,12 +1192,11 @@ DISTCLEAN_PKG += libmodplug-$(MODPLUG_VERSION).tar.gz
 # libcddb
 # ***************************************************************************
 
-libcddb-$(CDDB_VERSION).tar.gz:
+libcddb-$(CDDB_VERSION).tar.bz2:
 	$(WGET) $(CDDB_URL)
 
-libcddb: libcddb-$(CDDB_VERSION).tar.gz
-	$(EXTRACT_GZ)
-	patch -p 0 < Patches/libcddb.patch
+libcddb: libcddb-$(CDDB_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
 
 .cddb: libcddb
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS) -liconv" && make && make install)

extras/contrib/src/Patches/libcddb.patch

-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>
- 
- /**

extras/contrib/src/packages.mak

@@ -104,8 +104,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=0.9.6
-CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.gz
+CDDB_VERSION=1.2.1
+CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.bz2
 VCDIMAGER_VERSION=0.7.21
 VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
 CDIO_VERSION=0.72