Lots of updates to make xorg build again

recipes/drm/libdrm/drm-update-arm.patch

@@ -0,0 +1,34 @@
+Add ARM support into xf86arm.h.  This provides support for Xorg interface.
+Without this the vivante samples will hang during close requiring a reboot
+
+Upstream-Status: Pending
+
+Signed-off-by: Lauren Post <lauren.post@freescale.com>
+Signed-off-by: Evan Kotara <evan.kotara@freescale.com>
+
+diff --git a/xf86drm.h b/xf86drm.h
+--- a/xf86drm.h
++++ b/xf86drm.h
+@@ -455,6 +455,22 @@ do {	register unsigned int __old __asm("o0");		\
+ 		: "cr0", "memory");			\
+ 	} while (0)
+
++#elif defined(__arm__)
++       #undef DRM_DEV_MODE
++       #define DRM_DEV_MODE     (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
++
++       #define DRM_CAS(lock,old,new,__ret)             \
++       do {                                            \
++               __asm__ __volatile__ (                  \
++                       "1: ldrex %0, [%1]\n"           \
++                       "   teq %0, %2\n"               \
++                       "   strexeq %0, %3, [%1]\n"     \
++                       "   movne   %0, #1\n"           \
++               : "=&r" (__ret)                         \
++               : "r" (lock), "r" (old), "r" (new)      \
++               : "cc","memory");                       \
++       } while (0)
++
+ #endif /* architecture */
+ #endif /* __GNUC__ >= 2 */
+

recipes/drm/libdrm_2.4.36.oe

@@ -3,5 +3,6 @@ LICENSE = "MIT"
 
 SRC_URI += "file://installtests.patch \
             file://GNU_SOURCE_definition.patch \
+	    file://drm-update-arm.patch \
            "
 

recipes/mesa/mesa-7.11.inc → recipes/mesa/mesa-8.0.4.inc

@@ -1,12 +1,9 @@
 DEPENDS += "native:mesa-dri-glsl"
 
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \
-           file://uclibc.patch \
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${PV}/MesaLib-${PV}.tar.bz2 \
            file://crossfix.patch \
-           file://crossfix-mklib.patch \
-           file://mesa_fix_for_x32.patch \
-           "
+           file://crossfix-mklib.patch"
 S = "${SRCDIR}/Mesa-${PV}"
 
 do_autoreconf[prefuncs] += "do_autoreconf_fixup"

recipes/mesa/mesa-common.inc

@@ -11,9 +11,10 @@ BUGTRACKER = "https://bugs.freedesktop.org"
 LICENSE = "MIT"
 
 PROTO_DEPS = "xf86driproto glproto"
-LIB_DEPS = "libx11 libxext"
+LIB_DEPS = "libx11 libxext libxmu libxi"
 
-DEPENDS = "native:makedepend native:python-runtime native:libxml2 ${PROTO_DEPS} ${LIB_DEPS}  libxxf86vm libxdamage libxfixes"
+DEPENDS = "native:makedepend native:python2 native:libxml2 ${PROTO_DEPS} ${LIB_DEPS}\
+           libxxf86vm libxdamage libxfixes native:libxml2-python"
 DEPENDS_${PN}-dev += "xf86driproto glproto"
 
 inherit autotools-autoreconf pkgconfig auto-package-libs c make c++

recipes/mesa/mesa-dri-glsl_7.11.oe → recipes/mesa/mesa-dri-glsl_8.0.4.oe

@@ -6,7 +6,7 @@ LICENSE = "GPLv3+"
 DEPENDS = "makedepend"
 RECIPE_TYPES = "native"
 
-SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2"
+SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/older-versions/8.x/${PV}/MesaLib-${PV}.tar.bz2"
 S = "${SRCDIR}/Mesa-${PV}/src/glsl/"
 
 inherit make c c++

recipes/mesa/mesa-dri-glsl_8.0.4.oe.sig

@@ -0,0 +1 @@
+c64f8c03caf9ededd5f7011e246c42a649096c8c  MesaLib-8.0.4.tar.bz2

recipes/mesa/mesa-dri.inc

@@ -1,5 +1,5 @@
 PROTO_DEPS += "dri2proto xproto xf86vidmodeproto"
-LIB_DEPS += "libdrm libexpat libpthread libdl librt"
+LIB_DEPS += "libxcb-glx libdrm libexpat libpthread libdl librt"
 COMMON_RDEPENDS = "libpthread libdl libstdc++ libm libgcc libc"
 
 # most of our targets do not have DRI so will use mesa-xlib

recipes/mesa/mesa-dri/32bittest.patch

@@ -0,0 +1,23 @@
+--- Mesa-7.11/bin/mklib.orig	2014-07-24 09:49:10.919586204 +0200
++++ Mesa-7.11/bin/mklib	2014-07-24 09:49:37.799586962 +0200
+@@ -334,9 +334,6 @@
+ 	    # environment.  If so, pass -m32 flag to linker.
+ 	    set ${OBJECTS}
+ 	    ABI32=`file $1 | grep 32-bit`
+-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-		OPTS="-m32 ${OPTS}"
+-	    fi
+
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
+@@ -391,9 +388,7 @@
+ 	    # environment.  If so, pass -m32 flag to linker.
+ 	    set ${OBJECTS}
+ 	    ABI32=`file $1 | grep 32-bit`
+-	    if [ "${ABI32}" -a `uname -m` = "x86_64" ] ; then
+-		OPTS="-m32 ${OPTS}"
+-	    fi
++
+             if [ "${ALTOPTS}" ] ; then
+                 OPTS=${ALTOPTS}
+             fi

recipes/mesa/mesa-dri_8.0.4.oe

@@ -0,0 +1,14 @@
+include mesa-common.inc
+include mesa-${PV}.inc
+include mesa-dri.inc
+
+do_compile() {
+    export PYTHON_MAJOR=$(python2 -c 'import sys; print(sys.version_info.major)')
+    export PYTHON_MINOR=$(python2 -c 'import sys; print(sys.version_info.minor)')
+    LIBDYNLOAD=${BUILD_SYSROOT}/lib/python$PYTHON_MAJOR.$PYTHON_MINOR/lib-dynload
+    #TODO: fix libxml2 python packaging
+    PYDIR=${libdir}/python$PYTHON_MAJOR.$PYTHON_MINOR
+    export PYTHONPATH=${BUILD_SYSROOT}/$PYDIR:$LIBDYNLOAD:${BUILD_SYSROOT}/$PYDIR/site-packages
+    export PYTHONHOME=${TARGET_SYSROOT}${prefix}
+    do_compile_make
+}

recipes/mesa/mesa-dri_8.0.4.oe.sig

@@ -0,0 +1 @@
+c64f8c03caf9ededd5f7011e246c42a649096c8c  MesaLib-8.0.4.tar.bz2

recipes/xcb/xcb-proto_1.7.1.oe.sig

@@ -0,0 +1 @@
+82a568559235fc6e26d0a38911c5ea18f8e8455c  xcb-proto-1.7.1.tar.bz2

recipes/xorg-app/xconsole_1.0.6.oe

@@ -1,4 +1,4 @@
 require xorg-app-common.inc
 
-DEPENDS += "libxau libxt libxaw libxext libxmu libsm"
-RDEPENDS_${PN} += "libxau libxt libxaw libxext libxmu libsm"
+DEPENDS += "libutil libxau libxt libxaw libxext libxmu libsm"
+RDEPENDS_${PN} += "libutil libxau libxt libxaw libxext libxmu libsm"

recipes/xorg-app/xev_1.2.1.oe → recipes/xorg-app/xev_1.2.2.oe

@@ -5,4 +5,4 @@ inherit autotools-autoreconf pkgconfig
 DEPENDS += " util-macros libx11 libxau libxt libxaw libxmu libice libsm libxext libxpm libxft libxrender fontconfig libxkbfile libxrandr xproto"
 RDEPENDS_${PN} += "libx11 libxau libxt libxext libxmu libsm libice libxaw libxrender libxft libxrandr xproto"
 
