Commit 916c69e3 authored by Sam Hocevar's avatar Sam Hocevar

* debian/rules debian/control:

    + No longer build a local libmpeg2 since it entered sid.
    + Build the livedotcom plugin.
  * toolbox:
    + No longer remove flac, speex and matroska from the woody build; I will
      provide clean backports.
parent d180753a
......@@ -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.6.2), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.8), gcc-3.2 [powerpc]
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.6.2), libfreetype6-dev, libspeex-dev, linux-kernel-headers (>= 2.5.999-test7-bk-7), libcaca-dev (>= 0.8), gcc-3.2 [powerpc], liblivemedia-dev, libmpeg2-4-dev
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.110 2004/01/20 17:45:19 sam Exp $
# $Id: rules,v 1.111 2004/02/10 14:33:17 sam Exp $
# based on Joey Hess's one.
# Uncomment this to turn on verbose mode.
......@@ -47,12 +47,13 @@ CONFIG_FLAGS += \
--enable-pvr \
--enable-speex \
--enable-caca \
--enable-livedotcom \
--enable-libmpeg2 \
$(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/faad2
CONFIG_FLAGS += --enable-libmpeg2 --with-libmpeg2-tree=extras/mpeg2dec
# Glide and svgalib are only for x86
ifeq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
......@@ -106,21 +107,6 @@ configure-stamp:
&& $(MAKE); \
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 \
&& touch configure.in \
&& touch aclocal.m4 \
&& touch acinclude.m4 \
&& touch configure \
&& touch `find . -name config.h.in` \
&& touch `find . -name Makefile.in` \
&& ./configure --disable-shared \
&& cd libmpeg2 \
&& $(MAKE); \
fi
# Configure VLC
./configure --mandir=$${prefix}/share/man \
--infodir=$${prefix}/share/info $(CONFIG_FLAGS)
......@@ -153,13 +139,6 @@ ifneq ($(shell dpkg-architecture -qDEB_BUILD_GNU_CPU),i386)
&& $(MAKE) clean \
&& $(MAKE) AM_CFLAGS=-fPIC; \
fi
# HACK ME PLENTY MORE!!!
if test ! -d CVS; then \
cd extras/mpeg2dec/libmpeg2 \
&& $(MAKE) clean \
&& $(MAKE) LIBMPEG2_CFLAGS=-fPIC; \
fi
endif
# Build all the rest, with the PIC libs
......@@ -178,12 +157,8 @@ clean:
# 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
......
......@@ -523,3 +523,8 @@ the Boston strangler is to the woman home alone.
-- #videolan
%
-!- kixx_ changed the topic of #videolan to: VLC 0.7.0 :
http://www.videolan.org/ | Fenrir ta cotiz !
-- #videolan
%
#! /bin/sh
## toolbox for the VLC media player
## $Id: toolbox,v 1.55 2004/01/21 14:44:56 sam Exp $
## $Id: toolbox,v 1.56 2004/02/10 14:33:17 sam Exp $
##
## Authors: Samuel Hocevar <sam@zoy.org>
......@@ -628,11 +628,8 @@ then
# ttf-freefont with ttf-thryomanes
# dvb-dev (>= 1.0.1-6) with dvb-dev
# remove libwxgtk2.4-dev
# libflac-dev
# libidl0 (workaround for mozilla-dev's bad deps)
# libglib2.0-0 (workaround for mozilla-dev's bad deps)
# libmatroska-dev
# libspeex-dev
# gcc-3.2 (workaround for an ICE in gcc-3.3)
# change Section: gnome with Section: graphics
# Section: kde with Section: kde
......@@ -650,11 +647,8 @@ then
-e 's/, dvb-dev[^,]*/, dvb-dev/' \
-e 's/, libwx[^,]*//' \
-e '/Package: wxvlc/,/^ *$/d' \
-e 's/, libflac-dev[^,]*//' \
-e 's/, libidl0[^,]*//' \
-e 's/, libglib2.0-0[^,]*//' \
-e 's/, libmatroska-dev[^,]*//' \
-e 's/, libspeex-dev[^,]*//' \
-e 's/, gcc-3.2[^,]*//' \
-e 's/Section: gnome/Section: graphics/' \
-e 's/Section: kde/Section: graphics/' \
......@@ -663,14 +657,9 @@ then
mv "$1/debian/control.woody" "$1/debian/control"
# rules: remove wxwindows and skins stuff
# remove flac support
# remove matroska support
sed -e '/# Package: wxvlc/,/^ *$/d' \
-e 's,--enable-wxwindows,--disable-wxwindows,' \
-e 's,--enable-skins,--disable-skins,' \
-e 's,--enable-flac,--disable-flac,' \
-e 's,--enable-mkv,--disable-mkv,' \
-e 's,--enable-speex,--disable-speex,' \
< "$1/debian/rules" > "$1/debian/rules.woody"
mv "$1/debian/rules.woody" "$1/debian/rules"
chmod 0755 "$1/debian/rules"
......
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