[SCM] x264/master: Convert package to include multiarch support. .gitignore file must have been removed from upstream tarball, so removed here too.

Sat Sep 17 18:36:46 UTC 2011

The following commit has been merged in the master branch:
commit b4a2884aba31e3b687ad208eb11aee4693462a90
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Sat Sep 17 14:33:03 2011 -0400

    Convert package to include multiarch support.
    .gitignore file must have been removed from upstream tarball, so removed here
    too.

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index 9bca03e..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,26 +0,0 @@
-*~
-*.a
-*.diff
-*.dll*
-*.exe
-*.mo
-*.o
-*.pc
-*.pot
-*.so.*
-*.so
-.*.swp
-.depend
-config.h
-config.mak
-config.log
-x264
-checkasm
-
-*.264
-*.2pass
-*.mkv
-*.mp4
-*.y4m
-*.yuv
-x264_2pass.log
diff --git a/debian/changelog b/debian/changelog
index 3010504..90e976c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+x264 (2:0.116.2042+git178455c-2) unstable; urgency=low
+
+  * Convert package to include multiarch support.
+
+ -- Andres Mejia <amejia at debian.org>  Sat, 17 Sep 2011 14:08:08 -0400
+
 x264 (2:0.116.2042+git178455c-1) unstable; urgency=low
 
   * New upstream snapshot.
diff --git a/debian/compat b/debian/compat
index 7f8f011..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-7
+9
diff --git a/debian/confflags b/debian/confflags
index de19e12..c8528bf 100644
--- a/debian/confflags
+++ b/debian/confflags
@@ -10,7 +10,7 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
 	MAKEFLAGS += -j$(NUMJOBS)
 endif
 
-common_confflags += --prefix=/usr
+common_confflags += --prefix=/usr --libdir=/usr/lib/$(DEB_HOST_MULTIARCH)
 
 # XXX why isn't --enable-visualize used in the static build?
 # TODO --disable-asm when we build an opt flavor?
@@ -58,7 +58,7 @@ has_sse := $(call check_asm, $(sse_asm))
 ifneq ($(has_sse),1)
 # build an SSE optimized flavor for i686
 do_opt := yes
-opt_libdir := /usr/lib/i686/sse2
+opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/i686/sse2
 shared_confflags += --disable-asm
 endif
 endif
@@ -78,7 +78,7 @@ has_altivec := $(call check_c, $(altivec_c), -include altivec.h)
 ifneq ($(has_altivec),1)
 # build an Altivec optimized flavor
 do_opt := yes
-opt_libdir := /usr/lib/altivec
+opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/altivec
 shared_confflags += --disable-asm
 endif
 endif
@@ -94,7 +94,7 @@ has_vis := $(call check_asm, $(vis_asm))
 ifneq ($(has_vis),1)
 # build a VIS optimized flavor
 do_opt := yes
-opt_libdir := /usr/lib/v9
+opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/v9
 shared_confflags += --disable-asm
 endif
 endif
@@ -124,7 +124,7 @@ endif
 shared_extra_cflags += -march=$(toolchain_arch)
 else
 do_opt := yes
-opt_libdir := /usr/lib/neon/vfp
+opt_libdir := /usr/lib/$(DEB_HOST_MULTIARCH)/neon/vfp
 shared_confflags += --disable-asm
 endif
 endif
diff --git a/debian/control b/debian/control
index e417e90..385c8b9 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Reinhard Tartler <siretart at tauware.de>,
            Fabian Greffrath <fabian+debian at greffrath.com>,
            Andres Mejia <amejia at debian.org>
-Build-Depends: debhelper (>= 7.0.50~),
+Build-Depends: debhelper (>= 8.1.3~),
                libavformat-dev (>= 4:0.5),
                libffms2-dev,
                yasm [any-i386 any-amd64],
@@ -48,6 +48,8 @@ Description: video encoder for the H.264/MPEG-4 AVC standard
 
 Package: libx264-116
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${shlibs:Depends},
          ${misc:Depends}
 Description: x264 video coding library
