Skip to content

V
vlc-2-2
Commit 2ef0df8a authored by Christophe Mutricy's avatar Christophe Mutricy
Browse files
Options

Use newer version of libraries in extras/contrib. Patch courtesy of Jean-Baptiste Kempf

parent 62ab3db5
Hide whitespace changes
Inline Side-by-side
Showing with 145 additions and 185 deletions
THANKS
View file @ 2ef0df8a
......@@ -71,7 +71,8 @@ Jan Gerber <j at v2v dot org> - patch theora decoding aspect ratio
Jan Van Boghout <vlc at macrabbit.com> - iTunes like slider for OSX intf
Javier Varela <tonxabar at hotmail.com> - Spanish translation
Jean-Alexis Montignies <ja at sente.ch> - coreaudio multiple streams fix
Jean-Baptiste le Stang <jp.lestand at lestang.org> - Equalizer-GUI-fixes (OSX)
Jean-Baptiste Kempf <jb at via dot ecp.fr> - Contrib system upgrade
Jean-Baptiste Le Stang <jp.lestand at lestang.org> - Equalizer-GUI-fixes (OSX)
Jean-Philippe Grimaldi <jeanphi at via.ecp.fr> - bug fixes
Jean-Pierre Kuypers <Kuypers at sri.ucl.ac.be> - French translation
Jeffrey Baker <jwbaker at acm.org> - port of the ALSA plugin to the ALSA 1.0 API
......
extras/contrib/src/Makefile
View file @ 2ef0df8a
......@@ -674,6 +674,7 @@ libtheora-$(THEORA_VERSION).tar.bz2:
libtheora: libtheora-$(THEORA_VERSION).tar.bz2
$(EXTRACT_BZ2)
patch -p0 < Patches/theora.patch
patch -p0 < Patches/theora-1.0a7.patch
(cd $@; autoconf)
.theora: libtheora .ogg
......@@ -699,7 +700,7 @@ ifdef HAVE_WIN32
(cd $@; aclocal && automake)
endif
.shout: libshout .theora .ogg
.shout: libshout .theora .ogg .speex
(cd $<; $(HOSTCC) ./configure $(HOSTCONF) --prefix=$(PREFIX) && make && make install )
$(INSTALL_NAME)
touch $@
......
extras/contrib/src/Patches/ffmpeg-svn-win32.patch
View file @ 2ef0df8a
Index: libavutil/common.h
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavutil/common.h,v
retrieving revision 1.153
diff -u -r1.153 common.h
--- ffmpeg.orig/libavutil/common.h 19 Sep 2005 23:26:47 -0000 1.153
+++ ffmpeg/libavutil/common.h 1 Nov 2005 21:40:31 -0000
@@ -543,7 +543,7 @@
}\
}
-#ifndef HAVE_LRINTF
+#if !defined(HAVE_LRINTF) && !defined(__MINGW32__)
/* XXX: add ISOC specific test to avoid specific BSD testing. */
/* better than nothing implementation. */
/* btw, rintf() is existing on fbsd too -- alex */
extras/contrib/src/Patches/ffmpeg-svn.patch
View file @ 2ef0df8a
Index: ffmpeg/configure
Index: configure
===================================================================
--- ffmpeg/configure (revision 5790)
--- ffmpeg/configure (revision 5823)
+++ ffmpeg/configure (working copy)
@@ -2124,7 +2124,7 @@
@@ -2118,7 +2118,7 @@
# build pkg-config files libav*.pc and libpostproc.pc
# libavutil.pc
cat <<EOF >libavutil.pc
......@@ -11,7 +11,7 @@ Index: ffmpeg/configure
exec_prefix=\${PREFIX}
libdir=\${exec_prefix}/lib
includedir=\${PREFIX}/include
@@ -2139,7 +2139,7 @@
@@ -2133,7 +2133,7 @@
EOF
cat <<EOF >libavutil-uninstalled.pc
......@@ -20,7 +20,7 @@ Index: ffmpeg/configure
exec_prefix=
libdir=\${pcfiledir}/libavutil
includedir=\${pcfiledir}/libavutil
@@ -2155,7 +2155,7 @@
@@ -2149,7 +2149,7 @@
# libavcodec.pc
cat <<EOF >libavcodec.pc
......@@ -29,7 +29,7 @@ Index: ffmpeg/configure
exec_prefix=\${PREFIX}
libdir=\${exec_prefix}/lib
includedir=\${PREFIX}/include
@@ -2170,7 +2170,7 @@
@@ -2164,7 +2164,7 @@
EOF
cat <<EOF >libavcodec-uninstalled.pc
......@@ -38,7 +38,7 @@ Index: ffmpeg/configure
exec_prefix=
libdir=\${pcfiledir}/libavcodec
includedir=\${pcfiledir}/libavcodec
@@ -2186,7 +2186,7 @@
@@ -2180,7 +2180,7 @@
# libavformat.pc
cat <<EOF >libavformat.pc
......@@ -47,7 +47,7 @@ Index: ffmpeg/configure
exec_prefix=\${PREFIX}
libdir=\${exec_prefix}/lib
includedir=\${PREFIX}/include
@@ -2201,7 +2201,7 @@
@@ -2195,7 +2195,7 @@
EOF
cat <<EOF >libavformat-uninstalled.pc
......@@ -56,7 +56,7 @@ Index: ffmpeg/configure
exec_prefix=
libdir=\${pcfiledir}/libavformat
includedir=\${pcfiledir}/libavformat
@@ -2218,7 +2218,7 @@
@@ -2212,7 +2212,7 @@
# libpostproc.pc
cat <<EOF >libpostproc.pc
......@@ -65,7 +65,7 @@ Index: ffmpeg/configure
exec_prefix=\${PREFIX}
libdir=\${exec_prefix}/lib
includedir=\${PREFIX}/include
@@ -2233,7 +2233,7 @@
@@ -2227,7 +2227,7 @@
EOF
cat <<EOF >libpostproc-uninstalled.pc
......
extras/contrib/src/Patches/gnutls-win32.patch
View file @ 2ef0df8a
--- gnutls.orig/lib/gnutls_buffers.c 2006-03-08 18:26:31.000000000 +0100
+++ gnutls/lib/gnutls_buffers.c 2006-03-08 18:25:58.000000000 +0100
@@ -244,7 +244,11 @@
_gnutls_read_log("READ: %d returned from %d, errno=%d\n", i,
fd, errno);
--- gnutls-1.4.0/lib/gnutls_buffers.c 2006-03-08 11:44:59.000000000 +0100
+++ gnutls/lib/gnutls_buffers.c 2006-07-12 14:29:06.000000000 +0200
@@ -275,9 +275,12 @@
{
_gnutls_read_log ("READ: %d returned from %d, errno=%d\n", i,
fd, errno);
-
+#ifdef _WIN32
+ if (WSAGetLastError() == WSAEWOULDBLOCK) {
+ if (WSAGetLastError() == WSAEWOULDBLOCK) {
+#else
if (errno == EAGAIN || errno == EINTR) {
if (errno == EAGAIN || errno == EINTR)
{
+#endif
if (sizeOfPtr - left > 0) {
if (sizeOfPtr - left > 0)
{
_gnutls_read_log("READ: returning %d bytes from %d\n",
@@ -635,7 +639,11 @@
left);
@@ -707,8 +710,12 @@
if (i == -1) {
if (i == -1)
{
+#ifdef _WIN32
+ if (WSAGetLastError() == WSAEWOULDBLOCK) {
+ if (WSAGetLastError() == WSAEWOULDBLOCK) {
+#else
if (errno == EAGAIN || errno == EINTR) {
if (errno == EAGAIN || errno == EINTR)
{
+#endif
session->internals.record_send_buffer_prev_size +=
n - left;
session->internals.record_send_buffer_prev_size += n - left;
retval =
extras/contrib/src/Patches/libogg-1.1-win32.patch
View file @ 2ef0df8a
......@@ -3,9 +3,9 @@ Index: include/ogg/os_types.h
RCS file: /usr/local/cvsroot/ogg/include/ogg/os_types.h,v
retrieving revision 1.12
diff -u -r1.12 os_types.h
--- include/ogg/os_types.h 18 Sep 2002 04:42:09 -0000 1.12
+++ include/ogg/os_types.h 18 Apr 2003 13:48:18 -0000
@@ -24,7 +24,7 @@
--- libogg/include/ogg/os_types.h 18 Sep 2002 04:42:09 -0000 1.12
+++ libogg/include/ogg/os_types.h 18 Apr 2003 13:48:18 -0000
@@ -27,7 +27,7 @@
#define _ogg_realloc realloc
#define _ogg_free free
......
extras/contrib/src/Patches/libogg-1.1.patch
View file @ 2ef0df8a
diff -ruN libogg-1.1.2/configure.in libogg/configure.in
--- libogg-1.1.2/configure.in 2004-09-23 15:30:58.000000000 +0200
+++ libogg/configure.in 2005-11-14 22:16:04.000000000 +0100
@@ -28,17 +28,17 @@
case $host in
*-*-irix*)
DEBUG="-g -signed"
- CFLAGS="-O2 -w -signed"
+ EXTRA_CFLAGS="-O2 -w -signed"
PROFILE="-p -g3 -O2 -signed"
;;
sparc-sun-solaris*)
DEBUG="-v -g"
- CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
+ EXTRA_CFLAGS="-xO4 -fast -w -fsimple -native -xcg92"
PROFILE="-v -xpg -g -xO4 -fast -native -fsimple -xcg92 -Dsuncc"
;;
*)
DEBUG="-g"
- CFLAGS="-O"
+ EXTRA_CFLAGS="-O"
PROFILE="-g -p"
;;
esac
@@ -46,30 +46,30 @@
--- /libogg-1.1.3/configure.in 2005-11-28 05:26:07.000000000 +0100
+++ libogg/configure.in 2006-07-11 19:52:15.000000000 +0200
@@ -45,27 +45,27 @@
case $host in
*-*-linux*)
DEBUG="-g -Wall -fsigned-char"
......@@ -54,8 +32,4 @@ diff -ruN libogg-1.1.2/configure.in libogg/configure.in
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
DEBUG="$DEBUG $cflags_save"
PROFILE="$PROFILE $cflags_save"
-LDFLAGS="$LDFLAGS $ldflags_save"
+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
dnl Checks for programs.
extras/contrib/src/Patches/libpng-1.2.8-makefile.patch
View file @ 2ef0df8a
......@@ -6,9 +6,9 @@
# Prefix must be a full pathname.
-prefix=/usr/local
+prefix=$(PREFIX)
exec_prefix=$(prefix)
# Where the zlib library and include files are located.
#ZLIBLIB=/usr/local/lib
@@ -53,7 +53,7 @@
# If you're going to install into a temporary location
# via DESTDIR, $(DESTDIR)$(prefix) must already exist before
......
extras/contrib/src/Patches/libpng-win32.patch
View file @ 2ef0df8a
--- scripts/makefile.cygwin 2004-12-03 00:14:31.000000000 +0000
+++ scripts/makefile.cygwin 2006-04-09 17:56:32.203125000 +0100
--- scripts/makefile.cygwin 2006-06-27 22:22:40.000000000 +0200
+++ scripts/makefile.cygwin 2006-07-12 13:18:15.000000000 +0200
@@ -35,7 +35,6 @@
# $CFLAGS, and include pnggccrd.o in $OBJS, below, and in the dependency
# list at the bottom of this makefile.
......@@ -8,7 +8,7 @@
ifdef MINGW
MINGW_CCFLAGS=-mno-cygwin -I/usr/include/mingw
MINGW_LDFLAGS=-mno-cygwin -L/usr/lib/mingw
@@ -43,13 +42,12 @@
@@ -43,14 +42,13 @@
# Where "make install" puts libpng*.a, *png*.dll, png.h, and pngconf.h
ifndef prefix
......@@ -16,6 +16,7 @@
-$(warning You haven't specified a 'prefix=' location. Defaulting to "/usr")
+prefix=??PREFIX??
endif
exec_prefix=$(prefix)
# Where the zlib library and include files are located
-ZLIBLIB= /usr/lib
......@@ -25,17 +26,17 @@
#ZLIBLIB=../zlib
#ZLIBINC=../zlib
@@ -94,7 +92,9 @@
@@ -95,7 +93,9 @@
LDEXTRA=-Wl,--out-implib=$(IMPLIB) $(addprefix -L,$(ZLIBLIB)) -lz
MKDIR=/bin/mkdir -pv
MKDIR_P=/bin/mkdir -pv
+ifndef RANLIB
RANLIB=ranlib
+endif
#RANLIB=echo
INCPATH=$(prefix)/include
@@ -173,10 +173,10 @@
@@ -174,7 +174,7 @@
$(CC) -c $(CFLAGS) -DPNG_BUILD_DLL -o $@ $<
$(STATLIB): $(OBJS)
......@@ -43,8 +44,4 @@
+ $(AR) rc $@ $(OBJS)
$(RANLIB) $@
-$(SHAREDDEF): scripts/png32ms.def
+$(SHAREDDEF): scripts/pngw32.def
cat $< | sed -e '1{G;s/^\(.*\)\(\n\)/EXPORTS/;};2,/^EXPORTS/d' | \
sed -e 's/\([^;]*\);/;/' > $@
$(SHAREDDEF): scripts/pngw32.def
extras/contrib/src/Patches/libvorbis-1.1.patch
View file @ 2ef0df8a
......@@ -65,9 +65,7 @@ diff -ruN libvorbis-1.1.1/configure.in libvorbis/configure.in
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
-LDFLAGS="$LDFLAGS $ldflags_save"
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
dnl --------------------------------------------------
dnl Check for headers
extras/contrib/src/Patches/speex.patch
View file @ 2ef0df8a
diff -ru speex-1.1.10/libspeex/stack_alloc.h speex/libspeex/stack_alloc.h
--- speex-1.1.10/libspeex/stack_alloc.h 2005-04-25 07:58:00.000000000 +0000
+++ speex/libspeex/stack_alloc.h 2005-09-20 19:59:55.049666072 +0000
@@ -64,7 +64,7 @@
--- speex-1.1.12/libspeex/stack_alloc.h 2006-01-31 23:25:10.000000000 +0100
+++ speex/libspeex/stack_alloc.h 2006-07-11 21:34:01.000000000 +0200
@@ -109,7 +109,7 @@
#endif
-#if defined(VAR_ARRAYS)
+#if defined(VAR_ARRAYS) && !( defined(__GNUC__) && __GNUC__ < 3 )
+#if defined(VAR_ARRAYS) && !( defined(__GNUC__) && __GNUC__ < 3 )
#define VARDECL(var)
#define ALLOC(var, size, type) type var[size]
#elif defined(USE_ALLOCA)
diff -ruN speex-1.1.10/Makefile.am speex/Makefile.am
--- speex-1.1.10/Makefile.am Thu Jun 9 08:22:08 2005
+++ speex/Makefile.am Fri Aug 26 14:55:35 2005
diff -ruN speex-1.1.12/Makefile.am speex/Makefile.am
--- speex-1.1.12/Makefile.am 2005-11-23 12:42:56.000000000 +0100
+++ speex/Makefile.am 2006-07-11 21:34:45.000000000 +0200
@@ -13,9 +13,9 @@
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
#Fools KDevelop into including all files
-SUBDIRS = libspeex include @src@ doc win32 symbian
+SUBDIRS = libspeex include doc win32 symbian
-SUBDIRS = libspeex include @src@ doc win32 symbian ti
+SUBDIRS = libspeex include doc win32 symbian ti
-DIST_SUBDIRS = libspeex include src doc win32 symbian
+DIST_SUBDIRS = libspeex include doc win32 symbian
-DIST_SUBDIRS = libspeex include src doc win32 symbian ti
+DIST_SUBDIRS = libspeex include doc win32 symbian ti
rpm: dist
rpmbuild -ta ${PACKAGE}-${VERSION}.tar.gz
diff -ruN speex-1.1.10/Makefile.in speex/Makefile.in
--- speex-1.1.10/Makefile.in Thu Jun 9 08:25:48 2005
+++ speex/Makefile.in Fri Aug 26 14:56:21 2005
diff -ruN speex-1.1.12/Makefile.in speex/Makefile.in
--- speex-1.1.12/Makefile.in 2006-02-10 11:13:16.000000000 +0100
+++ speex/Makefile.in 2006-07-11 21:35:15.000000000 +0200
@@ -194,8 +194,8 @@
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in
EXTRA_DIST = Speex.spec Speex.spec.in Speex.kdevelop speex.m4 speex.pc.in README.blackfin README.symbian README.TI-DSP
#Fools KDevelop into including all files
-SUBDIRS = libspeex include @src@ doc win32 symbian
-DIST_SUBDIRS = libspeex include src doc win32 symbian
+SUBDIRS = libspeex include doc win32 symbian
+DIST_SUBDIRS = libspeex include doc win32 symbian
-SUBDIRS = libspeex include @src@ doc win32 symbian ti
-DIST_SUBDIRS = libspeex include src doc win32 symbian ti
+SUBDIRS = libspeex include doc win32 symbian ti
+DIST_SUBDIRS = libspeex include doc win32 symbian ti
all: config.h
$(MAKE) $(AM_MAKEFLAGS) all-recursive
extras/contrib/src/Patches/theora.patch
View file @ 2ef0df8a
diff -ruN libtheora-1.0alpha5/Makefile.am libtheora/Makefile.am
--- libtheora-1.0alpha5/Makefile.am Mon Aug 15 20:02:15 2005
+++ libtheora/Makefile.am Thu Aug 25 21:11:34 2005
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
-SUBDIRS = lib include doc examples debian tests
+SUBDIRS = lib include doc debian tests
EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
theora-uninstalled.pc.in
diff -ruN libtheora-1.0alpha5/Makefile.in libtheora/Makefile.in
--- libtheora-1.0alpha5/Makefile.in Sat Aug 20 21:30:42 2005
+++ libtheora/Makefile.in Thu Aug 25 21:11:46 2005
@@ -224,7 +224,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
-SUBDIRS = lib include doc examples debian tests
+SUBDIRS = lib include doc debian tests
EXTRA_DIST = COPYING autogen.sh win32 libtheora.spec libtheora.spec.in \
theora-uninstalled.pc.in
diff -ruN libtheora-1.0alpha5/configure.ac libtheora/configure.ac
--- libtheora-1.0alpha5/configure.ac 2005-08-20 20:43:13.000000000 +0200
+++ libtheora/configure.ac 2005-11-14 22:49:14.000000000 +0100
@@ -89,7 +89,7 @@
diff -ruN libtheora-1.0alpha7/configure.ac libtheora/configure.ac
--- libtheora-1.0alpha7/configure.ac 2006-06-20 22:04:50.000000000 +0200
+++ libtheora/configure.ac 2006-07-11 20:08:04.000000000 +0200
@@ -88,7 +88,7 @@
case $host in
*)
DEBUG="-g"
DEBUG="-g -DDEBUG"
- CFLAGS="-O"
+ EXTRA_CFLAGS="-O"
PROFILE="-g -p" ;;
PROFILE="-g -p -DDEBUG" ;;
esac
else
@@ -97,12 +97,12 @@
@@ -96,11 +96,11 @@
case $host in
*)
DEBUG="-g -W -D__NO_MATH_INLINES"
- CFLAGS="-g -O2 -Wall"
+ EXTRA_CFLAGS="-g -O2 -Wall"
PROFILE="-W -pg -g -O2 -fno-inline-functions";;
DEBUG="-g -Wall -DDEBUG -D__NO_MATH_INLINES"
- CFLAGS="-Wall -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
+ EXTRA_CFLAGS="-Wall -O3 -fforce-addr -fomit-frame-pointer -finline-functions -funroll-loops"
PROFILE="-Wall -pg -g -O3 -fno-inline-functions -DDEBUG";;
esac
fi
-CFLAGS="$CFLAGS $cflags_save"
-LDFLAGS="$LDFLAGS $ldflags_save"
+CFLAGS="$EXTRA_CFLAGS $cflags_save"
+LDFLAGS="$EXTRA_LDFLAGS $ldflags_save"
dnl Set extra linker options
case "$target_os" in
cpu_x86_64=no
cpu_x86_32=no
diff -ruN libtheora-1.0alpha7/Makefile.am libtheora/Makefile.am
--- libtheora-1.0alpha7/Makefile.am 2006-06-13 00:57:36.000000000 +0200
+++ libtheora/Makefile.am 2006-07-11 20:04:43.000000000 +0200
@@ -2,7 +2,7 @@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
-SUBDIRS = lib include doc examples tests m4
+SUBDIRS = lib include doc tests m4
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
diff -ruN libtheora-1.0alpha7/Makefile.in libtheora/Makefile.in
--- libtheora-1.0alpha7/Makefile.in 2006-06-20 22:06:56.000000000 +0200
+++ libtheora/Makefile.in 2006-07-11 20:05:06.000000000 +0200
@@ -231,7 +231,7 @@
target_os = @target_os@
target_vendor = @target_vendor@
AUTOMAKE_OPTIONS = foreign 1.6 dist-zip dist-bzip2
-SUBDIRS = lib include doc examples tests m4
+SUBDIRS = lib include doc tests m4
# we include the whole debian/ dir in EXTRA_DIST because there's a problem
# with autotools and HFS+ MacOSX file systems that caused debian/Makefile.am
extras/contrib/src/Patches/x264-svn-win32.patch
View file @ 2ef0df8a
Index: configure
===================================================================
--- configure (revision 473)
--- configure (revision 538)
+++ configure (working copy)
@@ -7,6 +7,7 @@
echo "available options:"
......@@ -10,7 +10,7 @@ Index: configure
echo " --enable-avis-input enables avisynth input (win32 only)"
echo " --enable-mp4-output enables mp4 output (using gpac)"
echo " --enable-vfw compiles the VfW frontend"
@@ -64,43 +65,143 @@
@@ -64,48 +65,147 @@
EXE=""
......@@ -114,7 +114,6 @@ Index: configure
+ ;;
+ esac
+done
+
+
case "$UNAMES" in
- BeOS)
......@@ -138,6 +137,12 @@ Index: configure
SYS="NETBSD"
LDFLAGS="$LDFLAGS -lm"
;;
- OpenBSD)
+ openbsd)
SYS="OPENBSD"
CFLAGS="$CFLAGS -I/usr/X11R6/include"
LDFLAGS="$LDFLAGS -lm"
;;
- Linux)
+ linux)
SYS="LINUX"
......@@ -163,7 +168,7 @@ Index: configure
SYS="SunOS"
CFLAGS="$CFLAGS -DHAVE_MALLOC_H"
LDFLAGS="$LDFLAGS -lm"
@@ -112,9 +213,8 @@
@@ -117,9 +217,8 @@
;;
esac
......@@ -174,7 +179,7 @@ Index: configure
ARCH="X86"
CFLAGS="$CFLAGS -DHAVE_MMXEXT -DHAVE_SSE2"
AS="nasm"
@@ -135,7 +235,7 @@
@@ -140,7 +239,7 @@
AS="yasm"
ASFLAGS="-f elf -m amd64"
;;
......@@ -183,7 +188,7 @@ Index: configure
ARCH="PPC"
if [ $SYS = MACOSX ]
then
@@ -183,90 +283,7 @@
@@ -188,90 +287,7 @@
CFLAGS="$CFLAGS -DARCH_$ARCH -DSYS_$SYS"
......@@ -274,7 +279,7 @@ Index: configure
# autodetect options that weren't forced nor disabled
if test "$pthread" = "auto" ; then
@@ -351,6 +368,9 @@
@@ -356,6 +372,9 @@
ASFLAGS=$ASFLAGS
VFW=$vfw
EXE=$EXE
......@@ -286,7 +291,7 @@ Index: configure
DEVNULL=$DEVNULL
Index: Makefile
===================================================================
--- Makefile (revision 473)
--- Makefile (revision 538)
+++ Makefile (working copy)
@@ -64,8 +64,8 @@
default: $(DEP) x264$(EXE)
......@@ -298,10 +303,10 @@ Index: Makefile
+ $(RANLIB) libx264.a
$(SONAME): .depend $(OBJS) $(OBJASM)
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME)
@@ -133,14 +133,14 @@
$(CC) -shared -o $@ $(OBJS) $(OBJASM) -Wl,-soname,$(SONAME) $(LDFLAGS)
@@ -134,14 +134,14 @@
distclean: clean
rm -f config.mak config.h vfw/build/cygwin/config.mak x264.pc
rm -f config.mak config.h vfw/build/cygwin/config.mak gtk/config.mak x264.pc
-install: x264 $(SONAME)
+install: x264$(EXE)
......@@ -312,8 +317,8 @@ Index: Makefile
install -m 644 x264.pc $(DESTDIR)$(libdir)/pkgconfig
- install x264 $(DESTDIR)$(bindir)
- ranlib $(DESTDIR)$(libdir)/libx264.a
+ install x264$(EXE) $(DESTDIR)$(bindir)
+ install x264$(EXE) $(DESTDIR)$(bindir)
+ $(RANLIB) $(DESTDIR)$(libdir)/libx264.a
$(if $(SONAME), ln -sf $(DESTDIR)$(libdir)/$(SONAME) $(DESTDIR)$(libdir)/libx264.so)
$(if $(SONAME), ln -sf $(SONAME) $(DESTDIR)$(libdir)/libx264.so)
$(if $(SONAME), install -m 755 $(SONAME) $(DESTDIR)$(libdir))
extras/contrib/src/packages.mak
View file @ 2ef0df8a
......@@ -26,7 +26,7 @@
GNU=http://ftp.belnet.be/mirror/ftp.gnu.org/gnu
SF=http://switch.dl.sourceforge.net/sourceforge
VIDEOLAN=http://download.videolan.org/pub/videolan
PERL_VERSION=5.8.5
PERL_VERSION=5.8.8
PERL_URL=http://ftp.funet.fi/pub/CPAN/src/perl-$(PERL_VERSION).tar.gz
# Autoconf > 2.57 doesn't work ok on BeOS. Don't ask why.
# we have to use a newer though, because bootstrap won't work otherwise
......@@ -38,14 +38,14 @@ AUTOMAKE_VERSION=1.9.6
AUTOMAKE_URL=$(GNU)/automake/automake-$(AUTOMAKE_VERSION).tar.gz
PKGCFG_VERSION=0.15.0
PKGCFG_URL=http://pkgconfig.freedesktop.org/releases/pkgconfig-$(PKGCFG_VERSION).tar.gz
LIBICONV_VERSION=1.9.1
LIBICONV_VERSION=1.9.2
LIBICONV_URL=$(GNU)/libiconv/libiconv-$(LIBICONV_VERSION).tar.gz
GETTEXT_VERSION=0.14.5
GETTEXT_VERSION=0.14.6
GETTEXT_URL=$(GNU)/gettext/gettext-$(GETTEXT_VERSION).tar.gz
FREETYPE2_VERSION=2.1.9
FREETYPE2_URL=$(SF)/freetype/freetype-$(FREETYPE2_VERSION).tar.gz
FRIBIDI_VERSION=0.10.4
FRIBIDI_URL=$(SF)/fribidi/fribidi-$(FRIBIDI_VERSION).tar.gz
FRIBIDI_URL=http://fribidi.org/download/fribidi-$(FRIBIDI_VERSION).tar.gz
A52DEC_VERSION=0.7.4
A52DEC_URL=$(VIDEOLAN)/testing/contrib/a52dec-$(A52DEC_VERSION).tar.gz
MPEG2DEC_VERSION=0.4.1-cvs
......@@ -56,16 +56,16 @@ LIBID3TAG_VERSION=0.15.1b
LIBID3TAG_URL=$(VIDEOLAN)/testing/contrib/libid3tag-$(LIBID3TAG_VERSION).tar.gz
LIBMAD_VERSION=0.15.1b
LIBMAD_URL=$(VIDEOLAN)/testing/contrib/libmad-$(LIBMAD_VERSION).tar.gz
OGG_VERSION=1.1.2
OGG_VERSION=1.1.3
OGG_URL=http://downloads.xiph.org/releases/ogg/libogg-$(OGG_VERSION).tar.gz
OGG_CVSROOT=:pserver:anoncvs@xiph.org:/usr/local/cvsroot
VORBIS_VERSION=1.1.1
VORBIS_VERSION=1.1.2
VORBIS_URL=http://downloads.xiph.org/releases/vorbis/libvorbis-$(VORBIS_VERSION).tar.gz
THEORA_VERSION=1.0alpha5
THEORA_URL=$(VIDEOLAN)/testing/contrib/libtheora-$(THEORA_VERSION).tar.bz2
THEORA_VERSION=1.0alpha7
THEORA_URL=http://downloads.xiph.org/releases/theora/libtheora-$(THEORA_VERSION).tar.bz2
FLAC_VERSION=1.1.2
FLAC_URL=$(SF)/flac/flac-$(FLAC_VERSION).tar.gz
SPEEX_VERSION=1.1.10
SPEEX_VERSION=1.1.12
SPEEX_URL=http://downloads.us.xiph.org/releases/speex/speex-$(SPEEX_VERSION).tar.gz
SHOUT_VERSION=2.2
SHOUT_URL=http://downloads.us.xiph.org/releases/libshout/libshout-$(SHOUT_VERSION).tar.gz
......@@ -76,14 +76,14 @@ FAAC_VERSION=1.24
FAAC_URL=$(VIDEOLAN)/testing/contrib/faac-$(FAAC_VERSION).tar.bz2
LAME_VERSION=3.97b2
LAME_URL=$(SF)/lame/lame-$(LAME_VERSION).tar.gz
LIBEBML_VERSION=0.7.6
LIBEBML_VERSION=0.7.7
LIBEBML_URL=http://dl.matroska.org/downloads/libebml/libebml-$(LIBEBML_VERSION).tar.bz2
LIBMATROSKA_VERSION=0.8.0
LIBMATROSKA_URL=http://dl.matroska.org/downloads/libmatroska/libmatroska-$(LIBMATROSKA_VERSION).tar.bz2
FFMPEG_VERSION=0.4.8
FFMPEG_URL=$(SF)/ffmpeg/ffmpeg-$(FFMPEG_VERSION).tar.gz
FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk
LIBDVDCSS_VERSION=1.2.8
LIBDVDCSS_VERSION=1.2.9
LIBDVDCSS_URL=$(VIDEOLAN)/libdvdcss/$(LIBDVDCSS_VERSION)/libdvdcss-$(LIBDVDCSS_VERSION).tar.gz
LIBDVDREAD_VERSION=20041028
LIBDVDREAD_URL=$(VIDEOLAN)/contrib/libdvdread-$(LIBDVDREAD_VERSION).tar.bz2
......@@ -101,8 +101,8 @@ LIBCACA_URL=http://sam.zoy.org/libcaca/libcaca-$(LIBCACA_VERSION).tar.gz
LIBDTS_VERSION=0.0.2
LIBDTS_URL=http://debian.unnet.nl/pub/videolan/libdts/$(LIBDTS_VERSION)/libdts-$(LIBDTS_VERSION).tar.gz
LIBDCA_SVN=svn://svn.videolan.org/libdca/trunk
MODPLUG_VERSION=0.7
MODPLUG_URL=$(VIDEOLAN)/testing/contrib/libmodplug-$(MODPLUG_VERSION).tar.gz
MODPLUG_VERSION=0.8
MODPLUG_URL=$(SF)/modplug-xmms/libmodplug-$(MODPLUG_VERSION).tar.gz
MASH_VERSION=5.2
MASH_URL=$(SF)/openmash/mash-src-$(MASH_VERSION).tar.gz
CDDB_VERSION=1.2.1
......@@ -111,15 +111,15 @@ VCDIMAGER_VERSION=0.7.21
VCDIMAGER_URL=$(GNU)/vcdimager/vcdimager-$(VCDIMAGER_VERSION).tar.gz
CDIO_VERSION=0.72
CDIO_URL=$(GNU)/libcdio/libcdio-$(CDIO_VERSION).tar.gz
PNG_VERSION=1.2.8
PNG_URL=$(VIDEOLAN)/testing/contrib/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.1
PNG_VERSION=1.2.12
PNG_URL=$(SF)/libpng/libpng-$(PNG_VERSION).tar.bz2
GPGERROR_VERSION=1.3
GPGERROR_URL=http://ftp.gnupg.org/gcrypt/libgpg-error/libgpg-error-$(GPGERROR_VERSION).tar.gz
#GPGERROR_URL=$(VIDEOLAN)/testing/contrib/libgpg-error-$(GPGERROR_VERSION).tar.gz
GCRYPT_VERSION=1.2.2
GCRYPT_URL=http://ftp.gnupg.org/gcrypt/libgcrypt/libgcrypt-$(GCRYPT_VERSION).tar.bz2
#GCRYPT_URL=$(VIDEOLAN)/testing/contrib/libgcrypt-$(GCRYPT_VERSION).tar.bz2
GNUTLS_VERSION=1.2.10
GNUTLS_VERSION=1.4.0
GNUTLS_URL=http://ftp.gnupg.org/gcrypt/gnutls/gnutls-$(GNUTLS_VERSION).tar.bz2
DAAP_VERSION=0.4.0
DAAP_URL=http://craz.net/programs/itunes/files/libopendaap-$(DAAP_VERSION).tar.bz2
......@@ -133,7 +133,7 @@ LIBIDL_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win
GLIB_WIN32_BIN_URL=ftp://ftp.mozilla.org/pub/mozilla.org/mozilla/libraries/win32/historic/vc6/glib-19990228.zip
MOZILLA_VERSION=1.7.5
MOZILLA_URL=http://ftp.mozilla.org/pub/mozilla.org/mozilla/releases/mozilla$(MOZILLA_VERSION)/source/mozilla-source-$(MOZILLA_VERSION).tar.bz2
TWOLAME_VERSION=0.3.2
TWOLAME_VERSION=0.3.8
TWOLAME_URL=$(SF)/twolame/twolame-$(TWOLAME_VERSION).tar.gz
X264_VERSION=20050609
X264_URL=$(VIDEOLAN)/testing/contrib/x264-$(X264_VERSION).tar.gz
......@@ -145,16 +145,16 @@ SDL_VERSION=1.2.8
SDL_URL=http://www.libsdl.org/release/SDL-$(SDL_VERSION).tar.gz
SDL_IMAGE_VERSION=1.2.4
SDL_IMAGE_URL=http://www.libsdl.org/projects/SDL_image/release/SDL_image-$(SDL_IMAGE_VERSION).tar.gz
MUSE_VERSION=1.2.1
MUSE_VERSION=1.2.2
#MUSE_URL=http://files.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
MUSE_URL=$(VIDEOLAN)/testing/contrib/libmpcdec-$(MUSE_VERSION).tar.bz2
MUSE_URL=http://files2.musepack.net/source/libmpcdec-$(MUSE_VERSION).tar.bz2
WXWIDGETS_VERSION=2.6.3
WXWIDGETS_URL=$(SF)/wxwindows/wxWidgets-$(WXWIDGETS_VERSION).tar.gz
QT4_VERSION=4.1.3
QT4_URL=$(VIDEOLAN)/testing/contrib/qt4-$(QT4_VERSION)-bin-win32.tar.gz
ZLIB_VERSION=1.2.3
ZLIB_URL=$(SF)/libpng/zlib-$(ZLIB_VERSION).tar.gz
XML_VERSION=2.6.20
XML_VERSION=2.6.22
XML_URL=ftp://xmlsoft.org/libxml2/libxml2-$(XML_VERSION).tar.gz
DIRAC_VERSION=0.5.3
DIRAC_URL=$(SF)/dirac/dirac-$(DIRAC_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