* Well i be .......

  libmodplug working now. apparently it didn't like dynamic linking on OS X.

diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile
index a38f1ea8a6a52671eddb8a172363089aa87b88e5..4bdbd81ec08cdd460c3dc4b32c51197c1604f3a1 100644 (file)
--- a/extras/contrib/src/Makefile
+++ b/extras/contrib/src/Makefile
@@ -2,7 +2,7 @@
 # src/Makefile : Dearchive and compile all files necessary
 # ***************************************************************************
 # Copyright (C) 2003, 2004 VideoLAN
-# $Id: Makefile,v 1.17 2004/03/02 01:10:26 hartman Exp $
+# $Id: Makefile,v 1.18 2004/03/02 19:21:03 hartman Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #          Derk-Jan Hartman <hartman at videolan dot org>
@@ -43,7 +43,7 @@ export LDFLAGS = -L$(PREFIX)/lib
 all: .autoconf .libtool .automake .iconv .intl .freetype .fribidi \
        .a52 .mpeg2 .id3tag .mad .ogg .vorbis .vorbisenc .theora \
        .FLAC .speex .faad .lame .ebml .matroska .ffmpeg .openslp \
-       .dvdcss .dvdread .dvdplay .dvdnav .dvbpsi .live .goom .caca .dts
+       .dvdcss .dvdread .dvdplay .dvdnav .dvbpsi .live .goom .caca .dts .mod
 FORCE:
 
 # ***************************************************************************
@@ -713,7 +713,7 @@ DISTCLEAN_PKG += libcaca-$(LIBCACA_VERSION).tar.gz
 # libdts
 # ***************************************************************************
 
-libdts-$(LIBDTS_VERSION).tar.bz:
+libdts-$(LIBDTS_VERSION).tar.gz:
        $(WGET) $(LIBDTS_URL)
 
 libdts: libdts-$(LIBDTS_VERSION).tar.gz
@@ -727,6 +727,24 @@ CLEAN_FILE += .dts
 CLEAN_PKG += libdts
 DISTCLEAN_PKG += libdts-$(LIBDTS_VERSION).tar.gz
 
+# ***************************************************************************
+# libmodplug
+# ***************************************************************************
+
+libmodplug-$(MODPLUG_VERSION).tar.gz:
+       $(WGET) $(MODPLUG_URL)
+
+libmodplug: libmodplug-$(MODPLUG_VERSION).tar.gz
+       $(EXTRACT_GZ)
+
+.mod: libmodplug
+       (cd $<; ./configure --prefix=$(PREFIX) --disable-shared --enable-static && make && make install)
+       touch $@
+
+CLEAN_FILE += .mod
+CLEAN_PKG += libmodplug
+DISTCLEAN_PKG += libmodplug-$(MODPLUG_VERSION).tar.gz
+
 # ***************************************************************************
 # Some cleansing
 # ***************************************************************************

diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak
index 523deaa86c63fd416851c9eb7a5d33e9b4dbbf2f..20861b266657e03a342a69eec99da8ad63b8f943 100644 (file)
--- a/extras/contrib/src/packages.mak
+++ b/extras/contrib/src/packages.mak
@@ -1,8 +1,8 @@
-# ***************************************************************************
+
 # src/packages.mak : Archive locations
 # ***************************************************************************
 # Copyright (C) 2003, 2004 VideoLAN
-# $Id: packages.mak,v 1.16 2004/03/02 00:59:16 hartman Exp $
+# $Id: packages.mak,v 1.17 2004/03/02 19:21:03 hartman Exp $
 #
 # Authors: Christophe Massiot <massiot@via.ecp.fr>
 #          Derk-Jan Hartman <hartman at videolan dot org>
@@ -91,4 +91,6 @@ GOOMDJ_URL=http://sidekick.student.utwente.nl/videolan/goom-dj.tar.gz
 LIBCACA_VERSION=0.9
 LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
 LIBDTS_VERSION=0.0.2
-DTSDEC_URL=http://download.videolan.org/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
+LIBDTS_URL=http://download.videolan.org/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
+MODPLUG_VERSION=0.7
+MODPLUG_URL=http://download.videolan.org/pub/videolan/contrib/libmodplug-$(MODPLUG_VERSION).tar.gz