diff --git a/debian/libx264-116.install b/debian/libx264-116.install
deleted file mode 100644
index 444ad85..0000000
--- a/debian/libx264-116.install
+++ /dev/null
@@ -1 +0,0 @@
-shared/usr/lib/libx264.so.*     usr/lib
diff --git a/debian/libx264-116.install.in b/debian/libx264-116.install.in
new file mode 100644
index 0000000..96b2468
--- /dev/null
+++ b/debian/libx264-116.install.in
@@ -0,0 +1 @@
+shared/usr/lib/@DEB_HOST_MULTIARCH@/libx264.so.*     usr/lib/@DEB_HOST_MULTIARCH@
diff --git a/debian/libx264-dev.install b/debian/libx264-dev.install
deleted file mode 100644
index 3ccf86c..0000000
--- a/debian/libx264-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-shared/usr/lib/libx264.so               usr/lib
-static/usr/lib/libx264.a                usr/lib
-shared/usr/lib/pkgconfig/x264.pc        usr/lib/pkgconfig
-shared/usr/include                      usr
diff --git a/debian/libx264-dev.install.in b/debian/libx264-dev.install.in
new file mode 100644
index 0000000..e739ef8
--- /dev/null
+++ b/debian/libx264-dev.install.in
@@ -0,0 +1,4 @@
+shared/usr/lib/@DEB_HOST_MULTIARCH@/libx264.so        usr/lib/@DEB_HOST_MULTIARCH@
+static/usr/lib/@DEB_HOST_MULTIARCH@/libx264.a         usr/lib/@DEB_HOST_MULTIARCH@
+shared/usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig/x264.pc usr/lib/@DEB_HOST_MULTIARCH@/pkgconfig
+shared/usr/include                                    usr
diff --git a/debian/rules b/debian/rules
index 69a19dd..367d50a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,7 @@
 
 libx264N := $(shell sed -rn 's/^Package:[[:space:]]*(libx264-[0-9]+)[[:space:]]*$$/\1/p' debian/control)
 
+DEB_HOST_MULTIARCH  ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_HOST_GNU_CPU    ?= $(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
@@ -10,10 +11,20 @@ include debian/confflags
 
 LDFLAGS += -Wl,--as-needed
 
+DH_INSTALL_INPUT_FILES = debian/libx264-116.install.in \
+                         debian/libx264-dev.install.in
+
+DH_INSTALL_OUTPUT_FILES = $(DH_INSTALL_INPUT_FILES:.in=)
+
 %:
 	dh $@ --parallel
 
+$(DH_INSTALL_OUTPUT_FILES): $(DH_INSTALL_INPUT_FILES)
+	@echo "Generating $$(echo $@ | sed 's/\.in$$//') from $@"
+	sed -e 's/@DEB_HOST_MULTIARCH@/$(DEB_HOST_MULTIARCH)/g' $@.in > $@
+
 override_dh_auto_build:
+	debian/rules $(DH_INSTALL_OUTPUT_FILES)
 	# Build static lib
 	LDFLAGS="$(LDFLAGS)" ./configure $(static_confflags) \
 	   || ( tail -v -n +0 config.log config.log ; exit 1 )
@@ -43,7 +54,7 @@ override_dh_auto_install:
 override_dh_auto_clean:
 	rm -rf debian/install
 	$(MAKE) -o config.mak distclean
-	dh_clean config.mak2
+	dh_clean config.mak2 $(DH_INSTALL_OUTPUT_FILES)
 
 override_dh_install:
 	dh_install --list-missing --sourcedir=debian/install
diff --git a/debian/source/lintian-overrides b/debian/source/lintian-overrides
new file mode 100644
index 0000000..b85bd9b
--- /dev/null
+++ b/debian/source/lintian-overrides
@@ -0,0 +1,2 @@
+# Ignore this, since currently only debhelper (>= 8.1.3~) is needed.
+x264 source: package-needs-versioned-debhelper-build-depends 9

-- 
x264 packaging

