[SCM] ffmpeg/ubuntu: Revert "Convert package to include multiarch support."

siretart at users.alioth.debian.org siretart at users.alioth.debian.org
Wed Sep 28 07:45:02 UTC 2011 

The following commit has been merged in the ubuntu branch:
commit 6fe511d284d89d9ffea264167127c3c419fc7f9a
Author: Reinhard Tartler <siretart at tauware.de>
Date:   Wed Sep 28 09:15:14 2011 +0200

    Revert "Convert package to include multiarch support."
    
    The previous upload was rejected by the archive administrators because
    of the imminent freeze. This patch is what they feel most problematic at
    this point, so let's revert it for now.
    
    This reverts commit cc04c2f6c7d171d5152e0085834de43d39587de5.
    
    Conflicts:
    
    	debian/changelog

diff --git a/debian/compat b/debian/compat
index ec63514..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-9
+7
diff --git a/debian/confflags b/debian/confflags
index 8fd9373..eee98ea 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -7,7 +7,6 @@ FLAVORS := static
 # shared is generic, i.e. without arch specific opcodes
 FLAVORS += shared
 
-export DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 export DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 export DEB_HOST_ARCH      ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 export DEB_HOST_ARCH_CPU  ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_CPU)
@@ -96,7 +95,6 @@ gpl_confflags += --enable-x11grab
 confflags += --extra-version='$(DEB_VERSION)'
 confflags += --arch='$(DEB_HOST_ARCH_CPU)'
 confflags += --prefix=/usr
-confflags += --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 confflags += --enable-vdpau
 confflags += --enable-bzlib
 confflags += --enable-libgsm
@@ -164,7 +162,7 @@ endif
 static_build_confflags += $(confflags)
 
 # Configuration flags for the non-optimized shared libraries
-shared_build_confflags += $(confflags) --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+shared_build_confflags += $(confflags)
 # amd64 has no problems with optimized shared libs. i386 and arm do.
 ifneq      ($(DEB_HOST_ARCH),amd64)
 shared_build_confflags += $(nooptflags)
@@ -175,7 +173,7 @@ shared_build_confflags += --disable-static
 ## specific to arm architectures
 # Configuration flags for the optimised shared libraries
 vfp_build_confflags += $(confflags)
-vfp_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/vfp
+vfp_build_confflags += --shlibdir=/usr/lib/vfp
 vfp_build_confflags += --enable-shared
 vfp_build_confflags += --disable-static
 vfp_build_confflags += --extra-cflags="-mfpu=vfp $(float_abi)"
@@ -183,7 +181,7 @@ vfp_build_confflags += --disable-ffmpeg
 vfp_build_confflags += --disable-ffplay
 # NB: NEON always implies v7+ and ffmpeg's NEON implementation requires VFP
 neon_build_confflags += $(confflags)
-neon_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
+neon_build_confflags += --shlibdir=/usr/lib/neon/vfp
 # the NEON pass now requires ubfx which was introduced in armv6t2; we need to
 # enable at least armv6t2 for the NEON pass to build, but NEON implies armv7-a
 # so pass armv7-a if it's not already enabled
@@ -200,7 +198,7 @@ neon_build_confflags += --disable-ffplay
 # Configuration flags for the optimized shared libraries
 cmov_build_confflags += $(confflags)
 cmov_build_confflags += $(nooptflags)
-cmov_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/i686/cmov
+cmov_build_confflags += --shlibdir=/usr/lib/i686/cmov
 cmov_build_confflags += --cpu='i686'
 cmov_build_confflags += --enable-shared
 cmov_build_confflags += --disable-static
@@ -210,7 +208,7 @@ cmov_build_confflags += --disable-ffplay
 ## powerpc architecture specific
 # Configuration flags for the optimized shared libraries
 altivec_build_confflags += $(confflags)
-altivec_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/altivec
+altivec_build_confflags += --shlibdir=/usr/lib/altivec
 altivec_build_confflags += --cpu='g4'
 altivec_build_confflags += --enable-shared
 altivec_build_confflags += --disable-static
@@ -221,7 +219,7 @@ altivec_build_confflags += --disable-ffplay
 ## sparc architecture specific
 # Configuration flags for the optimized shared libraries
 vis_build_confflags += $(confflags)
-vis_build_confflags += --shlibdir=/usr/lib/$(DEB_HOST_MULTIARCH)/v9
+vis_build_confflags += --shlibdir=/usr/lib/v9
 vis_build_confflags += --cpu='sparc64'
 vis_build_confflags += --enable-shared
 vis_build_confflags += --disable-static
diff --git a/debian/control b/debian/control
index 4a7c23e..e82cb16 100644
--- a/debian/control
+++ b/debian/control
@@ -15,7 +15,7 @@ Vcs-Git: git://git.debian.org/git/pkg-multimedia/libav.git
 Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/libav.git;a=summary
 Homepage: http://libav.org/
 Build-Depends-Indep: doxygen
