X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=extras%2Fcontrib%2Fsrc%2FMakefile;h=08eb0368573b5b33298f2d98e8ac94987c88aa67;hb=e3c2dcb097d0e2c5354680777af85ec3d19f05e5;hp=8b90fb8092762266e4a7ed875c80f6a8667a8b70;hpb=5fc224c4aadc7f7eb1085a207341105838231ca9;p=vlc

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index 8b90fb8092..08eb036857 100644
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -1,7 +1,7 @@
 # ***************************************************************************
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
-# Copyright (C) 2003, 2004 VideoLAN
+# Copyright (C) 2003, 2004, 2005 VideoLAN
 # $Id$
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
@@ -29,39 +29,74 @@ include ./packages.mak
 # Set a clean environment
 # ***************************************************************************
 
-ifeq ($(SYS),DARWIN)
+ifeq ($(HOST),ppc-darwin)
 export PATH = $(PREFIX)/bin:/bin:/usr/bin
 export DYLD_LIBRARY_PATH = $(PREFIX)/lib
-export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
-export CFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
-export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
-export LDFLAGS = -L$(PREFIX)/lib
 endif
-ifeq ($(SYS),BEOS)
+
+ifeq ($(HOST),i586-pc-beos)
+ifeq ($(HOST),$(BUILD))
+# Compiling on BeOS
 export PATH = $(PREFIX)/bin:.:/boot/home/config/bin:/bin:/boot/apps:/boot/preferences:/boot/beos/apps:/boot/beos/preferences:/boot/develop/tools/gnupro/bin
 export LIBRARY_PATH = $(PREFIX)/lib:%A/lib:/boot/home/config/lib:/boot/beos/system/lib
-export BELIBRARIES = $(PREFIX)/lib:/boot/develop/lib/x86
-export C_INCLUDE_PATH = $(PREFIX)/include
-export CPLUS_INCLUDE_PATH = $(PREFIX)/include
-export LDFLAGS = -lnet
+else
+# Cross compiling from Linux
+export PATH = $(PREFIX)/bin:/opt/cross-tools/bin:/usr/bin:/bin
+endif
+endif
+
+export CPPFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
+export CFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
+export CXXFLAGS = -I$(PREFIX)/include $(EXTRA_CPPFLAGS)
+export LDFLAGS = -L$(PREFIX)/lib $(EXTRA_LDFLAGS)
+
+# ***************************************************************************
+# Cross compilation variables
+# We'll usually use --host=<platform>, except for a few libraries which
+# don't handle it (gotta set CC/CXX/etc), and obviously FFmpeg has its own
+# way of doing it... ;)
+# ***************************************************************************
+
+ifneq ($(BUILD),$(HOST))
+# We are cross compiling
+HOSTCONF=--host=$(HOST)
+HOSTCC=CC=$(HOST)-gcc CXX=$(HOST)-g++ AR=$(HOST)-ar RANLIB=$(HOST)-ranlib
+# For libebml/libmatroska. Grrr.
+HOSTCC2=CC=$(HOST)-gcc CXX=$(HOST)-g++ "AR=$(HOST)-ar rcvu" RANLIB=$(HOST)-ranlib
+FFMPEGCONF=--cross-prefix=$(HOST)-
+RANLIB=$(HOST)-ranlib
+else
+# Building natively
+RANLIB=ranlib
 endif
 
 # ***************************************************************************
 # Standard rules
 # ***************************************************************************
 
-ifeq ($(SYS),DARWIN)
-all: .autoconf .libtool .automake .intl .iconv .pkgcfg .freetype .fribidi \
+ifeq ($(HOST),ppc-darwin)
+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
+	.png .gpgerror .gcrypt .gnutls .daap .cddb .cdio .vcdimager .aclocal
 endif
-ifeq ($(SYS),BEOS)
-all: .perl .autoconf .libtool .automake .intl .iconv .freetype .fribidi \
+
+ifeq ($(HOST),i586-pc-beos)
+ifeq ($(HOST),$(BUILD))
+# Native build: we need perl, autoconf, etc first
+all: .perl .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
 	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
 	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
-	.dvdread .dvdnav .dvbpsi
+	.dvdread .dvdnav .dvbpsi .aclocal
+else
+# Cross compiling: we already have the Linux tools, only build the
+# libraries now
+all: .iconv .intl .freetype .fribidi \
+	.a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
+	.FLAC .speex .faad .faac .lame .ebml .matroska .ffmpeg .dvdcss \
+	.dvdread .dvdnav .dvbpsi .aclocal
+endif
 endif
 
 FORCE:
@@ -94,7 +129,7 @@ endef
 #	$(INSTALL_NAME)
 #	touch $@
 
-ifeq ($(SYS),DARWIN)
+ifeq ($(HOST),ppc-darwin)
 define INSTALL_NAME_LIB
 	install_name_tool \
 		-change $(PREFIX)/lib/$(shell cd $(PREFIX)/lib; ls | grep "lib$(INSTALL_LIB).[0-9]*.dylib") \
@@ -116,7 +151,7 @@ define INSTALL_NAME
 endef
 endif
 
-ifeq ($(SYS),BEOS)
+ifeq ($(HOST),i586-pc-beos)
 # We test if the file actually exists, as sometimes (but not always)
 # libtool won't accept to build the shared library
 define INSTALL_NAME
@@ -132,7 +167,7 @@ endif
 # perl
 # ***************************************************************************
 
-ifeq ($(SYS),BEOS)
+ifeq ($(BUILD),i586-pc-beos)
 perl-$(PERL_VERSION).tar.gz:
 	$(WGET) $(PERL_URL)
 
@@ -172,7 +207,7 @@ DISTCLEAN_PKG += autoconf-$(AUTOCONF_VERSION).tar.gz
 # libtool
 # ***************************************************************************
 
-ifeq ($(SYS),DARWIN)
+ifeq ($(BUILD),ppc-darwin)
 .libtool:
 	if test -x /usr/bin/glibtoolize; then \
 		ln -sf /usr/bin/glibtoolize $(PREFIX)/bin/libtoolize ; \
@@ -180,7 +215,7 @@ ifeq ($(SYS),DARWIN)
 	touch $@
 endif
 
-ifeq ($(SYS),BEOS)
+ifeq ($(BUILD),i586-pc-beos)
 libtool-$(LIBTOOL_VERSION).tar.gz:
 	$(WGET) $(LIBTOOL_URL)
 
@@ -245,13 +280,19 @@ gettext: gettext-$(GETTEXT_VERSION).tar.gz
 	patch -p 0 < Patches/gettext.patch
 
 .intl: gettext
-	( cd $< && ./configure --prefix=$(PREFIX) )
-ifeq ($(SYS),BEOS)
+	( cd $< && ./configure $(HOSTCONF) --prefix=$(PREFIX) )
+ifeq ($(BUILD),i586-pc-beos)
 # The ugliest kludge ever - so libtool correctly links shared libraries
 # on BeOS. Sorry, I just can't figure out how libtool works
 	( cd $< && for f in `find . -name libtool`; do mv $$f $$f.orig; sed -e 's/ -shared / -nostart /' -e 's/^predep_objects.*/predep_objects=""/' < $$f.orig > $$f; chmod +x $$f; rm $$f.orig; done )
 endif
+ifneq ($(HOST),$(BUILD))
+# We'll use the installed gettext and only need to cross-compile libintl
+	( cd $< && make -C gettext-runtime/intl && make -C gettext-runtime/intl install )
+else
+# Build and install the whole gettext
 	( cd $< && make && make install )
+endif
 	$(INSTALL_NAME)
 	touch $@
 
