[SCM] libav/ubuntu: merge in changes from libav-extra sister package

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Sat Aug 11 09:29:48 UTC 2012 

The following commit has been merged in the ubuntu branch:
commit 8a7072f142786c8cc2fdc318192da2b63aa291d0
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Sat Aug 11 10:29:15 2012 +0200

    merge in changes from libav-extra sister package
    
    the intention is to minimize the differences

diff --git a/debian/rules b/debian/rules
index 956917f..a0f84e7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,12 +6,22 @@ DEB_VERSION := $(shell dpkg-parsechangelog | sed -n 's/^Version: //p')
 UPSTREAM_VERSION := $(shell echo $(DEB_VERSION) | sed -r 's/[^:]+://; s/-[^-]+$$//')
 SHLIBS_VERSION := $(EPOCH)0.8.3-1~
 
+ifeq ($(DEB_SOURCE),libav)
 # these package do not build -extra variants
 LIB_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 # these packages do build -extra variants
 LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 # these packages are the -extra- variants
 LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(libavcodec-extra-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+else
+# these package do not build -extra variants
+LIB_PKGS := 
+# these packages do build -extra variants
+LIB_PKGS2 := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+# these packages are the -extra- variants
+LIB_EXTRA_PKGS := $(shell sed -nr 's/^Package:[[:space:]]*(lib(avutil|avcodec|avdevice|avformat|avfilter|postproc|swscale)(-extra-)[0-9]+)[[:space:]]*$$/\1/p' debian/control)
+endif
+
 # these are the -dev packages
 DEV_PKGS := $(shell echo $(LIB_PKGS) $(LIB_PKGS2) | sed 's/[0-9]\+\>/-dev/g')
 
@@ -47,17 +57,25 @@ $(DH_INSTALL_FILES):
 	sed 's/@DEB_HOST_MULTIARCH\(_OPT\)\?@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
 	$(foreach opt_flavor,$(OPT_FLAVORS),$(call dh_install_file_opt_flavor,$@,$(opt_flavor)))
 
+ifeq ($(DEB_SOURCE),libav-extra)
+CONFIGURE := libav/configure
+libav/configure:
+	tar xvf /usr/src/libav-source.tar.gz
+else
+CONFIGURE := configure
+endif
+
 configure-%: configure-stamp-%
-configure-stamp-%:
+configure-stamp-%: $(CONFIGURE)
 	dh_testdir
 	mkdir -p debian-$*
-	cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
+	cd debian-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/$(CONFIGURE) \
 		$($*_build_confflags) $(extra_$*_build_confflags)
 	touch $@
 configure-extra-stamp-%:
 	dh_testdir
 	mkdir -p debian-extra-$*
-	cd debian-extra-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/configure \
+	cd debian-extra-$* && CFLAGS="$(CFLAGS)" CPPFLAGS="$(CPPFLAGS)" LDFLAGS="$(LDFLAGS)" $(CURDIR)/$(CONFIGURE) \
 		$($*_build_confflags) $(v3_confflags) $(extra_$*_build_confflags)
 	touch $@
 
@@ -77,7 +95,9 @@ debian-shared/tools/qt-faststart: build-stamp-shared
 build-doxy: build-doxy-stamp
 build-doxy-stamp:
 	dh_testdir
+ifneq ($(DEB_SOURCE), libav-extra)
 	[ ! -x /usr/bin/doxygen ] || doxygen
+endif
 	touch $@
 
 build: build-stamp build-extra
@@ -93,6 +113,7 @@ clean:
 	    $(addprefix configure-stamp-, $(FLAVORS)) \
 	    $(addprefix configure-extra-stamp-, $(FLAVORS)) \
 	    build-doxy-stamp
+	rm -rf libav/ # created by the libav-extra variant
 	rm -rf $(addprefix debian-, $(FLAVORS)) \
 		$(addprefix debian-extra-, $(FLAVORS)) doxy
 	dh_clean $(DH_INSTALL_FILES) $(wildcard formats*.txt) $(wildcard codecs*.txt)
@@ -120,6 +141,7 @@ install-common: build $(DH_INSTALL_FILES)
 	dh_testdir
 	dh_testroot
 	dh_prep
+ifeq ($(DEB_SOURCE), libav)
 	# the libav-source package does exist in some derivatives such as ubuntu, etc.
 	if grep -q 'Package: libav-source' debian/control; then \
 	  dh_installdirs -ptmp usr/src;  \
@@ -127,14 +149,15 @@ install-common: build $(DH_INSTALL_FILES)
 	  	 --exclude 'debian*' --exclude .git  --exclude .pc --exclude '*-stamp' \
 	  	 --transform 's,^./,libav/,' ; \
 	fi
+	dh_installdirs -ptmp usr/src
 	dh_installdirs -ptmp usr/share/doc/libav/html etc
 	dh_installdirs -ptmp usr/share/doc/libav-doc/html
 	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
 	# don't fail on binary-indep only builds.
 	[ ! -d doxy ] || cp -af doxy/html debian/tmp/usr/share/doc/libav-doc
 	install -m 644 -D debian-shared/doc/*.html debian/tmp/usr/share/doc/libav/html/
-	install -m 644 -D doc/avserver.conf debian/tmp/etc/
 	install -m 644 -D debian-shared/tools/qt-faststart debian/tmp/usr/bin/qt-faststart
+	install -m 644 -D doc/avserver.conf debian/tmp/etc/
 	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xffmpeg \
 		-Xffmpeg.1 -Xusr/share/doc/libav-doc \
 		-Xusr/share/doc/libav --fail-missing --sourcedir=debian/tmp
@@ -145,13 +168,19 @@ install-common: build $(DH_INSTALL_FILES)
 	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
 	dh_installdocs -plibavformat53 formats-$(DEB_HOST_ARCH).txt
 	dh_installdocs -plibavcodec53 codecs.txt
+else
+	$(foreach flavor,$(FLAVORS),$(call install_flavor,$(flavor)))
+	dh_install $(addprefix -N,$(LIB_EXTRA_PKGS)) -Nffmpeg -Xffmpeg \
+		-Xffmpeg.1 -Xusr/share/doc/libav-doc \
+		-Xusr/share/doc/libav --list-missing --sourcedir=debian/tmp
+endif
 
 install-extra: build $(DH_INSTALL_FILES)
 	dh_testdir
 	dh_testroot
 	$(foreach flavor,$(filter-out static,$(FLAVORS)),$(call install_flavor_extra,$(flavor)))
 	dh_install $(addprefix -p,$(LIB_EXTRA_PKGS)) -Xusr/share/doc/libav-doc \
-		-Xusr/share/doc/libav --fail-missing \
+		-Xusr/share/doc/libav --list-missing \
 		--sourcedir=debian/tmp/extra
 	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/extra/usr/lib/$(DEB_HOST_MULTIARCH)" \
 	debian/tmp/usr/bin/avconv -codecs | tee codecs.txt
@@ -163,20 +192,24 @@ binary-arch: build install
 	dh_testdir
 	dh_testroot
 	dh_installman -plibav-tools debian/qt-faststart.1
-	dh_installdocs doc/optimization.txt
 	dh_installdocs -A debian/README.Debian
+ifeq ($(DEB_SOURCE), libav)
 	dh_installdocs -p libavcodec-dev -plibavdevice-dev \
 		-plibavformat-dev -plibavfilter-dev -plibpostproc-dev \
 		-plibswscale-dev -plibavutil-dev -plibav-doc \
 		doc/APIchanges
 	dh_installexamples -p libav-tools doc/avserver.conf debian/recordshow.sh
 	dh_installexamples -p libavcodec-dev libavcodec/api-example.c
+	dh_strip --dbg-package=libav-dbg
 	dh_installchangelogs Changelog
+else
+	dh_strip --dbg-package=libav-extra-dbg
+	dh_installchangelogs libav/Changelog
+endif
 	dh_lintian
 	dh_link
 	dh_compress
 	dh_fixperms
-	dh_strip --dbg-package=libav-dbg
 
 	for pkg in $(LIB_PKGS) $(LIB_EXTRA_PKGS); do \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION))"; \

-- 
Libav/FFmpeg packaging

More information about the pkg-multimedia-commits mailing list