r204 - videolan/vlc/debian

xtophe-guest at alioth.debian.org xtophe-guest at alioth.debian.org
Fri Mar 16 23:51:32 CET 2007


Author: xtophe-guest
Date: 2007-03-15 22:47:48 +0000 (Thu, 15 Mar 2007)
New Revision: 204

Modified:
   videolan/vlc/debian/changelog
   videolan/vlc/debian/control
   videolan/vlc/debian/rules
Log:
Use debian's faad and x264


Modified: videolan/vlc/debian/changelog
===================================================================
--- videolan/vlc/debian/changelog	2007-03-15 22:42:45 UTC (rev 203)
+++ videolan/vlc/debian/changelog	2007-03-15 22:47:48 UTC (rev 204)
@@ -2,8 +2,9 @@
 
   * debian/control:
     + Build-depend on libx264-dev.
+    + Build-depend on libfaad-dev
   * debian/rules:
-    + Now that it is in unstable, no longer build our custom x264.
+    + Now that they are in unstable, no longer build our custom x264 and faad.
     + Fix a kFreeBSD FTBFS, courtesy of Petr Salinger (Closes: #399713).
 
  -- Christophe Mutricy <xtophe at videolan.org>  Mon, 12 Mar 2007 20:50:04 +0000

Modified: videolan/vlc/debian/control
===================================================================
--- videolan/vlc/debian/control	2007-03-15 22:42:45 UTC (rev 203)
+++ videolan/vlc/debian/control	2007-03-15 22:47:48 UTC (rev 204)
@@ -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, libx264-dev
+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, libfaad-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-15 22:42:45 UTC (rev 203)
+++ videolan/vlc/debian/rules	2007-03-15 22:47:48 UTC (rev 204)
@@ -77,12 +77,10 @@
 	--enable-debug \
 	--enable-twolame \
 	--enable-x264 \
+	--enable-faad \
 	$(NULL)
 
 
-# These ones are currently shipped with VLC
-vlc_confflags += --enable-faad --with-faad-tree=extras/faad2
-
 # Glide and svgalib are only for x86
 ifeq ($(shell dpkg-architecture -qDEB_BUILD_ARCH_CPU),i386)
 vlc_confflags += --enable-glide
@@ -113,17 +111,6 @@
 	touch configure
 	touch config.h.in
 	touch `find . -name Makefile.in`
-	# Check that we have an faad2 tree in here (can be a symlink)
-	test -d extras/faad2
-	cd extras/faad2 \
-	 && touch `find . -name configure.in` \
-	 && touch `find . -name aclocal.m4` \
-	 && touch `find . -name configure` \
-	 && touch `find . -name config.h.in` \
-	 && touch `find . -name Makefile.in` \
-	 && ./configure $(confflags) --disable-shared \
-	 && cd libfaad \
-	 && $(MAKE)
 	# Configure VLC
 	./configure --mandir=$${prefix}/share/man \
 	  --infodir=$${prefix}/share/info $(confflags) $(vlc_confflags)
@@ -132,8 +119,6 @@
 build: build-stamp
 build-stamp: configure-stamp
 	dh_testdir
-	# Hackety hackety hack
-	cd extras/faad2/libfaad && $(MAKE) clean && $(MAKE) AM_CFLAGS=-fPIC
 
 	 $(MAKE)
 
@@ -152,9 +137,6 @@
 	cp debian/vlc-nox.install.kfreebsd-i386 \
 	  debian/vlc-nox.install.kfreebsd-amd64
 	rm -f configure-stamp build-stamp
-	# Check that we have an faad2 tree in here (can be a symlink)
-	test -d extras/faad2
-	-cd extras/faad2 && $(MAKE) distclean
 	# Clean VLC
 	-$(MAKE) distclean
 	# Clean zsh completion stuff




More information about the Pkg-multimedia-commits mailing list