# ***************************************************************************
-# src/packages.mak : Archives locations
+# src/packages.mak : Archive locations
# ***************************************************************************
-# Copyright (C) 2003 VideoLAN
-# $Id: packages.mak,v 1.8 2004/01/05 16:22:40 hartman Exp $
+# Copyright (C) 2003, 2004 VideoLAN
+# $Id$
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
+# Derk-Jan Hartman <hartman at videolan dot org>
#
# This program is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
GNU=http://ftp.gnu.org/pub/gnu
SF=http://heanet.dl.sourceforge.net/sourceforge
-VIDEOLAN=http://download.videolan.org/pub/testing/contrib
+VIDEOLAN=http://download.videolan.org/pub/videolan
AUTOCONF_VERSION=2.58
AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
#LIBTOOL_VERSION=1.5
FRIBIDI_URL=$(SF)/fribidi/fribidi-$(FRIBIDI_VERSION).tar.gz
A52DEC_VERSION=0.7.4
A52DEC_URL=http://liba52.sourceforge.net/files/a52dec-$(A52DEC_VERSION).tar.gz
-MPEG2DEC_VERSION=0.4.0
+MPEG2DEC_VERSION=0.4.1-cvs
MPEG2DEC_CVSROOT=:pserver:anonymous@cvs.libmpeg2.sourceforge.net:/cvsroot/libmpeg2
MPEG2DEC_SNAPSHOT=http://libmpeg2.sourceforge.net/files/mpeg2dec-snapshot.tar.gz
-LIBID3TAG_VERSION=0.15.0b
+LIBID3TAG_VERSION=0.15.1b
LIBID3TAG_URL=ftp://ftp.mars.org/pub/mpeg/libid3tag-$(LIBID3TAG_VERSION).tar.gz
-LIBMAD_VERSION=0.15.0b
+LIBMAD_VERSION=0.15.1b
LIBMAD_URL=ftp://ftp.mars.org/pub/mpeg/libmad-$(LIBMAD_VERSION).tar.gz
OGG_VERSION=1.1
OGG_URL=http://www.vorbis.com/files/1.0.1/unix/libogg-$(OGG_VERSION).tar.gz
OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
VORBIS_VERSION=1.0
VORBIS_URL=http://www.xiph.org/ogg/vorbis/download/libvorbis-$(VORBIS_VERSION).tar.gz
-#VORBIS_URL=$(VIDEOLAN)/libvorbis-$(VORBIS_VERSION).tar.gz
THEORA_VERSION=1.0alpha2
THEORA_URL=http://www.theora.org/files/libtheora-$(THEORA_VERSION).tar.gz
FLAC_VERSION=1.1.0
FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
-SPEEX_VERSION=1.0.2
+SPEEX_VERSION=1.1.4
SPEEX_URL=http://www.speex.org/download/speex-$(SPEEX_VERSION).tar.gz
-FAAD2_VERSION=2.0rc2
-FAAD2_URL=$(VIDEOLAN)/faad2-$(FAAD2_VERSION).tar.gz
+FAAD2_VERSION=2.0
+FAAD2_URL=$(VIDEOLAN)/testing/contrib/faad2-$(FAAD2_VERSION).tar.bz2
FAAD2_CVSROOT=:pserver:anonymous@cvs.audiocoding.com:/cvsroot/faac
LAME_VERSION=3.93.1
LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
-LIBEBML_VERSION=0.6.3
+LIBEBML_VERSION=0.6.4
LIBEBML_URL=http://matroska.free.fr/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.gz
-LIBMATROSKA_VERSION=0.6.2
+LIBMATROSKA_VERSION=0.6.3
LIBMATROSKA_URL=http://matroska.free.fr/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.gz
FFMPEG_VERSION=0.4.8
FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
OPENSLP_VERSION=1.0.11
OPENSLP_URL=$(SF)/openslp/openslp-$(OPENSLP_VERSION).tar.gz
LIBDVDCSS_VERSION=1.2.8
-LIBDVDCSS_URL=http://download.videolan.org/pub/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
+LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
LIBDVDREAD_VERSION=0.9.4
LIBDVDREAD_URL=http://www.dtek.chalmers.se/groups/dvd/dist/libdvdread-$(LIBDVDREAD_VERSION).tar.gz
LIBDVDPLAY_VERSION=1.0.1
-LIBDVDPLAY_URL=http://download.videolan.org/pub/libdvdplay/$(LIBDVDPLAY_VERSION)/libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
+LIBDVDPLAY_URL=$(VIDEOLAN)/libdvdplay/$(LIBDVDPLAY_VERSION)/libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
+LIBDVDNAV_VERSION=0.1.9
+LIBDVDNAV_URL=http://ftp.snt.utwente.nl/pub/linux/gentoo/distfiles/libdvdnav-$(LIBDVDNAV_VERSION).tar.gz
LIBDVBPSI_VERSION=0.1.4
-LIBDVBPSI_URL=http://download.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
-LIVEDOTCOM_VERSION=2003.11.06
-LIVEDOTCOM_URL=http://download.videolan.org/pub/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
-GOOMDJ_URL=http://sidekick.student.utwente.nl/videolan/goom-dj.tar.gz
-LIBCACA_VERSION=0.6
+LIBDVBPSI_URL=$(VIDEOLAN)/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi3-$(LIBDVBPSI_VERSION).tar.gz
+LIVEDOTCOM_VERSION=2004.04.09
+LIVEDOTCOM_URL=$(VIDEOLAN)/testing/contrib/live.$(LIVEDOTCOM_VERSION).tar.gz
+GOOM_URL=$(VIDEOLAN)/testing/contrib/goom-macosx-altivec-bin.tar.gz
+LIBCACA_VERSION=0.9
LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
-
+LIBDTS_VERSION=0.0.2
+LIBDTS_URL=$(VIDEOLAN)/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
+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