r185 - unstable/vlc/debian

[Samuel Hocevar]

Author: sho
Date: 2007-03-12 15:52:01 +0000 (Mon, 12 Mar 2007)
New Revision: 185

Modified:
   unstable/vlc/debian/changelog
   unstable/vlc/debian/control
   unstable/vlc/debian/rules
Log:
  * debian/control:
    + Build-depend on libx264-dev.
  * debian/rules:
    + Now that it is in unstable, no longer build our custom x264.


Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2007-03-12 15:43:30 UTC (rev 184)
+++ unstable/vlc/debian/changelog	2007-03-12 15:52:01 UTC (rev 185)
@@ -2,6 +2,9 @@
 
   * debian/control:
     + Add XS-Vcs-Browser field.
+    + Build-depend on libx264-dev.
+  * debian/rules:
+    + Now that it is in unstable, no longer build our custom x264.
 
   * debian/patches/030_audio_format_crash.diff:
     + Patch from upstream to fix multiple crashes with audio conversions.

Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control	2007-03-12 15:43:30 UTC (rev 184)
+++ unstable/vlc/debian/control	2007-03-12 15:52:01 UTC (rev 185)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
 Uploaders: Clément Stenac <zorglub at debian.org>
-Build-Depends: debhelper (>= 4.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-i386 !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], libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev, python-dev
+Build-Depends: debhelper (>= 4.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-i386 !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], libxosd-dev, libtwolame-dev (>= 0.3.8-1), libspeex-dev, libsdl-image1.2-dev, libnotify-dev, libgtk2.0-dev, python-dev, libx264-dev
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/vlc/
 XS-Vcs-Browser: http://trac.videolan.org/pkg-multimedia/browser/unstable/vlc

Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules	2007-03-12 15:43:30 UTC (rev 184)
+++ unstable/vlc/debian/rules	2007-03-12 15:52:01 UTC (rev 185)
@@ -75,11 +75,11 @@
 	--enable-notify \
 	--enable-faad \
 	--enable-mediacontrol-bindings \
+	--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
 
 # These ones are only for Linux
 ifeq ($(DEB_HOST_ARCH_OS),linux)
@@ -116,12 +116,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 \
@@ -146,8 +140,6 @@
 	###cd modules && AM_MAKEFLAGS='plugin=no pic=no' $(MAKE)
 	###$(MAKE) vlc
 	# 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
 	#### Build all the rest, with the PIC libs
 	###AM_MAKEFLAGS='builtin=no' $(MAKE)
@@ -168,9 +160,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 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