+ Activated x264 support.
+ Re-enabled libmodplug support.
+ Build PIC plugins even on x86.
+ Disabled DVB and SLP because their code is broken.
* debian/control:
+ Force the vlc-plugin-arts and qvlc dependencies.
+ Build-depend on jam and nasm because of x264.
* debian/copyright:
+ Converted to UTF-8.
wxvlc.dirs \
wxvlc.menu \
patches/00list \
- patches/20_faad2.dpatch \
patches/20_ffmpeg.dpatch \
patches/20_interfaces.dpatch \
$(NULL)
- To build for a Debian woody system, first build a tarball using
"make dist-woody".
- - Usually VLC will come with a copy of ffmpeg and faad2 in the
+ - Usually VLC will come with a copy of ffmpeg, faad2 and x264 in the
extras/ directory, because they are not yet available in Debian.
- If there is no CVS directory in the root, debian/rules will assume a
- full build is requested and will clean ffmpeg and faad2.
+ full build is requested and will clean ffmpeg, faad2 and x264.
- VLC does not link with libdvdcss by default, thus it will not depend
on the libdvdcss packages. However it will use libdvdread that can
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
-Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev
+Build-Depends: debhelper (>= 4.0), dpatch, gettext, libx11-dev, libxext-dev, libxt-dev, libxv-dev, xlibs-static-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libaudiofile-dev, libsdl1.2-dev (>= 1.2.7-5), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi3-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, libxosd-dev (>= 2.2.4-1.3), svgalibg1-dev (>= 1.4.0) [i386], libogg-dev, libvorbis-dev, libwxgtk2.4-dev (>= 2.4.2.4), libdvdplay0-dev (>= 1.0.1-2), libdvdread3-dev, libslp-dev, libflac-dev (>= 1.1.0), libimlib2-dev, libmatroska-dev (>= 0.7.0), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.9), liblivemedia-dev (>= 2004.04.23-1), libmpeg2-4-dev, zlib1g-dev, libdts-dev, libfribidi-dev, libcdio-dev, libxml2-dev, libid3tag0-dev, libtheora-dev, jam, nasm, libmodplug-dev
Build-Conflicts: libavcodec-dev
Standards-Version: 3.6.1.1
Package: qvlc
Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc (= ${Source-Version}), libqt3c102-mt, ${misc:Depends}
Conflicts: vlc-qt (<< 0.5.0)
Replaces: vlc-qt (<< 0.5.0)
Description: Qt frontend for VLC
Package: vlc-plugin-arts
Architecture: any
-Depends: vlc (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}
+Depends: vlc (= ${Source-Version}), libartsc0, ${misc:Depends}
Conflicts: vlc-arts (<< 0.5.0)
Replaces: vlc-arts (<< 0.5.0)
Description: aRts audio output plugin for VLC
Mon, 13 Mar 2000 02:21:45 +0100.
It was taken from http://download.videolan.org/pub/vlc/0.7.1/, and the source
-tarball also contains the ffmpeg and faad2 trees.
+tarball also contains the ffmpeg, faad2 and x264 trees.
Upstream authors: The VideoLAN Team <videolan@videolan.org>
Tim Ferguson, Brian Foley, Arpad Gereoffy, Philip Gladstone,
Vladimir Gneushev, Falk Hueffner, Zdenek Kabelac, Robin Kay,
Nick Kurshev, Mike Melanson, Michael Niedermayer,
- François Revol, Roman Shaposhnik, Dieter Shirley,
+ François Revol, Roman Shaposhnik, Dieter Shirley,
Juan J. Sierralta, Ewald Snel, Roberto Togni, Lionel Ulmer
+x264 authors: Laurent Aimar <fenrir@via.ecp.fr>
+ Eric Petit <titer@videolan.org>
+ Min Chen <chenm001@163.com>
+ Justin Clay (justin_clay(at)hotmail.com)
+ Måns Rullgård (mru(at)mru.ath.cx)
+
VideoLAN is Copyright 1996-2004 The VideoLAN Team
This program is free software; you can redistribute it and/or modify
-20_faad2
20_ffmpeg
20_interfaces
+++ /dev/null
-#! /bin/sh -e
-## 20_faad2.dpatch by <sam+deb@zoy.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
-if [ $# -lt 1 ]; then
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1
-fi
-
-[ -f debian/patches/00patch-opts ] && . debian/patches/00patch-opts
-patch_opts="${patch_opts:--f --no-backup-if-mismatch} ${2:+-d $2}"
-
-case "$1" in
- -patch) patch -p1 ${patch_opts} < $0;;
- -unpatch) patch -R -p1 ${patch_opts} < $0;;
- *)
- echo "`basename $0`: script expects -patch|-unpatch as argument" >&2
- exit 1;;
-esac
-
-exit 0
-
-@DPATCH@
-diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/Makefile.am vlc-0.7.2.final/extras/faad2/Makefile.am
---- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/Makefile.am 2004-02-06 17:04:39.000000000 +0100
-+++ vlc-0.7.2.final/extras/faad2/Makefile.am 2004-07-29 17:11:18.000000000 +0200
-@@ -3,6 +3,6 @@
- EXTRA_DIST = faad2.spec
-
- rpm: Makefile
-- make dist
-- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-- rm $(PACKAGE)-$(VERSION).tar.gz
-+ make dist
-+ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-+ rm $(PACKAGE)-$(VERSION).tar.gz
-diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/Makefile.in vlc-0.7.2.final/extras/faad2/Makefile.in
---- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/Makefile.in 2004-02-22 02:23:18.000000000 +0100
-+++ vlc-0.7.2.final/extras/faad2/Makefile.in 2004-07-29 17:11:18.000000000 +0200
-@@ -560,9 +560,9 @@
-
-
- rpm: Makefile
-- make dist
-- $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-- rm $(PACKAGE)-$(VERSION).tar.gz
-+ make dist
-+ $(RPMBUILD) -ta $(PACKAGE)-$(VERSION).tar.gz
-+ rm $(PACKAGE)-$(VERSION).tar.gz
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
-diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/plugins/xmms/Makefile vlc-0.7.2.final/extras/faad2/plugins/xmms/Makefile
---- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/extras/faad2/plugins/xmms/Makefile 1970-01-01 01:00:00.000000000 +0100
-+++ vlc-0.7.2.final/extras/faad2/plugins/xmms/Makefile 2004-07-29 17:11:18.000000000 +0200
-@@ -0,0 +1 @@
-+distclean:
exit 0
@DPATCH@
-diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/modules/gui/kde/kde.cpp vlc-0.7.2.final/modules/gui/kde/kde.cpp
---- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/modules/gui/kde/kde.cpp 2004-03-05 20:24:00.000000000 +0100
-+++ vlc-0.7.2.final/modules/gui/kde/kde.cpp 2004-07-29 17:12:39.000000000 +0200
+diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/modules/gui/kde/kde.cpp vlc-0.7.2.svn20040826/modules/gui/kde/kde.cpp
+--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/modules/gui/kde/kde.cpp 2004-08-27 01:17:48.000000000 +0200
++++ vlc-0.7.2.svn20040826/modules/gui/kde/kde.cpp 2004-08-27 01:17:56.000000000 +0200
@@ -53,7 +53,7 @@
/* int i = getenv( "DISPLAY" ) == NULL ? 8 : 85; */
set_description( _("KDE interface") );
set_program( "kvlc" );
set_callbacks( open, close );
vlc_module_end();
-diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/modules/gui/skins2/src/skin_main.cpp vlc-0.7.2.final/modules/gui/skins2/src/skin_main.cpp
---- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/modules/gui/skins2/src/skin_main.cpp 2004-05-21 13:24:58.000000000 +0200
-+++ vlc-0.7.2.final/modules/gui/skins2/src/skin_main.cpp 2004-07-29 17:12:39.000000000 +0200
-@@ -258,7 +258,7 @@
- SKINS2_TRANSPARENCY_LONG, VLC_FALSE );
+diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/modules/gui/skins2/src/skin_main.cpp vlc-0.7.2.svn20040826/modules/gui/skins2/src/skin_main.cpp
+--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/modules/gui/skins2/src/skin_main.cpp 2004-08-27 01:17:48.000000000 +0200
++++ vlc-0.7.2.svn20040826/modules/gui/skins2/src/skin_main.cpp 2004-08-27 01:17:56.000000000 +0200
+@@ -349,7 +349,7 @@
#endif
+
set_description( _("Skinnable Interface") );
- set_capability( "interface", 30 );
-+ set_capability( "interface", 200 );
++ set_capability( "interface", 120 );
set_callbacks( Open, Close );
+ add_shortcut( "skins" );
set_program( "svlc" );
- vlc_module_end();
-diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/src/interface/interface.c vlc-0.7.2.final/src/interface/interface.c
---- /home/sam/debian/official/vlc/debian/vlc-0.7.2.final/src/interface/interface.c 2004-05-17 00:42:55.000000000 +0200
-+++ vlc-0.7.2.final/src/interface/interface.c 2004-07-29 17:12:39.000000000 +0200
-@@ -242,9 +242,11 @@
+diff -urNad /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/src/interface/interface.c vlc-0.7.2.svn20040826/src/interface/interface.c
+--- /home/sam/debian/official/vlc/debian/vlc-0.7.2.svn20040826/src/interface/interface.c 2004-08-27 01:17:48.000000000 +0200
++++ vlc-0.7.2.svn20040826/src/interface/interface.c 2004-08-27 01:17:56.000000000 +0200
+@@ -306,8 +306,10 @@
{
static char *ppsz_interfaces[] =
{
+/*
- "skins", "Skins",
"skins2", "Skins 2",
"wxwindows", "wxWindows",
+*/
--enable-mozilla \
--enable-kde \
--enable-mp4 \
- --enable-dvb \
+ --disable-dvb \
--enable-dv \
--disable-satellite \
--enable-ogg \
--enable-vorbis \
--enable-wxwindows \
- --enable-slp \
+ --disable-slp \
--enable-flac \
--disable-skins \
--disable-basic-skins \
--enable-cdio \
--enable-mod \
--enable-theora \
+ --enable-modplug \
$(NULL)
# These ones are currently shipped with VLC
CONFIG_FLAGS += --enable-ffmpeg --with-ffmpeg-tree=extras/ffmpeg
+#CONFIG_FLAGS += --enable-ffmpegaltivec
CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad2
+CONFIG_FLAGS += --enable-x264 --with-x264-tree=extras/x264
# Glide and svgalib are only for x86
ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
test -d extras/ffmpeg
if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/ffmpeg \
- && CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug \
+ && CC=$(CC) ./configure --enable-pp --enable-gpl --enable-zlib --disable-debug --disable-mmx \
&& cd libavcodec \
&& $(MAKE); \
fi
+ # Check that we have an x264 tree in here (can be a symlink)
+ test -d extras/x264
+ if test ! '(' -d CVS -o -d .svn ')'; then \
+ cd extras/x264 \
+ && jam -dx libx264.a; \
+ fi
+
# Check that we have an faad2 tree in here (can be a symlink)
test -d extras/faad2
if test ! '(' -d CVS -o -d .svn ')'; then \
cd modules && AM_MAKEFLAGS='plugin=no pic=no' $(MAKE)
$(MAKE) vlc
-ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
# Hackety hackety hack
if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/ffmpeg/libavcodec \
&& rm -f Makefile.pic; \
fi
+ # Hackety hackety hack
+ if test ! '(' -d CVS -o -d .svn ')'; then \
+ cd extras/x264 \
+ && jam -dx clean \
+ && rm -f Jamfile.pic \
+ && sed 's/^CCFLAGS *=/& -fPIC -DPIC /' <Jamfile >Jamfile.pic \
+ && jam -dx -sJAMFILE=Jamfile.pic libx264.a \
+ && rm -f Jamfile.pic; \
+ fi
+
# HACKETY HACKETY HACK
if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/faad2/libfaad \
&& $(MAKE) clean \
&& $(MAKE) AM_CFLAGS=-fPIC; \
fi
-endif
# Build all the rest, with the PIC libs
AM_MAKEFLAGS='builtin=no' $(MAKE)
-if test ! '(' -d CVS -o -d .svn ')'; then \
cd extras/ffmpeg && $(MAKE) distclean; \
fi
+ # Check that we have an x264 tree in here (can be a symlink)
+ test -d extras/x264
+ -if test ! '(' -d CVS -o -d .svn ')'; then \
+ cd extras/x264 && jam -dx clean; \
+ fi
# Check that we have an faad2 tree in here (can be a symlink)
test -d extras/faad2
-if test ! '(' -d CVS -o -d .svn ')'; then \
# Remove spurious autotools stuff
rm -f config.log confdefs.h
- touch configure.ac -d yesterday
- touch aclocal.m4 -d yesterday
- touch configure -d yesterday
- touch config.h.in -d yesterday
- touch `find . -name Makefile.in` -d yesterday
-$(MAKE) distclean
dh_clean
projects / vlc / commitdiff