summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKhem Raj <raj.khem@gmail.com>2014-08-28 19:08:05 -0700
committerRichard Purdie <richard.purdie@linuxfoundation.org>2014-09-01 18:03:05 +0100
commit9164912018b5e7b9e8d4431453d14b2a5c59c1a2 (patch)
tree67aeead417292de8826d226c56ad7c2a4080b581
parent4d2685130098bf4f7548ad339e0f88c114dd720a (diff)
downloadpoky-9164912018b5e7b9e8d4431453d14b2a5c59c1a2.tar.gz
xf86-video-intel/xf86-video-omapfb: Fix build with glibc 2.20
include xorg-xserver.h (From OE-Core rev: 286c3e8c88b1afbb3090a4988692968e67f498cf) Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch24
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb4
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch48
-rw-r--r--meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb1
4 files changed, 76 insertions, 1 deletions
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
new file mode 100644
index 0000000000..8a5dd39ae1
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch
@@ -0,0 +1,24 @@
1Include xorg-server.h to fix build errors seen with glibc 2.20
2
3In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0,
4 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-intel/2_2.99.912-r0/xf86-video-intel-2.99.912/src/backlight.c:39:
5/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
6 strndup(const char *str, size_t n);
7 ^
8
9Signed-off-by: Khem Raj <raj.khem@gmail.com>
10
11Upstream-Status: Pending
12
13Index: xf86-video-intel-2.99.912/src/backlight.c
14===================================================================
15--- xf86-video-intel-2.99.912.orig/src/backlight.c 2014-04-09 10:41:18.000000000 -0700
16+++ xf86-video-intel-2.99.912/src/backlight.c 2014-08-28 18:52:25.524070587 -0700
17@@ -29,6 +29,7 @@
18 #include "config.h"
19 #endif
20
21+#include <xorg-server.h>
22 #include <sys/types.h>
23 #include <sys/wait.h>
24 #include <sys/stat.h>
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
index 544de4ab55..a10cd9e278 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
@@ -10,7 +10,9 @@ Infrastructure (DRI)."
10LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" 10LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
11 11
12SRC_URI += "file://configure-dri.patch \ 12SRC_URI += "file://configure-dri.patch \
13 file://disable-x11-dri3.patch" 13 file://disable-x11-dri3.patch \
14 file://always_include_xorg_server.h.patch \
15 "
14 16
15SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4" 17SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4"
16SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501" 18SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch
new file mode 100644
index 0000000000..dc0b9b3f41
--- /dev/null
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch
@@ -0,0 +1,48 @@
1Fix errors with glibc 2.20
2
3In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0,
4 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53,
5 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115,
6 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37,
7 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44,
8 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-omapfb/2_0.1.1+gitrAUTOINC+28c006c94e-r21.7/git/src/omapfb-xv-blizzard.c:33:
9/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
10 strndup(const char *str, size_t n);
11 ^
12In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0,
13 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53,
14 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115,
15 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37,
16 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44,
17 from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/work/i586-oe-linux/xf86-video-omapfb/2_0.1.1+gitrAUTOINC+28c006c94e-r21.7/git/src/omapfb-xv-generic.c:28:
18/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
19 strndup(const char *str, size_t n);
20 ^
21
22Singed-off-by: Khem Raj <raj.khem@gmail.com>
23
24Upstream-Status: Pending
25Index: git/src/omapfb-xv-blizzard.c
26===================================================================
27--- git.orig/src/omapfb-xv-blizzard.c 2014-08-28 05:16:25.684070587 -0700
28+++ git/src/omapfb-xv-blizzard.c 2014-08-28 19:05:39.440070587 -0700
29@@ -30,6 +30,7 @@
30 * -
31 */
32
33+#include <xorg-server.h>
34 #include "xf86.h"
35 #include "xf86_OSlib.h"
36 #include "xf86xv.h"
37Index: git/src/omapfb-xv-generic.c
38===================================================================
39--- git.orig/src/omapfb-xv-generic.c 2014-08-28 05:16:25.684070587 -0700
40+++ git/src/omapfb-xv-generic.c 2014-08-28 19:05:51.780070587 -0700
41@@ -25,6 +25,7 @@
42 * Generic functions for the XV driver
43 */
44
45+#include <xorg-server.h>
46 #include "xf86.h"
47 #include "xf86_OSlib.h"
48 #include "xf86xv.h"
diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
index 50ce4c2f9c..4ad25389cd 100644
--- a/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
+++ b/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
@@ -20,6 +20,7 @@ SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
20 file://0004-blacklist-tv-out.patch \ 20 file://0004-blacklist-tv-out.patch \
21 file://0005-Attempt-to-fix-VRFB.patch \ 21 file://0005-Attempt-to-fix-VRFB.patch \
22 file://0006-omapfb-port-to-new-xserver-video-API.patch \ 22 file://0006-omapfb-port-to-new-xserver-video-API.patch \
23 file://0007-always_include_xorg_server.h.patch \
23" 24"
24 25
25S = "${WORKDIR}/git" 26S = "${WORKDIR}/git"