* fix contrib system on OS X 10.2.

  - some libcddb bugs found. Sent them upstream too.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index e09fcece4e768c7cfff0bfe476c4be6f3756ef7b..7f70593f8b2561e207f133b8ea2318e51e899ad4 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -775,7 +775,7 @@ libcddb: libcddb-$(CDDB_VERSION).tar.gz
        patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
-       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
        touch $@
 
 CLEAN_FILE += .cddb

diff --git a/extras/contrib/src/Patches/libcddb.patch b/extras/contrib/src/Patches/libcddb.patch
index 21bd11daa8380f33d25a4903f471e7f9d1274913..c477ca8b6be9ba05511541fc609267bc24e572bb 100644 (file)
--- a/extras/contrib/src/Patches/libcddb.patch
+++ b/extras/contrib/src/Patches/libcddb.patch
@@ -8,3 +8,14 @@
  #include <regex.h>
  
  
+--- libcddb.orig/lib/cddb_net.c        Mon Jul  5 22:07:40 2004
++++ libcddb/lib/cddb_net.c     Mon Jul  5 22:05:53 2004
+@@ -24,7 +24,7 @@
+ #include <netdb.h>
+ #include <setjmp.h>
+ #include <signal.h>
+-#include <time.h>
++#include <sys/time.h>
+ #include <unistd.h>
+ #include <sys/select.h>
+ #include <sys/socket.h>

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index e429912cdae5dc79df3a059a60060262d5465aaf..70e6e0ac811232fbd5311bb727e4ae5ddb36fe60 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -100,7 +100,7 @@ MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
 CDDB_VERSION=0.9.4
 CDDB_URL=$(SF)/libcddb/libcddb-$(CDDB_VERSION).tar.gz
 VCDIMAGER_VERSION=0.7.20
-VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
+VCDIMAGER_URL=$(VIDEOLAN)/testing/contrib/vcdimager-$(VCDIMAGER_VERSION).tar.gz
 CDIO_VERSION=0.69
 CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz