* Add libcddb, libcdio and vcdimager again to see if it works better on OSX by now

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 0c76e4634b9289d59f067a44cc19ddde148f93be..acff749c291f57ee9f81aa41ef6731aeae5c902c 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
+       .png .gpgerror .gcrypt .gnutls .daap .cddb .cdio .vcdimager
 endif
 ifeq ($(SYS),BEOS)
 all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
@@ -896,7 +896,6 @@ vcdimager-$(VCDIMAGER_VERSION).tar.gz:
 
 vcdimager: vcdimager-$(VCDIMAGER_VERSION).tar.gz
        $(EXTRACT_GZ)
-       patch -p 0 < Patches/vcdimager.patch
 
 ifeq ($(SYS),DARWIN)
 .vcdimager: vcdimager

diff --git a/extras/contrib/src/Patches/vcdimager.patch b/extras/contrib/src/Patches/vcdimager.patch
deleted file mode 100644 (file)
index cfe8c7e..0000000
--- a/extras/contrib/src/Patches/vcdimager.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- vcdimager.orig/lib/image.c Mon Jul  5 02:17:50 2004
-+++ vcdimager/lib/image.c      Sun Jul  4 23:08:26 2004
-@@ -76,7 +76,7 @@
- }
- 
- int
--vcd_image_sink_write (VcdImageSink *obj, void *buf, uint32_t lsn)
-+vcd_image_sink_write (VcdImageSink *obj, void *buf, lsn_t lsn)
- {
-   vcd_assert (obj != NULL);
- 

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 94b158ac718878c76351286a5060b6b9027ba2eb..e56bc280d5ac2aac0fa39f0e5f47165fa3ec1930 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -101,11 +101,11 @@ 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.4
+CDDB_VERSION=0.9.5
 CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.gz
-VCDIMAGER_VERSION=0.7.20
-VCDIMAGER_URL=$(VIDEOLAN)/testing/contrib/vcdimager-$(VCDIMAGER_VERSION).tar.gz
-CDIO_VERSION=0.70
+VCDIMAGER_VERSION=0.7.21
+VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
+CDIO_VERSION=0.71
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
 TOOLAME_VERSION=02m-beta8
 TOOLAME_URL=$(VIDEOLAN)/testing/contrib/toolame-$(TOOLAME_VERSION).tar.bz2