-export XEV_LIBS = "-lXt -ldl -lXmu -lXext -lXaw -lXrandr"
+export XEV_LIBS = "-lXt -ldl -lXmu -lXext -lXaw -lXrandr -lX11"

recipes/xorg-app/xev_1.2.2.oe.sig

@@ -0,0 +1 @@
+e737bc46c58b9bb10f0af9883dce203bbed708aa  xev-1.2.2.tar.bz2

recipes/xorg-app/xkbcomp_1.2.4.oe.sig

@@ -0,0 +1 @@
+695d2f2824884d9e54aa1419282ae167fdea163b  xkbcomp-1.2.4.tar.bz2

recipes/xorg-app/xmodmap_1.0.9.oe.sig

@@ -0,0 +1 @@
+fe735c8bbba68d7eb50f82d4e092fdcadf161314  xmodmap-1.0.9.tar.bz2

recipes/xorg-driver/xf86-input-evdev_2.7.3.oe

@@ -14,7 +14,7 @@ xorg.conf for each input device that will use this driver. "
 
 SRC_URI += "file://compile_without_udev.patch"
 
-DEPENDS += "mtdev-dev mtdev"
+DEPENDS += "mtdev-dev mtdev renderproto"
 RDEPENDS_${PN} += "mtdev"
 
 AUTORECONF_CMD = " \

recipes/xorg-driver/xf86-input-keyboard_1.6.1.oe

@@ -7,3 +7,4 @@ driver supports the standard OS-provided keyboard interface.  The driver \
 functions as a keyboard input device, and may be used as the X server's \
 core keyboard."
 
+DEPENDS += "renderproto"

recipes/xorg-driver/xf86-input-mouse_1.7.1.oe

@@ -8,3 +8,4 @@ functions as a pointer input device, and may be used as the X server's \
 core pointer. Multiple mice are supported by multiple instances of this \
 driver."
 
+DEPENDS += "renderproto"

recipes/xorg-driver/xf86-input-mtev_0.1.13.oe

@@ -9,7 +9,11 @@ SRC_URI = "file://xorg-x11-drv-mtev-0.1.13.tar.gz \
 	   "
 #SRC_URI += "file://ABI_12.patch"
 
-DEPENDS += "inputproto kbproto pixman xextproto libpciaccess xserver-xorg-dev xproto randrproto util-macros mtdev-dev libm mtdev"
+COMPATIBLE_IF_FLAGS = "build-xf86-input-mtev"
+
+DEPENDS += "inputproto kbproto pixman xextproto libpciaccess xserver-xorg-dev xproto \
+            randrproto util-macros mtdev-dev libm mtdev xineramaproto resourceproto \
+            scrnsaverproto videoproto"
 
 RDEPENDS_${PN} = "mtdev"
 

recipes/xorg-driver/xf86-video-ati_7.1.0.oe

@@ -2,7 +2,10 @@ DESCRIPTION = "X.Org X server -- Radeon ATI display driver"
 
 require xorg-driver-video.inc
 
-DEPENDS += "libdrm-radeon kbproto xf86driproto"
+COMPATIBLE_IF_FLAGS = "build-xf86-video-ati"
+
+DEPENDS += "libdrm-radeon kbproto xf86driproto renderproto resourceproto \
+            scrnsaverproto"
 LIBS_DEPS = """
 	xserver-xorg-extension-dri
 	xserver-xorg-extension-dri2

recipes/xorg-driver/xf86-video-fbdev_0.4.3.oe

@@ -1,6 +1,8 @@
 require xorg-driver-video.inc
 DESCRIPTION = "X.Org X server -- fbdev display driver"
 
+DEPENDS += "renderproto resourceproto scrnsaverproto"
+
 RDEPENDS_${PN} += """
 xserver-xorg-extension-fbdevhw
 xserver-xorg-extension-fb

recipes/xorg-lib/libx11_1.5.0.oe

@@ -25,7 +25,7 @@ PACKAGES =+ "${PN}-makekeys"
 DO_INSTALL_NATIVE = ""
 DO_INSTALL_NATIVE:native = "do_install_native"
 
