r189 - unstable/vlc/debian

[Samuel Hocevar]

Author: sho
Date: 2007-03-13 07:54:46 +0000 (Tue, 13 Mar 2007)
New Revision: 189

Modified:
   unstable/vlc/debian/changelog
   unstable/vlc/debian/rules
   unstable/vlc/debian/vlc-nox.install
Log:
  * debian/control:
    + Build-depend on libx264-dev.
    + Build-depend on libfaad-dev.
  * debian/rules:
    + Now that they're in unstable, no longer build our custom x264 and faad2.


Modified: unstable/vlc/debian/changelog
===================================================================
--- unstable/vlc/debian/changelog	2007-03-13 01:43:09 UTC (rev 188)
+++ unstable/vlc/debian/changelog	2007-03-13 07:54:46 UTC (rev 189)
@@ -3,8 +3,9 @@
   * debian/control:
     + Add XS-Vcs-Browser field.
     + 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're in unstable, no longer build our custom x264 and faad2.
 
   * debian/patches/030_audio_format_crash.diff:
     + Patch from upstream to fix multiple crashes with audio conversions.

Modified: unstable/vlc/debian/rules
===================================================================
--- unstable/vlc/debian/rules	2007-03-13 01:43:09 UTC (rev 188)
+++ unstable/vlc/debian/rules	2007-03-13 07:54:46 UTC (rev 189)
@@ -78,9 +78,6 @@
 	--enable-x264 \
 	$(NULL)
 
-# These ones are currently shipped with VLC
-vlc_confflags += --enable-faad --with-faad-tree=extras/faad2
-
 # These ones are only for Linux
 ifeq ($(DEB_HOST_ARCH_OS),linux)
 vlc_confflags += --enable-alsa --enable-dv --enable-v4l --enable-pvr
@@ -116,17 +113,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)
@@ -139,8 +125,6 @@
 	###$(MAKE) include/vlc_symbols.h
 	###cd modules && AM_MAKEFLAGS='plugin=no pic=no' $(MAKE)
 	###$(MAKE) vlc
-	# 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)
@@ -160,9 +144,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

Modified: unstable/vlc/debian/vlc-nox.install
===================================================================
--- unstable/vlc/debian/vlc-nox.install	2007-03-13 01:43:09 UTC (rev 188)
+++ unstable/vlc/debian/vlc-nox.install	2007-03-13 07:54:46 UTC (rev 189)
@@ -41,6 +41,8 @@
 usr/lib/vlc/codec/libsvcdsub_plugin.so
 usr/lib/vlc/codec/libcvdsub_plugin.so
 usr/lib/vlc/codec/libfake_plugin.so
+usr/lib/vlc/codec/libfaad_plugin.so
+usr/lib/vlc/codec/libx264_plugin.so
 usr/lib/vlc/control
 usr/lib/vlc/demux
 usr/lib/vlc/gui/libncurses_plugin.so