Commit 1b0b2ce6 authored by Christophe Massiot's avatar Christophe Massiot
Browse files

Contrib build system :

* Jumped to ogg-1.1
* Reverted to ffmpeg-0.4.8
parent 1956b767
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# src/Makefile : Dearchive and compile all files necessary # src/Makefile : Dearchive and compile all files necessary
# *************************************************************************** # ***************************************************************************
# Copyright (C) 2003 VideoLAN # Copyright (C) 2003 VideoLAN
# $Id: Makefile,v 1.8 2003/12/07 22:23:00 hartman Exp $ # $Id: Makefile,v 1.9 2003/12/16 23:01:41 massiot Exp $
# #
# Authors: Christophe Massiot <massiot@via.ecp.fr> # Authors: Christophe Massiot <massiot@via.ecp.fr>
# #
...@@ -515,18 +515,18 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz ...@@ -515,18 +515,18 @@ DISTCLEAN_PKG += libmatroska-$(LIBMATROSKA_VERSION).tar.gz
# ffmpeg # ffmpeg
# *************************************************************************** # ***************************************************************************
ffmpeg: #ffmpeg:
cvs -d $(FFMPEG_CVSROOT) login # cvs -d $(FFMPEG_CVSROOT) login
cvs -d $(FFMPEG_CVSROOT) co ffmpeg # cvs -d $(FFMPEG_CVSROOT) co ffmpeg
patch -p 0 < Patches/ffmpeg.patch.cvs # patch -p 0 < Patches/ffmpeg.patch.cvs
(cd $@; ./bootstrap) # (cd $@; ./bootstrap)
#ffmpeg-$(FFMPEG_VERSION).tar.gz: ffmpeg-$(FFMPEG_VERSION).tar.gz:
# $(WGET) $(FFMPEG_URL) $(WGET) $(FFMPEG_URL)
#
#ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz ffmpeg: ffmpeg-$(FFMPEG_VERSION).tar.gz
# $(EXTRACT_GZ) $(EXTRACT_GZ)
# patch -p 0 < Patches/ffmpeg.patch patch -p 0 < Patches/ffmpeg.patch
.ffmpeg: ffmpeg .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 && make && make -C libavcodec/libpostproc install && make -C libavcodec installlib && make -C libavformat installlib)
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
# src/packages.mak : Archives locations # src/packages.mak : Archives locations
# *************************************************************************** # ***************************************************************************
# Copyright (C) 2003 VideoLAN # Copyright (C) 2003 VideoLAN
# $Id: packages.mak,v 1.5 2003/12/07 22:23:00 hartman Exp $ # $Id: packages.mak,v 1.6 2003/12/16 23:01:41 massiot Exp $
# #
# Authors: Christophe Massiot <massiot@via.ecp.fr> # Authors: Christophe Massiot <massiot@via.ecp.fr>
# #
...@@ -47,11 +47,12 @@ LIBID3TAG_VERSION=0.15.0b ...@@ -47,11 +47,12 @@ LIBID3TAG_VERSION=0.15.0b
LIBID3TAG_URL=ftp://ftp.mars.org/pub/mpeg/libid3tag-$(LIBID3TAG_VERSION).tar.gz LIBID3TAG_URL=ftp://ftp.mars.org/pub/mpeg/libid3tag-$(LIBID3TAG_VERSION).tar.gz
LIBMAD_VERSION=0.15.0b LIBMAD_VERSION=0.15.0b
LIBMAD_URL=ftp://ftp.mars.org/pub/mpeg/libmad-$(LIBMAD_VERSION).tar.gz LIBMAD_URL=ftp://ftp.mars.org/pub/mpeg/libmad-$(LIBMAD_VERSION).tar.gz
OGG_VERSION=20031111 OGG_VERSION=1.1
OGG_URL=$(VIDEOLAN)/libogg-$(OGG_VERSION).tar.gz OGG_URL=$(VIDEOLAN)/libogg-$(OGG_VERSION).tar.gz
OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
VORBIS_VERSION=1.0 VORBIS_VERSION=1.0
VORBIS_URL=http://www.xiph.org/ogg/vorbis/download/libvorbis-$(VORBIS_VERSION).tar.gz 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_VERSION=1.0alpha2
THEORA_URL=http://www.theora.org/files/libtheora-$(THEORA_VERSION).tar.gz THEORA_URL=http://www.theora.org/files/libtheora-$(THEORA_VERSION).tar.gz
FLAC_VERSION=1.1.0 FLAC_VERSION=1.1.0
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment