Commit 3b099bef authored by Christophe Massiot's avatar Christophe Massiot

* New build system for the contrib packages of VLC. It supports to

  download a precompiled binary package, or to build all the packages
  from the sources, at the user's option. It is currently written for
  Mac OS X, but could easily be ported to other platforms.
parent b7d624b9
......@@ -466,6 +466,10 @@ VLC.app: vlc
then $(INSTALL) "$$i$(LIBEXT)" \
"$(top_builddir)/VLC.app/Contents/MacOS/modules" ; \
fi ; done
if test -d $(top_builddir)/extras/contrib/vlc-lib; then \
cp -R $(top_builddir)/extras/contrib/vlc-lib \
$(top_builddir)/VLC.app/Contents/MacOS/lib ; \
fi
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share
$(INSTALL) -d $(top_builddir)/VLC.app/Contents/MacOS/share/http
$(INSTALL) -m 644 $(srcdir)/share/http/*.html \
......@@ -658,7 +662,7 @@ package-macosx:
cd "$(srcdir)" && cp AUTHORS COPYING ChangeLog README README.MacOSX.rtf THANKS NEWS $(top_builddir)/tmp/
# Create disk image
$(srcdir)/extras/MacOSX/macosx-dmg 18 "vlc-${VERSION}" $(top_builddir)/tmp/*
$(srcdir)/extras/MacOSX/macosx-dmg 25 "vlc-${VERSION}" $(top_builddir)/tmp/*
# Clean up
rm -Rf $(top_builddir)/tmp
......
#! /bin/sh
## bootstrap file for the VLC media player
## $Id: bootstrap,v 1.82 2003/11/06 10:09:16 sam Exp $
## $Id: bootstrap,v 1.83 2003/11/15 01:21:48 massiot Exp $
##
## Authors: Sam Hocevar <sam@zoy.org>
......@@ -29,6 +29,13 @@ set -x
AUTOMAKESUCKS=no
INSTALLSUCKS=no
# Check for contrib directory
if test -d extras/contrib/bin; then
export PATH=./extras/contrib/bin:$PATH
export LD_LIBRARY_PATH=./extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=./extras/contrib/lib:$DYLD_LIBRARY_PATH
fi
# Check for automake
amvers="none"
if automake-1.7 --version >/dev/null 2>&1; then
......
dnl Autoconf settings for vlc
dnl $Id: configure.ac,v 1.112 2003/11/10 17:47:42 gbazin Exp $
dnl $Id: configure.ac,v 1.113 2003/11/15 01:21:48 massiot Exp $
AC_INIT(vlc,0.6.3-cvs)
......@@ -53,6 +53,7 @@ AC_CHECK_TOOL(STRIP, strip, :)
AC_CHECK_TOOL(AR, ar, :)
AC_CHECK_TOOL(LD, ld, :)
dnl Sam, if you think I didn't see that... --Meuuh
dnl AM_PROG_LIBTOOL
AC_PROG_INSTALL
......@@ -60,6 +61,30 @@ dnl Check for compiler properties
AC_C_CONST
AC_C_INLINE
dnl
dnl Check for the contrib directory
dnl
topdir="`pwd`"
if test -d ${topdir}/extras/contrib/lib; then
export PATH=${topdir}/extras/contrib/bin:$PATH
export LD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$LD_LIBRARY_PATH
export DYLD_LIBRARY_PATH=${topdir}/extras/contrib/lib:$DYLD_LIBRARY_PATH
CPPFLAGS="${CPPFLAGS} -I${topdir}/extras/contrib/include"
CPPFLAGS_save="${CPPFLAGS_save} -I${topdir}/extras/contrib/include"
CFLAGS="${CFLAGS} -I${topdir}/extras/contrib/include"
CFLAGS_save="${CFLAGS_save} -I${topdir}/extras/contrib/include"
CXXFLAGS="${CXXFLAGS} -I${topdir}/extras/contrib/include"
CXXFLAGS_save="${CXXFLAGS_save} -I${topdir}/extras/contrib/include"
OBJCFLAGS="${OBJCFLAGS} -I${topdir}/extras/contrib/include"
OBJCFLAGS_save="${OBJCFLAGS_save} -I${topdir}/extras/contrib/include"
if test -d ${topdir}/extras/contrib/vlc-lib; then
LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/vlc-lib"
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/vlc-lib"
fi
LDFLAGS="${LDFLAGS} -L${topdir}/extras/contrib/lib"
LDFLAGS_save="${LDFLAGS_save} -L${topdir}/extras/contrib/lib"
fi
dnl
dnl Set default values
dnl
......
bin
doc
etc
include
info
lib
man
sbin
share
vlc-lib
config.mak
contrib.tar.bz2
# ***************************************************************************
# Makefile : Build vlc-contrib files
# ***************************************************************************
# Copyright (C) 2003 VideoLAN
# $Id: Makefile,v 1.1 2003/11/15 01:21:48 massiot Exp $
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
# ***************************************************************************
include ./config.mak
BUILDDIRS = bin doc etc include info lib man sbin share vlc-lib
all: FORCE
@echo "Do you mean to make src or make bin ?"
src: FORCE
$(MAKE) -C src all
bin: FORCE
$(WGET) $(CONTRIB_URL)
bunzip2 -c $< | tar xf -
clean-src: FORCE
$(MAKE) -C src clean-src
clean-bin: FORCE
rm -rf $(BUILDDIRS)
$(MAKE) -C src clean-dots
clean: FORCE
@echo "Do you mean to clean-src or clean-bin ?"
package: FORCE
tar cf - bin include lib vlc-lib share/aclocal* share/autoconf* \
share/automake* share/gettext* \
| bzip2 -c > contrib.tar.bz2
FORCE:
This is the contrib build system for VLC Media Player. It has been
primarily developed for Mac OS X, though it should be easy to adapt to
other operating systems.
To use it, first type :
./bootstrap
Customize config.mak if you need type, then you need to choose between
building from source (can take a long time but is easily customizable)
and fetching a pre-compiled binary package. Either type 'make src'
or 'make bin'.
Once the contribs are built, you can start building VLC. VLC's bootstrap
and configure scripts will automatically detect the contrib directory,
but you still need to specify which plug-ins you want to build (though
it is unnecessary to add --with-* or --with-*-tree). For instance my
configure line is :
./configure --disable-x11 --disable-xvideo --disable-gtk --disable-sdl --enable-ffmpeg --with-ffmpeg-mp3lame --enable-mad --enable-libdvbpsi --enable-a52 --enable-dvdplay --enable-faad --enable-vorbis --enable-theora --enable-ogg --enable-slp --enable-flac --enable-libmpeg2 --enable-mkv --enable-speex --enable-debug
Then for Darwin, 'make' will build the VLC.app application and copy the
contrib libs to VLC.app/Contents/MacOS/lib. The application is ready.
Happy hacking.
--Meuuh 2003-11-15
#!/bin/sh
# ***************************************************************************
# bootstrap : Set up config.mak
# ***************************************************************************
# Copyright (C) 2003 VideoLAN
# $Id: bootstrap,v 1.1 2003/11/15 01:21:48 massiot Exp $
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
# ***************************************************************************
if test "$#" != "0"; then
echo "Usage: $0" >&2
echo " Prepare config.mak file." >&2
exit 1
fi
LANG=C
export LANG
set -e
set -x
echo -e "# Automatically generated by bootstrap.\n# Make changes if you know what you're doing.\n" >| config.mak
if test ".`uname -s`" = ".Darwin"; then
echo "SYS = DARWIN" >> config.mak
echo "EXTRA_CPPFLAGS = -no-cpp-precomp" >> config.mak
echo "CONTRIB_URL = http://www.videolan.org/pub/devtools/contrib-macosx.tar.bz2" >> config.mak
else
echo "SYS = UNKNOWN" >> config.mak
fi
if which curl >/dev/null; then
echo "WGET = curl -O" >> config.mak
elif which wget >/dev/null; then
echo "WGET = wget" >> config.mak
else
echo "You need at least wget or curl to fetch the packages." >&2
exit 1
fi
echo "PREFIX = `pwd`" >> config.mak
This diff is collapsed.
Index: common/mp4v2/mp4.h
===================================================================
RCS file: /cvsroot/faac/faad2/common/mp4v2/mp4.h,v
retrieving revision 1.14
diff -u -r1.14 mp4.h
--- common/mp4v2/mp4.h 7 Aug 2003 18:58:43 -0000 1.14
+++ common/mp4v2/mp4.h 2 Nov 2003 00:14:11 -0000
@@ -27,6 +27,8 @@
#include "mpeg4ip.h"
#include <math.h> /* to define float HUGE_VAL and/or NAN */
+/* Meuuh power */
+#undef NAN
#ifndef NAN
#define NAN HUGE_VAL
#endif
diff -ru ffmpeg.old/configure ffmpeg/configure
--- ffmpeg.old/configure Sun Sep 28 17:26:39 2003
+++ ffmpeg/configure Tue Nov 11 17:17:59 2003
@@ -172,18 +172,18 @@
extralibs=""
darwin="yes"
strip="strip -x"
-LDFLAGS="-d"
+LDFLAGS="$LDFLAGS -d"
FFSLDFLAGS=-Wl,-bind_at_load
gcc_version="$($cc -v 2>&1 | grep version | cut -d ' ' -f3-)"
case "$gcc_version" in
*2.95*)
-CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer"
+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
;;
*3.3*)
-CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL"
;;
*)
-CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
+CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
;;
esac
;;
diff -ru ffmpeg.old/libavcodec/dsputil.h ffmpeg/libavcodec/dsputil.h
--- ffmpeg.old/libavcodec/dsputil.h Sun Sep 28 17:26:39 2003
+++ ffmpeg/libavcodec/dsputil.h Tue Nov 11 17:16:28 2003
@@ -477,6 +477,8 @@
+name8(s, dst+8+8*stride, src+8+8*stride, stride);\
}
+/* Meuuh power */
+#undef HAVE_LRINTF
#ifndef HAVE_LRINTF
/* XXX: add ISOC specific test to avoid specific BSD testing. */
/* better than nothing implementation. */
diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c
--- ffmpeg.old/libavcodec/eval.c Sun Sep 28 17:26:39 2003
+++ ffmpeg/libavcodec/eval.c Tue Nov 11 17:16:28 2003
@@ -34,6 +34,8 @@
#include <string.h>
#include <math.h>
+/* Meuuh power */
+#undef NAN
#ifndef NAN
#define NAN 0
#endif
diff -ru ffmpeg.old/libavcodec/libpostproc/Makefile ffmpeg/libavcodec/libpostproc/Makefile
--- ffmpeg.old/libavcodec/libpostproc/Makefile Sun Sep 28 17:26:40 2003
+++ ffmpeg/libavcodec/libpostproc/Makefile Tue Nov 11 17:16:28 2003
@@ -55,6 +55,9 @@
ldconfig || true
mkdir -p $(prefix)/include/postproc
install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
+else
+ mkdir -p $(prefix)/include/libpostproc
+ install -m 644 postprocess.h $(prefix)/include/libpostproc/postprocess.h
endif
diff -ru ffmpeg.old/libavcodec/resample.c ffmpeg/libavcodec/resample.c
--- ffmpeg.old/libavcodec/resample.c Sun Sep 28 17:26:39 2003
+++ ffmpeg/libavcodec/resample.c Tue Nov 11 17:16:28 2003
@@ -49,7 +49,7 @@
static void init_mono_resample(ReSampleChannelContext *s, float ratio)
{
ratio = 1.0 / ratio;
- s->iratio = (int)floorf(ratio);
+ s->iratio = (int)floor(ratio);
if (s->iratio == 0)
s->iratio = 1;
s->incr = (int)((ratio / s->iratio) * FRAC);
diff -ru ffmpeg.old/libavformat/rtsp.c ffmpeg/libavformat/rtsp.c
--- ffmpeg.old/libavformat/rtsp.c Sun Sep 28 17:26:40 2003
+++ ffmpeg/libavformat/rtsp.c Tue Nov 11 17:16:28 2003
@@ -20,6 +20,7 @@
#include <unistd.h> /* for select() prototype */
#include <sys/time.h>
+#include <unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
#ifndef __BEOS__
diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c
--- ffmpeg.old/libavformat/tcp.c Sun Sep 28 17:26:40 2003
+++ ffmpeg/libavformat/tcp.c Tue Nov 11 17:16:28 2003
@@ -32,6 +32,7 @@
#include <netdb.h>
#include <sys/time.h>
#include <fcntl.h>
+#define socklen_t int
typedef struct TCPContext {
int fd;
diff -ru ffmpeg.old/configure ffmpeg/configure
--- ffmpeg.old/configure Sat Nov 1 15:29:32 2003
+++ ffmpeg/configure Sun Nov 2 02:04:09 2003
@@ -426,21 +426,21 @@
#Darwin CC versions
if test $targetos = Darwin; then
if test -n "`$cc -v 2>&1 | grep xlc`"; then
- CFLAGS="-qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
+ CFLAGS="$CFLAGS -qpdf2 -qlanglvl=extc99 -qmaxmem=-1 -qarch=auto -qtune=auto"
else
gcc_version="`$cc -v 2>&1 | grep version | cut -d ' ' -f3-`"
case "$gcc_version" in
*2.95*)
- CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer"
+ CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer"
;;
*3.1*)
- CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"
+ CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -force_cpusubtype_ALL -Wno-sign-compare"
;;
*3.3*)
- CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL -Wno-sign-compare"
+ CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic -force_cpusubtype_ALL -Wno-sign-compare"
;;
*)
- CFLAGS="-no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
+ CFLAGS="$CFLAGS -no-cpp-precomp -pipe -fomit-frame-pointer -mdynamic-no-pic"
;;
esac
fi
diff -ru ffmpeg.old/libavcodec/dsputil.h ffmpeg/libavcodec/dsputil.h
--- ffmpeg.old/libavcodec/dsputil.h Sat Oct 25 02:32:54 2003
+++ ffmpeg/libavcodec/dsputil.h Sun Nov 2 02:04:09 2003
@@ -487,6 +487,8 @@
+name8(s, dst+8+8*stride, src+8+8*stride, stride);\
}
+/* Meuuh power */
+#undef HAVE_LRINTF
#ifndef HAVE_LRINTF
/* XXX: add ISOC specific test to avoid specific BSD testing. */
/* better than nothing implementation. */
diff -ru ffmpeg.old/libavcodec/eval.c ffmpeg/libavcodec/eval.c
--- ffmpeg.old/libavcodec/eval.c Thu Mar 6 12:32:01 2003
+++ ffmpeg/libavcodec/eval.c Sun Nov 2 02:04:09 2003
@@ -34,6 +34,8 @@
#include <string.h>
#include <math.h>
+/* Meuuh power */
+#undef NAN
#ifndef NAN
#define NAN 0
#endif
diff -ru ffmpeg.old/libavcodec/libpostproc/Makefile ffmpeg/libavcodec/libpostproc/Makefile
--- ffmpeg.old/libavcodec/libpostproc/Makefile Sun May 11 13:26:35 2003
+++ ffmpeg/libavcodec/libpostproc/Makefile Sun Nov 2 19:20:31 2003
@@ -55,6 +55,9 @@
ldconfig || true
mkdir -p $(prefix)/include/postproc
install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h
+else
+ mkdir -p $(prefix)/include/libpostproc
+ install -m 644 postprocess.h $(prefix)/include/libpostproc/postprocess.h
endif
diff -ru ffmpeg.old/libavcodec/resample.c ffmpeg/libavcodec/resample.c
--- ffmpeg.old/libavcodec/resample.c Mon Sep 8 23:05:43 2003
+++ ffmpeg/libavcodec/resample.c Sun Nov 2 02:04:09 2003
@@ -49,7 +49,7 @@
static void init_mono_resample(ReSampleChannelContext *s, float ratio)
{
ratio = 1.0 / ratio;
- s->iratio = (int)floorf(ratio);
+ s->iratio = (int)floor(ratio);
if (s->iratio == 0)
s->iratio = 1;
s->incr = (int)((ratio / s->iratio) * FRAC);
diff -ru ffmpeg.old/libavformat/rtsp.c ffmpeg/libavformat/rtsp.c
--- ffmpeg.old/libavformat/rtsp.c Wed Oct 29 15:25:27 2003
+++ ffmpeg/libavformat/rtsp.c Sun Nov 2 02:04:09 2003
@@ -20,6 +20,7 @@
#include <unistd.h> /* for select() prototype */
#include <sys/time.h>
+#include <unistd.h>
#include <netinet/in.h>
#include <sys/socket.h>
#ifndef __BEOS__
diff -ru ffmpeg.old/libavformat/tcp.c ffmpeg/libavformat/tcp.c
--- ffmpeg.old/libavformat/tcp.c Mon Sep 29 03:41:30 2003
+++ ffmpeg/libavformat/tcp.c Sun Nov 2 02:04:09 2003
@@ -32,6 +32,7 @@
#include <netdb.h>
#include <sys/time.h>
#include <fcntl.h>
+#define socklen_t int
typedef struct TCPContext {
int fd;
This diff is collapsed.
diff -ru fribidi.old/acinclude.m4 fribidi/acinclude.m4
--- fribidi.old/acinclude.m4 Fri Dec 14 15:25:17 2001
+++ fribidi/acinclude.m4 Sun Nov 2 00:45:19 2003
@@ -1505,7 +1505,7 @@
;;
darwin* | rhapsody*)
- allow_undefined_flag='-undefined suppress'
+ allow_undefined_flag='-undefined error'
# FIXME: Relying on posixy $() will cause problems for
# cross-compilation, but unfortunately the echo tests do not
# yet detect zsh echo's removal of \ escapes.
This diff is collapsed.
diff -ru libtheora.old/Makefile.am libtheora/Makefile.am
--- libtheora.old/Makefile.am Thu Sep 26 04:50:51 2002
+++ libtheora/Makefile.am Wed Nov 12 00:06:14 2003
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include examples debian
+SUBDIRS = lib include
EXTRA_DIST = COPYING autogen.sh
diff -ru libtheora.old/Makefile.in libtheora/Makefile.in
--- libtheora.old/Makefile.in Mon Jun 9 23:26:11 2003
+++ libtheora/Makefile.in Wed Nov 12 00:06:37 2003
@@ -86,7 +86,7 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include examples debian
+SUBDIRS = lib include
EXTRA_DIST = COPYING autogen.sh
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
diff -Naur vorbis.old/Makefile vorbis/Makefile
--- vorbis.old/Makefile Sun Nov 2 15:05:33 2003
+++ vorbis/Makefile Sun Nov 2 16:50:28 2003
@@ -104,7 +104,7 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include doc examples win32 debian vq
+SUBDIRS = lib include doc
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
diff -Naur vorbis.old/Makefile.am vorbis/Makefile.am
--- vorbis.old/Makefile.am Thu Sep 11 22:42:26 2003
+++ vorbis/Makefile.am Sun Nov 2 16:50:56 2003
@@ -2,7 +2,8 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include doc examples win32 debian vq
+#SUBDIRS = lib include doc examples win32 debian vq
+SUBDIRS = lib include doc
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
diff -Naur vorbis.old/Makefile.in vorbis/Makefile.in
--- vorbis.old/Makefile.in Sun Nov 2 02:33:58 2003
+++ vorbis/Makefile.in Sun Nov 2 16:51:07 2003
@@ -104,7 +104,8 @@
AUTOMAKE_OPTIONS = foreign dist-zip
-SUBDIRS = lib include doc examples win32 debian vq
+#SUBDIRS = lib include doc examples win32 debian vq
+SUBDIRS = lib include doc
m4datadir = $(datadir)/aclocal
m4data_DATA = vorbis.m4
diff -Naur vorbis.old/lib/Makefile vorbis/lib/Makefile
--- vorbis.old/lib/Makefile Sun Nov 2 15:05:33 2003
+++ vorbis/lib/Makefile Sun Nov 2 16:48:57 2003
@@ -123,12 +123,12 @@
libvorbis_la_LDFLAGS = -no-undefined -version-info 3:0:3
libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LDFLAGS = -no-undefined -version-info 4:0:1
-libvorbisfile_la_LIBADD = libvorbis.la
+libvorbisfile_la_LDFLAGS = -version-info 4:0:1
+libvorbisfile_la_LIBADD = -lvorbis
libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LDFLAGS = -no-undefined -version-info 2:0:0
-libvorbisenc_la_LIBADD = libvorbis.la
+libvorbisenc_la_LDFLAGS = -version-info 2:0:0
+libvorbisenc_la_LIBADD = -lvorbis
EXTRA_PROGRAMS = barkmel tone psytune
CLEANFILES = $(EXTRA_PROGRAMS)
@@ -151,10 +151,10 @@
floor1.lo floor0.lo res0.lo mapping0.lo registry.lo codebook.lo \
sharedbook.lo lookup.lo bitrate.lo
libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
-libvorbisenc_la_DEPENDENCIES = libvorbis.la
+libvorbisenc_la_DEPENDENCIES =
am_libvorbisenc_la_OBJECTS = vorbisenc.lo
libvorbisenc_la_OBJECTS = $(am_libvorbisenc_la_OBJECTS)
-libvorbisfile_la_DEPENDENCIES = libvorbis.la
+libvorbisfile_la_DEPENDENCIES =
am_libvorbisfile_la_OBJECTS = vorbisfile.lo
libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS)
EXTRA_PROGRAMS = barkmel$(EXEEXT) tone$(EXEEXT) psytune$(EXEEXT)
diff -Naur vorbis.old/lib/Makefile.am vorbis/lib/Makefile.am
--- vorbis.old/lib/Makefile.am Sat Jan 18 22:02:20 2003
+++ vorbis/lib/Makefile.am Sun Nov 2 16:38:53 2003
@@ -20,12 +20,12 @@
libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
-libvorbisfile_la_LIBADD = libvorbis.la
+libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+libvorbisfile_la_LIBADD = -lvorbis
libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
-libvorbisenc_la_LIBADD = libvorbis.la
+libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+libvorbisenc_la_LIBADD = -lvorbis
EXTRA_PROGRAMS = barkmel tone psytune
CLEANFILES = $(EXTRA_PROGRAMS)
diff -Naur vorbis.old/lib/Makefile.in vorbis/lib/Makefile.in
--- vorbis.old/lib/Makefile.in Sun Nov 2 02:34:00 2003
+++ vorbis/lib/Makefile.in Sun Nov 2 16:51:10 2003
@@ -123,12 +123,12 @@
libvorbis_la_LDFLAGS = -no-undefined -version-info @V_LIB_CURRENT@:@V_LIB_REVISION@:@V_LIB_AGE@
libvorbisfile_la_SOURCES = vorbisfile.c
-libvorbisfile_la_LDFLAGS = -no-undefined -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
-libvorbisfile_la_LIBADD = libvorbis.la
+libvorbisfile_la_LDFLAGS = -version-info @VF_LIB_CURRENT@:@VF_LIB_REVISION@:@VF_LIB_AGE@
+libvorbisfile_la_LIBADD = -lvorbis
libvorbisenc_la_SOURCES = vorbisenc.c
-libvorbisenc_la_LDFLAGS = -no-undefined -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
-libvorbisenc_la_LIBADD = libvorbis.la
+libvorbisenc_la_LDFLAGS = -version-info @VE_LIB_CURRENT@:@VE_LIB_REVISION@:@VE_LIB_AGE@
+libvorbisenc_la_LIBADD = -lvorbis
EXTRA_PROGRAMS = barkmel tone psytune
CLEANFILES = $(EXTRA_PROGRAMS)
@@ -151,10 +151,10 @@
floor1.lo floor0.lo res0.lo mapping0.lo registry.lo codebook.lo \
sharedbook.lo lookup.lo bitrate.lo
libvorbis_la_OBJECTS = $(am_libvorbis_la_OBJECTS)
-libvorbisenc_la_DEPENDENCIES = libvorbis.la
+libvorbisenc_la_DEPENDENCIES =
am_libvorbisenc_la_OBJECTS = vorbisenc.lo
libvorbisenc_la_OBJECTS = $(am_libvorbisenc_la_OBJECTS)
-libvorbisfile_la_DEPENDENCIES = libvorbis.la
+libvorbisfile_la_DEPENDENCIES =
am_libvorbisfile_la_OBJECTS = vorbisfile.lo
libvorbisfile_la_OBJECTS = $(am_libvorbisfile_la_OBJECTS)
EXTRA_PROGRAMS = barkmel$(EXEEXT) tone$(EXEEXT) psytune$(EXEEXT)
# ***************************************************************************
# src/packages.mak : Archives locations
# ***************************************************************************
# Copyright (C) 2003 VideoLAN
# $Id: packages.mak,v 1.1 2003/11/15 01:21:48 massiot Exp $
#
# Authors: Christophe Massiot <massiot@via.ecp.fr>
#
# 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
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
#
# This program is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
# ***************************************************************************
GNU=http://ftp.gnu.org/pub/gnu
SF=http://heanet.dl.sourceforge.net/sourceforge
VIDEOLAN=http://www.videolan.org/pub/testing/contrib
AUTOCONF_VERSION=2.58
AUTOCONF_URL=$(GNU)/autoconf/autoconf-$(AUTOCONF_VERSION).tar.gz
#LIBTOOL_VERSION=1.5
#LIBTOOL_URL=$(GNU)/libtool/libtool-$(LIBTOOL_VERSION).tar.gz
#LIBTOOL_URL=http://ftp.fr.debian.org/debian/pool/main/libt/libtool/libtool_$(LIBTOOL_VERSION).orig.tar.gz
AUTOMAKE_VERSION=1.7.8
AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
LIBICONV_VERSION=1.9.1
LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
GETTEXT_VERSION=0.12.1
GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
FREETYPE2_VERSION=2.1.7
FREETYPE2_URL=ftp://ftp.freetype.org/freetype/freetype2/freetype-$(FREETYPE2_VERSION).tar.gz
FRIBIDI_VERSION=0.10.4
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_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_URL=ftp://ftp.mars.org/pub/mpeg/libid3tag-$(LIBID3TAG_VERSION).tar.gz
LIBMAD_VERSION=0.15.0b
LIBMAD_URL=ftp://ftp.mars.org/pub/mpeg/libmad-$(LIBMAD_VERSION).tar.gz
OGG_VERSION=20031111
OGG_URL=$(VIDEOLAN)/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
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_URL=http://www.speex.org/download/speex-$(SPEEX_VERSION).tar.gz
FAAD2_VERSION=2.0rc2
FAAD2_URL=$(VIDEOLAN)/faad2-$(FAAD2_VERSION).tar.gz
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=20031021
LIBEBML_URL=$(VIDEOLAN)/libebml-$(LIBEBML_VERSION).tar.bz2
LIBMATROSKA_VERSION=20031021
LIBMATROSKA_URL=$(VIDEOLAN)/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
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://www.videolan.org/pub/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://www.videolan.org/pub/libdvdplay/$(LIBDVDPLAY_VERSION)/libdvdplay-$(LIBDVDPLAY_VERSION).tar.gz
LIBDVBPSI_VERSION=0.1.3
LIBDVBPSI_URL=http://www.videolan.org/pub/libdvbpsi/$(LIBDVBPSI_VERSION)/libdvbpsi-$(LIBDVBPSI_VERSION).tar.gz
Markdown is supported
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