debian/changelog | 8 ++++++++
debian/control | 2 +-
debian/rules | 5 +++++
3 files changed, 14 insertions(+), 1 deletion(-)
New commits:
commit afc42805685752bd48f448a24a683eaf3848de2e
Author: Dylan Aïssi <bob.dyb...@gmail.com>
Date: Wed Dec 14 22:52:23 2016 +0100
Fix FTBFS on Hurd by adding a condition into dh_install target for
libchromeXvMC
diff --git a/debian/changelog b/debian/changelog
index 5daf091..0b9678f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+xserver-xorg-video-openchrome (1:0.5.0-2) UNRELEASED; urgency=medium
+
+ * Fix FTBFS on Hurd:
+ - Exclude libdrm-dev from Build-Depend for Hurd-any instead only i386.
+ - Add a condition (!hurd) into dh_install target for libchromeXvMC*.
+
+ -- Dylan Aïssi <bob.dyb...@gmail.com> Wed, 14 Dec 2016 22:47:09 +0100
+
xserver-xorg-video-openchrome (1:0.5.0-1) unstable; urgency=medium
* New upstream release. (LP: #1640787)
diff --git a/debian/control b/debian/control
index 7dadf47..d81aa92 100644
--- a/debian/control
+++ b/debian/control
@@ -5,7 +5,7 @@ Maintainer: Debian X Strike Force <debian-x@lists.debian.org>
Uploaders: Dylan Aïssi <bob.dyb...@gmail.com>
Build-Depends:
debhelper (>= 10),
- libdrm-dev (>> 2.0) [!hurd-i386],
+ libdrm-dev (>> 2.0) [!hurd-any],
libgl1-mesa-dev | libgl1-dev,
libx11-dev,
libxvmc-dev,
diff --git a/debian/rules b/debian/rules
index 838fbf2..4640eea 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,9 +24,14 @@ override_dh_auto_install:
# Kill *.la files, and forget no-one:
override_dh_install:
find debian/tmp -name '*.la' -delete
+
+ # Do not try to install libchromeXvMC* on Hurd since they are not build
+ ifneq ($(DEB_HOST_ARCH_OS), hurd)
mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
mv debian/tmp/usr/lib/libchromeXvMC* \
debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/.
+ endif
+
dh_install --fail-missing
# That's a plugin, use appropriate warning level:
