summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoss Burton <ross.burton@intel.com>2015-08-25 10:23:26 +0100
committerRichard Purdie <richard.purdie@linuxfoundation.org>2015-08-30 12:36:00 +0100
commit650fe92a0bab18fb8cf9b41b75b11cee264329ea (patch)
tree943a578201afb476db18739cddbdc34f76811f53
parenta91e6f6c754721ff4d9624632a6275e6e69841ad (diff)
downloadpoky-650fe92a0bab18fb8cf9b41b75b11cee264329ea.tar.gz
xf86-video-intel: fix missing fstat() prototype
What I'm guessing is an updated systemd exposes less system headers, so xf86-video-intel was using fstat() without the required includes. Backport a patch from upstream to fix this problem. (From OE-Core rev: 3f38c912384d7398516f689bc5934d36cbfdd4d0) (From OE-Core rev: e3d182740355d9df206af01bc9ebff43a433f059) Signed-off-by: Ross Burton <ross.burton@intel.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch59
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb1
2 files changed, 60 insertions, 0 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch
new file mode 100644
index 0000000000..0e675ee9f2
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch
@@ -0,0 +1,59 @@
1Upstream-Status: Backport
2Signed-off-by: Ross Burton <ross.burton@intel.com>
3
4From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001
5From: Chris Wilson <chris@chris-wilson.co.uk>
6Date: Tue, 24 Feb 2015 15:25:40 +0000
7Subject: sna: udev integration depends on fstat and sys/stat.h
8
9src/sna/sna_driver.c: In function 'sna_handle_uevents':
10src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration]
11
12Also take the opportunity to include udev support in the configure
13summary.
14
15Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
16
17diff --git a/configure.ac b/configure.ac
18index 7476e2b..de3a4b3 100644
19--- a/configure.ac
20+++ b/configure.ac
21@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev,
22
23 if test "x$UDEV" != "xno"; then
24 PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"])
25+ AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"])
26 if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then
27 AC_MSG_ERROR([udev support requested but not found (libudev)])
28 fi
29 if test "x$udev" = "xyes"; then
30 AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection])
31+ udev_msg=" yes"
32+ else
33+ udev_msg=" no"
34 fi
35 fi
36
37@@ -911,6 +915,7 @@ echo " Support for Kernel Mode Setting? $KMS"
38 echo " Support for legacy User Mode Setting (for i810)? $UMS"
39 echo " Support for Direct Rendering Infrastructure:$dri_msg"
40 echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg"
41+echo " Support for display hotplug notifications (udev):$udev_msg"
42 echo " Build additional tools and utilities?$tools_msg"
43 if test -n "$xp_msg"; then
44 echo " Experimental support:$xp_msg"
45diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c
46index 8c0d0b5..bc20ef0 100644
47--- a/src/sna/sna_driver.c
48+++ b/src/sna/sna_driver.c
49@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL)
50 }
51
52 #if HAVE_UDEV
53+#include <sys/stat.h>
54+
55 static void
56 sna_handle_uevents(int fd, void *closure)
57 {
58--
59cgit v0.10.2
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
index 5a3e06ccbd..a2f145659b 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb
@@ -12,6 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
12SRC_URI += "file://disable-x11-dri3.patch \ 12SRC_URI += "file://disable-x11-dri3.patch \
13 file://always_include_xorg_server.h.patch \ 13 file://always_include_xorg_server.h.patch \
14 file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \ 14 file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \
15 file://udev-fstat.patch \
15 " 16 "
16 17
17SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" 18SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b"