-do_install[postfuncs] = "${DO_INSTALL_NATIVE}"
+do_install[postfuncs] += "${DO_INSTALL_NATIVE}"
 
 do_install_native(){
   mkdir -p ${D}${bindir}

recipes/xorg-lib/libxft_2.3.1.oe.sig

@@ -0,0 +1 @@
+c7ec1361e3d4f095910f8c58988ab42e32f314d9  libXft-2.3.1.tar.bz2

recipes/xorg-lib/xkeyboard-config_2.6.oe.sig

@@ -0,0 +1 @@
+9a07cf04b1a7a13be7a86ce37c9f7efe1ec5fbc2  xkeyboard-config-2.6.tar.bz2

recipes/xorg-lib/xtrans_1.2.7.oe.sig

@@ -0,0 +1 @@
+b6ed421edf577816f6e641e1846dc0bff337676c  xtrans-1.2.7.tar.bz2

recipes/xorg-proto/bigreqsproto_1.1.2.oe.sig

@@ -0,0 +1 @@
+ef1765eeb5e9e38d080225fe6a64ed7cd2984b46  bigreqsproto-1.1.2.tar.bz2

recipes/xorg-proto/dri2proto_2.8.oe.sig

@@ -0,0 +1 @@
+2bc4e8f00778b1f3fe58b4c4f93607ac2adafbbf  dri2proto-2.8.tar.bz2

recipes/xorg-proto/fontsproto_2.1.2.oe.sig

@@ -0,0 +1 @@
+538f0880faa6981cb1a348ced93dc715c42840f7  fontsproto-2.1.2.tar.bz2

recipes/xorg-proto/glproto_1.4.16.oe.sig

@@ -0,0 +1 @@
+6f1a971c6c6da3daf860ff2888fa0eae347479b0  glproto-1.4.16.tar.bz2

recipes/xorg-proto/kbproto_1.0.6.oe.sig

@@ -0,0 +1 @@
+a2cc82357c22a1f4d6243017982c32703c95575c  kbproto-1.0.6.tar.bz2

recipes/xorg-proto/recordproto_1.14.2.oe.sig

@@ -0,0 +1 @@
+1f48c4b0004d8b133efd0498e8d88d68d3b9199c  recordproto-1.14.2.tar.bz2

recipes/xorg-proto/xcmiscproto_1.2.2.oe.sig

@@ -0,0 +1 @@
+59ae9ec6414964440bf654b207618e5dd66a32fb  xcmiscproto-1.2.2.tar.bz2

recipes/xorg-proto/xextproto_7.2.1.oe.sig

@@ -0,0 +1 @@
+f969e02009adf2d51fd1ba4583a859984728a461  xextproto-7.2.1.tar.bz2

recipes/xorg-proto/xproto_7.0.25.oe.sig

@@ -0,0 +1 @@
+335f84713f9da3f77c48536f53abb9b03bcb3961  xproto-7.0.25.tar.bz2

recipes/xorg-xserver/xserver-xorg-common.inc

@@ -74,9 +74,9 @@ XSERVER_CONF = ""
 DEPENDS:>USE_xserver_xf86vidmode = " xf86vidmodeproto"
 DEPENDS:>USE_xserver_screensaver = " scrnsaverproto"
 DEPENDS:>USE_xserver_record      = " recordproto"
-DEPENDS:>USE_xserver_dri         = " glproto xf86driproto dri2proto libgl"
+DEPENDS:>USE_xserver_dri         = " glproto xf86driproto dri2proto mesa-dri-libgl"
 DEPENDS:>USE_xserver_dga         = " xf86dgaproto"
-DEPENDS_${PN}:>USE_xserver_dri   = " glproto xf86driproto dri2proto"
+DEPENDS_${PN}:>USE_xserver_dri   = " glproto xf86driproto dri2proto mesa-dri-dev"
 RDEPENDS_${PN}:>USE_xserver_dri  = " libgl ${PN}-extension-dri mesa-dri"
 RDEPENDS_${PN}:>USE_xserver_dri2  = " ${PN}-extension-dri2"
 RDEPENDS_${PN}:>USE_xserver_glx  = " ${PN}-extension-glx"

recipes/xorg-xserver/xserver-xorg.inc

@@ -3,6 +3,5 @@ SRC_URI += "file://crosscompile.patch \
             file://fix_open_max_preprocessor_error.patch \
             file://mips64-compiler.patch \
             file://aarch64.patch \
-            file://fix_compilation_when_not_using_xinerama.patch \
-            file://0001-dixstruct.h-fix-segfaults-char-is-unsigned-for-ARM-a.patch \
+	    file://sdksyms_gcc5.patch \
            "

recipes/xorg-xserver/xserver-xorg/aarch64.patch

@@ -7,7 +7,7 @@ Xserver was checked in AArch64 fastmodel (commercial one with graphics support).
 
 http://patchwork.freedesktop.org/patch/12785/
 
-Upstream-status: Pending
+Upstream-Status: Pending
 
 ---
  include/servermd.h                      |    7 +++++++

recipes/xorg-xserver/xserver-xorg/fix_nested_extern_dec.patch

@@ -0,0 +1,10 @@
+--- xorg-server-1.14.0/dix/window.c.orig	2014-02-06 13:36:42.090942681 +0100
++++ xorg-server-1.14.0/dix/window.c	2014-02-06 13:37:06.538942327 +0100
+@@ -126,6 +126,7 @@
+ #ifdef COMPOSITE
+ #include "compint.h"
+ #endif
++#include "selection.h"
+
+ #include "privates.h"
+ #include "xace.h"

recipes/xorg-xserver/xserver-xorg/sdksyms_gcc5.patch

@@ -0,0 +1,46 @@
+From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001
+From: Egbert Eich <eich@freedesktop.org>
+Date: Tue, 3 Mar 2015 16:27:05 +0100
+Subject: symbols: Fix sdksyms.sh to cope with gcc5
+
+Gcc5 adds additional lines stating line numbers before and
+after __attribute__() which need to be skipped.
+
+Signed-off-by: Egbert Eich <eich@freedesktop.org>
+Tested-by: Daniel Stone <daniels@collabora.com>
+Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
+
+diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
+index 2305073..05ac410 100755
+--- a/hw/xfree86/sdksyms.sh
++++ b/hw/xfree86/sdksyms.sh
+@@ -350,13 +350,25 @@ BEGIN {
+     if (sdk) {
+ 	n = 3;
+
++        # skip line numbers GCC 5 adds before __attribute__
++        while ($n == "" || $0 ~ /^# [0-9]+ "/) {
++           getline;
++           n = 1;
++        }
++
+ 	# skip attribute, if any
+ 	while ($n ~ /^(__attribute__|__global)/ ||
+ 	    # skip modifiers, if any
+ 	    $n ~ /^\*?(unsigned|const|volatile|struct|_X_EXPORT)$/ ||
+ 	    # skip pointer
+-	    $n ~ /^[a-zA-Z0-9_]*\*$/)
++	    $n ~ /^[a-zA-Z0-9_]*\*$/) {
+ 	    n++;
++            # skip line numbers GCC 5 adds after __attribute__
++            while ($n == "" || $0 ~ /^# [0-9]+ "/) {
++               getline;
++               n = 1;
++            }
++        }
+
+ 	# type specifier may not be set, as in
+ 	#   extern _X_EXPORT unsigned name(...)
+-- 
+cgit v0.10.2
+

recipes/xorg-xserver/xserver-xorg_1.14.0.oe → recipes/xorg-xserver/xserver-xorg_1.14.7.oe

@@ -2,9 +2,10 @@ require xserver-xorg-common.inc
 
 require xserver-xorg.inc
 
-do_install[postfuncs] = "do_install_headers"
+do_install[postfuncs] += "do_install_headers"
 
 do_install_headers() {
   cd ${S}
   install -m 775 hw/xfree86/common/dgaproc.h ${D}${includedir}/xorg/.
-}
+}
+

recipes/xorg-xserver/xserver-xorg_1.14.7.oe.sig

@@ -0,0 +1 @@
+7a95765e56b124758fcd7b609589e65b8870880b  xorg-server-1.14.7.tar.bz2