sysmo-bts
/
generic-poky
9
0
Fork 0
Code Pull Requests Releases Activity

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>
This commit is contained in:
Khem Raj 2014-08-28 19:08:05 -07:00 committed by Richard Purdie
parent 4d26851300
commit 9164912018
4 changed files with 76 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
meta/recipes-graphics/xorg-driver/xf86-video-intel/always_include_xorg_server.h.patch Normal file
View File

@ -0,0 +1,24 @@
Include xorg-server.h to fix build errors seen with glibc 2.20
In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0,
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:
/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
strndup(const char *str, size_t n);
^
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: xf86-video-intel-2.99.912/src/backlight.c
===================================================================
--- xf86-video-intel-2.99.912.orig/src/backlight.c 2014-04-09 10:41:18.000000000 -0700
+++ xf86-video-intel-2.99.912/src/backlight.c 2014-08-28 18:52:25.524070587 -0700
@@ -29,6 +29,7 @@
#include "config.h"
#endif
+#include <xorg-server.h>
#include <sys/types.h>
#include <sys/wait.h>
#include <sys/stat.h>

4
meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb
View File

@ -10,7 +10,9 @@ Infrastructure (DRI)."
LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e"
SRC_URI += "file://configure-dri.patch \
file://disable-x11-dri3.patch"
file://disable-x11-dri3.patch \
file://always_include_xorg_server.h.patch \
"
SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4"
SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501"

48
meta/recipes-graphics/xorg-driver/xf86-video-omapfb/0007-always_include_xorg_server.h.patch Normal file
View File

@ -0,0 +1,48 @@
Fix errors with glibc 2.20
In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0,
from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53,
from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115,
from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37,
from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44,
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:
/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
strndup(const char *str, size_t n);
^
In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0,
from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53,
from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115,
from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37,
from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44,
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:
/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__'
strndup(const char *str, size_t n);
^
Singed-off-by: Khem Raj <raj.khem@gmail.com>
Upstream-Status: Pending
Index: git/src/omapfb-xv-blizzard.c
===================================================================
--- git.orig/src/omapfb-xv-blizzard.c 2014-08-28 05:16:25.684070587 -0700
+++ git/src/omapfb-xv-blizzard.c 2014-08-28 19:05:39.440070587 -0700
@@ -30,6 +30,7 @@
* -
*/
+#include <xorg-server.h>
#include "xf86.h"
#include "xf86_OSlib.h"
#include "xf86xv.h"
Index: git/src/omapfb-xv-generic.c
===================================================================
--- git.orig/src/omapfb-xv-generic.c 2014-08-28 05:16:25.684070587 -0700
+++ git/src/omapfb-xv-generic.c 2014-08-28 19:05:51.780070587 -0700
@@ -25,6 +25,7 @@
* Generic functions for the XV driver
*/
+#include <xorg-server.h>
#include "xf86.h"
#include "xf86_OSlib.h"
#include "xf86xv.h"

1
meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb
View File

@ -20,6 +20,7 @@ SRC_URI = "git://git.pingu.fi/xf86-video-omapfb;protocol=http \
file://0004-blacklist-tv-out.patch \
file://0005-Attempt-to-fix-VRFB.patch \
file://0006-omapfb-port-to-new-xserver-video-API.patch \
file://0007-always_include_xorg_server.h.patch \
"
S = "${WORKDIR}/git"