| 1 |
commit: 1469ff24575a246ca2ec87157358a2544205a46d |
| 2 |
Author: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 29 17:58:30 2016 +0000 |
| 4 |
Commit: Chí-Thanh Christopher Nguyễn <chithanh <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 29 17:58:30 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1469ff24 |
| 7 |
|
| 8 |
x11-drivers/xf86-video-omapfb: fix building against glibc-2.20 |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/show_bug.cgi?id=549264 |
| 11 |
|
| 12 |
Package-Manager: portage-2.2.28 |
| 13 |
|
| 14 |
.../files/0007-always_include_xorg_server.h.patch | 48 ++++++++++++++++++++++ |
| 15 |
1 file changed, 48 insertions(+) |
| 16 |
|
| 17 |
diff --git a/x11-drivers/xf86-video-omapfb/files/0007-always_include_xorg_server.h.patch b/x11-drivers/xf86-video-omapfb/files/0007-always_include_xorg_server.h.patch |
| 18 |
new file mode 100644 |
| 19 |
index 0000000..dc0b9b3 |
| 20 |
--- /dev/null |
| 21 |
+++ b/x11-drivers/xf86-video-omapfb/files/0007-always_include_xorg_server.h.patch |
| 22 |
@@ -0,0 +1,48 @@ |
| 23 |
+Fix errors with glibc 2.20 |
| 24 |
+ |
| 25 |
+In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, |
| 26 |
+ from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, |
| 27 |
+ from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, |
| 28 |
+ from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, |
| 29 |
+ from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, |
| 30 |
+ 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: |
| 31 |
+/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' |
| 32 |
+ strndup(const char *str, size_t n); |
| 33 |
+ ^ |
| 34 |
+In file included from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/string.h:634:0, |
| 35 |
+ from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:53, |
| 36 |
+ from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/misc.h:115, |
| 37 |
+ from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86str.h:37, |
| 38 |
+ from /home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/xf86.h:44, |
| 39 |
+ 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: |
| 40 |
+/home/ubuntu/work/upstream/openembedded-core/build/tmp-glibc/sysroots/qemux86/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' |
| 41 |
+ strndup(const char *str, size_t n); |
| 42 |
+ ^ |
| 43 |
+ |
| 44 |
+Singed-off-by: Khem Raj <raj.khem@×××××.com> |
| 45 |
+ |
| 46 |
+Upstream-Status: Pending |
| 47 |
+Index: git/src/omapfb-xv-blizzard.c |
| 48 |
+=================================================================== |
| 49 |
+--- git.orig/src/omapfb-xv-blizzard.c 2014-08-28 05:16:25.684070587 -0700 |
| 50 |
++++ git/src/omapfb-xv-blizzard.c 2014-08-28 19:05:39.440070587 -0700 |
| 51 |
+@@ -30,6 +30,7 @@ |
| 52 |
+ * - |
| 53 |
+ */ |
| 54 |
+ |
| 55 |
++#include <xorg-server.h> |
| 56 |
+ #include "xf86.h" |
| 57 |
+ #include "xf86_OSlib.h" |
| 58 |
+ #include "xf86xv.h" |
| 59 |
+Index: git/src/omapfb-xv-generic.c |
| 60 |
+=================================================================== |
| 61 |
+--- git.orig/src/omapfb-xv-generic.c 2014-08-28 05:16:25.684070587 -0700 |
| 62 |
++++ git/src/omapfb-xv-generic.c 2014-08-28 19:05:51.780070587 -0700 |
| 63 |
+@@ -25,6 +25,7 @@ |
| 64 |
+ * Generic functions for the XV driver |
| 65 |
+ */ |
| 66 |
+ |
| 67 |
++#include <xorg-server.h> |
| 68 |
+ #include "xf86.h" |
| 69 |
+ #include "xf86_OSlib.h" |
| 70 |
+ #include "xf86xv.h" |
Archives