r187 - videolan/vlc/debian
xtophe-guest at alioth.debian.org
xtophe-guest at alioth.debian.org
Wed Mar 14 14:23:17 CET 2007
Author: xtophe-guest
Date: 2007-03-12 21:03:38 +0000 (Mon, 12 Mar 2007)
New Revision: 187
Modified:
videolan/vlc/debian/changelog
videolan/vlc/debian/control
videolan/vlc/debian/rules
Log:
Sync with unstable package
Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog 2007-03-12 20:54:49 UTC (rev 186)
+++ videolan/vlc/debian/changelog 2007-03-12 21:03:38 UTC (rev 187)
@@ -1,6 +1,16 @@
+vlc (0.9.0-svn12) experimental; urgency=low
+
+ * debian/control:
+ + Build-depend on libx264-dev.
+ * debian/rules:
+ + Now that it is in unstable, no longer build our custom x264.
+ + Fix a kFreeBSD FTBFS, courtesy of Petr Salinger (Closes: #399713).
+
+ -- Christophe Mutricy <xtophe at videolan.org> Mon, 12 Mar 2007 20:50:04 +0000
+
vlc (0.9.0-svn11) experimental; urgency=low
- * Add some replaces/Conficts between vlc and vlc-nox. It should help the
+ * replaces/Conficts between vlc and vlc-nox. It should help the
transition between sid and nightlies.
-- Christophe Mutricy <xtophe at videolan.org> Tue, 13 Feb 2007 22:52:53 +0000
Modified: videolan/vlc/debian/control
===================================================================
--- videolan/vlc/debian/control 2007-03-12 20:54:49 UTC (rev 186)
+++ videolan/vlc/debian/control 2007-03-12 21:03:38 UTC (rev 187)
@@ -3,7 +3,7 @@
Priority: optional
Maintainer: VideoLAN <vlc-devel at videolan.org>
Uploaders: Christophe Mutricy <xtophe at videolan.org>
-Build-Depends: debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i38+6 !kfreebsd-amd64 !hurd-i386], libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libshout3-dev, libqt4-dev, qt4-dev-tools
+Build-Depends: debhelper (>= 5.0), dh-buildinfo, quilt, nasm, yasm [amd64 kfreebsd-amd64], gettext, linux-kernel-headers (>= 2.5.999-test7-bk-7) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], xulrunner, libxul-dev, xlibmesa-gl-dev, liba52-0.7.4-dev, libaa1-dev, libarts1-dev (>= 1.4.2-1), libasound2-dev (>= 0.9.0beta10a) [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libaudiofile-dev, libavahi-client-dev, libavcodec-dev (>= 0.cvs20060823-1), libavformat-dev (>= 0.cvs20060823-1), libcaca-dev (>= 0.99.beta4-1), libcdio-dev, libdvbpsi4-dev, libdvdnav-dev, libdvdread-dev (>= 0.9.5), libdts-dev, libesd0-dev, libflac-dev (>= 1.1.2-3), libfreetype6-dev, libfribidi-dev, libggi2-dev, libglib2.0-0, libglide2-dev [i386], libgnutls-dev (>= 1.2.8), libhal-dev (>= 0.5.5.1-3) [!kfreebsd-i38+6 !kfreebsd-amd64 !hurd-i386], libid3tag0-dev, libidl0, libimlib2-dev, liblircclient-dev, liblivemedia-dev (>= 2006.03.17), libmad0-dev, libmatroska-dev (>= 0.8.0), libmodplug-dev, libmpcdec-dev, libmpeg2-4-dev, libncurses5-dev, libogg-dev, libpostproc-dev (>= 0.cvs20060823-1), libpng12-dev, libsdl1.2-dev (>= 1.2.7+1.2.8cvs20041007-5.3), libsmbclient-dev, libsvga1-dev [i386], libsysfs-dev, libtar-dev, libtheora-dev, libvcdinfo-dev, libvorbis-dev, libwxgtk2.6-dev, libx11-dev, libxext-dev, libxml2-dev, libxt-dev, libxv-dev, zlib1g-dev, libavc1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libraw1394-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libdc1394-13-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libnotify-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libshout3-dev, libqt4-dev, qt4-dev-tools, libx264-dev
Standards-Version: 3.7.2
XS-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/upstream/vlc/
XS-Vcs-Browser: https://trac.videolan.org/pkg-multimedia/browser/upstream/vlc
Modified: videolan/vlc/debian/rules
===================================================================
--- videolan/vlc/debian/rules 2007-03-12 20:54:49 UTC (rev 186)
+++ videolan/vlc/debian/rules 2007-03-12 21:03:38 UTC (rev 187)
@@ -76,12 +76,12 @@
--enable-notify \
--enable-debug \
--enable-twolame \
+ --enable-x264 \
$(NULL)
# These ones are currently shipped with VLC
vlc_confflags += --enable-faad --with-faad-tree=extras/faad2
-vlc_confflags += --enable-x264 --with-x264-tree=extras/x264
# Glide and svgalib are only for x86
ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
@@ -113,12 +113,6 @@
touch configure
touch config.h.in
touch `find . -name Makefile.in`
- # Check that we have an x264 tree in here (can be a symlink)
- test -d extras/x264
- cd extras/x264 \
- && ./configure $(confflags) --extra-cflags='$$(ECFLAGS)' \
- --extra-asflags='$$(EASFLAGS)' \
- && $(MAKE)
# Check that we have an faad2 tree in here (can be a symlink)
test -d extras/faad2
cd extras/faad2 \
@@ -139,8 +133,6 @@
build-stamp: configure-stamp
dh_testdir
# Hackety hackety hack
- cd extras/x264 && $(MAKE) clean && $(MAKE) ECFLAGS=-fPIC EASFLAGS=-D__PIC__
- # HACKETY HACKETY HACK
cd extras/faad2/libfaad && $(MAKE) clean && $(MAKE) AM_CFLAGS=-fPIC
$(MAKE)
@@ -155,10 +147,11 @@
clean:
dh_testdir
dh_testroot
+ sed -e '/lib\(alsa\|dvb\|v4l\|pvr\)_/d' debian/vlc-nox.install \
+ > debian/vlc-nox.install.kfreebsd-i386
+ cp debian/vlc-nox.install.kfreebsd-i386 \
+ debian/vlc-nox.install.kfreebsd-amd64
rm -f configure-stamp build-stamp
- # Check that we have an x264 tree in here (can be a symlink)
- test -d extras/x264
- -cd extras/x264 && $(MAKE) distclean
# Check that we have an faad2 tree in here (can be a symlink)
test -d extras/faad2
-cd extras/faad2 && $(MAKE) distclean
More information about the Pkg-multimedia-commits
mailing list