From c37f12306579dd7abffbda18f78800a223889a40 Mon Sep 17 00:00:00 2001 From: Christophe Massiot Date: Sun, 22 Feb 2004 15:41:27 +0000 Subject: [PATCH] * Updated contrib build system * src/misc/threads.c: fixed a Darwin-specific bug introduced recently --- extras/contrib/src/Makefile | 15 +++++---- extras/contrib/src/Patches/faad2.patch | 14 +++------ extras/contrib/src/Patches/ffmpeg.patch.cvs | 34 ++------------------- extras/contrib/src/packages.mak | 11 +++---- src/libvlc.c | 3 +- src/misc/threads.c | 4 ++- 6 files changed, 26 insertions(+), 55 deletions(-) diff --git a/extras/contrib/src/Makefile b/extras/contrib/src/Makefile index 7eeb13acf1..79d923ddbf 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.15 2004/02/09 12:54:47 hartman Exp $ +# $Id: Makefile,v 1.16 2004/02/22 15:41:27 massiot Exp $ # # Authors: Christophe Massiot # Derk-Jan Hartman @@ -261,6 +261,9 @@ DISTCLEAN_PKG += a52dec-$(A52DEC_VERSION).tar.gz # cvs -d $(MPEG2DEC_CVSROOT) co mpeg2dec # (cd $@; ./bootstrap) +#mpeg2dec-$(MPEG2DEC_VERSION).tar.gz: +# $(WGET) $(MPEG2DEC_URL) + # It is easier to use bootstrapped versions... mpeg2dec-$(MPEG2DEC_VERSION).tar.gz: $(WGET) $(MPEG2DEC_SNAPSHOT) @@ -275,6 +278,7 @@ mpeg2dec: mpeg2dec-$(MPEG2DEC_VERSION).tar.gz CLEAN_FILE += .mpeg2 CLEAN_PKG += mpeg2dec +#DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz DISTCLEAN_PKG += mpeg2dec-$(MPEG2_DEC_VERSION).tar.gz # *************************************************************************** @@ -308,7 +312,6 @@ libmad: libmad-$(LIBMAD_VERSION).tar.gz .mad: libmad (cd $<; ./configure --prefix=$(PREFIX) && make && make install) - $(INSTALL_NAME) touch $@ CLEAN_FILE += .mad @@ -438,12 +441,12 @@ DISTCLEAN_PKG += speex-$(SPEEX_VERSION).tar.gz # (cd $@; patch -p 0 < ../Patches/faad2.patch) # (cd $@; sh ./bootstrap) -faad2-$(FAAD2_VERSION).tar.gz: +faad2-$(FAAD2_VERSION).tar.bz2: $(WGET) $(FAAD2_URL) -faad2: faad2-$(FAAD2_VERSION).tar.gz - $(EXTRACT_GZ) - (cd $@; patch -p 0 < ../Patches/faad2.patch) +faad2: faad2-$(FAAD2_VERSION).tar.bz2 + $(EXTRACT_BZ2) + patch -p 0 < Patches/faad2.patch .faad: faad2 (cd $<; ./configure --prefix=$(PREFIX) && make -C libfaad && make -C libfaad install) diff --git a/extras/contrib/src/Patches/faad2.patch b/extras/contrib/src/Patches/faad2.patch index a41958cf76..f49e6ab041 100644 --- a/extras/contrib/src/Patches/faad2.patch +++ b/extras/contrib/src/Patches/faad2.patch @@ -1,14 +1,10 @@ -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 +diff -ru faad2.old/common/mp4v2/mp4.h faad2/common/mp4v2/mp4.h +--- faad2.old/common/mp4v2/mp4.h Sun Feb 22 14:04:55 2004 ++++ faad2/common/mp4v2/mp4.h Sun Feb 22 14:18:41 2004 @@ -27,6 +27,8 @@ - #include "mpeg4ip.h" + #include - #include /* to define float HUGE_VAL and/or NAN */ + #include /* to define float HUGE_VAL and/or NAN */ +/* Meuuh power */ +#undef NAN #ifndef NAN diff --git a/extras/contrib/src/Patches/ffmpeg.patch.cvs b/extras/contrib/src/Patches/ffmpeg.patch.cvs index 44b742cbf7..901ae7534b 100644 --- a/extras/contrib/src/Patches/ffmpeg.patch.cvs +++ b/extras/contrib/src/Patches/ffmpeg.patch.cvs @@ -1,33 +1,3 @@ -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 @@ -60,8 +30,8 @@ diff -ru ffmpeg.old/libavcodec/libpostproc/Makefile ffmpeg/libavcodec/libpostpro 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 ++ mkdir -p $(prefix)/include/postproc ++ install -m 644 postprocess.h $(prefix)/include/postproc/postprocess.h endif diff --git a/extras/contrib/src/packages.mak b/extras/contrib/src/packages.mak index d70c955df5..aa4cbc51c4 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.13 2004/02/09 12:54:47 hartman Exp $ +# $Id: packages.mak,v 1.14 2004/02/22 15:41:27 massiot Exp $ # # Authors: Christophe Massiot # Derk-Jan Hartman @@ -61,14 +61,14 @@ 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_VERSION=2.0 +FAAD2_URL=$(VIDEOLAN)/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 @@ -92,4 +92,3 @@ 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 - diff --git a/src/libvlc.c b/src/libvlc.c index 20530526d8..3a6ea1a466 100644 --- a/src/libvlc.c +++ b/src/libvlc.c @@ -2,7 +2,7 @@ * libvlc.c: main libvlc source ***************************************************************************** * Copyright (C) 1998-2004 VideoLAN - * $Id: libvlc.c,v 1.116 2004/02/22 15:03:33 gbazin Exp $ + * $Id: libvlc.c,v 1.117 2004/02/22 15:41:27 massiot Exp $ * * Authors: Vincent Seguin * Samuel Hocevar @@ -204,6 +204,7 @@ int VLC_Create( void ) { return VLC_EGENERIC; } + p_vlc->thread_id = 0; vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW ); p_vlc->psz_object_name = "root"; diff --git a/src/misc/threads.c b/src/misc/threads.c index 3b2072c39d..789587722a 100644 --- a/src/misc/threads.c +++ b/src/misc/threads.c @@ -2,7 +2,7 @@ * threads.c : threads implementation for the VideoLAN client ***************************************************************************** * Copyright (C) 1999-2004 VideoLAN - * $Id: threads.c,v 1.46 2004/02/20 17:20:01 massiot Exp $ + * $Id: threads.c,v 1.47 2004/02/22 15:41:27 massiot Exp $ * * Authors: Jean-Marc Dressler * Samuel Hocevar @@ -668,6 +668,8 @@ int __vlc_thread_set_priority( vlc_object_t *p_this, char * psz_file, param.sched_priority = i_priority; i_policy = SCHED_RR; } + if ( !p_this->thread_id ) + p_this->thread_id = pthread_self(); if ( (i_error = pthread_setschedparam( p_this->thread_id, i_policy, ¶m )) ) { -- 2.39.2