* updated libcddb to 1.2.1 from 0.9.6 (refs #292)

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index c342b41422b21d9ddb9917e71d89a67a52173d04..41384d42b572bf157cfa8b652ddf35742b2e4ea3 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -6,6 +6,8 @@
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #          Derk-Jan Hartman <hartman at videolan dot org>
+#          Eric Petit <titer@m0k.org>
+#          Felix Kühne <fkuehne@users.sourceforge.net>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -997,11 +999,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)
+libcddb: libcddb-$(CDDB_VERSION).tar.bz2
+       $(EXTRACT_BZ2)
        patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
@@ -1010,7 +1012,7 @@ libcddb: libcddb-$(CDDB_VERSION).tar.gz
 
 CLEAN_FILE += .cddb
 CLEAN_PKG += libcddb
-DISTCLEAN_PKG += libcddb-$(CDDB_VERSION).tar.gz
+DISTCLEAN_PKG += libcddb-$(CDDB_VERSION).tar.bz2
 
 # ***************************************************************************
 # vcdimager

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index a03714de0973a6d000393909e7f0567df17bb226..b1c8597aa70cb63c66957e3f25c0e650cc1e6072 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -6,7 +6,7 @@
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #          Derk-Jan Hartman <hartman at videolan dot org>
-#          Felix Kühne <fkuehne@users.sourceforge.net>
+#          Felix Kühne <fkuehne@users.sourceforge.net>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -105,9 +105,9 @@ LIBDTS_URL=$(VIDEOLAN)/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
 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
+MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.bz2
+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