[SCM] FFmpeg packaging branch, master, updated. upstream/0.svn20090119-33-g141ca8c

[siretart at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1377b09e3f0413dcd12f8e146c6b56eca1b3a381
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Tue Jan 20 12:49:32 2009 +0100

    more branches to minimize the changes needed in the branches
    that ship the 'unstripped' variant

diff --git a/debian/confflags b/debian/confflags
index df99071..15e3fc6 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -25,11 +25,23 @@ endif
 
 # Configuration flags causing the libs to be GPL tainted
 gpl_confflags += --enable-gpl
-gpl_confflags += --enable-libfaad
 gpl_confflags += --enable-postproc
 gpl_confflags += --enable-swscale
 gpl_confflags += --enable-x11grab
 
+# there is no libfaad in ubuntu/main, on in ubuntu/multiverse
+HAVE_LIBFAAD = no
+ifeq ($(ubuntu),)
+HAVE_LIBFAAD = yes
+endif
+ifneq ($(DEB_SOURCE),ffmpeg-debian)
+HAVE_LIBFAAD = yes
+endif
+
+ifeq ($(HAVE_LIBFAAD),yes)
+gpl_confflags += --enable-libfaad
+endif
+
 # Common configuration flags; comment out following line for LGPL versions of
 # the libraries
 confflags += $(gpl_confflags)
@@ -45,6 +57,23 @@ confflags += --enable-pthreads
 confflags += --disable-stripping
 confflags += --disable-vhook
 
+# this part below is intended for the 'ffmpeg' package in ubuntu/multiverse
+ifneq ($(DEB_SOURCE),ffmpeg-debian)
+confflags += --enable-libxvid
+confflags += --enable-libmp3lame
+confflags += --enable-libfaac
+confflags += --enable-libx264
+
+ifeq      ($(DEB_HOST_ARCH),i386)
+confflags += --enable-xvmc
+confflags += --enable-vdpau
+else ifeq ($(DEB_HOST_ARCH),amd64)
+confflags += --enable-xvmc
+confflags += --enable-vdpau
+endif
+
+endif
+
 # Enable IEEE 1394 (FireWire) support on Linux only
 ifneq (,$(findstring linux,$(DEB_HOST_GNU_TYPE)))
   confflags += --enable-libdc1394
diff --git a/debian/rules b/debian/rules
index df7f7a2..1656dd7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,6 +7,7 @@ DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SVN_VERSION := $(shell echo $(UPSTREAM_VERSION) | sed -nr 's/^[0-9.:-]+\.svn([0-9]+)$$/\1/p')
 SHLIBS_VERSION := 3:0.svn20081101-1
+ubuntu := $(findstring ubuntu,$(DEB_VERSION))
 
 LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-unstripped-)?[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
@@ -105,7 +106,7 @@ else
 endif
 
 formats.txt: install
-	env LD_LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib \
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	debian/tmp/usr/bin/ffmpeg -formats > $@
 
 ifneq ($(DEB_SOURCE),ffmpeg-debian)
@@ -120,7 +121,11 @@ binary-arch: build install formats.txt
 	dh_installdocs $(extradoc) doc/optimization.txt
 	dh_installdocs -A MAINTAINERS CREDITS doc/TODO
 	dh_installdocs -A debian/patents.txt debian/README.Debian
+ifeq ($(DEB_SOURCE),ffmpeg)
+	dh_installdocs -p libavcodec-unstripped-52 formats.txt
+else
 	dh_installdocs -p libavcodec52 formats.txt
+endif
 	dh_installexamples -pffmpeg doc/ffserver.conf debian/recordshow.sh
 	dh_installexamples -plibavcodec-dev libavcodec/apiexample.c
 	dh_installchangelogs Changelog
@@ -133,8 +138,12 @@ endif
 	dh_compress
 	dh_fixperms
 	for pkg in $(LIB_PKGS); do \
+ifneq ($(DEB_SOURCE),ffmpeg-debian)
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-unstripped-\1/'); \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION)) | $$upkg (>= $(SHLIBS_VERSION))"; \
+else
+	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(SHLIBS_VERSION))"; \
+endif
 	done
 	dh_installdeb
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \

-- 
FFmpeg packaging