diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics/xorg-lib')
13 files changed, 120 insertions, 276 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch deleted file mode 100644 index e92fc0d95d..0000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0001-Include-config.h-before-anything-else-in-.c.patch +++ /dev/null @@ -1,187 +0,0 @@ -From b14696a55796e739624bbda4f772427032efff2a Mon Sep 17 00:00:00 2001 -From: Julien Cristau <jcristau@debian.org> -Date: Sun, 26 Apr 2015 15:20:57 +0200 -Subject: [PATCH 1/4] Include config.h before anything else in *.c - -Debian bug#749008 <https://bugs.debian.org/749008> - -Reported-by: Michael Tautschnig <mt@debian.org> -Signed-off-by: Julien Cristau <jcristau@debian.org> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -Upstream-Status: Backport - - src/common_capability.c | 3 +++ - src/common_init.c | 3 +++ - src/common_interface.c | 3 +++ - src/common_io.c | 3 +++ - src/common_iterator.c | 3 +++ - src/common_map.c | 3 +++ - src/common_vgaarb_stub.c | 3 +++ - src/linux_devmem.c | 5 +++-- - src/openbsd_pci.c | 3 +++ - src/solx_devfs.c | 3 +++ - src/x86_pci.c | 4 +++- - 11 files changed, 33 insertions(+), 3 deletions(-) - -diff --git a/src/common_capability.c b/src/common_capability.c -index 488743d..15d395d 100644 ---- a/src/common_capability.c -+++ b/src/common_capability.c -@@ -31,6 +31,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <stdio.h> -diff --git a/src/common_init.c b/src/common_init.c -index b1c0c3e..f7b59bd 100644 ---- a/src/common_init.c -+++ b/src/common_init.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <errno.h> -diff --git a/src/common_interface.c b/src/common_interface.c -index 59778cf..cb95e90 100644 ---- a/src/common_interface.c -+++ b/src/common_interface.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <string.h> -diff --git a/src/common_io.c b/src/common_io.c -index f5c9e45..e9586ad 100644 ---- a/src/common_io.c -+++ b/src/common_io.c -@@ -22,6 +22,9 @@ - * Author: - * Adam Jackson <ajax@redhat.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <string.h> -diff --git a/src/common_iterator.c b/src/common_iterator.c -index ccf656d..2beb180 100644 ---- a/src/common_iterator.c -+++ b/src/common_iterator.c -@@ -28,6 +28,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <string.h> -diff --git a/src/common_map.c b/src/common_map.c -index 8757151..f1854bb 100644 ---- a/src/common_map.c -+++ b/src/common_map.c -@@ -21,6 +21,9 @@ - * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER - * DEALINGS IN THE SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <sys/types.h> - #include <sys/mman.h> -diff --git a/src/common_vgaarb_stub.c b/src/common_vgaarb_stub.c -index 9394273..c1708f6 100644 ---- a/src/common_vgaarb_stub.c -+++ b/src/common_vgaarb_stub.c -@@ -23,6 +23,9 @@ - * OTHER DEALINGS IN THE SOFTWARE. - * - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdio.h> - #include "pciaccess.h" -diff --git a/src/linux_devmem.c b/src/linux_devmem.c -index 10e3bde..0d0567c 100644 ---- a/src/linux_devmem.c -+++ b/src/linux_devmem.c -@@ -32,8 +32,9 @@ - * - * \author Ian Romanick <idr@us.ibm.com> - */ -- --#define _GNU_SOURCE -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <string.h> -diff --git a/src/openbsd_pci.c b/src/openbsd_pci.c -index 4d1b5cd..b8ce318 100644 ---- a/src/openbsd_pci.c -+++ b/src/openbsd_pci.c -@@ -13,6 +13,9 @@ - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <sys/param.h> - #include <sys/ioctl.h> -diff --git a/src/solx_devfs.c b/src/solx_devfs.c -index f572393..cf96467 100644 ---- a/src/solx_devfs.c -+++ b/src/solx_devfs.c -@@ -25,6 +25,9 @@ - /* - * Solaris devfs interfaces - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - - #include <stdlib.h> - #include <strings.h> -diff --git a/src/x86_pci.c b/src/x86_pci.c -index 49c1cab..32daa04 100644 ---- a/src/x86_pci.c -+++ b/src/x86_pci.c -@@ -18,8 +18,10 @@ - * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF - * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - */ -+#ifdef HAVE_CONFIG_H -+#include "config.h" -+#endif - --#define _GNU_SOURCE - #include <unistd.h> - #include <stdio.h> - #include <stdlib.h> --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch deleted file mode 100644 index 16d69a82a4..0000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0002-Fix-quoting-issue.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 765e0a38cb8c40f8865af5cb356ffe6039ffb08f Mon Sep 17 00:00:00 2001 -From: Thomas Klausner <wiz@NetBSD.org> -Date: Sun, 22 Mar 2015 21:38:23 +0100 -Subject: [PATCH 2/4] Fix quoting issue. - -m4 has '[]' as quoting characters, so if we want '[]' to -end up in the configure script, we need to quote them again. - -Reported by Greg Troxel <gdt@ir.bbn.com>. - -Signed-off-by: Thomas Klausner <wiz@NetBSD.org> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -Upstream-Status: Backport - - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index e67e9e1..888330b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -76,7 +76,7 @@ case $host_os in - ;; - *netbsd*) - case $host in -- *i[3-9]86*) -+ *i[[3-9]]86*) - PCIACCESS_LIBS="$PCIACCESS_LIBS -li386" - ;; - *x86_64*|*amd64*) --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch deleted file mode 100644 index f513c8e59c..0000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess/0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 6bd2f7f92eae713663f4e13f6e2cb23526607b8c Mon Sep 17 00:00:00 2001 -From: Felix Janda <felix.janda@posteo.de> -Date: Fri, 1 May 2015 16:36:50 +0200 -Subject: [PATCH 3/4] linux_sysfs.c: Include <limits.h> for PATH_MAX - -Fixes compilation with musl libc. - -Tested-by: Bernd Kuhls <bernd.kuhls@t-online.de> -Signed-off-by: Felix Janda <felix.janda@posteo.de> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> ---- -Upstream-Status: Backport - - src/linux_sysfs.c | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/linux_sysfs.c b/src/linux_sysfs.c -index 50d94cf..3f95e53 100644 ---- a/src/linux_sysfs.c -+++ b/src/linux_sysfs.c -@@ -45,6 +45,7 @@ - #include <sys/types.h> - #include <sys/stat.h> - #include <fcntl.h> -+#include <limits.h> - #include <sys/mman.h> - #include <dirent.h> - #include <errno.h> --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb index ffa6a609f3..a3b682b09b 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.4.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb @@ -6,14 +6,11 @@ PCI bus and devices in a platform-independent way." require xorg-lib-common.inc SRC_URI += "\ - file://0001-Include-config.h-before-anything-else-in-.c.patch \ - file://0002-Fix-quoting-issue.patch \ - file://0003-linux_sysfs.c-Include-limits.h-for-PATH_MAX.patch \ file://0004-Don-t-include-sys-io.h-on-arm.patch \ " -SRC_URI[md5sum] = "ace78aec799b1cf6dfaea55d3879ed9f" -SRC_URI[sha256sum] = "07f864654561e4ac8629a0ef9c8f07fbc1f8592d1b6c418431593e9ba2cf2fcf" +SRC_URI[md5sum] = "d810ab17e24c1418dedf7207fb2841d4" +SRC_URI[sha256sum] = "752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999" LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb index 5514c7f5e8..a699841255 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb @@ -14,8 +14,8 @@ ALLOW_EMPTY_${PN} = "1" SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" -SRC_URI[md5sum] = "e8fa31b42e13f87e8f5a7a2b731db7ee" -SRC_URI[sha256sum] = "35b6d54e3cc6f3ba28061da81af64b9a92b7b757319098172488a660e3d87299" +SRC_URI[md5sum] = "48c1544854a94db0e51499cc3afd797f" +SRC_URI[sha256sum] = "e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb index 0c761d766a..295f96a2e7 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.4.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.5.bb @@ -11,8 +11,8 @@ SRC_URI += "file://X18NCMSstubs.diff \ RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "6d54227082f3aa2c596f0b3a3fbb9175" -SRC_URI[sha256sum] = "b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441" +SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" +SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" EXTRA_OECONF += "--disable-xlocale" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch new file mode 100644 index 0000000000..897882b8d8 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch @@ -0,0 +1,60 @@ +From 5235a7f3692a4c3c90dd4ac1be3c670388904bbe Mon Sep 17 00:00:00 2001 +From: Tatu Frisk <tatu.frisk@ge.com> +Date: Tue, 14 Mar 2017 14:41:27 +0200 +Subject: [PATCH] Fix hanging issue in _XReply + +Assume event queue is empty if another thread is blocking waiting for event. + +If one thread was blocking waiting for an event and another thread sent a +reply to the X server, both threads got blocked until an event was +received. + +Upstream-Status: Submitted [https://patchwork.freedesktop.org/patch/171458/] + +This patch needs to be removed once the corresponding patch has been merged upstream. + +https://patchwork.freedesktop.org/patch/171458/ + +Signed-off-by: Tatu Frisk <tatu.frisk@ge.com> +Signed-off-by: Jose Alarcon <jose.alarcon@ge.com> +--- + src/xcb_io.c | 19 +++++++------------ + 1 file changed, 7 insertions(+), 12 deletions(-) + +diff --git a/src/xcb_io.c b/src/xcb_io.c +index 5987329..c64eb04 100644 +--- a/src/xcb_io.c ++++ b/src/xcb_io.c +@@ -609,22 +609,17 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard) + * letting anyone else process this sequence number, we + * need to process any events that should have come + * earlier. */ +- + if(dpy->xcb->event_owner == XlibOwnsEventQueue) + { + xcb_generic_reply_t *event; +- /* If some thread is already waiting for events, +- * it will get the first one. That thread must +- * process that event before we can continue. */ +- /* FIXME: That event might be after this reply, +- * and might never even come--or there might be +- * multiple threads trying to get events. */ +- while(dpy->xcb->event_waiter) +- { /* need braces around ConditionWait */ +- ConditionWait(dpy, dpy->xcb->event_notify); ++ ++ /* Assume event queue is empty if another thread is blocking ++ * waiting for event. */ ++ if(!dpy->xcb->event_waiter) ++ { ++ while((event = poll_for_response(dpy))) ++ handle_response(dpy, event, True); + } +- while((event = poll_for_event(dpy))) +- handle_response(dpy, event, True); + } + + req->reply_waiter = 0; +-- +2.10.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb deleted file mode 100644 index caa95fb48a..0000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.4.bb +++ /dev/null @@ -1,10 +0,0 @@ -require libx11.inc -inherit gettext - -BBCLASSEXTEND = "native nativesdk" - -SRC_URI += "file://disable_tests.patch \ - " - -SRC_URI[md5sum] = "6d54227082f3aa2c596f0b3a3fbb9175" -SRC_URI[sha256sum] = "b7c748be3aa16ec2cbd81edc847e9b6ee03f88143ab270fb59f58a044d34e441" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb new file mode 100644 index 0000000000..427bf28ceb --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11_1.6.5.bb @@ -0,0 +1,14 @@ +require libx11.inc +inherit gettext + +BBCLASSEXTEND = "native nativesdk" + +SRC_URI += "file://disable_tests.patch \ + file://Fix-hanging-issue-in-_XReply.patch \ + " +do_configure_append () { + sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile +} + +SRC_URI[md5sum] = "0f618db70c4054ca67cee0cc156a4255" +SRC_URI[sha256sum] = "4d3890db2ba225ba8c55ca63c6409c1ebb078a2806de59fb16342768ae63435d" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb index 455e869c7a..7c7fa3ddb3 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb @@ -16,6 +16,7 @@ PV = "0.0+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate \ file://fix-xcb.patch" +UPSTREAM_VERSION_UNKNOWN = "1" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch new file mode 100644 index 0000000000..1a691a3d5e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch @@ -0,0 +1,33 @@ +From b0c0e6d90bd99a699701c9542640adb218f5d536 Mon Sep 17 00:00:00 2001 +From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Date: Mon, 10 Jul 2017 16:51:13 +0300 +Subject: [PATCH] libXt: util: don't link makestrs with target cflags + +The line: AM_CFLAGS = $(XT_CFLAGS) +in util/Makefile.am is wrong because it adds target cflags to the +compilation of makestrs, which is built for the build machine, which +leads to build failures when cross-compiling. + +Upstream-Status: Pending + +Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- + util/Makefile.am | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/util/Makefile.am b/util/Makefile.am +index 800b35b..f2dd1f9 100644 +--- a/util/Makefile.am ++++ b/util/Makefile.am +@@ -11,7 +11,6 @@ EXTRA_DIST = \ + StrDefs.ht \ + string.list + +-AM_CFLAGS = $(XT_CFLAGS) + makestrs_SOURCES = makestrs.c + + +-- +2.4.0 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb index c1ed0bb314..180d00d9b0 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb @@ -23,7 +23,9 @@ PE = "1" XORG_PN = "libXt" -SRC_URI += "file://libxt_fix_for_x32.patch" +SRC_URI += "file://libxt_fix_for_x32.patch \ + file://0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch \ + " BBCLASSEXTEND = "native" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.20.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.21.bb index d00904df21..01a51adadc 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.20.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.21.bb @@ -13,11 +13,11 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "1f68886339116ae3877052204c9b9b88" -SRC_URI[sha256sum] = "d1bfc72553c4e3ef1cd6f13eec0488cf940498b612ab8a0b362e7090c94bc134" +SRC_URI[md5sum] = "af9498e8954907d0a47f0f7b3d21e1ef" +SRC_URI[sha256sum] = "30c17049fae129fc14875656da9aa3099e3031d6ce0ee1d77aae190fd9edcec5" SECTION = "x11/libs" -DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" +DEPENDS = "intltool-native util-macros libxslt-native" EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" |