# 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 <massiot@via.ecp.fr>
# Derk-Jan Hartman <hartman at videolan dot org>
# 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)
CLEAN_FILE += .mpeg2
CLEAN_PKG += mpeg2dec
+#DISTCLEAN_PKG += mpeg2dec-$(MPEG2DEC_VERSION)-cvs.tar.gz
DISTCLEAN_PKG += mpeg2dec-$(MPEG2_DEC_VERSION).tar.gz
# ***************************************************************************
.mad: libmad
(cd $<; ./configure --prefix=$(PREFIX) && make && make install)
- $(INSTALL_NAME)
touch $@
CLEAN_FILE += .mad
# (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)
-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 <mpeg4ip.h>
- #include <math.h> /* to define float HUGE_VAL and/or NAN */
+ #include <math.h> /* to define float HUGE_VAL and/or NAN */
+/* Meuuh power */
+#undef NAN
#ifndef NAN
-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
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
# 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 <massiot@via.ecp.fr>
# Derk-Jan Hartman <hartman at videolan dot org>
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
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
-
* 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 <seguin@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
{
return VLC_EGENERIC;
}
+ p_vlc->thread_id = 0;
vlc_thread_set_priority( p_vlc, VLC_THREAD_PRIORITY_LOW );
p_vlc->psz_object_name = "root";
* 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 <polux@via.ecp.fr>
* Samuel Hocevar <sam@zoy.org>
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 )) )
{