From 7cf466ab4cd5a8ff3785879775a92aaaaf87d916 Mon Sep 17 00:00:00 2001 From: Torbjorn Tyridal Date: Mon, 25 Jan 2016 14:29:12 +0100 Subject: [PATCH] Enable multiarch .deb --- debian.upstream/compat | 2 +- debian.upstream/control.in | 2 +- debian.upstream/libva-dev.install | 4 ++-- debian.upstream/libva-drm.install.in | 2 +- debian.upstream/libva-egl.install.in | 2 +- debian.upstream/libva-glx.install.in | 2 +- debian.upstream/libva-wayland.install.in | 2 +- debian.upstream/libva-x11.install.in | 2 +- debian.upstream/libva.install.in | 2 +- debian.upstream/rules | 3 +++ 10 files changed, 13 insertions(+), 10 deletions(-) diff --git a/debian.upstream/compat b/debian.upstream/compat index 7ed6ff8..ec63514 100644 --- a/debian.upstream/compat +++ b/debian.upstream/compat @@ -1 +1 @@ -5 +9 diff --git a/debian.upstream/control.in b/debian.upstream/control.in index 6d7d82c..0ed8772 100644 --- a/debian.upstream/control.in +++ b/debian.upstream/control.in @@ -4,7 +4,7 @@ Maintainer: Gwenole Beauchesne Build-Depends: automake, autotools-dev, cdbs, - debhelper (>= 5), + debhelper (>= 9), libdrm-dev (>= @LIBDRM_VERSION@), @USE_X11_TRUE@ libx11-dev, libxext-dev, libxfixes-dev, @USE_GLX_TRUE@ libgl-dev, diff --git a/debian.upstream/libva-dev.install b/debian.upstream/libva-dev.install index 2611cdb..c69f68b 100644 --- a/debian.upstream/libva-dev.install +++ b/debian.upstream/libva-dev.install @@ -1,3 +1,3 @@ debian/tmp/usr/include/va/va*.h -debian/tmp/usr/lib/libva*.so -debian/tmp/usr/lib/pkgconfig/libva*.pc +debian/tmp/usr/lib/x86_64-linux-gnu/libva*.so +debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/libva*.pc diff --git a/debian.upstream/libva-drm.install.in b/debian.upstream/libva-drm.install.in index 7a9b5f2..0694282 100644 --- a/debian.upstream/libva-drm.install.in +++ b/debian.upstream/libva-drm.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libva-drm.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libva-drm.so.* diff --git a/debian.upstream/libva-egl.install.in b/debian.upstream/libva-egl.install.in index 5554b69..d8ebc46 100644 --- a/debian.upstream/libva-egl.install.in +++ b/debian.upstream/libva-egl.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libva-egl.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libva-egl.so.* diff --git a/debian.upstream/libva-glx.install.in b/debian.upstream/libva-glx.install.in index 2d33032..75c0c8a 100644 --- a/debian.upstream/libva-glx.install.in +++ b/debian.upstream/libva-glx.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libva-glx.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libva-glx.so.* diff --git a/debian.upstream/libva-wayland.install.in b/debian.upstream/libva-wayland.install.in index 2563fea..3926238 100644 --- a/debian.upstream/libva-wayland.install.in +++ b/debian.upstream/libva-wayland.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libva-wayland.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libva-wayland.so.* diff --git a/debian.upstream/libva-x11.install.in b/debian.upstream/libva-x11.install.in index 461d7bd..7cc86dd 100644 --- a/debian.upstream/libva-x11.install.in +++ b/debian.upstream/libva-x11.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libva-x11.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libva-x11.so.* diff --git a/debian.upstream/libva.install.in b/debian.upstream/libva.install.in index bad195c..c76432d 100644 --- a/debian.upstream/libva.install.in +++ b/debian.upstream/libva.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libva.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libva.so.* diff --git a/debian.upstream/rules b/debian.upstream/rules index 40b76be..d4269a5 100755 --- a/debian.upstream/rules +++ b/debian.upstream/rules @@ -4,6 +4,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + # Allow SMP build ifeq ($(DEBIAN_BUILD_NCPUS),) DEBIAN_BUILD_NCPUS = $(shell /usr/bin/getconf _NPROCESSORS_ONLN) -- 1.9.1