Commit 2c7a2e20 authored by Sam Hocevar's avatar Sam Hocevar

* ./debian/control: removed versioned dependency on libxosd.

  * ./debian/rules: added comments here and there.
parent 2a55093c
......@@ -2,7 +2,7 @@ Source: vlc
Section: graphics
Priority: optional
Maintainer: Samuel Hocevar <sam@zoy.org>
Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs-dev, dvb-dev, libdv2-dev, libxosd-dev (>=1.0.2-1), svgalibg1-dev (>=1.4.0), libogg-dev, libvorbis-dev
Build-Depends: debhelper (>=2.2.0), xlibs-dev, xlibs-pic, libgnome-dev, libggi2-dev, libglide2-dev [i386], libesd0-dev, libsdl1.2-dev (>=1.2.2-3.1), libqt-dev, libasound2-dev (>=0.9.0beta10a), libarts-dev, libmad0-dev, liblircclient-dev, liba52-0.7.4-dev, aalib1-dev, libdvbpsi1-dev, mozilla-dev, kdelibs-dev, dvb-dev, libdv2-dev, libxosd-dev, svgalibg1-dev (>=1.4.0), libogg-dev, libvorbis-dev
Standards-Version: 3.5.6
Package: vlc
......@@ -265,7 +265,7 @@ Description: a multimedia plugin for Mozilla, based on vlc
This plugin adds support for MPEG, MPEG2, DVD and DivX to your Mozilla
browser. The decoding process is done by vlc and the output window is
embedded in a webpage or directly in the browser window. There is also
support for fullscreen display.
support for fullscreen display and javascript control.
Package: kvlc
Architecture: any
......
......@@ -13,16 +13,46 @@ export DH_COMPAT=3
#
CONFIG_FLAGS = --enable-release --prefix=/usr
CONFIG_FLAGS += --enable-gnome --enable-gtk --enable-familiar --enable-fb --enable-ggi --enable-sdl --enable-esd --enable-qt --enable-mad --enable-arts --enable-alsa --enable-lirc --enable-a52 --enable-aa --enable-dvbpsi --enable-xosd --enable-mozilla --enable-kde --enable-mp4 --enable-dvb --enable-dv --enable-svgalib --enable-satellite --enable-ogg --enable-vorbis
CONFIG_FLAGS += \
--enable-gnome \
--enable-gtk \
--enable-familiar \
--enable-fb \
--enable-ggi \
--enable-sdl \
--enable-esd \
--enable-qt \
--enable-mad \
--enable-arts \
--enable-alsa \
--enable-lirc \
--enable-a52 \
--enable-aa \
--enable-dvbpsi \
--enable-xosd \
--enable-mozilla \
--enable-kde \
--enable-mp4 \
--enable-dvb \
--enable-dv \
--enable-svgalib \
--enable-satellite \
--enable-ogg \
--enable-vorbis \
$(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
# Glide is only for x86
ifeq ($(DEB_BUILD_ARCH),i386)
CONFIG_FLAGS += --enable-glide
else
ARCH_EXCLUDE = -Nvlc-plugin-glide
endif
# Remove --without-dvdcss here in non-totalitarian countries
# Remove --without-dvdcss in non-totalitarian countries
CONFIG_FLAGS += --enable-dvd --without-dvdcss
VIDDIR = usr/share/vlc
......@@ -39,15 +69,15 @@ build-stamp:
# Check that we have an ffmpeg tree in here (can be a symlink)
test -d extras/ffmpeg
if test "$(PRESERVE_EXTRAS)" != "1"; then cd extras/ffmpeg && ./configure && make; fi
if test "$(PRESERVE_EXTRAS)" = ""; then cd extras/ffmpeg && ./configure && make; fi
# Check that we have an faad tree in here (can be a symlink)
test -d extras/faad
if test "$(PRESERVE_EXTRAS)" != "1"; then cd extras/faad && ./configure && cd libfaad && make; fi
if test "$(PRESERVE_EXTRAS)" = ""; then cd extras/faad && ./configure --disable-shared && cd libfaad && make; fi
# Configure VLC and build it
./configure --mandir=$${prefix}/share/man \
--infodir=$${prefix}/share/info $(CONFIG_FLAGS)
$(MAKE)
touch build-stamp
......@@ -59,10 +89,10 @@ clean:
# Check that we have an ffmpeg tree in here (can be a symlink)
test -d extras/ffmpeg
-if test "$(PRESERVE_EXTRAS)" != "1"; then cd extras/ffmpeg && make distclean; fi
-if test "$(PRESERVE_EXTRAS)" = ""; 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 "$(PRESERVE_EXTRAS)" != "1"; then cd extras/faad && make distclean; fi
-if test "$(PRESERVE_EXTRAS)" = ""; then cd extras/faad && make distclean; fi
-$(MAKE) distclean
......
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