From 5e53660ac349de354e6038debacea1d9685b9e04 Mon Sep 17 00:00:00 2001 From: Derk-Jan Hartman Date: Mon, 9 Feb 2004 12:54:47 +0000 Subject: [PATCH] * added dtsdec, 're' upgrade of libmad --- extras/contrib/src/Makefile | 48 ++++++++++++++++++++++----------- extras/contrib/src/packages.mak | 8 +++--- 2 files changed, 38 insertions(+), 18 deletions(-) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index b1be21efcd..7eeb13acf1 100644 --- 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.14 2004/01/24 21:06:52 hartman Exp $ +# $Id: Makefile,v 1.15 2004/02/09 12:54:47 hartman Exp $ # # Authors: Christophe Massiot # Derk-Jan Hartman @@ -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 + .dvdcss .dvdread .dvdplay .dvdnav .dvbpsi .live .goom .caca .dts FORCE: # *************************************************************************** @@ -300,20 +300,20 @@ DISTCLEAN_PKG += libid3tag-$(LIBID3TAG_VERSION).tar.gz # libmad # *************************************************************************** -mad-$(LIBMAD_VERSION).tar.gz: +libmad-$(LIBMAD_VERSION).tar.gz: $(WGET) $(LIBMAD_URL) -mad: mad-$(LIBMAD_VERSION).tar.gz +libmad: libmad-$(LIBMAD_VERSION).tar.gz $(EXTRACT_GZ) -.mad: mad +.mad: libmad (cd $<; ./configure --prefix=$(PREFIX) && make && make install) $(INSTALL_NAME) touch $@ CLEAN_FILE += .mad -CLEAN_PKG += mad -DISTCLEAN_PKG += mad-$(LIBMAD_VERSION).tar.gz +CLEAN_PKG += libmad +DISTCLEAN_PKG += libmad-$(LIBMAD_VERSION).tar.gz # *************************************************************************** # ogg @@ -516,21 +516,21 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz # ffmpeg # *************************************************************************** -#ffmpeg: -# cvs -d $(FFMPEG_CVSROOT) login -# cvs -d $(FFMPEG_CVSROOT) co ffmpeg -# patch -p 0 < Patches/ffmpeg.patch.cvs +ffmpeg: + cvs -d $(FFMPEG_CVSROOT) login + cvs -d $(FFMPEG_CVSROOT) co ffmpeg + patch -p 0 < Patches/ffmpeg.patch.cvs # (cd $@; ./bootstrap) ffmpeg-$(FFMPEG_VERSION).tar.gz: $(WGET) $(FFMPEG_URL) -ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz - $(EXTRACT_GZ) - patch -p 0 < Patches/ffmpeg.patch +#ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz +# $(EXTRACT_GZ) +# patch -p 0 < Patches/ffmpeg.patch .ffmpeg: ffmpeg - (cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-mp3lame --enable-pp --disable-vhook --disable-vorbis --disable-faad --disable-a52 --enable-mp3lame && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib) + (cd $<; ./configure --prefix=$(PREFIX) --extra-cflags="$(CFLAGS)" --extra-ldflags="$(LDFLAGS)" --enable-mp3lame --enable-pp --disable-vhook --disable-vorbis --disable-faad --disable-a52 --enable-mp3lame --disable-zlib && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib) touch $@ CLEAN_FILE += .ffmpeg @@ -706,6 +706,24 @@ CLEAN_FILE += .caca CLEAN_PKG += libcaca DISTCLEAN_PKG += libcaca-$(LIBCACA_VERSION).tar.gz +# *************************************************************************** +# libdts +# *************************************************************************** + +dtsdec-$(DTSDEC_VERSION).tar.gz: + $(WGET) $(DTSDEC_URL) + +dtsdec: dtsdec-$(DTSDEC_VERSION).tar.gz + $(EXTRACT_GZ) + +.dts: dtsdec + (cd $<; ./configure --prefix=$(PREFIX) && make && make install) + touch $@ + +CLEAN_FILE += .dts +CLEAN_PKG += dtsdec +DISTCLEAN_PKG += dtsdec-$(DTSDEC_VERSION).tar.gz + # *************************************************************************** # Some cleansing # *************************************************************************** diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak index ba42bfb85d..d70c955df5 100644 --- a/extras/contrib/src/packages.mak +++ b/extras/contrib/src/packages.mak @@ -2,7 +2,7 @@ # src/packages.mak : Archive locations # *************************************************************************** # Copyright (C) 2003, 2004 VideoLAN -# $Id: packages.mak,v 1.12 2004/01/24 21:06:52 hartman Exp $ +# $Id: packages.mak,v 1.13 2004/02/09 12:54:47 hartman Exp $ # # Authors: Christophe Massiot # Derk-Jan Hartman @@ -47,8 +47,8 @@ MPEG2DEC_CVSROOT=:pserver:anonymous@cvs.libmpeg2.sourceforge.net:/cvsroot/libmpe MPEG2DEC_SNAPSHOT=http://libmpeg2.sourceforge.net/files/mpeg2dec-snapshot.tar.gz LIBID3TAG_VERSION=0.15.0b LIBID3TAG_URL=ftp://ftp.mars.org/pub/mpeg/libid3tag-$(LIBID3TAG_VERSION).tar.gz -LIBMAD_VERSION=0.14.2b -LIBMAD_URL=ftp://ftp.mars.org/pub/mpeg/mad-$(LIBMAD_VERSION).tar.gz +LIBMAD_VERSION=0.15.0b +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 @@ -90,4 +90,6 @@ LIVEDOTCOM_URL=http://download.videolan.org/pub/testing/contrib/live.$(LIVEDOTCO GOOMDJ_URL=http://sidekick.student.utwente.nl/videolan/goom-dj.tar.gz LIBCACA_VERSION=0.8 LIBCACA_URL=http://sam.zoy.org/projects/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz +DTSDEC_VERSION=0.0.1 +DTSDEC_URL=http://download.videolan.org/pub/videolan/dtsdec/$(DTSDEC_VERSION)/dtsdec-$(DTSDEC_VERSION).tar.gz