r127 - unstable/vlc/debian

[Samuel Hocevar]

Author: sho
Date: 2007-01-08 08:40:15 +0000 (Mon, 08 Jan 2007)
New Revision: 127

Modified:
   unstable/vlc/debian/changelog
   unstable/vlc/debian/control
   unstable/vlc/debian/rules
Log:
  * Holy freaking crap, faad2 was removed from etch. Go back to our ugly
    embedded version.


Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2007-01-08 02:27:58 UTC (rev 126)
+++ unstable/vlc/debian/changelog	2007-01-08 08:40:15 UTC (rev 127)
@@ -5,8 +5,6 @@
     (Closes: #405425, #400720, #403022).
 
   * debian/control:
-    + Build-depend on libfaad-dev so that we no longer need to ship an faad2
-      snapshot.
     + Put back mozilla-plugin-vlc package.
 
   * debian/rules:
@@ -69,7 +67,7 @@
     + Disable debug messages and spurious messages to stderr.
 
   * patch-sanitise-javascript-0.8.6debian-0.8.6a.diff:
-    + Fix the javascript string sanitisiing.
+    + Fix the javascript string sanitising.
 
   * patch-sanity-checks-0.8.6debian-0.8.6a.diff:
     + Various sanity checks for untrusted data.

Modified: unstable/vlc/debian/control
===================================================================
--- unstable/vlc/debian/control	2007-01-08 02:27:58 UTC (rev 126)
+++ unstable/vlc/debian/control	2007-01-08 08:40:15 UTC (rev 127)
@@ -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, libfaad-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
 Standards-Version: 3.7.2
 XS-Vcs-Svn: svn://svn.videolan.org/pkg-multimedia/unstable/vlc/
 

Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules	2007-01-08 02:27:58 UTC (rev 126)
+++ unstable/vlc/debian/rules	2007-01-08 08:40:15 UTC (rev 127)
@@ -78,6 +78,7 @@
 	$(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
@@ -121,6 +122,17 @@
 	 && ./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 \
+	 && 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)
@@ -135,6 +147,8 @@
 	###$(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)
 	$(MAKE)
@@ -157,6 +171,9 @@
 	# 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
 	# Clean VLC
 	-$(MAKE) distclean
 	# Clean zsh completion stuff