From 5af2340f39a04fb548c87eaa6acc34786265bb3d Mon Sep 17 00:00:00 2001 From: Torbjorn Tyridal Date: Mon, 25 Jan 2016 14:19:10 +0100 Subject: [PATCH] Enable multiarch .deb --- debian.upstream/compat | 2 +- debian.upstream/control.in | 2 +- debian.upstream/libgstvaapi-dev.install.in | 4 ++-- debian.upstream/libgstvaapi-drm.install.in | 2 +- debian.upstream/libgstvaapi-glx.install.in | 2 +- debian.upstream/libgstvaapi-wayland.install.in | 2 +- debian.upstream/libgstvaapi-x11.install.in | 2 +- debian.upstream/libgstvaapi.install.in | 4 ++-- debian.upstream/rules | 4 ++++ 9 files changed, 14 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 ec60688..f76ab9a 100644 --- a/debian.upstream/control.in +++ b/debian.upstream/control.in @@ -2,7 +2,7 @@ Source: gstreamer@GST_API_VERSION@-vaapi Section: libs Priority: optional Maintainer: Gwenole Beauchesne -Build-Depends: debhelper (>= 5), +Build-Depends: debhelper (>= 9), cdbs, libglib2.0-dev (>= @GLIB_VERSION_REQUIRED@), libgstreamer@GST_PKG_VERSION@-dev (>= @GST_VERSION_REQUIRED@), diff --git a/debian.upstream/libgstvaapi-dev.install.in b/debian.upstream/libgstvaapi-dev.install.in index 33d178a..14a060c 100644 --- a/debian.upstream/libgstvaapi-dev.install.in +++ b/debian.upstream/libgstvaapi-dev.install.in @@ -1,3 +1,3 @@ -debian/tmp/usr/lib/libgstvaapi*.so -debian/tmp/usr/lib/pkgconfig/gstreamer-vaapi*.pc +debian/tmp/usr/lib/x86_64-linux-gnu/libgstvaapi*.so +debian/tmp/usr/lib/x86_64-linux-gnu/pkgconfig/gstreamer-vaapi*.pc debian/tmp/usr/include/gstreamer-@GST_PKG_VERSION@/gst/vaapi/*.h diff --git a/debian.upstream/libgstvaapi-drm.install.in b/debian.upstream/libgstvaapi-drm.install.in index 3b18b62..061cb2b 100644 --- a/debian.upstream/libgstvaapi-drm.install.in +++ b/debian.upstream/libgstvaapi-drm.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libgstvaapi-drm-@GST_API_VERSION@.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libgstvaapi-drm-@GST_API_VERSION@.so.* diff --git a/debian.upstream/libgstvaapi-glx.install.in b/debian.upstream/libgstvaapi-glx.install.in index c100102..e4dd040 100644 --- a/debian.upstream/libgstvaapi-glx.install.in +++ b/debian.upstream/libgstvaapi-glx.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libgstvaapi-glx-@GST_API_VERSION@.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libgstvaapi-glx-@GST_API_VERSION@.so.* diff --git a/debian.upstream/libgstvaapi-wayland.install.in b/debian.upstream/libgstvaapi-wayland.install.in index ce4b3dd..1009bd1 100644 --- a/debian.upstream/libgstvaapi-wayland.install.in +++ b/debian.upstream/libgstvaapi-wayland.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libgstvaapi-wayland-@GST_API_VERSION@.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libgstvaapi-wayland-@GST_API_VERSION@.so.* diff --git a/debian.upstream/libgstvaapi-x11.install.in b/debian.upstream/libgstvaapi-x11.install.in index ff05932..929dfd4 100644 --- a/debian.upstream/libgstvaapi-x11.install.in +++ b/debian.upstream/libgstvaapi-x11.install.in @@ -1 +1 @@ -debian/tmp/usr/lib/libgstvaapi-x11-@GST_API_VERSION@.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libgstvaapi-x11-@GST_API_VERSION@.so.* diff --git a/debian.upstream/libgstvaapi.install.in b/debian.upstream/libgstvaapi.install.in index afb5221..9244172 100644 --- a/debian.upstream/libgstvaapi.install.in +++ b/debian.upstream/libgstvaapi.install.in @@ -1,2 +1,2 @@ -debian/tmp/usr/lib/libgstcodecparsers_vpx.so.* -debian/tmp/usr/lib/libgstvaapi-@GST_API_VERSION@.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libgstcodecparsers_vpx.so.* +debian/tmp/usr/lib/x86_64-linux-gnu/libgstvaapi-@GST_API_VERSION@.so.* diff --git a/debian.upstream/rules b/debian.upstream/rules index fe7eae2..cae29f3 100755 --- a/debian.upstream/rules +++ b/debian.upstream/rules @@ -5,6 +5,10 @@ include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/cdbs/1/rules/utils.mk + +DEB_CONFIGURE_EXTRA_FLAGS += --libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) + + # Allow HTML documentation build indep_conf_flags = \ --with-html-dir=\$${prefix}/share/doc/$(DEB_SOURCE_PACKAGE) -- 1.9.1