xserver-xorg-video-intel: Changes to 'debian-unstable'
debian/changelog | 7 +
debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch | 51 ++++++++++
debian/patches/series | 2
3 files changed, 59 insertions(+), 1 deletion(-)
New commits:
commit ebf161f3c0f4df4e54bf453e058bf1b1e3fb9e00
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 15:31:40 2013 +0200
Upload to unstable
diff --git a/debian/changelog b/debian/changelog
index fe193cf..dd638b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,9 +1,9 @@
-xserver-xorg-video-intel (2:2.21.14-3) UNRELEASED; urgency=low
+xserver-xorg-video-intel (2:2.21.14-3) unstable; urgency=low
* Add patch to deal with missing 'struct sysinfo' in kfreebsd's
<sys/sysinfo.h>.
- -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 15:30:20 +0200
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 15:31:14 +0200
xserver-xorg-video-intel (2:2.21.14-2) unstable; urgency=low
commit 81c096e2887ece4bb1ec711b07b0a26366e2529c
Author: Julien Cristau <jcristau@debian.org>
Date: Mon Aug 12 15:30:56 2013 +0200
Add patch to deal with missing 'struct sysinfo' in kfreebsd's <sys/sysinfo.h>.
diff --git a/debian/changelog b/debian/changelog
index d5bcbc5..fe193cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xserver-xorg-video-intel (2:2.21.14-3) UNRELEASED; urgency=low
+
+ * Add patch to deal with missing 'struct sysinfo' in kfreebsd's
+ <sys/sysinfo.h>.
+
+ -- Julien Cristau <jcristau@debian.org> Mon, 12 Aug 2013 15:30:20 +0200
+
xserver-xorg-video-intel (2:2.21.14-2) unstable; urgency=low
* Don't enable valgrind on kfreebsd.
diff --git a/debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch b/debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch
new file mode 100644
index 0000000..ff4c0bd
--- /dev/null
+++ b/debian/patches/Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch
@@ -0,0 +1,51 @@
+From 73afe87de5d5cab04680c5954dad1f2ee9e2e5f4 Mon Sep 17 00:00:00 2001
+From: Julien Cristau <jcristau@debian.org>
+Date: Mon, 12 Aug 2013 14:38:22 +0200
+Subject: [PATCH 1/2] Check for struct sysinfo as well as <sys/sysinfo.h>
+
+Non-linux glibc systems have the latter but not the former.
+
+Signed-off-by: Julien Cristau <jcristau@debian.org>
+---
+ configure.ac | 2 +-
+ src/sna/kgem.c | 4 ++--
+ 2 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index 7235bde..aa98966 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -211,7 +211,7 @@ AC_ARG_ENABLE(sna,
+
+ if test "x$SNA" != "xno"; then
+ AC_DEFINE(USE_SNA, 1, [Enable SNA support])
+- AC_CHECK_HEADERS([sys/sysinfo.h])
++ AC_CHECK_HEADERS([sys/sysinfo.h], AC_CHECK_MEMBERS([struct sysinfo.totalram], [], [], [[#include <sys/sysinfo.h>]]))
+ fi
+ AC_MSG_CHECKING([whether to include SNA support])
+ AM_CONDITIONAL(SNA, test x$SNA != xno)
+diff --git a/src/sna/kgem.c b/src/sna/kgem.c
+index 5afe05f..98e801a 100644
+--- a/src/sna/kgem.c
++++ b/src/sna/kgem.c
+@@ -46,7 +46,7 @@
+ #include <memcheck.h>
+ #endif
+
+-#if HAVE_SYS_SYSINFO_H
++#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
+ #include <sys/sysinfo.h>
+ #endif
+
+@@ -694,7 +694,7 @@ agp_aperture_size(struct pci_device *dev, unsigned gen)
+ static size_t
+ total_ram_size(void)
+ {
+-#if HAVE_SYS_SYSINFO_H
++#ifdef HAVE_STRUCT_SYSINFO_TOTALRAM
+ struct sysinfo info;
+ if (sysinfo(&info) == 0)
+ return info.totalram * info.mem_unit;
+--
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index 9ed72bb..8a2257c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-# empty for now
+Check-for-struct-sysinfo-as-well-as-sys-sysinfo.h.patch
Reply to: