diff --git a/recipes/drm/libdrm/drm-update-arm.patch b/recipes/drm/libdrm/drm-update-arm.patch new file mode 100644 index 0000000..4389fe4 --- /dev/null +++ b/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 +Signed-off-by: Evan Kotara + +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 */ + diff --git a/recipes/drm/libdrm_2.4.36.oe b/recipes/drm/libdrm_2.4.36.oe index d074fb8..3ae5c22 100644 --- a/recipes/drm/libdrm_2.4.36.oe +++ b/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 \ " diff --git a/recipes/mesa/mesa-7.11.inc b/recipes/mesa/mesa-8.0.4.inc similarity index 73% rename from recipes/mesa/mesa-7.11.inc rename to recipes/mesa/mesa-8.0.4.inc index 2f4ded4..8363990 100644 --- a/recipes/mesa/mesa-7.11.inc +++ b/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" diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index a10ff6d..16f3d87 100644 --- a/recipes/mesa/mesa-common.inc +++ b/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++ diff --git a/recipes/mesa/mesa-dri-glsl_7.11.oe.sig b/recipes/mesa/mesa-dri-glsl_7.11.oe.sig deleted file mode 100644 index b7fcb75..0000000 --- a/recipes/mesa/mesa-dri-glsl_7.11.oe.sig +++ /dev/null @@ -1 +0,0 @@ -942358e42dcfaac966c643fe39375549c8638b68 MesaLib-7.11.tar.bz2 diff --git a/recipes/mesa/mesa-dri-glsl_7.11.oe b/recipes/mesa/mesa-dri-glsl_8.0.4.oe similarity index 86% rename from recipes/mesa/mesa-dri-glsl_7.11.oe rename to recipes/mesa/mesa-dri-glsl_8.0.4.oe index 1a0c38d..1ee0b65 100644 --- a/recipes/mesa/mesa-dri-glsl_7.11.oe +++ b/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++ diff --git a/recipes/mesa/mesa-dri-glsl_8.0.4.oe.sig b/recipes/mesa/mesa-dri-glsl_8.0.4.oe.sig new file mode 100644 index 0000000..5f785ec --- /dev/null +++ b/recipes/mesa/mesa-dri-glsl_8.0.4.oe.sig @@ -0,0 +1 @@ +c64f8c03caf9ededd5f7011e246c42a649096c8c MesaLib-8.0.4.tar.bz2 diff --git a/recipes/mesa/mesa-dri.inc b/recipes/mesa/mesa-dri.inc index 0c0a0d8..a212b57 100644 --- a/recipes/mesa/mesa-dri.inc +++ b/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 diff --git a/recipes/mesa/mesa-dri/32bittest.patch b/recipes/mesa/mesa-dri/32bittest.patch new file mode 100644 index 0000000..3ef73f7 --- /dev/null +++ b/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 diff --git a/recipes/mesa/mesa-dri_7.11.oe b/recipes/mesa/mesa-dri_7.11.oe deleted file mode 100644 index 6493407..0000000 --- a/recipes/mesa/mesa-dri_7.11.oe +++ /dev/null @@ -1,3 +0,0 @@ -include mesa-common.inc -include mesa-${PV}.inc -include mesa-dri.inc diff --git a/recipes/mesa/mesa-dri_7.11.oe.sig b/recipes/mesa/mesa-dri_7.11.oe.sig deleted file mode 100644 index b7fcb75..0000000 --- a/recipes/mesa/mesa-dri_7.11.oe.sig +++ /dev/null @@ -1 +0,0 @@ -942358e42dcfaac966c643fe39375549c8638b68 MesaLib-7.11.tar.bz2 diff --git a/recipes/mesa/mesa-dri_8.0.4.oe b/recipes/mesa/mesa-dri_8.0.4.oe new file mode 100644 index 0000000..8e15f11 --- /dev/null +++ b/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 +} \ No newline at end of file diff --git a/recipes/mesa/mesa-dri_8.0.4.oe.sig b/recipes/mesa/mesa-dri_8.0.4.oe.sig new file mode 100644 index 0000000..5f785ec --- /dev/null +++ b/recipes/mesa/mesa-dri_8.0.4.oe.sig @@ -0,0 +1 @@ +c64f8c03caf9ededd5f7011e246c42a649096c8c MesaLib-8.0.4.tar.bz2 diff --git a/recipes/xcb/xcb-proto_1.7.oe b/recipes/xcb/xcb-proto_1.7.1.oe similarity index 100% rename from recipes/xcb/xcb-proto_1.7.oe rename to recipes/xcb/xcb-proto_1.7.1.oe diff --git a/recipes/xcb/xcb-proto_1.7.1.oe.sig b/recipes/xcb/xcb-proto_1.7.1.oe.sig new file mode 100644 index 0000000..11f3c0d --- /dev/null +++ b/recipes/xcb/xcb-proto_1.7.1.oe.sig @@ -0,0 +1 @@ +82a568559235fc6e26d0a38911c5ea18f8e8455c xcb-proto-1.7.1.tar.bz2 diff --git a/recipes/xcb/xcb-proto_1.7.oe.sig b/recipes/xcb/xcb-proto_1.7.oe.sig deleted file mode 100644 index 0898e48..0000000 --- a/recipes/xcb/xcb-proto_1.7.oe.sig +++ /dev/null @@ -1 +0,0 @@ -f47772de91394aa9ad8ee8a5b57a71072d438b2b xcb-proto-1.7.tar.bz2 diff --git a/recipes/xorg-app/xconsole_1.0.6.oe b/recipes/xorg-app/xconsole_1.0.6.oe index a963e8e..53e3048 100644 --- a/recipes/xorg-app/xconsole_1.0.6.oe +++ b/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" \ No newline at end of file +DEPENDS += "libutil libxau libxt libxaw libxext libxmu libsm" +RDEPENDS_${PN} += "libutil libxau libxt libxaw libxext libxmu libsm" \ No newline at end of file diff --git a/recipes/xorg-app/xev_1.2.1.oe.sig b/recipes/xorg-app/xev_1.2.1.oe.sig deleted file mode 100644 index 6f0cd73..0000000 --- a/recipes/xorg-app/xev_1.2.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -7ae6233ccfd8f500d547093291cc2de4f2b8fbaa xev-1.2.1.tar.bz2 diff --git a/recipes/xorg-app/xev_1.2.1.oe b/recipes/xorg-app/xev_1.2.2.oe similarity index 83% rename from recipes/xorg-app/xev_1.2.1.oe rename to recipes/xorg-app/xev_1.2.2.oe index 2f1d02a..8378787 100644 --- a/recipes/xorg-app/xev_1.2.1.oe +++ b/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" diff --git a/recipes/xorg-app/xev_1.2.2.oe.sig b/recipes/xorg-app/xev_1.2.2.oe.sig new file mode 100644 index 0000000..32b2bdc --- /dev/null +++ b/recipes/xorg-app/xev_1.2.2.oe.sig @@ -0,0 +1 @@ +e737bc46c58b9bb10f0af9883dce203bbed708aa xev-1.2.2.tar.bz2 diff --git a/recipes/xorg-app/xkbcomp_1.2.3.oe.sig b/recipes/xorg-app/xkbcomp_1.2.3.oe.sig deleted file mode 100644 index fe6070a..0000000 --- a/recipes/xorg-app/xkbcomp_1.2.3.oe.sig +++ /dev/null @@ -1 +0,0 @@ -c20d1b5b8e25634cc9a79c5e4c3397a5ffbee1e0 xkbcomp-1.2.3.tar.bz2 diff --git a/recipes/xorg-app/xkbcomp_1.2.3.oe b/recipes/xorg-app/xkbcomp_1.2.4.oe similarity index 100% rename from recipes/xorg-app/xkbcomp_1.2.3.oe rename to recipes/xorg-app/xkbcomp_1.2.4.oe diff --git a/recipes/xorg-app/xkbcomp_1.2.4.oe.sig b/recipes/xorg-app/xkbcomp_1.2.4.oe.sig new file mode 100644 index 0000000..730bbee --- /dev/null +++ b/recipes/xorg-app/xkbcomp_1.2.4.oe.sig @@ -0,0 +1 @@ +695d2f2824884d9e54aa1419282ae167fdea163b xkbcomp-1.2.4.tar.bz2 diff --git a/recipes/xorg-app/xmodmap_1.0.7.oe.sig b/recipes/xorg-app/xmodmap_1.0.7.oe.sig deleted file mode 100644 index c2a9e40..0000000 --- a/recipes/xorg-app/xmodmap_1.0.7.oe.sig +++ /dev/null @@ -1 +0,0 @@ -9f9c6b7bd058c09a8e15b1c4f4eccb972e51ffef xmodmap-1.0.7.tar.bz2 diff --git a/recipes/xorg-app/xmodmap_1.0.7.oe b/recipes/xorg-app/xmodmap_1.0.9.oe similarity index 100% rename from recipes/xorg-app/xmodmap_1.0.7.oe rename to recipes/xorg-app/xmodmap_1.0.9.oe diff --git a/recipes/xorg-app/xmodmap_1.0.9.oe.sig b/recipes/xorg-app/xmodmap_1.0.9.oe.sig new file mode 100644 index 0000000..8e30b90 --- /dev/null +++ b/recipes/xorg-app/xmodmap_1.0.9.oe.sig @@ -0,0 +1 @@ +fe735c8bbba68d7eb50f82d4e092fdcadf161314 xmodmap-1.0.9.tar.bz2 diff --git a/recipes/xorg-driver/xf86-input-evdev_2.7.3.oe b/recipes/xorg-driver/xf86-input-evdev_2.7.3.oe index 61ff6d9..75a5ffa 100644 --- a/recipes/xorg-driver/xf86-input-evdev_2.7.3.oe +++ b/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 = " \ diff --git a/recipes/xorg-driver/xf86-input-keyboard_1.6.1.oe b/recipes/xorg-driver/xf86-input-keyboard_1.6.1.oe index 64effed..6b9969c 100644 --- a/recipes/xorg-driver/xf86-input-keyboard_1.6.1.oe +++ b/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" diff --git a/recipes/xorg-driver/xf86-input-mouse_1.7.1.oe b/recipes/xorg-driver/xf86-input-mouse_1.7.1.oe index 8f32909..25e5dbf 100644 --- a/recipes/xorg-driver/xf86-input-mouse_1.7.1.oe +++ b/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" diff --git a/recipes/xorg-driver/xf86-input-mtev_0.1.13.oe b/recipes/xorg-driver/xf86-input-mtev_0.1.13.oe index bb0c9c6..ccc9efe 100644 --- a/recipes/xorg-driver/xf86-input-mtev_0.1.13.oe +++ b/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" diff --git a/recipes/xorg-driver/xf86-video-ati_7.1.0.oe b/recipes/xorg-driver/xf86-video-ati_7.1.0.oe index 1a01d7a..82d4c5f 100644 --- a/recipes/xorg-driver/xf86-video-ati_7.1.0.oe +++ b/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 diff --git a/recipes/xorg-driver/xf86-video-fbdev_0.4.3.oe b/recipes/xorg-driver/xf86-video-fbdev_0.4.3.oe index b9db26c..0a8ecde 100644 --- a/recipes/xorg-driver/xf86-video-fbdev_0.4.3.oe +++ b/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 diff --git a/recipes/xorg-lib/libx11_1.5.0.oe b/recipes/xorg-lib/libx11_1.5.0.oe index 244d022..ac0bfc5 100644 --- a/recipes/xorg-lib/libx11_1.5.0.oe +++ b/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} diff --git a/recipes/xorg-lib/libxft_2.3.0.oe.sig b/recipes/xorg-lib/libxft_2.3.0.oe.sig deleted file mode 100644 index 322a461..0000000 --- a/recipes/xorg-lib/libxft_2.3.0.oe.sig +++ /dev/null @@ -1 +0,0 @@ -687f38a810b9ae58e1169c295d9d438370235e23 libXft-2.3.0.tar.bz2 diff --git a/recipes/xorg-lib/libxft_2.3.0.oe b/recipes/xorg-lib/libxft_2.3.1.oe similarity index 100% rename from recipes/xorg-lib/libxft_2.3.0.oe rename to recipes/xorg-lib/libxft_2.3.1.oe diff --git a/recipes/xorg-lib/libxft_2.3.1.oe.sig b/recipes/xorg-lib/libxft_2.3.1.oe.sig new file mode 100644 index 0000000..86cb0e3 --- /dev/null +++ b/recipes/xorg-lib/libxft_2.3.1.oe.sig @@ -0,0 +1 @@ +c7ec1361e3d4f095910f8c58988ab42e32f314d9 libXft-2.3.1.tar.bz2 diff --git a/recipes/xorg-lib/xkeyboard-config_2.1.oe.sig b/recipes/xorg-lib/xkeyboard-config_2.1.oe.sig deleted file mode 100644 index 9a05213..0000000 --- a/recipes/xorg-lib/xkeyboard-config_2.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -4e96e0704b2a17b291f98b2240611390e7a99f9e xkeyboard-config-2.1.tar.bz2 diff --git a/recipes/xorg-lib/xkeyboard-config_2.1.oe b/recipes/xorg-lib/xkeyboard-config_2.6.oe similarity index 100% rename from recipes/xorg-lib/xkeyboard-config_2.1.oe rename to recipes/xorg-lib/xkeyboard-config_2.6.oe diff --git a/recipes/xorg-lib/xkeyboard-config_2.6.oe.sig b/recipes/xorg-lib/xkeyboard-config_2.6.oe.sig new file mode 100644 index 0000000..61fca62 --- /dev/null +++ b/recipes/xorg-lib/xkeyboard-config_2.6.oe.sig @@ -0,0 +1 @@ +9a07cf04b1a7a13be7a86ce37c9f7efe1ec5fbc2 xkeyboard-config-2.6.tar.bz2 diff --git a/recipes/xorg-lib/xtrans_1.2.6.oe.sig b/recipes/xorg-lib/xtrans_1.2.6.oe.sig deleted file mode 100644 index 5d3203b..0000000 --- a/recipes/xorg-lib/xtrans_1.2.6.oe.sig +++ /dev/null @@ -1 +0,0 @@ -99f019a6e6d4d2b8274c4a27f9c8482c7fc64e85 xtrans-1.2.6.tar.bz2 diff --git a/recipes/xorg-lib/xtrans_1.2.6.oe b/recipes/xorg-lib/xtrans_1.2.7.oe similarity index 100% rename from recipes/xorg-lib/xtrans_1.2.6.oe rename to recipes/xorg-lib/xtrans_1.2.7.oe diff --git a/recipes/xorg-lib/xtrans_1.2.7.oe.sig b/recipes/xorg-lib/xtrans_1.2.7.oe.sig new file mode 100644 index 0000000..d969a85 --- /dev/null +++ b/recipes/xorg-lib/xtrans_1.2.7.oe.sig @@ -0,0 +1 @@ +b6ed421edf577816f6e641e1846dc0bff337676c xtrans-1.2.7.tar.bz2 diff --git a/recipes/xorg-proto/bigreqsproto_1.1.1.oe.sig b/recipes/xorg-proto/bigreqsproto_1.1.1.oe.sig deleted file mode 100644 index d92208a..0000000 --- a/recipes/xorg-proto/bigreqsproto_1.1.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -2db1d1e98958eee4d6cae0f68dbd03b2ec1018ce bigreqsproto-1.1.1.tar.bz2 diff --git a/recipes/xorg-proto/bigreqsproto_1.1.1.oe b/recipes/xorg-proto/bigreqsproto_1.1.2.oe similarity index 100% rename from recipes/xorg-proto/bigreqsproto_1.1.1.oe rename to recipes/xorg-proto/bigreqsproto_1.1.2.oe diff --git a/recipes/xorg-proto/bigreqsproto_1.1.2.oe.sig b/recipes/xorg-proto/bigreqsproto_1.1.2.oe.sig new file mode 100644 index 0000000..5dd4fe2 --- /dev/null +++ b/recipes/xorg-proto/bigreqsproto_1.1.2.oe.sig @@ -0,0 +1 @@ +ef1765eeb5e9e38d080225fe6a64ed7cd2984b46 bigreqsproto-1.1.2.tar.bz2 diff --git a/recipes/xorg-proto/dri2proto_2.6.oe.sig b/recipes/xorg-proto/dri2proto_2.6.oe.sig deleted file mode 100644 index 34f6d24..0000000 --- a/recipes/xorg-proto/dri2proto_2.6.oe.sig +++ /dev/null @@ -1 +0,0 @@ -ba65fc53376fd6e6b41bf6ef1e2ea1ba4b12ca96 dri2proto-2.6.tar.bz2 diff --git a/recipes/xorg-proto/dri2proto_2.6.oe b/recipes/xorg-proto/dri2proto_2.8.oe similarity index 100% rename from recipes/xorg-proto/dri2proto_2.6.oe rename to recipes/xorg-proto/dri2proto_2.8.oe diff --git a/recipes/xorg-proto/dri2proto_2.8.oe.sig b/recipes/xorg-proto/dri2proto_2.8.oe.sig new file mode 100644 index 0000000..01f4572 --- /dev/null +++ b/recipes/xorg-proto/dri2proto_2.8.oe.sig @@ -0,0 +1 @@ +2bc4e8f00778b1f3fe58b4c4f93607ac2adafbbf dri2proto-2.8.tar.bz2 diff --git a/recipes/xorg-proto/fontsproto_2.1.1.oe.sig b/recipes/xorg-proto/fontsproto_2.1.1.oe.sig deleted file mode 100644 index 051f792..0000000 --- a/recipes/xorg-proto/fontsproto_2.1.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -77ab428ad4ad7cf0294a72a2201d665c4edf5fb1 fontsproto-2.1.1.tar.bz2 diff --git a/recipes/xorg-proto/fontsproto_2.1.1.oe b/recipes/xorg-proto/fontsproto_2.1.2.oe similarity index 100% rename from recipes/xorg-proto/fontsproto_2.1.1.oe rename to recipes/xorg-proto/fontsproto_2.1.2.oe diff --git a/recipes/xorg-proto/fontsproto_2.1.2.oe.sig b/recipes/xorg-proto/fontsproto_2.1.2.oe.sig new file mode 100644 index 0000000..0b1b2b5 --- /dev/null +++ b/recipes/xorg-proto/fontsproto_2.1.2.oe.sig @@ -0,0 +1 @@ +538f0880faa6981cb1a348ced93dc715c42840f7 fontsproto-2.1.2.tar.bz2 diff --git a/recipes/xorg-proto/glproto_1.4.15.oe.sig b/recipes/xorg-proto/glproto_1.4.15.oe.sig deleted file mode 100644 index 77e03ee..0000000 --- a/recipes/xorg-proto/glproto_1.4.15.oe.sig +++ /dev/null @@ -1 +0,0 @@ -4cee35232f1926312b29d59a94da1c526b01e5c3 glproto-1.4.15.tar.bz2 diff --git a/recipes/xorg-proto/glproto_1.4.15.oe b/recipes/xorg-proto/glproto_1.4.16.oe similarity index 100% rename from recipes/xorg-proto/glproto_1.4.15.oe rename to recipes/xorg-proto/glproto_1.4.16.oe diff --git a/recipes/xorg-proto/glproto_1.4.16.oe.sig b/recipes/xorg-proto/glproto_1.4.16.oe.sig new file mode 100644 index 0000000..de030cb --- /dev/null +++ b/recipes/xorg-proto/glproto_1.4.16.oe.sig @@ -0,0 +1 @@ +6f1a971c6c6da3daf860ff2888fa0eae347479b0 glproto-1.4.16.tar.bz2 diff --git a/recipes/xorg-proto/kbproto_1.0.5.oe.sig b/recipes/xorg-proto/kbproto_1.0.5.oe.sig deleted file mode 100644 index 345b40c..0000000 --- a/recipes/xorg-proto/kbproto_1.0.5.oe.sig +++ /dev/null @@ -1 +0,0 @@ -d95fada09399568c434729b436e1a09503e15b7a kbproto-1.0.5.tar.bz2 diff --git a/recipes/xorg-proto/kbproto_1.0.5.oe b/recipes/xorg-proto/kbproto_1.0.6.oe similarity index 100% rename from recipes/xorg-proto/kbproto_1.0.5.oe rename to recipes/xorg-proto/kbproto_1.0.6.oe diff --git a/recipes/xorg-proto/kbproto_1.0.6.oe.sig b/recipes/xorg-proto/kbproto_1.0.6.oe.sig new file mode 100644 index 0000000..7a880e5 --- /dev/null +++ b/recipes/xorg-proto/kbproto_1.0.6.oe.sig @@ -0,0 +1 @@ +a2cc82357c22a1f4d6243017982c32703c95575c kbproto-1.0.6.tar.bz2 diff --git a/recipes/xorg-proto/recordproto_1.14.1.oe.sig b/recipes/xorg-proto/recordproto_1.14.1.oe.sig deleted file mode 100644 index da8b8c4..0000000 --- a/recipes/xorg-proto/recordproto_1.14.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -14acb36540814bfe5d3caf47311b72a3bf1322bd recordproto-1.14.1.tar.bz2 diff --git a/recipes/xorg-proto/recordproto_1.14.1.oe b/recipes/xorg-proto/recordproto_1.14.2.oe similarity index 100% rename from recipes/xorg-proto/recordproto_1.14.1.oe rename to recipes/xorg-proto/recordproto_1.14.2.oe diff --git a/recipes/xorg-proto/recordproto_1.14.2.oe.sig b/recipes/xorg-proto/recordproto_1.14.2.oe.sig new file mode 100644 index 0000000..ca55e6a --- /dev/null +++ b/recipes/xorg-proto/recordproto_1.14.2.oe.sig @@ -0,0 +1 @@ +1f48c4b0004d8b133efd0498e8d88d68d3b9199c recordproto-1.14.2.tar.bz2 diff --git a/recipes/xorg-proto/xcmiscproto_1.2.1.oe.sig b/recipes/xorg-proto/xcmiscproto_1.2.1.oe.sig deleted file mode 100644 index 6a74afe..0000000 --- a/recipes/xorg-proto/xcmiscproto_1.2.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -ff7ddb6e5698bf4461a524ca30f3b32e2a9dce8a xcmiscproto-1.2.1.tar.bz2 diff --git a/recipes/xorg-proto/xcmiscproto_1.2.1.oe b/recipes/xorg-proto/xcmiscproto_1.2.2.oe similarity index 100% rename from recipes/xorg-proto/xcmiscproto_1.2.1.oe rename to recipes/xorg-proto/xcmiscproto_1.2.2.oe diff --git a/recipes/xorg-proto/xcmiscproto_1.2.2.oe.sig b/recipes/xorg-proto/xcmiscproto_1.2.2.oe.sig new file mode 100644 index 0000000..b0e0cb8 --- /dev/null +++ b/recipes/xorg-proto/xcmiscproto_1.2.2.oe.sig @@ -0,0 +1 @@ +59ae9ec6414964440bf654b207618e5dd66a32fb xcmiscproto-1.2.2.tar.bz2 diff --git a/recipes/xorg-proto/xextproto_7.2.0.oe.sig b/recipes/xorg-proto/xextproto_7.2.0.oe.sig deleted file mode 100644 index b1f9345..0000000 --- a/recipes/xorg-proto/xextproto_7.2.0.oe.sig +++ /dev/null @@ -1 +0,0 @@ -a117fb9d7fdebee7af3f9e79efe9812e39e650a5 xextproto-7.2.0.tar.bz2 diff --git a/recipes/xorg-proto/xextproto_7.2.0.oe b/recipes/xorg-proto/xextproto_7.2.1.oe similarity index 100% rename from recipes/xorg-proto/xextproto_7.2.0.oe rename to recipes/xorg-proto/xextproto_7.2.1.oe diff --git a/recipes/xorg-proto/xextproto_7.2.1.oe.sig b/recipes/xorg-proto/xextproto_7.2.1.oe.sig new file mode 100644 index 0000000..5244316 --- /dev/null +++ b/recipes/xorg-proto/xextproto_7.2.1.oe.sig @@ -0,0 +1 @@ +f969e02009adf2d51fd1ba4583a859984728a461 xextproto-7.2.1.tar.bz2 diff --git a/recipes/xorg-proto/xproto_7.0.22.oe.sig b/recipes/xorg-proto/xproto_7.0.22.oe.sig deleted file mode 100644 index 574f125..0000000 --- a/recipes/xorg-proto/xproto_7.0.22.oe.sig +++ /dev/null @@ -1 +0,0 @@ -96d9b37d15591412a94dd0d3620008e20ef500ca xproto-7.0.22.tar.bz2 diff --git a/recipes/xorg-proto/xproto_7.0.22.oe b/recipes/xorg-proto/xproto_7.0.25.oe similarity index 100% rename from recipes/xorg-proto/xproto_7.0.22.oe rename to recipes/xorg-proto/xproto_7.0.25.oe diff --git a/recipes/xorg-proto/xproto_7.0.25.oe.sig b/recipes/xorg-proto/xproto_7.0.25.oe.sig new file mode 100644 index 0000000..4398e7f --- /dev/null +++ b/recipes/xorg-proto/xproto_7.0.25.oe.sig @@ -0,0 +1 @@ +335f84713f9da3f77c48536f53abb9b03bcb3961 xproto-7.0.25.tar.bz2 diff --git a/recipes/xorg-xserver/xserver-xorg-common.inc b/recipes/xorg-xserver/xserver-xorg-common.inc index bd77b56..8767814 100644 --- a/recipes/xorg-xserver/xserver-xorg-common.inc +++ b/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" diff --git a/recipes/xorg-xserver/xserver-xorg.inc b/recipes/xorg-xserver/xserver-xorg.inc index f9e4ca9..7226869 100644 --- a/recipes/xorg-xserver/xserver-xorg.inc +++ b/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 \ " diff --git a/recipes/xorg-xserver/xserver-xorg/aarch64.patch b/recipes/xorg-xserver/xserver-xorg/aarch64.patch index 7882ebe..045e24a 100644 --- a/recipes/xorg-xserver/xserver-xorg/aarch64.patch +++ b/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 +++++++ diff --git a/recipes/xorg-xserver/xserver-xorg/fix_nested_extern_dec.patch b/recipes/xorg-xserver/xserver-xorg/fix_nested_extern_dec.patch new file mode 100644 index 0000000..ae9bca4 --- /dev/null +++ b/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" diff --git a/recipes/xorg-xserver/xserver-xorg/sdksyms_gcc5.patch b/recipes/xorg-xserver/xserver-xorg/sdksyms_gcc5.patch new file mode 100644 index 0000000..15ef6ee --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg/sdksyms_gcc5.patch @@ -0,0 +1,46 @@ +From 21b896939c5bb242f3aacc37baf12379e43254b6 Mon Sep 17 00:00:00 2001 +From: Egbert Eich +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 +Tested-by: Daniel Stone +Signed-off-by: Peter Hutterer + +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 + diff --git a/recipes/xorg-xserver/xserver-xorg_1.14.0.oe.sig b/recipes/xorg-xserver/xserver-xorg_1.14.0.oe.sig deleted file mode 100644 index 101f5ac..0000000 --- a/recipes/xorg-xserver/xserver-xorg_1.14.0.oe.sig +++ /dev/null @@ -1 +0,0 @@ -62b35456ece3e2bb9944b0c1f8b880ec02aab91e xorg-server-1.14.0.tar.bz2 diff --git a/recipes/xorg-xserver/xserver-xorg_1.14.0.oe b/recipes/xorg-xserver/xserver-xorg_1.14.7.oe similarity index 76% rename from recipes/xorg-xserver/xserver-xorg_1.14.0.oe rename to recipes/xorg-xserver/xserver-xorg_1.14.7.oe index 90ee280..d65094a 100644 --- a/recipes/xorg-xserver/xserver-xorg_1.14.0.oe +++ b/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/. -} \ No newline at end of file +} + diff --git a/recipes/xorg-xserver/xserver-xorg_1.14.7.oe.sig b/recipes/xorg-xserver/xserver-xorg_1.14.7.oe.sig new file mode 100644 index 0000000..0b82593 --- /dev/null +++ b/recipes/xorg-xserver/xserver-xorg_1.14.7.oe.sig @@ -0,0 +1 @@ +7a95765e56b124758fcd7b609589e65b8870880b xorg-server-1.14.7.tar.bz2