@@ -270,7 +311,7 @@ libiconv: libiconv-$(LIBICONV_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .iconv: libiconv
-	(cd libiconv; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd libiconv; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-nls && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -289,7 +330,7 @@ freetype2: freetype-$(FREETYPE2_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .freetype: freetype2
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -306,10 +347,10 @@ fribidi-$(FRIBIDI_VERSION).tar.gz:
 
 fribidi: fribidi-$(FRIBIDI_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/fribidi.patch
+	patch -p 0 < Patches/fribidi.patch.real
 
 .fribidi: fribidi
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./bootstrap && ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -328,7 +369,7 @@ a52dec: a52dec-$(A52DEC_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .a52: a52dec
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	touch $@
 
 CLEAN_FILE += .a52
@@ -358,7 +399,7 @@ mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz
 #	patch -p 0 < Patches/mpeg2dec.patch
 
 .mpeg2: mpeg2dec
-	(cd $<; ./configure --prefix=$(PREFIX) --without-x --disable-dsl && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --without-x --disable-dsl && make && make install)
 	touch $@
 
 CLEAN_FILE += .mpeg2
@@ -377,7 +418,7 @@ libid3tag: libid3tag-$(LIBID3TAG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .id3tag: libid3tag
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -396,7 +437,7 @@ libmad: libmad-$(LIBMAD_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .mad: libmad
-	(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="-O3" && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -421,7 +462,7 @@ libogg: libogg-$(OGG_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .ogg: libogg
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -447,12 +488,16 @@ libvorbis: libvorbis-$(VORBIS_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .vorbis: libvorbis .ogg
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
-	$(INSTALL_NAME)
+# libvorbis' configure doesn't handle --host
+# FIXME: shared libs disabled for now because configure thinks we should
+# link the .so to -lc when cross-compiling to BeOS (-> fails)
+#   -- titer 2005/02/12
+	(cd $<; $(HOSTCC) ./configure --prefix=$(PREFIX) --disable-shared && make && make install)
+#	$(INSTALL_NAME)
 	touch $@
 
 .vorbisenc: .vorbis .ogg
-	$(INSTALL_NAME)
+#	$(INSTALL_NAME)
 	touch $@
 
 CLEAN_FILE += .vorbis .vorbisenc
@@ -471,7 +516,8 @@ libtheora: libtheora-$(THEORA_VERSION).tar.bz2
 	patch -p 0 < Patches/theora.patch
 
 .theora: libtheora
-	(cd $<; CC="gcc $(CFLAGS)" ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
+	$(INSTALL_NAME)
 	touch $@
 
 CLEAN_FILE += .theora
@@ -489,7 +535,7 @@ flac: flac-$(FLAC_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .FLAC: flac
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -509,7 +555,7 @@ speex: speex-$(SPEEX_VERSION).tar.gz
 	patch -p 0 < Patches/speex.patch
 
 .speex: speex
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --enable-ogg=no && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -535,7 +581,7 @@ faad2: faad2-$(FAAD2_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
 
 .faad: faad2
-	(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) CFLAGS="-O3" && make -C libfaad && make -C libfaad install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -555,7 +601,7 @@ faac: faac-$(FAAC_VERSION).tar.bz2
 	patch -p 0 < Patches/faac.patch
 
 .faac: faac
-	(cd $<; ./bootstrap && ./configure --prefix=$(PREFIX) --disable-shared && make && make install)
+	(cd $<; rm -f install-sh mkinstalldirs missing && ./bootstrap && ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
 	touch $@
 
 CLEAN_FILE += .faac
@@ -573,7 +619,7 @@ lame: lame-$(LAME_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .lame: lame
-	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --disable-shared && make && make install)
 	touch $@
 
 CLEAN_FILE += .lame
@@ -589,12 +635,11 @@ libebml-$(LIBEBML_VERSION).tar.bz2:
 
 libebml: libebml-$(LIBEBML_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/ebml.patch
 	-rm -rf $@/CVS
 
 .ebml: libebml
-	(cd $<; make -C make/linux prefix=$(PREFIX) && make -C make/linux install prefix=$(PREFIX))
-	ranlib $(PREFIX)/lib/libebml.a
+	(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) && make -C make/linux install prefix=$(PREFIX))
+	$(RANLIB) $(PREFIX)/lib/libebml.a
 	touch $@
 
 CLEAN_FILE += .ebml
@@ -610,12 +655,11 @@ libmatroska-$(LIBMATROSKA_VERSION).tar.bz2:
 
 libmatroska: libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
 	$(EXTRACT_BZ2)
-	patch -p 0 < Patches/matroska.patch
 	-rm -rf $@/CVS
 
 .matroska: libmatroska
-	(cd $<; make -C make/linux prefix=$(PREFIX) && make -C make/linux install prefix=$(PREFIX))
-	ranlib $(PREFIX)/lib/libmatroska.a
+	(cd $<; make -C make/linux prefix=$(PREFIX) $(HOSTCC2) && make -C make/linux install prefix=$(PREFIX))
+	$(RANLIB) $(PREFIX)/lib/libmatroska.a
 	touch $@
 
 CLEAN_FILE += .matroska
@@ -640,7 +684,7 @@ ffmpeg-$(FFMPEG_VERSION).tar.gz:
 #	patch -p 0 < Patches/ffmpeg.patch
 
 .ffmpeg: ffmpeg
-	(cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --disable-vorbis --disable-faad --enable-mp3lame --enable-zlib --enable-a52 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
+	(cd $<; ./configure $(FFMPEGCONF) --prefix=$(PREFIX) --extra-cflags="$(CFLAGS) -DRUNTIME_CPUDETECT" --extra-ldflags="$(LDFLAGS)" --enable-gpl --enable-mp3lame --enable-faac --enable-pp --disable-vhook --disable-audio-beos --disable-ffserver --disable-vorbis --disable-faad --enable-mp3lame --enable-zlib --enable-a52 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
 	touch $@
 
 CLEAN_FILE += .ffmpeg
@@ -677,7 +721,7 @@ libdvdcss: libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .dvdcss: libdvdcss
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -697,7 +741,7 @@ libdvdread: libdvdread-$(LIBDVDREAD_VERSION).tar.gz
 	patch -p 0 < Patches/libdvdread.patch
 
 .dvdread: libdvdread .dvdcss
-	(cd $<; ./configure --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -715,15 +759,14 @@ libdvdnav-$(LIBDVDNAV_VERSION).tar.gz:
 libdvdnav: libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
 	$(EXTRACT_GZ)
 	patch -p 0 < Patches/dvdnav.patch
-ifeq ($(SYS),DARWIN)
+ifeq ($(BUILD),ppc-darwin)
 	(cd $@; autoconf)
-endif
-ifeq ($(SYS),BEOS)
+else
 	(cd $@; ./autogen.sh noconfig)
 endif
 
 .dvdnav: libdvdnav .dvdread
-	(cd $<; ./configure --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --enable-static --prefix=$(PREFIX) --with-libdvdcss=$(PREFIX) CFLAGS="$(CFLAGS) -Dlseek64=lseek -Doff64_t=off_t" && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -742,7 +785,7 @@ libdvbpsi: libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .dvbpsi: libdvbpsi
-	(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
+	(cd $<; ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install)
 	$(INSTALL_NAME)
 	touch $@
 
@@ -791,19 +834,21 @@ DISTCLEAN_PKG += live.$(LIVEDOTCOM_VERSION).tar.gz
 # goom2k4
 # ***************************************************************************
 
-goom2k4-$(GOOM2k4_VERSION).tar.gz:
+goom$(GOOM2k4_VERSION).tar.gz:
 	$(WGET) $(GOOM2k4_URL)
+	mv goom-$(GOOM2k4_VERSION)-src.tar.gz goom$(GOOM2k4_VERSION).tar.gz
 
-goom: goom2k4-$(GOOM2k4_VERSION).tar.gz
+goom: goom$(GOOM2k4_VERSION).tar.gz
 	$(EXTRACT_GZ)
+	patch -p 0 < Patches/goom.patch
 
 .goom2k4: goom
-	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -faltivec" && make && make install )
+	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install )
 	touch $@
 
 CLEAN_FILE += .goom2k4
 CLEAN_PKG += goom
-DISTCLEAN_PKG += goom2k4-$(GOOM2k_VESION).tar.gz
+DISTCLEAN_PKG += goom$(GOOM2k_VESION).tar.gz
 
 # ***************************************************************************
 # libcaca
@@ -830,16 +875,14 @@ DISTCLEAN_PKG += libcaca-$(LIBCACA_VERSION).tar.gz
 libdts-$(LIBDTS_VERSION).tar.gz:
 	$(WGET) $(LIBDTS_URL)
 
-ifeq ($(SYS),DARWIN)
+ifeq ($(HOST),i586-pc-beos)
 # libdts 0.0.2 doesn't compile on BeOS
-libdts: libdts-$(LIBDTS_VERSION).tar.gz
-	$(EXTRACT_GZ)
-endif
-
-ifeq ($(SYS),BEOS)
 libdts:
 	svn co svn://svn.videolan.org/libdts/trunk libdts
 	(cd $@; ./bootstrap)
+else
+libdts: libdts-$(LIBDTS_VERSION).tar.gz
+	$(EXTRACT_GZ)
 endif
 
 .dts: libdts
@@ -880,7 +923,7 @@ libcddb: libcddb-$(CDDB_VERSION).tar.gz
 	patch -p 0 < Patches/libcddb.patch
 
 .cddb: libcddb
-	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make && make install)
+	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" LDFLAGS="-L$(PREFIX)/lib -liconv" && make && make install)
 	touch $@
 
 CLEAN_FILE += .cddb
@@ -896,15 +939,12 @@ vcdimager-$(VCDIMAGER_VERSION).tar.gz:
 
 vcdimager: vcdimager-$(VCDIMAGER_VERSION).tar.gz
 	$(EXTRACT_GZ)
-	patch -p 0 < Patches/vcdimager.patch
 
-ifeq ($(SYS),DARWIN)
+ifeq ($(HOST),ppc-darwin)
 .vcdimager: vcdimager
 	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static LDFLAGS="$(LDFLAGS) -framework CoreFoundation -framework IOKit" && make && make install)
 	touch $@
-endif
-
-ifeq ($(SYS),BEOS)
+else
 .vcdimager: vcdimager
 	(cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
 	touch $@
@@ -925,7 +965,7 @@ libcdio: libcdio-$(CDIO_VERSION).tar.gz
 	$(EXTRACT_GZ)
 
 .cdio: libcdio
-	(cd $<; ./configure --prefix=$(PREFIX) --without-libcddb --without-vcdinfo && make && make install)
+	(cd $<; ./configure --prefix=$(PREFIX) --without-vcdinfo && make && make install)
 	touch $@
 
 CLEAN_FILE += .cdio
@@ -1060,6 +1100,36 @@ CLEAN_FILE += .gnutls
 CLEAN_PKG += gnutls
 DISCLEAN_PKG += gnutls-$(GNUTLS_VERSION).tar.bz2
 
+# ***************************************************************************
+# libopendaap
+# ***************************************************************************
+
+libopendaap-$(DAAP_VERSION).tar.bz2:
+	$(WGET) $(DAAP_URL)
+
+libopendaap: libopendaap-$(DAAP_VERSION).tar.bz2
+	$(EXTRACT_BZ2)
+	patch -p 0 < Patches/daap.patch
+
+.daap: libopendaap
+	(cd $<; ./configure --prefix=$(PREFIX) CFLAGS="$(CFLAGS) -D_BSD_SOCKLEN_T_=int" && make install )
+	touch $@
+
+CLEAN_FILE += .daap
+CLEAN_PKG += libopendaap
+DISCLEAN_PKG += libopendaap-$(DAAP_VERSION).tar.bz2
+
+# ***************************************************************************
+# Copy aclocal files
+# This is necessary for --missing aclocal to succeed after a
+# configure.ac/Makefile.am change in the vlc root dir
+# **************************************************************************
+
+.aclocal:
+	cp -R $(PREFIX)/share/aclocal/* $(PREFIX)/../../m4/
+	touch $@
+
+
 # ***************************************************************************
 # Some cleansing
 # ***************************************************************************