[vlc-commits] contribs: fixed libcdio linking on Mac OS X 10.6 and later

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sat May  7 20:17:15 2011 +0200| [44769546724f577ccf17aaeed81f8c0d4a664e48] | committer: Felix Paul Kühne

contribs: fixed libcdio linking on Mac OS X 10.6 and later

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=44769546724f577ccf17aaeed81f8c0d4a664e48
---

 extras/contrib/src/Patches/libcddb-darwin.patch |   10 ++++++++++
 extras/contrib/src/contrib-src.mak              |    8 ++++++++
 2 files changed, 18 insertions(+), 0 deletions(-)

diff --git a/extras/contrib/src/Patches/libcddb-darwin.patch b/extras/contrib/src/Patches/libcddb-darwin.patch
new file mode 100644
index 0000000..482ec72
--- /dev/null
+++ b/extras/contrib/src/Patches/libcddb-darwin.patch
@@ -0,0 +1,10 @@
+--- include/cddb/cddb_ni.h.orig	2009-10-25 21:58:20.000000000 +0100
++++ include/cddb/cddb_ni.h	2009-10-25 21:58:46.000000000 +0100
+@@ -35,6 +35,7 @@
+ #  include <iconv.h>
+ #else
+    typedef void *iconv_t;       /* for code uniformity */
++   #define ICONV_CONST const
+ #endif
+ 
+ #ifdef HAVE_WINDOWS_H
diff --git a/extras/contrib/src/contrib-src.mak b/extras/contrib/src/contrib-src.mak
index e4b8f55..4eaf6bb 100644
--- a/extras/contrib/src/contrib-src.mak
+++ b/extras/contrib/src/contrib-src.mak
@@ -1537,15 +1537,23 @@ endif
 ifdef HAVE_WIN32
 	(cd $@; patch -p0 < ../Patches/libcddb-win32.patch )
 endif
+ifdef HAVE_DARWIN_OS
+	(cd $@; patch -p0 < ../Patches/libcddb-darwin.patch )
+endif
 	patch -p0 < Patches/libcddb-getenv-crash.patch
 
 ifdef HAVE_WIN32
 .cddb: libcddb .regex
 	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --without-iconv CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
 else
+ifdef HAVE_DARWIN_OS
+.cddb: libcddb
+	(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared --enable-static --without-iconv CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="$(LDFLAGS)" && make && make install)
+else
 .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)
 endif
+endif
 	touch $@
 
 CLEAN_FILE += .cddb