-Build-Depends: debhelper (>= 8.1.3~),
+Build-Depends: debhelper (>= 7),
  libasound2-dev [linux-any],
  libbz2-dev,
  libdc1394-22-dev [linux-any],
@@ -125,8 +125,6 @@ Description: Documentation of the Libav API
 
 Package: libavutil51
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Libav utility library
@@ -135,8 +133,6 @@ Description: Libav utility library
 
 Package: libavcodec53
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Libav codec library
@@ -146,8 +142,6 @@ Description: Libav codec library
 
 Package: libavdevice53
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Libav device handling library
@@ -155,8 +149,6 @@ Description: Libav device handling library
 
 Package: libavformat53
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Libav file format library
@@ -167,8 +159,6 @@ Description: Libav file format library
 
 Package: libavfilter2
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Libav video filtering library
@@ -176,8 +166,6 @@ Description: Libav video filtering library
 
 Package: libpostproc52
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Libav video postprocessing library
@@ -185,8 +173,6 @@ Description: Libav video postprocessing library
 
 Package: libswscale2
 Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
  ${misc:Depends}
 Description: Libav video scaling library
diff --git a/debian/libavcodec-dev.install b/debian/libavcodec-dev.install
index 57ecd96..6fa94c8 100644
--- a/debian/libavcodec-dev.install
+++ b/debian/libavcodec-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavcodec
-usr/lib/*/libavcodec.a
-usr/lib/*/{,*/,*/*/}libavcodec.so
-usr/lib/*/pkgconfig/libavcodec.pc
+usr/lib/libavcodec.a
+usr/lib/{,*/,*/*/}libavcodec.so
+usr/lib/pkgconfig/libavcodec.pc
diff --git a/debian/libavcodec53.install b/debian/libavcodec53.install
index 27da00e..db9ed34 100644
--- a/debian/libavcodec53.install
+++ b/debian/libavcodec53.install
@@ -1 +1 @@
-usr/lib/*/{,*/,*/*/}libavcodec.so.*
+usr/lib/{,*/,*/*/}libavcodec.so.*
diff --git a/debian/libavdevice-dev.install b/debian/libavdevice-dev.install
index b38e4f0..bc65cd0 100644
--- a/debian/libavdevice-dev.install
+++ b/debian/libavdevice-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavdevice
-usr/lib/*/libavdevice.a
-usr/lib/*/{,*/,*/*/}libavdevice.so
-usr/lib/*/pkgconfig/libavdevice.pc
+usr/lib/libavdevice.a
+usr/lib/{,*/,*/*/}libavdevice.so
+usr/lib/pkgconfig/libavdevice.pc
diff --git a/debian/libavdevice53.install b/debian/libavdevice53.install
index 30b41e5..acdb58b 100644
--- a/debian/libavdevice53.install
+++ b/debian/libavdevice53.install
@@ -1 +1 @@
-usr/lib/*/{,*/,*/*/}libavdevice.so.*
+usr/lib/{,*/,*/*/}libavdevice.so.*
diff --git a/debian/libavfilter-dev.install b/debian/libavfilter-dev.install
index f278a96..6d196e2 100644
--- a/debian/libavfilter-dev.install
+++ b/debian/libavfilter-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavfilter
-usr/lib/*/libavfilter.a
-usr/lib/*/{,*/,*/*/}libavfilter.so
-usr/lib/*/pkgconfig/libavfilter.pc
+usr/lib/libavfilter.a
+usr/lib/{,*/,*/*/}libavfilter.so
+usr/lib/pkgconfig/libavfilter.pc
diff --git a/debian/libavfilter2.install b/debian/libavfilter2.install
index 1efdd0b..43fec8a 100644
--- a/debian/libavfilter2.install
+++ b/debian/libavfilter2.install
@@ -1 +1 @@
-usr/lib/*/{,*/,*/*/}libavfilter.so.*
+usr/lib/{,*/,*/*/}libavfilter.so.*
diff --git a/debian/libavformat-dev.install b/debian/libavformat-dev.install
index 93c742e..c154e6a 100644
--- a/debian/libavformat-dev.install
+++ b/debian/libavformat-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavformat
-usr/lib/*/libavformat.a
-usr/lib/*/{,*/,*/*/}libavformat.so
-usr/lib/*/pkgconfig/libavformat.pc
+usr/lib/libavformat.a
+usr/lib/{,*/,*/*/}libavformat.so
+usr/lib/pkgconfig/libavformat.pc
diff --git a/debian/libavformat53.install b/debian/libavformat53.install
index 0a3dc1a..37a67ad 100644
--- a/debian/libavformat53.install
+++ b/debian/libavformat53.install
@@ -1 +1 @@
-usr/lib/*/{,*/,*/*/}libavformat.so.*
+usr/lib/{,*/,*/*/}libavformat.so.*
diff --git a/debian/libavutil-dev.install b/debian/libavutil-dev.install
index 2a410c7..ce267d1 100644
--- a/debian/libavutil-dev.install
+++ b/debian/libavutil-dev.install
@@ -1,4 +1,4 @@
 usr/include/libavutil
-usr/lib/*/libavutil.a
-usr/lib/*/{,*/,*/*/}libavutil.so
-usr/lib/*/pkgconfig/libavutil.pc
+usr/lib/libavutil.a
+usr/lib/{,*/,*/*/}libavutil.so
+usr/lib/pkgconfig/libavutil.pc
diff --git a/debian/libavutil51.install b/debian/libavutil51.install
index f89ecbe..f9f5687 100644
--- a/debian/libavutil51.install
+++ b/debian/libavutil51.install
@@ -1 +1 @@
-usr/lib/*/{,*/,*/*/}libavutil.so.*
+usr/lib/{,*/,*/*/}libavutil.so.*
diff --git a/debian/libpostproc-dev.install b/debian/libpostproc-dev.install
index de5d0f9..da9df8f 100644
--- a/debian/libpostproc-dev.install
+++ b/debian/libpostproc-dev.install
@@ -1,4 +1,4 @@
 usr/include/libpostproc
-usr/lib/*/libpostproc.a
-usr/lib/*/{,*/,*/*/}libpostproc.so
-usr/lib/*/pkgconfig/libpostproc.pc
+usr/lib/libpostproc.a
+usr/lib/{,*/,*/*/}libpostproc.so
+usr/lib/pkgconfig/libpostproc.pc
diff --git a/debian/libpostproc52.install b/debian/libpostproc52.install
index 78d31a1..5506233 100644
--- a/debian/libpostproc52.install
+++ b/debian/libpostproc52.install
@@ -1 +1 @@
-usr/lib/*/{,*/,*/*/}libpostproc.so.*
+usr/lib/{,*/,*/*/}libpostproc.so.*
diff --git a/debian/libswscale-dev.install b/debian/libswscale-dev.install
index b4d9715..9c2395c 100644
--- a/debian/libswscale-dev.install
+++ b/debian/libswscale-dev.install
@@ -1,4 +1,4 @@
 usr/include/libswscale
-usr/lib/*/libswscale.a
-usr/lib/*/{,*/,*/*/}libswscale.so
-usr/lib/*/pkgconfig/libswscale.pc
+usr/lib/libswscale.a
+usr/lib/{,*/,*/*/}libswscale.so
+usr/lib/pkgconfig/libswscale.pc
diff --git a/debian/libswscale2.install b/debian/libswscale2.install
index b403da1..8965d77 100644
--- a/debian/libswscale2.install
+++ b/debian/libswscale2.install
@@ -1 +1 @@
-usr/lib/*/{,*/,*/*/}libswscale.so.*
+usr/lib/{,*/,*/*/}libswscale.so.*
diff --git a/debian/rules b/debian/rules
index c02594c..5002070 100755
--- a/debian/rules
+++ b/debian/rules
@@ -93,11 +93,11 @@ install: build
 		--fail-missing --sourcedir=debian/tmp
 
 formats.txt: install
-	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	debian/tmp/usr/bin/ffmpeg -formats | tee $@
 
 codecs.txt: install
-	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	debian/tmp/usr/bin/ffmpeg -codecs | tee $@
 
 binary-indep: build-doxy install
@@ -129,7 +129,7 @@ binary-arch: build install codecs.txt formats.txt
 	    upkg=$$(echo "$$pkg" | sed -r 's/([0-9]+)$$/-extra-\1/'); \
 	    dh_makeshlibs -p"$$pkg" -V"$$pkg (>= $(DEB_VERSION)) | $$upkg (>= $(EPOCH)$(UPSTREAM_VERSION)), $$pkg (<< $(EPOCH)$(UPSTREAM_VERSION)-99) | $$upkg (<< $(EPOCH)$(UPSTREAM_VERSION).99)"; \
 	done
-	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)" \
+	env LD_LIBRARY_PATH="$(LD_LIBRARY_PATH):$(CURDIR)/debian/tmp/usr/lib" \
 	dh_shlibdeps
 # target dependencies for external packages
 	for pkg in $(LIB_PKGS); do \
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
index 4c9bf6e..ba6ab02 100644
--- a/debian/source/lintian-overrides
+++ b/debian/source/lintian-overrides
@@ -3,5 +3,3 @@
 libav source: debian-rules-calls-debhelper-in-odd-order
 # ffmpeg-dbg is an empty, transitional package
 libav source: dbg-package-missing-depends ffmpeg-dbg
-# Ignore this, since currently only debhelper (>= 8.1.3~) is needed.
-libav source: package-needs-versioned-debhelper-build-depends 9

-- 
Libav/FFmpeg packaging

More information about the pkg-multimedia-commits mailing list