[xorg-x11-drv-intel] xserver 1.15.99.903 ABI rebuild

[Hans de Goede]

commit 30d18a955b61bd49cd398d98cb31c32a4f27bc94
Author: Hans de Goede <hdegoede at redhat.com>
Date:   Wed Jun 18 15:12:07 2014 +0200

    xserver 1.15.99.903 ABI rebuild

 0002-backlight-Fix-compile-error.patch |   39 ++++++++++++++++++++++++++++++++
 xorg-x11-drv-intel.spec                |    2 +
 2 files changed, 41 insertions(+), 0 deletions(-)
---
diff --git a/0002-backlight-Fix-compile-error.patch b/0002-backlight-Fix-compile-error.patch
new file mode 100644
index 0000000..c03e3ad
--- /dev/null
+++ b/0002-backlight-Fix-compile-error.patch
@@ -0,0 +1,39 @@
+From fa6d053afc7d8f08d160714606e43c2635d00bc2 Mon Sep 17 00:00:00 2001
+From: Hans de Goede <hdegoede at redhat.com>
+Date: Wed, 18 Jun 2014 14:38:48 +0200
+Subject: [PATCH 2/4] backlight: Fix compile error
+
+/usr/include/xorg/os.h around line 579 reads:
+
+extern _X_EXPORT char *
+strndup(const char *str, size_t n);
+
+However strndup is already defined by glibc, and this redefine causes a
+compile error.
+
+This gets triggered because backlight.c does:
+
+Without first doing:
+
+Causing HAVE_STRNDUP to not be defined.
+
+Signed-off-by: Hans de Goede <hdegoede at redhat.com>
+---
+ src/backlight.c | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/backlight.c b/src/backlight.c
+index d5b10a0..62241ab 100644
+--- a/src/backlight.c
++++ b/src/backlight.c
+@@ -42,6 +42,7 @@
+ #include <fcntl.h>
+ #include <unistd.h>
+ #include <dirent.h>
++#include <xorg-server.h>
+ #include <xf86.h>
+ #include <pciaccess.h>
+ 
+-- 
+2.0.0
+
diff --git a/xorg-x11-drv-intel.spec b/xorg-x11-drv-intel.spec
index f329570..3c6580e 100644
--- a/xorg-x11-drv-intel.spec
+++ b/xorg-x11-drv-intel.spec
@@ -40,6 +40,7 @@ Source1:    make-intel-gpu-tools-snapshot.sh
 Source3:    http://xorg.freedesktop.org/archive/individual/app/intel-gpu-tools-%{gputoolsver}.tar.bz2
 Source4:    make-git-snapshot.sh
 Patch1:     0001-HACK-quick-fix-disable-dri3.patch
+Patch2:     0002-backlight-Fix-compile-error.patch
 
 ExclusiveArch: %{ix86} x86_64 ia64
 
@@ -88,6 +89,7 @@ Debugging tools for Intel graphics chips
 %prep
 %setup -q -n xf86-video-intel-%{?gitdate:%{gitdate}}%{!?gitdate:%{dirsuffix}} -b3
 %patch1 -p1
+%patch2 -p1
 autoreconf -i -v
 
 %build