Commit a9bd5d7e authored by Sam Hocevar's avatar Sam Hocevar

* debian/control:

    + Build-depend on fixed linux-kernel-headers packages.
  * debian/rules:
    + Look for faad in extras/faad2, not extras/faad.
    + Enable postprocessing in the ffmpeg configuration.
    + Activated libcaca video output.
parent 9e519df8
vlc (XXX) unstable; urgency=low
vlc (0.7.0-1) unstable; urgency=low
* New upstream release.
* debian/control:
+ Build-depend on fixed dvb-dev packages.
+ Build-depend on fixed linux-kernel-headers packages.
* debian/rules:
+ Look for faad in extras/faad2, not extras/faad.
+ Enable postprocessing in the ffmpeg configuration.
+ Activated libcaca video output.
* doc/vlc.1:
+ Fixed a minor typo (Closes: #223605).
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> XXX
-- Sam Hocevar (Debian packages) <sam+deb@zoy.org> Sun, 4 Jan 2004 03:29:22 +0100
vlc (0.6.2+cvs20031030-2) unstable; urgency=low
......
......@@ -2,7 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Sam Hocevar (Debian packages) <sam+deb@zoy.org>
Build-Depends: debhelper (>= 4.0), gettext, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>= 1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev (>= 1.0.1-6), libdv2-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.5.0-3), libfreetype6-dev, libspeex-dev
Build-Depends: debhelper (>= 4.0), gettext, xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>= 1.2.2-3.1), libqt3-mt-dev, libqt3-compat-headers, libasound2-dev (>= 0.9.0beta10a), libarts1-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi2-dev, mozilla-dev, libidl0, libglib2.0-0, kdelibs4-dev, dvb-dev (>= 1.0.1-6), libdv2-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.5.0-3), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.6)
Build-Conflicts: libmpeg2-dev, libmpeg2-0-dev, libmpeg2-1-dev, libmpeg2-2-dev, libmpeg2-3-dev
Standards-Version: 3.6.1.0
......
#!/usr/bin/make -f
# debian/rules for the VideoLAN Client - uses debhelper.
# $Id: rules,v 1.108 2003/11/01 10:07:09 sam Exp $
# $Id: rules,v 1.109 2004/01/04 04:53:07 sam Exp $
# based on Joey Hess's one.
# Uncomment this to turn on verbose mode.
......@@ -46,11 +46,12 @@ CONFIG_FLAGS += \
--enable-v4l \
--enable-pvr \
--enable-speex \
--enable-caca \
$(NULL)
# These ones are currently shipped with VLC
CONFIG_FLAGS += --enable-ffmpeg --with-ffmpeg-tree=extras/ffmpeg
CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad
CONFIG_FLAGS += --enable-faad --with-faad-tree=extras/faad2
CONFIG_FLAGS += --enable-libmpeg2 --with-libmpeg2-tree=extras/mpeg2dec
# Glide and svgalib are only for x86
......@@ -86,15 +87,15 @@ configure-stamp:
test -d extras/ffmpeg
if test ! -d CVS; then \
cd extras/ffmpeg \
&& ./configure \
&& ./configure --enable-pp \
&& cd libavcodec \
&& $(MAKE); \
fi
# Check that we have an faad tree in here (can be a symlink)
test -d extras/faad
# Check that we have an faad2 tree in here (can be a symlink)
test -d extras/faad2
if test ! -d CVS; then \
cd extras/faad \
cd extras/faad2 \
&& touch `find . -name configure.in` \
&& touch `find . -name aclocal.m4` \
&& touch `find . -name configure` \
......@@ -148,7 +149,7 @@ ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
# HACKETY HACKETY HACK
if test ! -d CVS; then \
cd extras/faad/libfaad \
cd extras/faad2/libfaad \
&& $(MAKE) clean \
&& $(MAKE) AM_CFLAGS=-fPIC; \
fi
......@@ -174,13 +175,18 @@ clean:
# Check that we have an ffmpeg tree in here (can be a symlink)
test -d extras/ffmpeg
-if test ! -d CVS; then cd extras/ffmpeg && $(MAKE) distclean; fi
# Check that we have an faad tree in here (can be a symlink)
test -d extras/faad
-if test ! -d CVS; then cd extras/faad && $(MAKE) distclean; fi
# Check that we have an faad2 tree in here (can be a symlink)
test -d extras/faad2
-if test ! -d CVS; then cd extras/faad2 && $(MAKE) distclean; fi
# Check that we have an mpeg2dec tree in here (can be a symlink)
test -d extras/mpeg2dec
-if test ! -d CVS; then cd extras/mpeg2dec && $(MAKE) distclean; fi
# Removed ugly cruft
rm -f extras/mpeg2dec/include/mpeg2dec
rm -f src/misc/modules_builtin.h
rm -f mozilla/vlcintf.xpt mozilla/vlcintf.h
# Remove spurious autotools stuff
rm -f config.log confdefs.h
......
......@@ -513,3 +513,13 @@ the Boston strangler is to the woman home alone.
-- #videolan
%
<sam> 16K ChangeLog-1999
<sam> 96K ChangeLog-2000
<sam> 168K ChangeLog-2001
<sam> 304K ChangeLog-2002
<sam> 488K ChangeLog-2003
<zorglub> conclusion: les dvs pipotent de plus en plus dans les messages de
commit
-- #videolan
%
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