debian/changelog | 7 +++
debian/patches/Link-the-driver-against-pixman.patch | 38 ++++++++++++++++++++
debian/patches/series | 1
3 files changed, 46 insertions(+)
New commits:
commit 7ec16ddfc59db873f4d5919bf4e300969ef9d89e
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Aug 12 19:48:48 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index 1868d4a..99835f1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.21.14-4) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-4) unstable; urgency=low
* Link the driver against pixman to get correct dependency (closes: #719518).
Thanks to Martin Perazzo for the report!
- -- Julien Cristau <jcris...@debian.org> Mon, 12 Aug 2013 19:36:46 +0200
+ -- Julien Cristau <jcris...@debian.org> Mon, 12 Aug 2013 19:48:43 +0200
xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low
commit 55f8f83a0cb6857b2ed4ca09f63522700ed61cb7
Author: Julien Cristau <jcris...@debian.org>
Date: Mon Aug 12 19:37:28 2013 +0200
Link the driver against pixman to get correct dependency (closes: #719518).
Thanks to Martin Perazzo for the report!
diff --git a/debian/changelog b/debian/changelog
index dd638b3..1868d4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.14-4) UNRELEASED; urgency=low
+
+ * Link the driver against pixman to get correct dependency (closes: #719518).
+ Thanks to Martin Perazzo for the report!
+
+ -- Julien Cristau <jcris...@debian.org> Mon, 12 Aug 2013 19:36:46 +0200
+
xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low
* Add patch to deal with missing 'struct sysinfo' in kfreebsd's
diff --git a/debian/patches/Link-the-driver-against-pixman.patch
b/debian/patches/Link-the-driver-against-pixman.patch
new file mode 100644
index 0000000..203552f
--- /dev/null
+++ b/debian/patches/Link-the-driver-against-pixman.patch
@@ -0,0 +1,38 @@
+From 666b4e7005b1b538c0320fbf4117e4477a61f951 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcris...@debian.org>
+Date: Mon, 12 Aug 2013 19:31:53 +0200
+Subject: [PATCH 1/2] Link the driver against pixman
+
+---
+ configure.ac | 1 +
+ src/Makefile.am | 2 +-
+ 2 files changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 104113e..bd5ce9d 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -392,6 +392,7 @@ XORG_DRIVER_CHECK_EXT(DPMSExtension, xextproto)
+ # Obtain compiler/linker options for the driver dependencies
+ PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.20]) # libdrm_intel is checked
separately
+ PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10])
++PKG_CHECK_MODULES(PIXMAN, [pixman-1])
+
+ LIBS=""
+ AC_SEARCH_LIBS(clock_gettime, rt, [CLOCK_GETTIME_LIBS=$LIBS])
+diff --git a/src/Makefile.am b/src/Makefile.am
+index 16b6967..8810b74 100644
+--- a/src/Makefile.am
++++ b/src/Makefile.am
+@@ -37,7 +37,7 @@ AM_CFLAGS = \
+ intel_drv_la_LTLIBRARIES = intel_drv.la
+ intel_drv_la_LDFLAGS = -module -avoid-version
+ intel_drv_ladir = @moduledir@/drivers
+-intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@
++intel_drv_la_LIBADD = legacy/liblegacy.la @PCIACCESS_LIBS@ $(PIXMAN_LIBS)
+
+ if SNA
+ SUBDIRS += sna
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 8a2257c..25dca33 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,2 @@
Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch
+Link-the-driver-against-pixman.patch
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1v8wje-0005c5...@vasks.debian.org
