[SCM] libva packaging branch, master, updated. upstream/1.0.1-10-gd79d9f6

[ceros-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit d79d9f601b58c3fc76fb3f3b831c42a8c4f3b81c
Author: Andres Mejia <mcitadel at gmail.com>
Date:   Wed Jun 2 18:02:44 2010 -0400

    Don't build i965 driver on non-i386 or non-amd64 architectures.

diff --git a/debian/control b/debian/control
index 9a41abb..acdc6fd 100644
--- a/debian/control
+++ b/debian/control
@@ -68,7 +68,7 @@ Description: Video Acceleration (VA) API for Linux -- X11 runtime
  This package provides the libva-x11 library.
 
 Package: i965-va-driver
-Architecture: any
+Architecture: i386 amd64 kfreebsd-i386 kfreebsd-amd64 hurd-i386
 Provides: va-driver
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: Video Acceleration (VA) API for Linux -- i965 VA driver
diff --git a/debian/rules b/debian/rules
index 4145e1c..c94b377 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,12 @@
 #!/usr/bin/make -f
 
-CONFIGURE_OPTIONS ?= --prefix=/usr --enable-i965-driver
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
+I965_DRIVER=$(shell dpkg-architecture -a$(DEB_HOST_ARCH) -iany-amd64 || \
+	dpkg-architecture -a$(DEB_HOST_ARCH) -iany-i386 && \
+	echo '--enable-i965-driver')
+
+CONFIGURE_OPTIONS ?= --prefix=/usr $(I965_DRIVER)
 
 %:
 	dh --with quilt $@

-- 
libva packaging