[SCM] libva/master: Run configure with --disable-wayland on non-linux architectures
sramacher at users.alioth.debian.org
sramacher at users.alioth.debian.org
Sun Apr 6 12:06:58 UTC 2014
The following commit has been merged in the master branch:
commit b20d3158dc153910ae89b6eff525bb81ca794447
Author: Sebastian Ramacher <sramacher at debian.org>
Date: Sun Apr 6 14:06:46 2014 +0200
Run configure with --disable-wayland on non-linux architectures
diff --git a/debian/libva-dev.install b/debian/libva-dev.install
index 0269945..93646c2 100644
--- a/debian/libva-dev.install
+++ b/debian/libva-dev.install
@@ -1,9 +1,3 @@
usr/include
-usr/lib/*/libva-drm.so
-usr/lib/*/libva-egl.so
-usr/lib/*/libva-glx.so
-usr/lib/*/libva-tpi.so
-usr/lib/*/libva-x11.so
-usr/lib/*/libva-wayland.so
-usr/lib/*/libva.so
+usr/lib/*/libva*.so
usr/lib/*/pkgconfig
diff --git a/debian/rules b/debian/rules
index df9608a..ab767e0 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,13 @@
#!/usr/bin/make -f
+DEB_HOST_ARCH_OS = $(shell dpkg-architecture -qDEB_HOST_ARCH_OS)
+
+confflags = --disable-silent-rules
+ifeq (,$(findstring linux,$(DEB_HOST_ARCH_OS)))
+# wayland is only available on linux-any
+confflags += --disable-wayland
+endif
+
%:
dh $@ --parallel --with autoreconf
@@ -9,7 +17,7 @@ override_dh_makeshlibs:
dh_makeshlibs -plibva1 -V 'libva1 (>> 1.3.0~)'
override_dh_auto_configure:
- dh_auto_configure -- --disable-silent-rules
+ dh_auto_configure -- $(confflags)
get-orig-source:
$(dir $_)libva-get-orig-source
--
libva packaging
More information about the pkg-multimedia-commits
mailing list