Package: libxine2-dev
Version: 1.2.6-1.3
Tags: patch
User: helm...@debian.org
Usertags: rebootstrap
Control: affects -1 + src:xine

xine fails to cross build from source, because its ./configure fails to
find libxine.pc. During cross compilation, pkg-config does not search
/usr/lib/pkgconfig and only considers /usr/share/pkgconfig and
/usr/lib/<hosttriplet>/pkgconfig. Since the former doesn't make sense
for libxine.pc, please move it to the latter directory.

The attached patch implements that in a minimal way, but passing a
multiarch --libdir to ./configure would solve this bug as well.

Helmut
diff --minimal -Nru xine-lib-1.2-1.2.6/debian/changelog 
xine-lib-1.2-1.2.6/debian/changelog
--- xine-lib-1.2-1.2.6/debian/changelog 2017-01-10 18:43:36.000000000 +0100
+++ xine-lib-1.2-1.2.6/debian/changelog 2017-09-17 15:51:41.000000000 +0200
@@ -1,3 +1,10 @@
+xine-lib-1.2 (1.2.6-1.4) UNRELEASED; urgency=medium
+
+  * Non-maintainer upload.
+  * Move libxine.pc to a multiarch location. (Closes: #-1)
+
+ -- Helmut Grohne <hel...@subdivi.de>  Sun, 17 Sep 2017 15:51:41 +0200
+
 xine-lib-1.2 (1.2.6-1.3) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --minimal -Nru xine-lib-1.2-1.2.6/debian/rules 
xine-lib-1.2-1.2.6/debian/rules
--- xine-lib-1.2-1.2.6/debian/rules     2017-01-10 18:32:42.000000000 +0100
+++ xine-lib-1.2-1.2.6/debian/rules     2017-09-17 15:51:41.000000000 +0200
@@ -12,9 +12,7 @@
 
 # These are used for cross-compiling and for saving the configure script
 # from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE      ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE     ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-DEB_HOST_ARCH          ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+include /usr/share/dpkg/architecture.mk
 
 ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
   $(error cross compiling is not supported by xine)
@@ -112,6 +110,10 @@
        dh_testdir
        dh_testroot
        dh_install
+       set -e; if test "$(DH_PACKAGE)" = libxine2-dev; then \
+               mkdir debian/libxine2-dev/usr/lib/$(DEB_HOST_MULTIARCH); \
+               mv debian/libxine2-dev/usr/lib/pkgconfig 
debian/libxine2-dev/usr/lib/$(DEB_HOST_MULTIARCH)/pkgconfig; \
+       fi
        test ! -f debian/overrides/$(DH_PACKAGE) || \
          install -Dm644 \
               debian/overrides/$(DH_PACKAGE) \

Reply via email to