From dc4d98f3b5a65d242857dee24f3ead22f5810763 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:45:57 +0200 Subject: [PATCH 01/17] mesa: Update to last version --- recipes/mesa/mesa-10.5.5.inc | 5 ++++ recipes/mesa/mesa-7.11.inc | 18 -------------- recipes/mesa/mesa-common.inc | 2 +- recipes/mesa/mesa-dri-glsl_7.11.oe | 24 ------------------- recipes/mesa/mesa-dri-glsl_7.11.oe.sig | 1 - recipes/mesa/mesa-dri.inc | 8 ++++--- recipes/mesa/mesa-dri/mesa_fix_for_arm.patch | 23 ++++++++++++++++++ .../{mesa-dri_7.11.oe => mesa-dri_10.5.5.oe} | 0 recipes/mesa/mesa-dri_10.5.5.oe.sig | 1 + recipes/mesa/mesa-dri_7.11.oe.sig | 1 - 10 files changed, 35 insertions(+), 48 deletions(-) create mode 100644 recipes/mesa/mesa-10.5.5.inc delete mode 100644 recipes/mesa/mesa-7.11.inc delete mode 100644 recipes/mesa/mesa-dri-glsl_7.11.oe delete mode 100644 recipes/mesa/mesa-dri-glsl_7.11.oe.sig create mode 100644 recipes/mesa/mesa-dri/mesa_fix_for_arm.patch rename recipes/mesa/{mesa-dri_7.11.oe => mesa-dri_10.5.5.oe} (100%) create mode 100644 recipes/mesa/mesa-dri_10.5.5.oe.sig delete mode 100644 recipes/mesa/mesa-dri_7.11.oe.sig diff --git a/recipes/mesa/mesa-10.5.5.inc b/recipes/mesa/mesa-10.5.5.inc new file mode 100644 index 0000000..7474e71 --- /dev/null +++ b/recipes/mesa/mesa-10.5.5.inc @@ -0,0 +1,5 @@ +DEPENDS += "libxmu libxi" + +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" + +S = "${SRCDIR}/mesa-${PV}" diff --git a/recipes/mesa/mesa-7.11.inc b/recipes/mesa/mesa-7.11.inc deleted file mode 100644 index 2f4ded4..0000000 --- a/recipes/mesa/mesa-7.11.inc +++ /dev/null @@ -1,18 +0,0 @@ -DEPENDS += "native:mesa-dri-glsl" - - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ - file://uclibc.patch \ - file://crossfix.patch \ - file://crossfix-mklib.patch \ - file://mesa_fix_for_x32.patch \ - " -S = "${SRCDIR}/Mesa-${PV}" - -do_autoreconf[prefuncs] += "do_autoreconf_fixup" -do_autoreconf_fixup() { - #check for python not python2, because python-native does not stage python2 binary/link - sed -i 's/AC_CHECK_PROGS(\[PYTHON2\], \[python2 python\])/AC_CHECK_PROGS(\[PYTHON2\], \[python python\])/g' ${S}/configure.ac - # We need builtin_compiler built for buildhost arch instead of target (is provided by mesa-dri-glsl-native)" - sed -i "s#\./builtin_compiler#builtin_compiler#g" ${S}/src/glsl/Makefile -} diff --git a/recipes/mesa/mesa-common.inc b/recipes/mesa/mesa-common.inc index a10ff6d..42ab6f0 100644 --- a/recipes/mesa/mesa-common.inc +++ b/recipes/mesa/mesa-common.inc @@ -13,7 +13,7 @@ LICENSE = "MIT" PROTO_DEPS = "xf86driproto glproto" LIB_DEPS = "libx11 libxext" -DEPENDS = "native:makedepend native:python-runtime native:libxml2 ${PROTO_DEPS} ${LIB_DEPS} libxxf86vm libxdamage libxfixes" +DEPENDS += "native:makedepend native:python-runtime native:libxml2 ${PROTO_DEPS} ${LIB_DEPS} libxxf86vm libxdamage libxfixes" 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 b/recipes/mesa/mesa-dri-glsl_7.11.oe deleted file mode 100644 index 1a0c38d..0000000 --- a/recipes/mesa/mesa-dri-glsl_7.11.oe +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "gl shader language specific build from mesa-dri" -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -LICENSE = "GPLv3+" - -DEPENDS = "makedepend" -RECIPE_TYPES = "native" - -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" -S = "${SRCDIR}/Mesa-${PV}/src/glsl/" - -inherit make c c++ - -# use default config for native build -do_configure[prefuncs] += "do_configure_create" -do_configure_create() { - ln -sf ${S}/../../configs/linux ${S}/../../configs/current -} - -do_install() { - install -d ${D}/${bindir} - install -m 755 ${S}/builtin_compiler ${D}/${bindir}/builtin_compiler - install -m 755 ${S}/glsl_compiler ${D}/${bindir}/glsl_compiler -} 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.inc b/recipes/mesa/mesa-dri.inc index 0c0a0d8..19ce104 100644 --- a/recipes/mesa/mesa-dri.inc +++ b/recipes/mesa/mesa-dri.inc @@ -1,10 +1,12 @@ -PROTO_DEPS += "dri2proto xproto xf86vidmodeproto" -LIB_DEPS += "libdrm libexpat libpthread libdl librt" +PROTO_DEPS += "dri2proto dri3proto presentproto xproto xf86vidmodeproto" +LIB_DEPS += "libdrm libexpat libpthread libdl librt libxcb-glx libxcb-dri2 libxcb-randr libxcb-render libxcb-xfixes libxcb-shape libxcb-sync libxshmfence" COMMON_RDEPENDS = "libpthread libdl libstdc++ libm libgcc libc" # most of our targets do not have DRI so will use mesa-xlib DEFAULT_PREFERENCE = "-1" +DEPENDS += "native:bison" + DRIDRIVERS = "swrast" PACKAGES =+ "${PN}-swrast ${PN}-swrast-dbg" FILES_${PN} += "${libdir}/dri/swrast*" @@ -12,7 +14,7 @@ FILES_${PN}-dbg += "${libdir}/dri/.debug/swrast*" RDEPENDS_${PN} += "${LIB_DEPS} ${COMMON_RDEPENDS} libdrm" DEPENDS_${PN} += "${LIB_DEPS} ${COMMON_RDEPENDS}" -EXTRA_OECONF += "--with-driver=dri --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS} --with-egl-platforms=x11" +EXTRA_OECONF += "--with-driver=dri --without-gallium-drivers --with-dri-drivers=${DRIDRIVERS} --with-egl-platforms=x11 --enable-sysfs" FILES_${PN}-dbg += "${libdir}/dri/.debug/*" diff --git a/recipes/mesa/mesa-dri/mesa_fix_for_arm.patch b/recipes/mesa/mesa-dri/mesa_fix_for_arm.patch new file mode 100644 index 0000000..ed1da89 --- /dev/null +++ b/recipes/mesa/mesa-dri/mesa_fix_for_arm.patch @@ -0,0 +1,23 @@ +diff -urN a/bin/mklib b/bin/mklib +--- a/bin/mklib 2011-07-09 03:37:09.000000000 +0200 ++++ b/bin/mklib 2015-05-14 10:48:47.261622841 +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,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} + fi diff --git a/recipes/mesa/mesa-dri_7.11.oe b/recipes/mesa/mesa-dri_10.5.5.oe similarity index 100% rename from recipes/mesa/mesa-dri_7.11.oe rename to recipes/mesa/mesa-dri_10.5.5.oe diff --git a/recipes/mesa/mesa-dri_10.5.5.oe.sig b/recipes/mesa/mesa-dri_10.5.5.oe.sig new file mode 100644 index 0000000..081f7eb --- /dev/null +++ b/recipes/mesa/mesa-dri_10.5.5.oe.sig @@ -0,0 +1 @@ +367f78c244a34eeb5e8fc4531228166ea1118165 mesa-10.5.5.tar.xz 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 From 41aacc13e5a19ef3efd1c684739c6e6578ee2a54 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:46:25 +0200 Subject: [PATCH 02/17] libdrm: Update to last version --- recipes/drm/libdrm.inc | 2 +- recipes/drm/libdrm_2.4.36.oe | 7 ------- recipes/drm/libdrm_2.4.36.oe.sig | 1 - recipes/drm/libdrm_2.4.61.oe | 7 +++++++ recipes/drm/libdrm_2.4.61.oe.sig | 1 + 5 files changed, 9 insertions(+), 9 deletions(-) delete mode 100644 recipes/drm/libdrm_2.4.36.oe delete mode 100644 recipes/drm/libdrm_2.4.36.oe.sig create mode 100644 recipes/drm/libdrm_2.4.61.oe create mode 100644 recipes/drm/libdrm_2.4.61.oe.sig diff --git a/recipes/drm/libdrm.inc b/recipes/drm/libdrm.inc index 5ced494..5a18540 100644 --- a/recipes/drm/libdrm.inc +++ b/recipes/drm/libdrm.inc @@ -10,7 +10,7 @@ inherit autotools-autoreconf pkgconfig library SRC_URI = "http://dri.freedesktop.org/libdrm/libdrm-${PV}.tar.bz2" #libpciaccess is required starting from libdrm 2.4.26 -DEPENDS = "libpciaccess libpthread-stubs libx11" +DEPENDS = "libpciaccess libpthread-stubs libx11 native:util-macros" COMMON_DEPENDS += "librt libc libgcc" DEPENDS += "${COMMON_DEPENDS}" diff --git a/recipes/drm/libdrm_2.4.36.oe b/recipes/drm/libdrm_2.4.36.oe deleted file mode 100644 index d074fb8..0000000 --- a/recipes/drm/libdrm_2.4.36.oe +++ /dev/null @@ -1,7 +0,0 @@ -require libdrm.inc -LICENSE = "MIT" - -SRC_URI += "file://installtests.patch \ - file://GNU_SOURCE_definition.patch \ - " - diff --git a/recipes/drm/libdrm_2.4.36.oe.sig b/recipes/drm/libdrm_2.4.36.oe.sig deleted file mode 100644 index 1ef5c94..0000000 --- a/recipes/drm/libdrm_2.4.36.oe.sig +++ /dev/null @@ -1 +0,0 @@ -bbf0efd37e806ea7fa83fab19e032eac1cdc775f libdrm-2.4.36.tar.bz2 diff --git a/recipes/drm/libdrm_2.4.61.oe b/recipes/drm/libdrm_2.4.61.oe new file mode 100644 index 0000000..8fee0bd --- /dev/null +++ b/recipes/drm/libdrm_2.4.61.oe @@ -0,0 +1,7 @@ +require libdrm.inc +LICENSE = "MIT" + +#SRC_URI += "file://installtests.patch \ +# file://GNU_SOURCE_definition.patch \ +# " + diff --git a/recipes/drm/libdrm_2.4.61.oe.sig b/recipes/drm/libdrm_2.4.61.oe.sig new file mode 100644 index 0000000..d7ed39f --- /dev/null +++ b/recipes/drm/libdrm_2.4.61.oe.sig @@ -0,0 +1 @@ +fce70371540af0490541b05d96c6b6b43f1fab80 libdrm-2.4.61.tar.bz2 From b65ab55055ba5da1ca7391cf0996209d1b8f4f51 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:46:59 +0200 Subject: [PATCH 03/17] xcb: Update to last version --- recipes/xcb/libxcb.inc | 3 +-- recipes/xcb/{libxcb_1.8.1.oe => libxcb_1.11.oe} | 4 ---- recipes/xcb/libxcb_1.11.oe.sig | 1 + recipes/xcb/libxcb_1.8.1.oe.sig | 1 - recipes/xcb/{xcb-proto_1.7.oe => xcb-proto_1.11.oe} | 0 recipes/xcb/xcb-proto_1.11.oe.sig | 1 + recipes/xcb/xcb-proto_1.7.oe.sig | 1 - 7 files changed, 3 insertions(+), 8 deletions(-) rename recipes/xcb/{libxcb_1.8.1.oe => libxcb_1.11.oe} (73%) create mode 100644 recipes/xcb/libxcb_1.11.oe.sig delete mode 100644 recipes/xcb/libxcb_1.8.1.oe.sig rename recipes/xcb/{xcb-proto_1.7.oe => xcb-proto_1.11.oe} (100%) create mode 100644 recipes/xcb/xcb-proto_1.11.oe.sig delete mode 100644 recipes/xcb/xcb-proto_1.7.oe.sig diff --git a/recipes/xcb/libxcb.inc b/recipes/xcb/libxcb.inc index bbdf030..8be23c9 100644 --- a/recipes/xcb/libxcb.inc +++ b/recipes/xcb/libxcb.inc @@ -13,8 +13,7 @@ EXTRA_OECONF += "--disable-build-docs" inherit autotools-autoreconf pkgconfig library LICENSE = "MIT-X" -PARALLEL_MAKE = "" -DEPENDS = "xproto libxau xcb-proto python-xcbgen" +DEPENDS = "xproto libxau xcb-proto python-xcbgen native:util-macros" SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2" diff --git a/recipes/xcb/libxcb_1.8.1.oe b/recipes/xcb/libxcb_1.11.oe similarity index 73% rename from recipes/xcb/libxcb_1.8.1.oe rename to recipes/xcb/libxcb_1.11.oe index 9da5c6c..a6a92cf 100644 --- a/recipes/xcb/libxcb_1.8.1.oe +++ b/recipes/xcb/libxcb_1.11.oe @@ -3,10 +3,6 @@ include libxcb.inc LICENSE = "MIT" RECIPE_TYPES = "machine native" -SRC_URI += "file://libtool-include-m4s.patch" DEPENDS += "libpthread-stubs native:xcb-proto libxdmcp libc" DEPENDS_${PN} += "libpthread-stubs libxau libxdmcp libc" - -PARALLEL_MAKE = "" - diff --git a/recipes/xcb/libxcb_1.11.oe.sig b/recipes/xcb/libxcb_1.11.oe.sig new file mode 100644 index 0000000..4c61d73 --- /dev/null +++ b/recipes/xcb/libxcb_1.11.oe.sig @@ -0,0 +1 @@ +8343b417d7eeb2a2c6b6c4a87a03a4fd0fc65c46 libxcb-1.11.tar.bz2 diff --git a/recipes/xcb/libxcb_1.8.1.oe.sig b/recipes/xcb/libxcb_1.8.1.oe.sig deleted file mode 100644 index 4cb6cce..0000000 --- a/recipes/xcb/libxcb_1.8.1.oe.sig +++ /dev/null @@ -1 +0,0 @@ -98199b6054750a06cddd4e77baa4354af547ce6f libxcb-1.8.1.tar.bz2 diff --git a/recipes/xcb/xcb-proto_1.7.oe b/recipes/xcb/xcb-proto_1.11.oe similarity index 100% rename from recipes/xcb/xcb-proto_1.7.oe rename to recipes/xcb/xcb-proto_1.11.oe diff --git a/recipes/xcb/xcb-proto_1.11.oe.sig b/recipes/xcb/xcb-proto_1.11.oe.sig new file mode 100644 index 0000000..ffe4e89 --- /dev/null +++ b/recipes/xcb/xcb-proto_1.11.oe.sig @@ -0,0 +1 @@ +608bd60663e223464d38acec0183ddb827776401 xcb-proto-1.11.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 From 9c0953f5b012ec48b8ab8129c5c871294f24810d Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:47:21 +0200 Subject: [PATCH 04/17] util-macros: Update to last version --- recipes/xorg-util/util-macros_1.17.oe.sig | 1 - recipes/xorg-util/{util-macros_1.17.oe => util-macros_1.19.0.oe} | 0 recipes/xorg-util/util-macros_1.19.0.oe.sig | 1 + 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 recipes/xorg-util/util-macros_1.17.oe.sig rename recipes/xorg-util/{util-macros_1.17.oe => util-macros_1.19.0.oe} (100%) create mode 100644 recipes/xorg-util/util-macros_1.19.0.oe.sig diff --git a/recipes/xorg-util/util-macros_1.17.oe.sig b/recipes/xorg-util/util-macros_1.17.oe.sig deleted file mode 100644 index ee1f6f6..0000000 --- a/recipes/xorg-util/util-macros_1.17.oe.sig +++ /dev/null @@ -1 +0,0 @@ -570783cbfb7ad44de34a939455eb645856361f28 util-macros-1.17.tar.gz diff --git a/recipes/xorg-util/util-macros_1.17.oe b/recipes/xorg-util/util-macros_1.19.0.oe similarity index 100% rename from recipes/xorg-util/util-macros_1.17.oe rename to recipes/xorg-util/util-macros_1.19.0.oe diff --git a/recipes/xorg-util/util-macros_1.19.0.oe.sig b/recipes/xorg-util/util-macros_1.19.0.oe.sig new file mode 100644 index 0000000..bc87482 --- /dev/null +++ b/recipes/xorg-util/util-macros_1.19.0.oe.sig @@ -0,0 +1 @@ +ac9cb34a6b9919ad197ddd12ead74b634d7d2147 util-macros-1.19.0.tar.gz From 341baba95fe1cebaf1ac3bc79ad5fb339b9c5ada Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:48:19 +0200 Subject: [PATCH 05/17] remove xf86-video-imxfb: not valid dependency --- .../xorg-driver/xf86-video-imxfb_11.09.01.oe | 48 ------------------- 1 file changed, 48 deletions(-) delete mode 100644 recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe diff --git a/recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe b/recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe deleted file mode 100644 index a58cdb6..0000000 --- a/recipes/xorg-driver/xf86-video-imxfb_11.09.01.oe +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (C) 2011 Freescale -# Released under the MIT license (see COPYING.MIT for the terms) - -DESCRIPTION = "X.Org X server -- Freescale iMx framebuffer driver" -LICENSE = "MIT-X" - -DEPENDS = "xserver-xorg libx11 xproto renderproto videoproto randrproto util-macros fontsproto xextproto inputproto pixman libpciaccess libz160 amd-gpu-x11-bin-mx51" -RDEPENDS_${PN} = "amd-gpu-x11-bin-mx51 libz160" - -inherit autotools pkgconfig -SRC_URI = "file://xserver-xorg-video-imx-${PV}.tar.gz \ - file://mfloat-toolchain-decides.patch \ - file://xf86-video-imxfb-fix-m4-hardcodded-paths.patch \ - file://Make-video-API-forward-and-backward-compatible.patch \ - file://ext-Update-to-newer-swap-macros.patch \ - file://Fix-error-unknown-type-name-uint.patch \ - file://xserver-1.14-compat.patch \ - " -RECIPE_FLAGS = "xorg_video_imx_xvideo_enable" -DEFAULT_USE_xorg_video_imx_xvideo_enable = "0" -DEPENDS:>USE_xorg_video_imx_xvideo_enable += " imx-lib-dev" -RDEPENDS_${PN}:>USE_xorg_video_imx_xvideo_enable += " imx-lib" -SRC_URI:>USE_xorg_video_imx_xvideo_enable += "file://enable_xvideo.patch" - -FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" -FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" -EXTRA_OECONF_armv7a = " --enable-neon " -CFLAGS += " -I${HOST_SYSROOT}${includedir}/xorg -I${HOST_SYSROOT}${includedir}/pixman-1 " - -S = "${SRCDIR}/xserver-xorg-video-imx-${PV}" - -do_compile[prefuncs] += "do_compile_fix_includes" - -do_compile_fix_includes () { - find ${S} -name '*.c' |xargs sed 's|#include \"\(.*\)\"|#include \<\1\>|' -i - find ${S} -name 'config.h'| xargs sed 's|#include \"\(.*\)\"|#include \<\1\>|' -i -} - -FILES_${PN}-dev += "${libdir}/xorg/modules/drivers/*.la" -FILES_${PN}-dev += "${includedir}/X11/extensions/imx_ext.h" - - -RDEPENDS_${PN} += """ -xserver-xorg-extension-exa -xserver-xorg-extension-fbdevhw -xserver-xorg-extension-fb -""" - From b9d43d810c0849ce2ea695fb3cf3576e7c1a366b Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:49:43 +0200 Subject: [PATCH 06/17] glproto: Update to last version --- recipes/xorg-proto/glproto_1.4.15.oe.sig | 1 - recipes/xorg-proto/{glproto_1.4.15.oe => glproto_1.4.17.oe} | 0 recipes/xorg-proto/glproto_1.4.17.oe.sig | 1 + 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 recipes/xorg-proto/glproto_1.4.15.oe.sig rename recipes/xorg-proto/{glproto_1.4.15.oe => glproto_1.4.17.oe} (100%) create mode 100644 recipes/xorg-proto/glproto_1.4.17.oe.sig 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.17.oe similarity index 100% rename from recipes/xorg-proto/glproto_1.4.15.oe rename to recipes/xorg-proto/glproto_1.4.17.oe diff --git a/recipes/xorg-proto/glproto_1.4.17.oe.sig b/recipes/xorg-proto/glproto_1.4.17.oe.sig new file mode 100644 index 0000000..6a4bcf6 --- /dev/null +++ b/recipes/xorg-proto/glproto_1.4.17.oe.sig @@ -0,0 +1 @@ +20e061c463bed415051f0f89e968e331a2078551 glproto-1.4.17.tar.bz2 From 68686dfacbe384461da6b1cc20027b0ac7f2127f Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:50:06 +0200 Subject: [PATCH 07/17] dri2proto: Update to last version --- recipes/xorg-proto/dri2proto_2.6.oe.sig | 1 - recipes/xorg-proto/{dri2proto_2.6.oe => dri2proto_2.8.oe} | 0 recipes/xorg-proto/dri2proto_2.8.oe.sig | 1 + 3 files changed, 1 insertion(+), 1 deletion(-) delete mode 100644 recipes/xorg-proto/dri2proto_2.6.oe.sig rename recipes/xorg-proto/{dri2proto_2.6.oe => dri2proto_2.8.oe} (100%) create mode 100644 recipes/xorg-proto/dri2proto_2.8.oe.sig 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 From 69f6aab732c252d5ff6708099b563266a358b2d7 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:50:27 +0200 Subject: [PATCH 08/17] dri3proto: add recipe --- recipes/xorg-proto/dri3proto_1.0.oe | 9 +++++++++ recipes/xorg-proto/dri3proto_1.0.oe.sig | 1 + 2 files changed, 10 insertions(+) create mode 100644 recipes/xorg-proto/dri3proto_1.0.oe create mode 100644 recipes/xorg-proto/dri3proto_1.0.oe.sig diff --git a/recipes/xorg-proto/dri3proto_1.0.oe b/recipes/xorg-proto/dri3proto_1.0.oe new file mode 100644 index 0000000..4d8ffb8 --- /dev/null +++ b/recipes/xorg-proto/dri3proto_1.0.oe @@ -0,0 +1,9 @@ +require xorg-proto-common.inc + +SUMMARY = "DRI3: Direct Rendering Infrastructure 3 headers" + +DESCRIPTION = "This package provides the wire protocol for the Direct \ +Rendering Ifnrastructure 3. DIR is required for may hardware \ +accelerated OpenGL drivers." + +LICENSE = "MIT" diff --git a/recipes/xorg-proto/dri3proto_1.0.oe.sig b/recipes/xorg-proto/dri3proto_1.0.oe.sig new file mode 100644 index 0000000..4a04161 --- /dev/null +++ b/recipes/xorg-proto/dri3proto_1.0.oe.sig @@ -0,0 +1 @@ +1007eaa2f83022653a224f7d2e676ea51cba2f2b dri3proto-1.0.tar.bz2 From a4166f53f1b5afe21a4221681339cda075ed62de Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:50:41 +0200 Subject: [PATCH 09/17] presentproto: add recipe --- recipes/xorg-proto/presentproto_1.0.oe | 3 +++ recipes/xorg-proto/presentproto_1.0.oe.sig | 1 + 2 files changed, 4 insertions(+) create mode 100644 recipes/xorg-proto/presentproto_1.0.oe create mode 100644 recipes/xorg-proto/presentproto_1.0.oe.sig diff --git a/recipes/xorg-proto/presentproto_1.0.oe b/recipes/xorg-proto/presentproto_1.0.oe new file mode 100644 index 0000000..a1231b5 --- /dev/null +++ b/recipes/xorg-proto/presentproto_1.0.oe @@ -0,0 +1,3 @@ +require xorg-proto-common.inc + +LICENSE = "MIT" diff --git a/recipes/xorg-proto/presentproto_1.0.oe.sig b/recipes/xorg-proto/presentproto_1.0.oe.sig new file mode 100644 index 0000000..f559b66 --- /dev/null +++ b/recipes/xorg-proto/presentproto_1.0.oe.sig @@ -0,0 +1 @@ +432371cdc464881029c3f39f9bf81cc80a484e54 presentproto-1.0.tar.bz2 From 99f345807d55f04a9b39d0d453897da4fd344f63 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:50:58 +0200 Subject: [PATCH 10/17] libxshmfence: add recipe --- recipes/xorg-lib/libxshmfence_1.2.oe | 24 ++++++++++++++++++++++++ recipes/xorg-lib/libxshmfence_1.2.oe.sig | 1 + 2 files changed, 25 insertions(+) create mode 100644 recipes/xorg-lib/libxshmfence_1.2.oe create mode 100644 recipes/xorg-lib/libxshmfence_1.2.oe.sig diff --git a/recipes/xorg-lib/libxshmfence_1.2.oe b/recipes/xorg-lib/libxshmfence_1.2.oe new file mode 100644 index 0000000..c7d9535 --- /dev/null +++ b/recipes/xorg-lib/libxshmfence_1.2.oe @@ -0,0 +1,24 @@ +LICENSE = "MIT & MIT-style" + +RECIPE_TYPES = "machine native sdk" + +require conf/fetch/xorg.conf + +inherit autotools pkgconfig gettext + +XORG_PN = "${PN}" +SRC_URI = "${XORG_MIRROR}/individual/lib/${XORG_PN}-${PV}.tar.bz2" + +DEPENDS += "xproto" + +#xtrans provides headers and c code. Thus no libs but lib-ish. +DEPENDS_${PN} = "${PN}-dev_${PV}" +DEPENDS_${PN}-dev = "" +RDEPENDS_${PN}-dev = "" + +S = "${SRCDIR}/${XORG_PN}-${PV}" + + + + + diff --git a/recipes/xorg-lib/libxshmfence_1.2.oe.sig b/recipes/xorg-lib/libxshmfence_1.2.oe.sig new file mode 100644 index 0000000..5e3ab0d --- /dev/null +++ b/recipes/xorg-lib/libxshmfence_1.2.oe.sig @@ -0,0 +1 @@ +a2ebe90e5595afca4db93a4359732af43b2b8c69 libxshmfence-1.2.tar.bz2 From 2c587ef92418c353b3174cdf27fc35503122d1e2 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:52:14 +0200 Subject: [PATCH 11/17] xkeyboard-config: use alternative source --- recipes/xorg-lib/xkeyboard-config_2.1.oe | 2 +- recipes/xorg-lib/xkeyboard-config_2.1.oe.sig | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/xorg-lib/xkeyboard-config_2.1.oe b/recipes/xorg-lib/xkeyboard-config_2.1.oe index 26c493c..84b71bc 100644 --- a/recipes/xorg-lib/xkeyboard-config_2.1.oe +++ b/recipes/xorg-lib/xkeyboard-config_2.1.oe @@ -10,7 +10,7 @@ HOMEPAGE = "http://freedesktop.org/wiki/Software/XKeyboardConfig" LICENSE = "MIT & MIT-style" -SRC_URI = "http://people.freedesktop.org/~svu/xkeyboard-config-${PV}.tar.bz2" +SRC_URI = "http://www.x.org/releases/individual/data/xkeyboard-config/${PN}-${PV}.tar.bz2" DEPENDS = " native:xkbcomp glib libxkbfile" diff --git a/recipes/xorg-lib/xkeyboard-config_2.1.oe.sig b/recipes/xorg-lib/xkeyboard-config_2.1.oe.sig index 66e818f..9a05213 100644 --- a/recipes/xorg-lib/xkeyboard-config_2.1.oe.sig +++ b/recipes/xorg-lib/xkeyboard-config_2.1.oe.sig @@ -1 +1 @@ -63438dcda6253ce25d3010e7c460ef1369a53368 xkeyboard-config-2.1.tar.bz2 +4e96e0704b2a17b291f98b2240611390e7a99f9e xkeyboard-config-2.1.tar.bz2 From 7ea281ed6e22b9310aebbc9242fd2d24a5fa95f0 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:52:40 +0200 Subject: [PATCH 12/17] xkeyboard-config: need native intltool --- recipes/xorg-lib/xkeyboard-config_2.1.oe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/recipes/xorg-lib/xkeyboard-config_2.1.oe b/recipes/xorg-lib/xkeyboard-config_2.1.oe index 84b71bc..cb9b0f1 100644 --- a/recipes/xorg-lib/xkeyboard-config_2.1.oe +++ b/recipes/xorg-lib/xkeyboard-config_2.1.oe @@ -12,7 +12,7 @@ LICENSE = "MIT & MIT-style" SRC_URI = "http://www.x.org/releases/individual/data/xkeyboard-config/${PN}-${PV}.tar.bz2" -DEPENDS = " native:xkbcomp glib libxkbfile" +DEPENDS = " native:xkbcomp native:intltool glib libxkbfile" EXTRA_OECONF = "--with-xkb-rules-symlink=xorg" From 69f0e60ecb3496ba785d8eefafc96ac81cd1e5db Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:53:25 +0200 Subject: [PATCH 13/17] xserver-xorg: add missing dependencies --- recipes/xorg-xserver/xserver-xorg-common.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/xorg-xserver/xserver-xorg-common.inc b/recipes/xorg-xserver/xserver-xorg-common.inc index bd77b56..59e2ff3 100644 --- a/recipes/xorg-xserver/xserver-xorg-common.inc +++ b/recipes/xorg-xserver/xserver-xorg-common.inc @@ -37,6 +37,7 @@ LIB_DEPS:>USE_dbus_x11 = " libdbus" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} xtrans font-util util-macros" DEPENDS_${PN} = "${PN}-dev_${PV}" +DEPENDS_${PN} += "resourceproto videoproto" DEPENDS_${PN}-dev = "" DEPENDS_${PN}[qa] = "allow-missing-lib-depends" @@ -76,7 +77,8 @@ DEPENDS:>USE_xserver_screensaver = " scrnsaverproto" DEPENDS:>USE_xserver_record = " recordproto" DEPENDS:>USE_xserver_dri = " glproto xf86driproto dri2proto libgl" DEPENDS:>USE_xserver_dga = " xf86dgaproto" -DEPENDS_${PN}:>USE_xserver_dri = " glproto xf86driproto dri2proto" +DEPENDS_${PN}:>USE_xserver_screensaver = " scrnsaverproto" +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" From e4332c50fae0fc0b0164a762ff80275a46460c12 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:54:19 +0200 Subject: [PATCH 14/17] xev: remove incorrect override --- recipes/xorg-app/xev_1.2.1.oe | 2 -- 1 file changed, 2 deletions(-) diff --git a/recipes/xorg-app/xev_1.2.1.oe b/recipes/xorg-app/xev_1.2.1.oe index 2f1d02a..131b290 100644 --- a/recipes/xorg-app/xev_1.2.1.oe +++ b/recipes/xorg-app/xev_1.2.1.oe @@ -4,5 +4,3 @@ 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" From 4f67f37fac09594c9c323981e22d0b4dfc6424f1 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:55:52 +0200 Subject: [PATCH 15/17] xorg-app-common: need GNU_SOURCE flag --- recipes/xorg-app/xorg-app-common.inc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/recipes/xorg-app/xorg-app-common.inc b/recipes/xorg-app/xorg-app-common.inc index e89f869..4f4453b 100644 --- a/recipes/xorg-app/xorg-app-common.inc +++ b/recipes/xorg-app/xorg-app-common.inc @@ -14,4 +14,6 @@ inherit autotools pkgconfig c++ FILES_${PN} += " /usr/lib/X11/${PN} /usr/share/X11/app-defaults/" -DEPENDS_${PN}[qa] = "allow-missing-lib-depends" \ No newline at end of file +CFLAGS += "-D_GNU_SOURCE" + +DEPENDS_${PN}[qa] = "allow-missing-lib-depends" From 085eb107b5f53c6da3d4bf02f604a9d3d956c623 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:57:04 +0200 Subject: [PATCH 16/17] xf86-input-mtev: fix DEPENDS --- recipes/xorg-driver/xf86-input-mtev_0.1.13.oe | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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..de04c16 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,7 @@ 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" +DEPENDS += "inputproto kbproto pixman xextproto libpciaccess xserver-xorg xproto randrproto util-macros mtdev-dev libm mtdev" RDEPENDS_${PN} = "mtdev" From c5709b4bce09e0841ac69aa1dedbddb215f23331 Mon Sep 17 00:00:00 2001 From: Yann Diorcet Date: Fri, 22 May 2015 11:57:51 +0200 Subject: [PATCH 17/17] libx11: fix compilation with new autotools --- recipes/xorg-lib/libx11/nls_makefile.patch | 12 ++++++++++++ recipes/xorg-lib/libx11_1.5.0.oe | 3 ++- 2 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 recipes/xorg-lib/libx11/nls_makefile.patch diff --git a/recipes/xorg-lib/libx11/nls_makefile.patch b/recipes/xorg-lib/libx11/nls_makefile.patch new file mode 100644 index 0000000..8f77ea7 --- /dev/null +++ b/recipes/xorg-lib/libx11/nls_makefile.patch @@ -0,0 +1,12 @@ +diff -urN a/nls/Makefile.am b/nls/Makefile.am +--- a/nls/Makefile.am 2012-06-02 08:37:18.000000000 +0200 ++++ b/nls/Makefile.am 2015-04-30 12:18:36.638612068 +0200 +@@ -38,7 +38,7 @@ + + if HAVE_PERL + TESTS_ENVIRONMENT = $(PERL) +-TESTS = $(srcdir)/compose-check.pl ++TESTS = compose-check.pl + endif HAVE_PERL + + diff --git a/recipes/xorg-lib/libx11_1.5.0.oe b/recipes/xorg-lib/libx11_1.5.0.oe index 244d022..a5bdcd2 100644 --- a/recipes/xorg-lib/libx11_1.5.0.oe +++ b/recipes/xorg-lib/libx11_1.5.0.oe @@ -16,7 +16,8 @@ RDEPENDS_${PN} += "libxcb libxau libxdmcp libdl libc" SRC_URI += " file://keysymdef_include.patch \ file://pkgconfig.patch \ - file://fix-cross-compile-include-path.patch \ + file://fix-cross-compile-include-path.patch \ + file://nls_makefile.patch \ " # handle makekeys ro be run on build host