diff options
Diffstat (limited to 'yocto-poky/meta/recipes-graphics')
127 files changed, 1658 insertions, 2444 deletions
diff --git a/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb b/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb index bb729fce2..0a64c31ab 100644 --- a/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb +++ b/yocto-poky/meta/recipes-graphics/builder/builder_0.1.bb @@ -3,10 +3,9 @@ DESCRIPTION = "This recipe create a new user named ${PN}, who is used for specif SECTION = "x11" PR = "r6" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://builder_hob_start.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e" +LIC_FILES_CHKSUM = "file://builder_session.sh;endline=5;md5=84796c3c41785d86100fdabcbdade00e" -SRC_URI = "file://builder_hob_start.sh \ - file://please_wait_dialog.py \ +SRC_URI = "file://builder_session.sh \ " S = "${WORKDIR}" @@ -25,9 +24,8 @@ USERADD_PARAM_${PN} = "--system --create-home \ do_install () { install -d -m 755 ${D}${sysconfdir}/mini_x/session.d - install -p -m 755 builder_hob_start.sh ${D}${sysconfdir}/mini_x/session.d/ + install -p -m 755 builder_session.sh ${D}${sysconfdir}/mini_x/session.d/ - chown builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_hob_start.sh - install -p -m 755 please_wait_dialog.py ${D}${sysconfdir}/mini_x + chown builder.builder ${D}${sysconfdir}/mini_x/session.d/builder_session.sh } diff --git a/yocto-poky/meta/recipes-graphics/builder/files/builder_hob_start.sh b/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh index b394b0905..001a03357 100644 --- a/yocto-poky/meta/recipes-graphics/builder/files/builder_hob_start.sh +++ b/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh @@ -30,8 +30,4 @@ fi cd /home/builder/poky . ./oe-init-build-env -hob & - matchbox-terminal& - -/etc/mini_x/please_wait_dialog.py & diff --git a/yocto-poky/meta/recipes-graphics/builder/files/please_wait_dialog.py b/yocto-poky/meta/recipes-graphics/builder/files/please_wait_dialog.py deleted file mode 100644 index fd2381bc8..000000000 --- a/yocto-poky/meta/recipes-graphics/builder/files/please_wait_dialog.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python -import glib -import gtk - -def destroy_window_cb(widget, event): - gtk.main_quit() - -def all_done_cb(): - gtk.main_quit() - -def dialogue_ui(): - window = gtk.Window() - window.set_title("Please wait...") - window.connect("delete-event", destroy_window_cb) - window.show() - window.set_border_width(12) - - msg = "Please wait while BitBake initializes Hob" - label = gtk.Label(msg) - label.show() - window.add(label) - - glib.timeout_add_seconds(10, all_done_cb) - -if __name__ == "__main__": - dialogue_ui() - gtk.main() - diff --git a/yocto-poky/meta/recipes-graphics/cairo/cairo.inc b/yocto-poky/meta/recipes-graphics/cairo/cairo.inc index 45651bad2..c7e686d5a 100644 --- a/yocto-poky/meta/recipes-graphics/cairo/cairo.inc +++ b/yocto-poky/meta/recipes-graphics/cairo/cairo.inc @@ -44,5 +44,3 @@ export ac_cv_lib_bfd_bfd_openr="no" export ac_cv_lib_lzo2_lzo2a_decompress="no" BBCLASSEXTEND = "native" - -CFLAGS += "-ffat-lto-objects" diff --git a/yocto-poky/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch b/yocto-poky/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch deleted file mode 100644 index 955b7d4ef..000000000 --- a/yocto-poky/meta/recipes-graphics/cairo/cairo/Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch +++ /dev/null @@ -1,49 +0,0 @@ -Upstream-Status: Backport - - http://lists.cairographics.org/archives/cairo/2015-May/026253.html - http://cgit.freedesktop.org/cairo/commit/?id=f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 - -Signed-off-by: Andre McCurdy <armccurdy@gmail.com> - - -From f52f0e2feb1ad0a4de23c475a8c020d41a1764a8 Mon Sep 17 00:00:00 2001 -From: Zan Dobersek <zdobersek@igalia.com> -Date: Fri, 8 May 2015 01:50:25 -0700 -Subject: [PATCH] Manually transpose the matrix in _cairo_gl_shader_bind_matrix() - -To maintain compatibility with OpenGL ES 2.0, the matrix in -_cairo_gl_shader_bind_matrix() should be manually transposed, -and GL_FALSE passed as the transpose argument to the -glUniformMatrix3fv() call as it is the only valid value for -that parameter in OpenGL ES 2.0. - -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> -Acked-by: "Henry (Yu) Song" <henry.song@samsung.com> ---- - src/cairo-gl-shaders.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/src/cairo-gl-shaders.c b/src/cairo-gl-shaders.c -index 2710606..fe975d2 100644 ---- a/src/cairo-gl-shaders.c -+++ b/src/cairo-gl-shaders.c -@@ -973,12 +973,12 @@ _cairo_gl_shader_bind_matrix (cairo_gl_context_t *ctx, - { - cairo_gl_dispatch_t *dispatch = &ctx->dispatch; - float gl_m[9] = { -- m->xx, m->xy, m->x0, -- m->yx, m->yy, m->y0, -- 0, 0, 1 -+ m->xx, m->yx, 0, -+ m->xy, m->yy, 0, -+ m->x0, m->y0, 1 - }; - assert (location != -1); -- dispatch->UniformMatrix3fv (location, 1, GL_TRUE, gl_m); -+ dispatch->UniformMatrix3fv (location, 1, GL_FALSE, gl_m); - } - - void --- -1.9.1 - diff --git a/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.2.bb b/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb index 75cde0ad7..20b46689f 100644 --- a/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.2.bb +++ b/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb @@ -3,10 +3,11 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" -SRC_URI += "file://Manually-transpose-the-matrix-in-_cairo_gl_shader_bi.patch" -SRC_URI[md5sum] = "e1cdfaf1c6c995c4d4c54e07215b0118" -SRC_URI[sha256sum] = "c919d999ddb1bbbecd4bbe65299ca2abd2079c7e13d224577895afa7005ecceb" +SRC_URI[md5sum] = "23a0b2f0235431d35238df1d3a517fdb" +SRC_URI[sha256sum] = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252" + +UPSTREAM_CHECK_REGEX = "cairo-(?P<pver>\d+(\.\d+)+)\.tar" PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" diff --git a/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb b/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb new file mode 100644 index 000000000..127f0a1c3 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb @@ -0,0 +1,24 @@ +SUMMARY = "Cantarell, a Humanist sans-serif font family" + +DESCRIPTION = "The Cantarell font typeface is designed as a \ + contemporary Humanist sans serif, and was developed for \ + on-screen reading; in particular, reading web pages on an \ + HTC Dream mobile phone." + +HOMEPAGE = "https://git.gnome.org/browse/cantarell-fonts/" +SECTION = "fonts" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=df91e3ffcab8cfb972a66bf11255188d" + +PV = "0.0.21+git${SRCPV}" + +SRCREV = "611c169df5287c059d63b0c8f0570647c75c9189" +SRC_URI = "git://git.gnome.org/cantarell-fonts;protocol=git;branch=master" + +S = "${WORKDIR}/git" + +inherit autotools allarch fontcache + +PACKAGECONFIG ??= "" +PACKAGECONFIG[fontforge] = "--enable-source-rebuild=yes,--enable-source-rebuild=no,fontforge-native" +FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc index da21cee8b..c6ecd0804 100644 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -2,7 +2,9 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2.1+" -inherit clutter ptest-gnome +inherit clutter ptest-gnome distro_features_check upstream-version-is-even gobject-introspection +# depends on cogl-1.0 which needs opengl +REQUIRED_DISTRO_FEATURES ?= "opengl" DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" PACKAGE_BEFORE_PN += "${PN}-examples" @@ -17,8 +19,7 @@ EDEPENDS_EVDEV = "libxkbcommon" ERDEPENDS_EVDEV = "xkeyboard-config" # Disable pretty much everything, override in platform specific set up -EXTRA_OECONF += "--disable-introspection \ - --disable-quartz-backend \ +EXTRA_OECONF += "--disable-quartz-backend \ --disable-win32-backend \ --disable-gdk-backend \ --disable-cex100-backend \ @@ -37,11 +38,8 @@ PACKAGECONFIG ??= "egl \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx x11', '', d)}" -FILES_${PN}-dbg += "${libdir}/clutter/examples/.debug" FILES_${PN}-examples = "${libdir}/clutter/examples" -FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug" - do_configure_prepend() { # see https://bugzilla.gnome.org/show_bug.cgi?id=661128 for this touch -t 200001010000 ${S}/po/clutter-1.0.pot diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch new file mode 100644 index 000000000..c4edff395 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch @@ -0,0 +1,105 @@ +From 483a4bb00e7dd2f14d86e167c8013c8638723c33 Mon Sep 17 00:00:00 2001 +From: Emmanuele Bassi <ebassi@gnome.org> +Date: Thu, 18 Feb 2016 17:19:09 +0000 +Subject: [PATCH] build: Use AC_COMPILE_IFELSE + +Instead of AC_TRY_COMPILE, which has been deprecated by newer autoconf. +--- +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> + + configure.ac | 66 ++++++++++++++++++++++++++++++------------------------------ + 1 file changed, 33 insertions(+), 33 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 4d72e0c..8ca3f94 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -348,24 +348,25 @@ AS_IF([test "x$enable_wayland" != xno], + # We need to manually check for Wayland support in Cogl because + # the windowing systems are not exposed in the pkg-config file + saved_CFLAGS="${CFLAGS}" +- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" ++ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" + + AC_MSG_CHECKING([for Wayland Cogl backend]) +- AC_TRY_COMPILE([#include <cogl/cogl.h>], +- [ +- #ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT +- #error "No Wayland support in Cogl" +- #endif +- int main (void) { return 0; } +- ], +- [ +- AC_MSG_RESULT(yes) +- have_cogl_wayland=yes +- ], +- [ +- AC_MSG_RESULT(no) +- have_cogl_wayland=no +- ]) ++ ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#include <cogl/cogl.h> ++]], ++[[ ++#ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT ++#error Cogl compiled without Wayland support ++#endif ++]])], [ ++ AC_MSG_RESULT(yes) ++ have_cogl_wayland=yes ++ ], [ ++ AC_MSG_RESULT(no) ++ have_cogl_wayland=no ++ ]) ++ + CFLAGS="${saved_CFLAGS}" + AS_IF([test "x$have_cogl_wayland" = xyes], + [ +@@ -499,26 +500,25 @@ AS_IF([test "x$enable_mir" = "xyes"], + # We need to manually check for Mir support in Cogl because + # the windowing systems are not exposed in the pkg-config file + saved_CFLAGS="${CFLAGS}" +- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" ++ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" + + AC_MSG_CHECKING([for Mir Cogl backend]) +- AC_TRY_COMPILE([#include <cogl/cogl.h>], +- [ +- #ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT +- #error "No Mir support in Cogl" +- #endif +- int main (void) { return 0; } +- ], +- [ +- AC_MSG_RESULT(yes) +- have_cogl_mir=yes +- ], +- [ +- AC_MSG_RESULT(no) +- have_cogl_mir=no +- ]) + +- CFLAGS="${saved_CFLAGS}" ++ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ ++#include <cogl/cogl.h> ++]], ++[[ ++#ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT ++#error Cogl compiled without Mir support ++#endif ++]])], [ ++ AC_MSG_RESULT(yes) ++ have_cogl_mir=yes ++ ], [ ++ AC_MSG_RESULT(no) ++ have_cogl_mir=no ++ ]) ++ + AS_IF([test "x$have_cogl_mir" = xno], [AC_MSG_ERROR("*** Cogl is missing Mir support.")]) + + PKG_CHECK_EXISTS([mirclient], +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb index 418cdfd37..c53b3e71b 100644 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.22.4.bb +++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb @@ -2,9 +2,9 @@ require clutter-1.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -SRC_URI[archive.md5sum] = "26494256c980d49703a553916e3083cd" -SRC_URI[archive.sha256sum] = "1d77ce16025f87667a1d00dc4fa617a1935156f63fd17635fdadf138866c9e1e" - +SRC_URI[archive.md5sum] = "3b98e1b33719982a5736ae42cbf7183e" +SRC_URI[archive.sha256sum] = "9631c98cb4bcbfec15e1bbe9eaa6eef0f127201552fce40d7d28f2133803cd63" SRC_URI += "file://install-examples.patch \ file://run-installed-tests-with-tap-output.patch \ + file://0001-build-Use-AC_COMPILE_IFELSE.patch \ file://run-ptest" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc index d4fed7127..4c877982b 100644 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -2,17 +2,16 @@ SUMMARY = "GStreamer integration library for Clutter" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2+" -inherit clutter +inherit clutter distro_features_check upstream-version-is-even gobject-introspection +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" SRC_URI += "file://0001-Install-example-binary-needed-for-core-image-clutter.patch" -DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0" +DEPENDS = "gstreamer1.0-plugins-base gstreamer1.0-plugins-bad clutter-1.0 libgudev" RDEPENDS_${PN} += "gstreamer1.0-meta-base" PACKAGES =+ "${PN}-examples" -EXTRA_OECONF += "--disable-introspection" - FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" -FILES_${PN}-dbg += "${libdir}/gstreamer-1.0/.debug/lib*.so" FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch deleted file mode 100644 index b3aec392e..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0/enable-tests.patch +++ /dev/null @@ -1,23 +0,0 @@ -Install example binary needed for core-image-clutter - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> - -Upstream-Status: Inappropriate [configuration] - -Imported from clutter-gst-1.8 package, git://git.openembedded.org/openembedded, -commit ae28ee3f7a060b9e0d13154a84f2444a98490b5b, updated for clutter-gst 1.6 - -Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> - -Index: git/examples/Makefile.am -=================================================================== ---- git.orig/examples/Makefile.am 2011-01-31 10:14:23.000000000 +0800 -+++ git/examples/Makefile.am 2011-01-31 10:14:34.000000000 +0800 -@@ -1,6 +1,6 @@ - NULL = # - --noinst_PROGRAMS = video-player video-sink video-sink-navigation -+bin_PROGRAMS = video-player video-sink video-sink-navigation - - INCLUDES = -I$(top_srcdir) \ - $(MAINTAINER_CFLAGS) \ diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.8.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb index 319a955d3..fcf5242c5 100644 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.8.bb +++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb @@ -3,5 +3,5 @@ require clutter-gst-3.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" -SRC_URI[archive.md5sum] = "f7d97f96e7cca82f38317d1734d5dadb" -SRC_URI[archive.sha256sum] = "582e85b88482e16f7ec719363e38fadf84fab4d4baaa21e5227a454b824f135c" +SRC_URI[archive.md5sum] = "ca24eb92a0d34fc9e66fd686a965d51c" +SRC_URI[archive.sha256sum] = "803e8b7265e63e0581e21fd0c6064792dfe951512e9f515e9e7a9b452caaf9f0" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc index 45898b4d6..05c4e5f5c 100644 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -2,11 +2,14 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2+" -inherit clutter +inherit clutter distro_features_check upstream-version-is-even gobject-introspection +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES ?= "opengl" +# depends on gtk+3 +ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" DEPENDS = "clutter-1.0 gtk+3" PACKAGES =+ "${PN}-examples" AUTOTOOLS_AUXDIR = "${S}/build" -EXTRA_OECONF += "--disable-introspection" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.2.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.2.bb deleted file mode 100644 index 530ea18c3..000000000 --- a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require clutter-gtk-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI[archive.md5sum] = "557d814c3e70cc3a2d1cf3816919b14f" -SRC_URI[archive.sha256sum] = "bbd03dfa9a20102d5cdb440513b0a035933da557ad7e9da31546034de2daf069" diff --git a/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb new file mode 100644 index 000000000..23257bb9c --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI[archive.md5sum] = "79dc3d7a8645f87d83a9ccca8a08aa8e" +SRC_URI[archive.sha256sum] = "9440a68600f58d00fe0af35383738943e8ead9907f4cf507a102d96822434a28" diff --git a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc index 3da31c85f..690ea3b86 100644 --- a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -2,7 +2,9 @@ SUMMARY = "Modern 3D graphics API with associated utility APIs" HOMEPAGE = "http://wiki.clutter-project.org/wiki/Cogl" LICENSE = "MIT" -inherit clutter +inherit clutter distro_features_check upstream-version-is-even gobject-introspection +# cogl-1.0 needs opengl to build +REQUIRED_DISTRO_FEATURES ?= "opengl" DEPENDS = "glib-2.0 gdk-pixbuf" PACKAGES =+ "${PN}-examples \ @@ -24,8 +26,7 @@ ERDEPENDS_GL = "libgl" ERDEPENDS_GLES2 = "libgles2" # GLESv1 is rarely tested, so disable it -EXTRA_OECONF += "--disable-introspection \ - --enable-examples-install \ +EXTRA_OECONF += "--enable-examples-install \ --enable-debug \ --disable-gles1 \ --disable-cairo \ @@ -56,11 +57,15 @@ PACKAGECONFIG ??= "cogl-pango gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ " +do_compile_prepend() { + export GIR_EXTRA_LIBS_PATH="${B}/cogl/.libs" +} +FILES_${PN} = "" FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" -FILES_libcogl = "${libdir}/libcogl${SOLIBS}" +FILES_libcogl = "${libdir}/libcogl${SOLIBS} ${libdir}/girepository-1.0/Cogl-*.typelib" FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" -FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" +FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS} ${libdir}/girepository-1.0/CoglPango*.typelib" FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" diff --git a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch deleted file mode 100644 index 8e839579f..000000000 --- a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/cogl-framebuffer-gl-Work-again-on-GLESv2.patch +++ /dev/null @@ -1,41 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> - - - -From f8cce5f6cb2958a4074f87cd345bfe46e0dda6e1 Mon Sep 17 00:00:00 2001 -From: "Jasper St. Pierre" <jstpierre@mecheye.net> -Date: Mon, 20 Apr 2015 12:08:29 -0700 -Subject: cogl-framebuffer-gl: Work again on GLESv2 - - -diff --git a/cogl/driver/gl/cogl-framebuffer-gl.c b/cogl/driver/gl/cogl-framebuffer-gl.c -index 793b10b..609cfb3 100644 ---- a/cogl/driver/gl/cogl-framebuffer-gl.c -+++ b/cogl/driver/gl/cogl-framebuffer-gl.c -@@ -107,6 +107,12 @@ - #ifndef GL_PACK_INVERT_MESA - #define GL_PACK_INVERT_MESA 0x8758 - #endif -+#ifndef GL_BACK_LEFT -+#define GL_BACK_LEFT 0x0402 -+#endif -+#ifndef GL_BACK_RIGHT -+#define GL_BACK_RIGHT 0x0403 -+#endif - - #ifndef GL_COLOR - #define GL_COLOR 0x1800 -@@ -245,6 +251,9 @@ _cogl_framebuffer_gl_flush_stereo_mode_state (CoglFramebuffer *framebuffer) - if (framebuffer->type == COGL_FRAMEBUFFER_TYPE_OFFSCREEN) - return; - -+ if (!ctx->glDrawBuffer) -+ return; -+ - /* The one-shot default draw buffer setting in _cogl_framebuffer_gl_bind - * must have already happened. If not it would override what we set here. */ - g_assert (ctx->was_bound_to_onscreen); --- -cgit v0.10.2 - diff --git a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch new file mode 100644 index 000000000..479a0ff4b --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0/test-backface-culling.c-fix-may-be-used-uninitialize.patch @@ -0,0 +1,35 @@ +From a51f61d675a0e7d6649182c6a1325ceab8342df2 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 4 Jan 2016 22:47:29 -0800 +Subject: [PATCH] test-backface-culling.c: fix may be used uninitialized error + +Fixed when gcc -O: +test-backface-culling.c:206:7: error: 'cull_front' may be used uninitialized in this function [-Werror=maybe-uninitialized] +| validate_part (framebuffer, +| ^ +| cc1: some warnings being treated as errors + +Upstream-Status: Pending + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + tests/conform/test-backface-culling.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/tests/conform/test-backface-culling.c b/tests/conform/test-backface-culling.c +index e90c2f5..7c45592 100644 +--- a/tests/conform/test-backface-culling.c ++++ b/tests/conform/test-backface-culling.c +@@ -164,7 +164,8 @@ validate_result (CoglFramebuffer *framebuffer, int y_offset) + + for (draw_num = 0; draw_num < 16; draw_num++) + { +- CoglBool cull_front, cull_back; ++ CoglBool cull_front = FALSE; ++ CoglBool cull_back = FALSE; + CoglPipelineCullFaceMode cull_mode; + + if (USE_LEGACY_STATE (draw_num)) +-- +1.7.9.5 + diff --git a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb deleted file mode 100644 index d20b814e8..000000000 --- a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.20.0.bb +++ /dev/null @@ -1,8 +0,0 @@ -require cogl-1.0.inc - -SRC_URI += "file://cogl-framebuffer-gl-Work-again-on-GLESv2.patch" - -LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" -SRC_URI[archive.md5sum] = "5b28897194d9ff76a574a9493d1f7ee0" -SRC_URI[archive.sha256sum] = "729e35495829e7d31fafa3358e47b743ba21a2b08ff9b6cd28fb74c0de91192b" - diff --git a/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb new file mode 100644 index 000000000..ed10c7a39 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0_1.22.0.bb @@ -0,0 +1,7 @@ +require cogl-1.0.inc + +SRC_URI += "file://test-backface-culling.c-fix-may-be-used-uninitialize.patch" + +LIC_FILES_CHKSUM = "file://COPYING;md5=1b1a508d91d25ca607c83f92f3e31c84" +SRC_URI[archive.md5sum] = "ab684ec96848d79d22757fb3064820c8" +SRC_URI[archive.sha256sum] = "689dfb5d14fc1106e9d2ded0f7930dcf7265d0bc84fa846b4f03941633eeaa91" diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb index 9c3e8bf3d..7907c5c0d 100644 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb +++ b/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb @@ -7,7 +7,7 @@ SECTION = "libs" LICENSE = "MIT" SRC_URI = " \ - http://www.directfb.org/downloads/Extras/DirectFB-examples-${PV}.tar.gz \ + http://downloads.yoctoproject.org/mirror/sources/DirectFB-examples-${PV}.tar.gz \ file://configure.in-Fix-string-argument-syntax.patch \ " diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb.inc b/yocto-poky/meta/recipes-graphics/directfb/directfb.inc index cbd401483..f6b7cbe1a 100644 --- a/yocto-poky/meta/recipes-graphics/directfb/directfb.inc +++ b/yocto-poky/meta/recipes-graphics/directfb/directfb.inc @@ -11,11 +11,14 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" HOMEPAGE = "http://directfb.org" DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" -SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ +SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ file://configurefix.patch \ file://fusion.patch \ file://bashism.patch \ file://0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch \ + file://compar_fn_t.patch \ + file://union-sigval.patch \ + file://use-PTHREAD_MUTEX_RECURSIVE.patch \ " S = "${WORKDIR}/DirectFB-${PV}" @@ -23,7 +26,7 @@ S = "${WORKDIR}/DirectFB-${PV}" LDFLAGS_append =" -lts -lm" # Workaround for linking issues seen with armv7a + gold -LDFLAGS_append_armv7a = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" +LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" BINCONFIG = "${bindir}/directfb-config" @@ -59,13 +62,6 @@ TARGET_CFLAGS_remove_x86 = "-fno-omit-frame-pointer" # NOTE: monolithic packaging for now, should improve that eventually - - -FILES_${PN}-dbg += "\ - ${libdir}/directfb-${RV}/*/*/.debug/*.so \ - ${libdir}/directfb-${RV}/*/.debug/*.so \ -" - FILES_${PN}-dev += "\ ${bindir}/directfb-config \ ${libdir}/directfb-${RV}/systems/*.la \ diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch new file mode 100644 index 000000000..ee4d900ba --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch @@ -0,0 +1,62 @@ +test for __compar_fn_t and if not defined by libc then define it +help make directfb compile with musl + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +Index: DirectFB-1.7.7/configure.in +=================================================================== +--- DirectFB-1.7.7.orig/configure.in ++++ DirectFB-1.7.7/configure.in +@@ -112,6 +112,17 @@ AC_CHECK_SIZEOF(long) + AC_CHECK_SIZEOF(long long) + AC_CHECK_FUNCS(fork) + ++AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ ++ AC_TRY_COMPILE( ++ [#include <stdlib.h>], ++ [void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }], ++ ccache_cv_COMPAR_FN_T=yes, ++ ccache_cv_COMPAR_FN_T=no)]) ++if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then ++ AC_DEFINE(HAVE_COMPAR_FN_T, 1, ++ Define to 1 if you have the `__compar_fn_t' typedef.) ++fi ++ + AC_PATH_PROGS(PERL, perl5 perl) + + AC_PATH_PROG(MAN2HTML, man2html, no) +Index: DirectFB-1.7.7/inputdrivers/lirc/lirc.c +=================================================================== +--- DirectFB-1.7.7.orig/inputdrivers/lirc/lirc.c ++++ DirectFB-1.7.7/inputdrivers/lirc/lirc.c +@@ -59,6 +59,11 @@ + + #include <core/input_driver.h> + ++#if HAVE_COMPAR_FN_T ++#define COMPAR_FN_T __compar_fn_t ++#else ++typedef int (*COMPAR_FN_T)(const void *, const void *); ++#endif + + DFB_INPUT_DRIVER( lirc ) + +@@ -97,7 +102,7 @@ static DFBInputDeviceKeySymbol lirc_pars + qsort ( keynames, + D_ARRAY_SIZE( keynames ), + sizeof(keynames[0]), +- (__compar_fn_t) keynames_sort_compare ); ++ (COMPAR_FN_T) keynames_sort_compare ); + keynames_sorted = true; + } + +@@ -124,7 +129,7 @@ static DFBInputDeviceKeySymbol lirc_pars + symbol_name = bsearch( name, keynames, + D_ARRAY_SIZE( keynames ), + sizeof(keynames[0]), +- (__compar_fn_t) keynames_compare ); ++ (COMPAR_FN_T) keynames_compare ); + if (symbol_name) + return symbol_name->symbol; + break; diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch new file mode 100644 index 000000000..29f45c797 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch @@ -0,0 +1,19 @@ +This patch is taken from gentoo musl overlay +sigval_t is glibc only construct, we use a union of sigval +which pretty much is same effect as sigval_t + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +diff -Naur DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c +--- DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c 2014-07-15 02:54:58.000000000 -0400 ++++ DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c 2015-07-18 16:55:35.077989166 -0400 +@@ -111,7 +111,7 @@ + void + direct_trap( const char *domain, int sig ) + { +- sigval_t val; ++ union sigval val; + + if (direct_config->delay_trap_ms) { + D_LOG( Direct_Trap, VERBOSE, "NOT RAISING signal %d from %s, waiting for %dms... attach gdb --pid=%d\n", sig, domain, direct_config->delay_trap_ms, getpid() ); diff --git a/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch b/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch new file mode 100644 index 000000000..ac48f68db --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch @@ -0,0 +1,116 @@ +Remove use of DIRECT_RECURSIVE_MUTEX_INITIALIZER its not portable +use portable way to initialize recursive mutex using pthread_once() and direct_recursive_mutex_init() + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Index: DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h +=================================================================== +--- DirectFB-1.7.7.orig/lib/direct/os/linux/glibc/mutex.h ++++ DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h +@@ -46,7 +46,6 @@ struct __D_DirectMutex { + /**********************************************************************************************************************/ + + #define DIRECT_MUTEX_INITIALIZER(name) { PTHREAD_MUTEX_INITIALIZER } +-#define DIRECT_RECURSIVE_MUTEX_INITIALIZER(name) { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP } + + #endif + +Index: DirectFB-1.7.7/lib/direct/trace.c +=================================================================== +--- DirectFB-1.7.7.orig/lib/direct/trace.c ++++ DirectFB-1.7.7/lib/direct/trace.c +@@ -89,8 +89,15 @@ struct __D_DirectTraceBuffer { + /**************************************************************************************************/ + + static DirectLink *buffers; +-static DirectMutex buffers_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(buffers_lock); + ++static pthread_once_t buffers_lock_init_once = PTHREAD_ONCE_INIT; ++static DirectMutex buffers_lock; ++ ++static void ++buffers_lock_init( void ) ++{ ++ direct_recursive_mutex_init(&buffers_lock); ++} + /**************************************************************************************************/ + + __dfb_no_instrument_function__ +@@ -113,6 +120,7 @@ get_trace_buffer( void ) + + D_MAGIC_SET( buffer, DirectTraceBuffer ); + ++ pthread_once(&buffers_lock_init_once, buffers_lock_init); + direct_mutex_lock( &buffers_lock ); + direct_list_append( &buffers, &buffer->link ); + direct_mutex_unlock( &buffers_lock ); +@@ -138,8 +146,14 @@ typedef struct { + } SymbolTable; + + static DirectLink *tables = NULL; +-static DirectMutex tables_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(tables_lock); ++static pthread_once_t tables_lock_init_once = PTHREAD_ONCE_INIT; ++static DirectMutex tables_lock; + ++static void ++tables_lock_init( void ) ++{ ++ direct_recursive_mutex_init(&tabless_lock); ++} + + __dfb_no_instrument_function__ + static void +@@ -370,6 +384,7 @@ direct_trace_lookup_symbol( const char * + Symbol *symbol; + SymbolTable *table; + ++ pthread_once(&tables_lock_init_once, tables_lock_init); + direct_mutex_lock( &tables_lock ); + + table = find_table( filename ); +@@ -514,6 +529,7 @@ direct_trace_print_stacks() + DirectTraceBuffer *b; + DirectTraceBuffer *buffer = get_trace_buffer(); + ++ pthread_once(&buffers_lock_init_once, buffers_lock_init); + direct_mutex_lock( &buffers_lock ); + + if (buffer && buffer->level) +@@ -611,6 +627,7 @@ direct_trace_free_buffer( DirectTraceBuf + D_MAGIC_ASSERT( buffer, DirectTraceBuffer ); + + if (buffer->thread) { ++ pthread_once(&buffers_lock_init_once, buffers_lock_init); + direct_mutex_lock( &buffers_lock ); + direct_list_remove( &buffers, &buffer->link ); + direct_mutex_unlock( &buffers_lock ); +Index: DirectFB-1.7.7/src/directfb.c +=================================================================== +--- DirectFB-1.7.7.orig/src/directfb.c ++++ DirectFB-1.7.7/src/directfb.c +@@ -99,6 +99,15 @@ const unsigned int directfb_micro_versio + const unsigned int directfb_binary_age = DIRECTFB_BINARY_AGE; + const unsigned int directfb_interface_age = DIRECTFB_INTERFACE_AGE; + ++static pthread_once_t lock_init_once = PTHREAD_ONCE_INIT; ++static DirectMutex lock; ++ ++static void ++lock_init( void ) ++{ ++ direct_recursive_mutex_init(&lock); ++} ++ + const char * + DirectFBCheckVersion( unsigned int required_major, + unsigned int required_minor, +@@ -215,8 +224,7 @@ DirectFBCreate( IDirectFB **interface_pt + if (dfb_config->remote.host) + return CreateRemote( dfb_config->remote.host, dfb_config->remote.port, interface_ptr ); + +- static DirectMutex lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(lock); +- ++ pthread_once(&lock_init_once, lock_init); + direct_mutex_lock( &lock ); + + if (!dfb_config->no_singleton && idirectfb_singleton) { diff --git a/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch b/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch new file mode 100644 index 000000000..286e548bc --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch @@ -0,0 +1,24 @@ +drmdevice.c: define _GNU_SOURCE + +Include config.h to fix this build error with uclibc: + +libdrm-2.4.66/tests/drmdevice.c: In function 'main': +libdrm-2.4.66/tests/drmdevice.c:96:60: error: +'O_CLOEXEC' undeclared (first use in this function) +fd = open(devices[i]->nodes[j],O_RDONLY | O_CLOEXEC, 0); + +Upstream-Status: Pending + +Signed-off-by: Maxin B. John <maxin.john@intel.com> +--- +diff -Naur libdrm-2.4.66-orig/tests/drmdevice.c libdrm-2.4.66/tests/drmdevice.c +--- libdrm-2.4.66-orig/tests/drmdevice.c 2016-02-23 11:34:02.054904502 +0200 ++++ libdrm-2.4.66/tests/drmdevice.c 2016-02-23 11:35:34.371750383 +0200 +@@ -21,6 +21,7 @@ + * + */ + ++#include <config.h> + #include <stdio.h> + #include <stdlib.h> + #include <sys/stat.h> diff --git a/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch b/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch index 1175daef9..30e0a61fd 100644 --- a/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch +++ b/yocto-poky/meta/recipes-graphics/drm/libdrm/installtests.patch @@ -4,20 +4,12 @@ Upstream-Status: Inappropriate [configuration] Signed-off-by: Yu Ke <ke.yu@intel.com> -diff --git a/tests/Makefile.am b/tests/Makefile.am -index bf1987f..d909e19 100644 ---- a/tests/Makefile.am -+++ b/tests/Makefile.am -@@ -27,10 +27,11 @@ AM_CPPFLAGS = \ - - LDADD = $(top_builddir)/libdrm.la - --check_PROGRAMS = \ -+bin_PROGRAMS = \ - dristat \ - drmstat - -+check_PROGRAMS = - if HAVE_NOUVEAU - SUBDIRS += nouveau +Index: libdrm-2.4.66/tests/Makefile.am +=================================================================== +--- libdrm-2.4.66.orig/tests/Makefile.am ++++ libdrm-2.4.66/tests/Makefile.am +@@ -73,3 +73,4 @@ TESTS += \ endif + + check_PROGRAMS += $(TESTS) ++bin_PROGRAMS = $(check_PROGRAMS) diff --git a/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.62.bb b/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.67.bb index ea6305e51..ddd697f34 100644 --- a/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.62.bb +++ b/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.67.bb @@ -11,9 +11,12 @@ PROVIDES = "drm" DEPENDS = "libpthread-stubs udev libpciaccess" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ - file://installtests.patch " -SRC_URI[md5sum] = "c9291bae0e5ca65d1483821d3698d3ab" -SRC_URI[sha256sum] = "906c294bdbe1c94c3ca084305d61a6e5a8367f3b4986e6cc13b1e9b3f75931dc" + file://installtests.patch \ + file://fix_O_CLOEXEC_undeclared.patch \ + " + +SRC_URI[md5sum] = "b844c6af34e613ebf52f80b3cd8d7055" +SRC_URI[sha256sum] = "ee5b71e1113be37544d0752681c12f040c01f782e2933df7d7bc21fd0d10cebe" inherit autotools pkgconfig @@ -26,12 +29,12 @@ EXTRA_OECONF += "--disable-cairo-tests \ ALLOW_EMPTY_${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ - ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno" + ${PN}-intel ${PN}-exynos ${PN}-kms ${PN}-freedreno ${PN}-amdgpu" RRECOMMENDS_${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ - ${PN}-exynos ${PN}-freedreno" + ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu" -FILES_${PN}-tests = "${bindir}/dr* ${bindir}/mode* ${bindir}/*test" +FILES_${PN}-tests = "${bindir}/*" FILES_${PN}-radeon = "${libdir}/libdrm_radeon.so.*" FILES_${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" FILES_${PN}-omap = "${libdir}/libdrm_omap.so.*" @@ -39,4 +42,4 @@ FILES_${PN}-intel = "${libdir}/libdrm_intel.so.*" FILES_${PN}-exynos = "${libdir}/libdrm_exynos.so.*" FILES_${PN}-kms = "${libdir}/libkms*.so.*" FILES_${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" - +FILES_${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.*" diff --git a/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc index b87688af7..d0c0c2761 100644 --- a/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc +++ b/yocto-poky/meta/recipes-graphics/eglinfo/eglinfo.inc @@ -6,12 +6,16 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=8d4f33bc3add976f7dfae85dab66f03c" DEPENDS = "virtual/egl" -SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master" +SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \ + file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \ + " SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de" S = "${WORKDIR}/git" -inherit waf +inherit waf distro_features_check +# depends on virtual/egl +REQUIRED_DISTRO_FEATURES ?= "opengl" # BSP layers should add .bbappend files for the -x11 and -fb .bb recipes, which # append the respective EGL/OpenGLES/OpenVG libraries to DEPENDS and set diff --git a/yocto-poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch b/yocto-poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch new file mode 100644 index 000000000..ca9f55c18 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch @@ -0,0 +1,34 @@ +From 94b1e6daf7d70550b0e32fbb269fcf6887948d3f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 13 Jan 2016 16:08:22 -0800 +Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers + +bcm_host.h is in standard includedir in sysroot +add that to header search paths. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + wscript | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/wscript b/wscript +index fcbb55b..cece8bf 100644 +--- a/wscript ++++ b/wscript +@@ -163,9 +163,10 @@ def configure_raspberrypi_device(conf, platform): + conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') + import os + sysroot = conf.options.sysroot + conf.options.prefix ++ std_include_path = os.path.join(sysroot, 'include') + vcos_pthread_path = os.path.join(sysroot, 'include/interface/vcos/pthreads') + vcms_host_path = os.path.join(sysroot, 'include/interface/vmcs_host/linux') +- if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path], uselib_store = 'EGL'): ++ if not conf.check_cxx(mandatory = 0, header_name = ['vcos_platform_types.h', 'EGL/egl.h', 'bcm_host.h'], includes = [vcos_pthread_path, vcms_host_path, std_include_path], uselib_store = 'EGL'): + conf.fatal('Check if --prefix and --sysroot are set correctly.') + conf.env['WITH_APIS'] = [] + if check_gles2(conf): +-- +2.7.0 + diff --git a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch new file mode 100644 index 000000000..f2fd5d473 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch @@ -0,0 +1,132 @@ +From 46ec6a52d4cc447cc3ff4a13b2067ecb76c9db2e Mon Sep 17 00:00:00 2001 +From: Behdad Esfahbod <behdad@behdad.org> +Date: Fri, 26 Jun 2015 17:02:13 -0700 +Subject: [PATCH] Revert changes made to FcConfigAppFontAddDir() recently + +In 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb the behavior of +FcConfigAppFontAddFile/Dir() were changed to return false +if not fonts were found. While this is welldefined and useful +for AddFile(), it's quite problematic for AddDir(). For example, +if the directory is empty, is that a failure or success? Worse, +the false value from AddDir() was being propagated all the way +to FcInit() returning false now. This only happened upon memory +allocation failure before, and some clients assert that FcInit() +is successful. + +With this change, AddDir() is reverted back to what it was. +AddFont() change (which was actually in fcdir.c) from the original +commit is left in. + +Upstream-Status: backport + +Signed-off-by: Li Zhou <li.zhou@windriver.com> +--- + doc/fcconfig.fncs | 2 +- + src/fccfg.c | 29 +++++++++++------------------ + src/fcint.h | 3 --- + src/fcstr.c | 8 -------- + 4 files changed, 12 insertions(+), 30 deletions(-) + +Index: fontconfig-2.11.94/doc/fcconfig.fncs +=================================================================== +--- fontconfig-2.11.94.orig/doc/fcconfig.fncs ++++ fontconfig-2.11.94/doc/fcconfig.fncs +@@ -232,7 +232,7 @@ the current configuration is used. + @DESC@ + Scans the specified directory for fonts, adding each one found to the + application-specific set of fonts. Returns FcFalse +-if the fonts cannot be added (due to allocation failure or no fonts found). ++if the fonts cannot be added (due to allocation failure). + Otherwise returns FcTrue. If <parameter>config</parameter> is NULL, + the current configuration is used. + @@ +Index: fontconfig-2.11.94/src/fccfg.c +=================================================================== +--- fontconfig-2.11.94.orig/src/fccfg.c ++++ fontconfig-2.11.94/src/fccfg.c +@@ -368,7 +368,6 @@ FcConfigAddDirList (FcConfig *config, Fc + FcStrList *dirlist; + FcChar8 *dir; + FcCache *cache; +- FcBool ret = FcFalse; + + dirlist = FcStrListCreate (dirSet); + if (!dirlist) +@@ -383,10 +382,9 @@ FcConfigAddDirList (FcConfig *config, Fc + continue; + FcConfigAddCache (config, cache, set, dirSet); + FcDirCacheUnload (cache); +- ret = FcTrue; + } + FcStrListDone (dirlist); +- return ret; ++ return FcTrue; + } + + /* +@@ -2199,7 +2197,6 @@ FcConfigAppFontAddFile (FcConfig *con + FcStrSet *subdirs; + FcStrList *sublist; + FcChar8 *subdir; +- FcBool ret = FcFalse; + + if (!config) + { +@@ -2229,19 +2226,16 @@ FcConfigAppFontAddFile (FcConfig *con + FcStrSetDestroy (subdirs); + return FcFalse; + } +- if (subdirs->num == 0) +- ret = FcTrue; +- else if ((sublist = FcStrListCreate (subdirs))) ++ if ((sublist = FcStrListCreate (subdirs))) + { + while ((subdir = FcStrListNext (sublist))) + { +- if (FcConfigAppFontAddDir (config, subdir)) +- ret = FcTrue; ++ FcConfigAppFontAddDir (config, subdir); + } + FcStrListDone (sublist); + } + FcStrSetDestroy (subdirs); +- return ret; ++ return FcTrue; + } + + FcBool +@@ -2250,7 +2244,6 @@ FcConfigAppFontAddDir (FcConfig *con + { + FcFontSet *set; + FcStrSet *dirs; +- FcBool ret = FcTrue; + + if (!config) + { +@@ -2269,8 +2262,8 @@ FcConfigAppFontAddDir (FcConfig *con + set = FcFontSetCreate (); + if (!set) + { +- ret = FcFalse; +- goto bail; ++ FcStrSetDestroy (dirs); ++ return FcFalse; + } + FcConfigSetFonts (config, set, FcSetApplication); + } +@@ -2278,10 +2271,12 @@ FcConfigAppFontAddDir (FcConfig *con + FcStrSetAddFilename (dirs, dir); + + if (!FcConfigAddDirList (config, FcSetApplication, dirs)) +- ret = FcFalse; +-bail: ++ { ++ FcStrSetDestroy (dirs); ++ return FcFalse; ++ } + FcStrSetDestroy (dirs); +- return ret; ++ return FcTrue; + } + + void diff --git a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb index 9bbff208c..b427947a9 100644 --- a/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb +++ b/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb @@ -22,6 +22,7 @@ DEPENDS = "expat freetype zlib" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://revert-static-pkgconfig.patch \ + file://0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch \ " SRC_URI[md5sum] = "479be870c7f83f15f87bac085b61d641" SRC_URI[sha256sum] = "73f6d323c7bcfbde25d78397675191d55b8f4139132c6a9444410f3a2d8a9a95" @@ -40,6 +41,10 @@ inherit autotools pkgconfig FONTCONFIG_CACHE_DIR ?= "${localstatedir}/cache/fontconfig" -EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR}" +# comma separated list of additional directories +# /usr/share/fonts is already included by default (you can change it with --with-default-fonts) +FONTCONFIG_FONT_DIRS ?= "no" + +EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR} --with-add-fonts=${FONTCONFIG_FONT_DIRS}" BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch b/yocto-poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch new file mode 100644 index 000000000..20838813d --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/freetype/freetype/use-right-libtool.patch @@ -0,0 +1,14 @@ +Freetype think that it knows best about where libtool is, and explicitly the +libtool autoconf macros telling it where to find the libtool script. Of course +we prefix the script with the target triplet, so it's wrong. Fix this by +removing the forced assignment, so the configure script's knowledge of where it +put libtool is used. + +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +--- freetype-2.6/builds/unix/unix-cc.in.orig 2016-01-07 19:21:45.244943479 +0000 ++++ freetype-2.6/builds/unix/unix-cc.in 2016-01-07 19:21:50.213112131 +0000 +@@ -19,1 +18,1 @@ +-LIBTOOL := $(FT_LIBTOOL_DIR)/libtool ++LIBTOOL := $(FT_LIBTOOL_DIR)/@LIBTOOL@ diff --git a/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.bb b/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.3.bb index 70599c67a..3ed907012 100644 --- a/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.bb +++ b/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.3.bb @@ -5,56 +5,42 @@ images). It can be used in graphics libraries, display servers, font conversion image generation tools, and many other products as well." HOMEPAGE = "http://www.freetype.org/" BUGTRACKER = "https://savannah.nongnu.org/bugs/?group=freetype" +SECTION = "libs" LICENSE = "FreeType | GPLv2+" -LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 \ +LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \ file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" -SECTION = "libs" - -SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2" -SRC_URI[md5sum] = "5682890cb0267f6671dd3de6eabd3e69" -SRC_URI[sha256sum] = "8469fb8124764f85029cc8247c31e132a2c5e51084ddce2a44ea32ee4ae8347e" +SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ + file://use-right-libtool.patch" -BINCONFIG = "${bindir}/freetype-config" +SRC_URI[md5sum] = "0037b25a8c090bc8a1218e867b32beb1" +SRC_URI[sha256sum] = "371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2" -inherit autotools-brokensep pkgconfig binconfig-disabled multilib_header +inherit autotools pkgconfig binconfig-disabled multilib_header -LIBTOOL = "${S}/builds/unix/${HOST_SYS}-libtool" -EXTRA_OEMAKE = "'LIBTOOL=${LIBTOOL}'" -EXTRA_OEMAKE_class-native = "" -EXTRA_OECONF = "--without-zlib --without-bzip2 CC_BUILD='${BUILD_CC}'" -TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64" +# Adapt autotools to work with the minimal autoconf usage in freetype +AUTOTOOLS_SCRIPT_PATH = "${S}/builds/unix" +CONFIGURE_SCRIPT = "${S}/configure" +EXTRA_AUTORECONF += "--exclude=autoheader --exclude=automake" +PACKAGECONFIG ??= "zlib" -PACKAGECONFIG ??= "" -PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" -# This results in a circular dependency so enabling is non-trivial +PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" +# harfbuzz results in a circular dependency so enabling is non-trivial PACKAGECONFIG[harfbuzz] = "--with-harfbuzz,--without-harfbuzz,harfbuzz" +PACKAGECONFIG[pixmap] = "--with-png,--without-png,libpng" +PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" -do_configure() { - cd builds/unix - libtoolize --force --copy - aclocal -I . - gnu-configize --force - autoconf - cd ${S} - oe_runconf -} - -do_configure_class-native() { - (cd builds/unix && gnu-configize) || die "failure running gnu-configize" - oe_runconf -} +EXTRA_OECONF = "CC_BUILD='${BUILD_CC}'" -do_compile_prepend() { - ${BUILD_CC} -o objs/apinames src/tools/apinames.c -} +TARGET_CPPFLAGS += "-D_FILE_OFFSET_BITS=64" do_install_append() { - oe_multilib_header freetype2/config/ftconfig.h + oe_multilib_header freetype2/freetype/config/ftconfig.h } -BBCLASSEXTEND = "native" +BINCONFIG = "${bindir}/freetype-config" +BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/glew/glew/autotools.patch b/yocto-poky/meta/recipes-graphics/glew/glew/autotools.patch deleted file mode 100644 index 7dfe087d5..000000000 --- a/yocto-poky/meta/recipes-graphics/glew/glew/autotools.patch +++ /dev/null @@ -1,149 +0,0 @@ - -Upstream-Status: Inappropriate [configuration] - -Index: glew/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/Makefile.am 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,5 @@ -+ -+ACLOCAL_AMFLAGS = -I m4 --install -+ -+SUBDIRS = include src -+ -Index: glew/configure.ac -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/configure.ac 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,67 @@ -+# -*- Autoconf -*- -+# Process this file with autoconf to produce a configure script. -+ -+AC_PREREQ([2.62]) -+AC_INIT([glew], [1.9.0], [BUG-REPORT-ADDRESS]) -+AC_CONFIG_SRCDIR([src/glew.c]) -+AC_CONFIG_HEADERS([config.h]) -+AM_INIT_AUTOMAKE([-Wall -Werror foreign]) -+AC_CONFIG_MACRO_DIR([m4]) -+ -+LT_INIT -+ -+# Checks for programs. -+AC_PROG_CC -+AC_PROG_INSTALL -+AC_PROG_LN_S -+ -+# Checks for libraries. -+ -+# Checks for header files. -+AC_CHECK_HEADERS([inttypes.h stddef.h stdint.h stdlib.h string.h]) -+ -+# Checks for typedefs, structures, and compiler characteristics. -+AC_TYPE_INT32_T -+AC_TYPE_INT64_T -+AC_TYPE_UINT64_T -+AC_CHECK_TYPES([ptrdiff_t]) -+ -+# Checks for library functions. -+AC_FUNC_MALLOC -+AC_CHECK_FUNCS([strtol]) -+ -+# Check for pkgconfig libs -+ -+PKG_CHECK_MODULES([X11], [x11]) -+AC_SUBST([X11_LIBS]) -+AC_SUBST([X11_CFLAGS]) -+ -+PKG_CHECK_MODULES([XMU], [xmu]) -+AC_SUBST([XMU_LIBS]) -+AC_SUBST([XMU_CFLAGS]) -+ -+PKG_CHECK_MODULES([XI], [xi]) -+AC_SUBST([XI_LIBS]) -+AC_SUBST([XI_CFLAGS]) -+ -+PKG_CHECK_MODULES([XEXT], [xext]) -+AC_SUBST([XEXT_LIBS]) -+AC_SUBST([XEXT_CFLAGS]) -+ -+# Check for GLU is enough and imples gl so no doubled -lGL in LDFLAGS -+PKG_CHECK_MODULES([GLU], [glu]) -+AC_SUBST([GLU_LIBS]) -+AC_SUBST([GLU_CFLAGS]) -+ -+# ENABLE option for Multiple Rendering Contexts support -+AC_CHECK_ENABLE_GLEWMX -+ -+# for now we use the same version as the package, but that should be avoided -+# in the future -+ -+AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) -+ -+AC_CONFIG_FILES([Makefile -+ include/Makefile -+ src/Makefile]) -+AC_OUTPUT -Index: glew/src/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/src/Makefile.am 2009-12-02 00:33:48.690786110 +0100 -@@ -0,0 +1,35 @@ -+ -+AM_CPPFLAGS = -I$(top_srcdir)/include -+ -+if ENABLE_GLEWMX -+AM_CPPFLAGS += -DGLEW_MX -+endif -+ -+AM_CFLAGS = @X11_CFLAGS@ \ -+ @XMU_CFLAGS@ \ -+ @XI_CFLAGS@ \ -+ @XEXT_CFLAGS@ \ -+ @GLU_CFLAGS@ -+ -+lib_LTLIBRARIES = libGLEW.la -+ -+libGLEW_la_SOURCES = glew.c -+ -+libGLEW_la_LIBADD = @X11_LIBS@ \ -+ @XMU_LIBS@ \ -+ @XI_LIBS@ \ -+ @XEXT_LIBS@ \ -+ @GLU_LIBS@ -+ -+libGLEW_la_LDFLAGS = -version-number @LIBGLEW_SO_VERSION@ -+ -+bin_PROGRAMS = glewinfo visualinfo -+ -+glewinfo_SOURCES = glewinfo.c -+ -+glewinfo_LDADD = libGLEW.la -+ -+visualinfo_SOURCES = visualinfo.c -+ -+visualinfo_LDADD = libGLEW.la -+ -Index: glew/m4/glewmx.m4 -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/m4/glewmx.m4 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,11 @@ -+ -+AC_DEFUN([AC_CHECK_ENABLE_GLEWMX],[ -+AC_MSG_CHECKING([whether to include Multiple Rendering Contexts support]) -+AC_ARG_ENABLE([glewmx], -+ [AS_HELP_STRING([--enable-glewmx], [enable GLEW Multiple Rendering Contexts (default is no)])], -+ [ENABLE_GLEWMX="$enableval"], -+ [ENABLE_GLEWMX="no"]) -+AC_MSG_RESULT([${ENABLE_GLEWMX}]) -+AM_CONDITIONAL([ENABLE_GLEWMX], [test x"${ENABLE_GLEWMX}" = "xyes"]) -+]) -+ -Index: glew/include/Makefile.am -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ glew/include/Makefile.am 2009-12-02 00:30:23.296641663 +0100 -@@ -0,0 +1,3 @@ -+ -+nobase_include_HEADERS = GL/glew.h GL/glxew.h GL/wglew.h -+ diff --git a/yocto-poky/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch b/yocto-poky/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch deleted file mode 100644 index 70a99aeee..000000000 --- a/yocto-poky/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch +++ /dev/null @@ -1,46 +0,0 @@ - -We maintain the autotools configure.ac and Makefile.am, to correctly -provide the glew.pc, the following patch is needed. - -Upstream-Status: Inappropriate - -Signed-off-by: Saul Wold <sgw@linux.intel.com> - -Index: glew-1.11.0/Makefile.am -=================================================================== ---- glew-1.11.0.orig/Makefile.am -+++ glew-1.11.0/Makefile.am -@@ -3,3 +3,5 @@ ACLOCAL_AMFLAGS = -I m4 --install - - SUBDIRS = include src - -+pkgconfigdir = $(libdir)/pkgconfig -+pkgconfig_DATA = glew.pc -Index: glew-1.11.0/configure.ac -=================================================================== ---- glew-1.11.0.orig/configure.ac -+++ glew-1.11.0/configure.ac -@@ -66,5 +66,6 @@ AC_SUBST([LIBGLEW_SO_VERSION], [1:9:0]) - - AC_CONFIG_FILES([Makefile - include/Makefile -- src/Makefile]) -+ src/Makefile -+ glew.pc]) - AC_OUTPUT -Index: glew-1.11.0/glew.pc.in -=================================================================== ---- glew-1.11.0.orig/glew.pc.in -+++ glew-1.11.0/glew.pc.in -@@ -5,7 +5,7 @@ includedir=${prefix}/include/GL - - Name: glew - Description: The OpenGL Extension Wrangler library --Version: @version@ --Cflags: -I${includedir} @cflags@ --Libs: -L${libdir} -l@libname@ --Requires: @requireslib@ -+Version: @VERSION@ -+Cflags: -I${includedir} @CFLAGS@ -+Libs: -L${libdir} -lGLEW -+Requires: glu diff --git a/yocto-poky/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch b/yocto-poky/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch deleted file mode 100644 index 0707efba2..000000000 --- a/yocto-poky/meta/recipes-graphics/glew/glew/glew_fix_for_automake-1.12.patch +++ /dev/null @@ -1,25 +0,0 @@ -Upstream-Status: Pending - -This patch fixes following issue with automake 1.12 - -| automake: warnings are treated as errors -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: warning: 'libGLEW.la': linking libtool libraries using a non-POSIX -| /srv/home/nitin/builds/build-gcc47/tmp/sysroots/x86_64-linux/usr/share/automake-1.12/am/ltlibrary.am: archiver requires 'AM_PROG_AR' in 'configure.ac' - -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> -2012/05/03 - -Index: glew-1.7.0/configure.ac -=================================================================== ---- glew-1.7.0.orig/configure.ac -+++ glew-1.7.0/configure.ac -@@ -14,6 +14,9 @@ LT_INIT - AC_PROG_CC - AC_PROG_INSTALL - AC_PROG_LN_S -+# automake 1.12 seems to require this, but automake 1.11 doesn't recognize it -+m4_pattern_allow([AM_PROG_AR]) -+AM_PROG_AR - - # Checks for libraries. - diff --git a/yocto-poky/meta/recipes-graphics/glew/glew/no-strip.patch b/yocto-poky/meta/recipes-graphics/glew/glew/no-strip.patch new file mode 100644 index 000000000..e411f11cb --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/glew/glew/no-strip.patch @@ -0,0 +1,12 @@ +Don't forcibly strip the binaries. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +Upstream-Status: Pending + +diff --git a/Makefile b/Makefile +index 6a9803c..170c0ce 100644 +--- a/Makefile ++++ b/Makefile +@@ -285 +285 @@ install.bin: glew.bin +- $(INSTALL) -s -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" ++ $(INSTALL) -m 0755 bin/$(GLEWINFO.BIN) bin/$(VISUALINFO.BIN) "$(DESTDIR)$(BINDIR)/" diff --git a/yocto-poky/meta/recipes-graphics/glew/glew_1.12.0.bb b/yocto-poky/meta/recipes-graphics/glew/glew_1.12.0.bb deleted file mode 100644 index eb28c4d4f..000000000 --- a/yocto-poky/meta/recipes-graphics/glew/glew_1.12.0.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "OpenGL extension loading library" -DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." -HOMEPAGE = "http://glew.sourceforge.net/" -BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" - -DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" - - -SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ - file://autotools.patch \ - file://glew_fix_for_automake-1.12.patch \ - file://fix-glew.pc-install.patch \ - " - -SRC_URI[md5sum] = "01246c7ecd135d99be031aa63f86dca1" -SRC_URI[sha256sum] = "af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf" - -inherit autotools lib_package pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" diff --git a/yocto-poky/meta/recipes-graphics/glew/glew_1.13.0.bb b/yocto-poky/meta/recipes-graphics/glew/glew_1.13.0.bb new file mode 100644 index 000000000..a25c405f3 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/glew/glew_1.13.0.bb @@ -0,0 +1,40 @@ +SUMMARY = "OpenGL extension loading library" +DESCRIPTION = "The OpenGL Extension Wrangler Library (GLEW) is a cross-platform open-source C/C++ extension loading library." +HOMEPAGE = "http://glew.sourceforge.net/" +BUGTRACKER = "http://sourceforge.net/tracker/?group_id=67586" +SECTION = "x11" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" + +DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" + +SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ + file://no-strip.patch" + +SRC_URI[md5sum] = "7cbada3166d2aadfc4169c4283701066" +SRC_URI[sha256sum] = "aa25dc48ed84b0b64b8d41cdd42c8f40f149c37fa2ffa39cd97f42c78d128bc7" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew" +UPSTREAM_CHECK_REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/" + +inherit lib_package pkgconfig distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +# Override SYSTEM to avoid calling config.guess, we're cross-compiling. Pass +# our CFLAGS via POPT as that's the optimisation variable and safely +# overwritten. +EXTRA_OEMAKE = "SYSTEM='linux' \ + CC='${CC}' LD='${CC}' STRIP='' \ + LDFLAGS.EXTRA='${LDFLAGS}' \ + POPT='${CFLAGS}' \ + GLEW_PREFIX='${prefix}' BINDIR='${bindir}' \ + LIBDIR='${libdir}' INCDIR='${includedir}/GL'" + +do_compile() { + oe_runmake +} + +do_install() { + oe_runmake 'DESTDIR=${D}' install.all +} diff --git a/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.2.bb b/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.3.bb index 670bd98e1..cfe885fe7 100644 --- a/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.0.2.bb +++ b/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.3.bb @@ -2,34 +2,38 @@ SUMMARY = "Text shaping library" DESCRIPTION = "HarfBuzz is an OpenType text shaping engine." HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" - +SECTION = "libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ file://src/hb-ucdn/COPYING;md5=994ba0f1295f15b4bda4999a5bbeddef \ " -SECTION = "libs" +DEPENDS = "glib-2.0 cairo fontconfig freetype" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" -SRC_URI[md5sum] = "e74f644045fe42c38a2641fc1e82a800" -SRC_URI[sha256sum] = "beb3caf8654010fcdca61c810a3a7532237fc567ee4271deb674b5efbbe3b466" - -inherit autotools pkgconfig lib_package - -DEPENDS = "glib-2.0 cairo freetype" -BBCLASSEXTEND = "native" +SRC_URI[md5sum] = "da8d97e262e6ef8288e1ae76369421bd" +SRC_URI[sha256sum] = "8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c" -EXTRA_OECONF = "--with-glib --with-freetype --with-cairo --without-graphite2" +inherit autotools pkgconfig lib_package PACKAGECONFIG ??= "icu" PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" -PACKAGES =+ "${PN}-icu ${PN}-icu-dbg ${PN}-icu-dev" +EXTRA_OECONF = " \ + --with-cairo \ + --with-fontconfig \ + --with-freetype \ + --with-glib \ + --without-graphite2 \ +" + +PACKAGES =+ "${PN}-icu ${PN}-icu-dev" FILES_${PN}-icu = "${libdir}/libharfbuzz-icu.so.*" -FILES_${PN}-icu-dbg = "${libdir}/.debug/libharfbuzz-icu.so*" FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ ${libdir}/libharfbuzz-icu.so \ ${libdir}/pkgconfig/harfbuzz-icu.pc \ " + +BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb b/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb new file mode 100644 index 000000000..485943194 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb @@ -0,0 +1,41 @@ +DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression" +HOMEPAGE = "http://libjpeg-turbo.org/" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=cad955d15145c3fdceec6855e078e953 \ + file://jpeglib.h;endline=14;md5=dfc803dc51ae21178d1376ec73c4454d \ + file://djpeg.c;endline=9;md5=e93a8f2061e8a0ac71c7a485c10489e2 \ +" + +DEPENDS = "nasm-native" + +BASEPV = "${@d.getVar('PV',True).split('+')[1]}" + +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${BASEPV}.tar.gz" +SRC_URI[md5sum] = "86b0d5f7507c2e6c21c00219162c3c44" +SRC_URI[sha256sum] = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" +UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" + +S = "${WORKDIR}/${BPN}-${BASEPV}" + +# Drop-in replacement for jpeg +PROVIDES = "jpeg" +RPROVIDES_${PN} += "jpeg" +RREPLACES_${PN} += "jpeg" +RCONFLICTS_${PN} += "jpeg" + +inherit autotools pkgconfig + +# Work around missing x32 ABI support +EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", d)}" + +PACKAGES =+ "jpeg-tools libturbojpeg" + +DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library." +FILES_jpeg-tools = "${bindir}/*" + +DESCRIPTION_libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs" +FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*" + +BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb index ad1729383..6c247ccaf 100644 --- a/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb +++ b/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_git.bb @@ -17,7 +17,9 @@ PV = "1.3.1" S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/egl +REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS = "util-macros virtual/egl" diff --git a/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch b/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch deleted file mode 100644 index 3f9763953..000000000 --- a/yocto-poky/meta/recipes-graphics/libsdl/libsdl-1.2.15/configure_tweak.patch +++ /dev/null @@ -1,1111 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: SDL-1.2.15/configure.in -=================================================================== ---- SDL-1.2.15.orig/configure.in -+++ SDL-1.2.15/configure.in -@@ -48,9 +48,9 @@ AC_CONFIG_AUX_DIR([build-scripts]) - dnl AC_CANONICAL_HOST - AC_C_BIGENDIAN - if test x$ac_cv_c_bigendian = xyes; then -- AC_DEFINE(SDL_BYTEORDER, 4321) -+ AC_DEFINE(SDL_BYTEORDER, 4321, "Byte Order") - else -- AC_DEFINE(SDL_BYTEORDER, 1234) -+ AC_DEFINE(SDL_BYTEORDER, 1234, "Byte Order") - fi - - dnl Check for tools -@@ -134,7 +134,7 @@ AC_ARG_ENABLE(libc, - AC_HELP_STRING([--enable-libc], [Use the system C library [[default=yes]]]), - , enable_libc=yes) - if test x$enable_libc = xyes; then -- AC_DEFINE(HAVE_LIBC) -+ AC_DEFINE(HAVE_LIBC,1,"") - - dnl Check for C library headers - AC_HEADER_STDC -@@ -145,7 +145,7 @@ if test x$enable_libc = xyes; then - if test x$ac_cv_header_inttypes_h = xyes -o x$ac_cv_header_stdint_h = xyes; then - AC_CHECK_TYPE(int64_t) - if test x$ac_cv_type_int64_t = xyes; then -- AC_DEFINE(SDL_HAS_64BIT_TYPE) -+ AC_DEFINE(SDL_HAS_64BIT_TYPE,1,"") - fi - have_inttypes=yes - fi -@@ -161,11 +161,11 @@ if test x$enable_libc = xyes; then - - AC_FUNC_MEMCMP - if test x$ac_cv_func_memcmp_working = xyes; then -- AC_DEFINE(HAVE_MEMCMP) -+ AC_DEFINE(HAVE_MEMCMP,1,"") - fi - AC_FUNC_STRTOD - if test x$ac_cv_func_strtod = xyes; then -- AC_DEFINE(HAVE_STRTOD) -+ AC_DEFINE(HAVE_STRTOD,1,"") - fi - AC_CHECK_FUNC(mprotect, - AC_TRY_COMPILE([ -@@ -191,40 +191,40 @@ if test x$have_inttypes != xyes; then - AC_CHECK_SIZEOF(long, 4) - AC_CHECK_SIZEOF(long long, 8) - if test x$ac_cv_sizeof_char = x1; then -- AC_DEFINE(int8_t, signed char) -- AC_DEFINE(uint8_t, unsigned char) -+ AC_DEFINE(int8_t, signed char,"") -+ AC_DEFINE(uint8_t, unsigned char,"") - fi - if test x$ac_cv_sizeof_short = x2; then -- AC_DEFINE(int16_t, signed short) -- AC_DEFINE(uint16_t, unsigned short) -+ AC_DEFINE(int16_t, signed short,"") -+ AC_DEFINE(uint16_t, unsigned short,"") - else - if test x$ac_cv_sizeof_int = x2; then -- AC_DEFINE(int16_t, signed int) -- AC_DEFINE(uint16_t, unsigned int) -+ AC_DEFINE(int16_t, signed int,"") -+ AC_DEFINE(uint16_t, unsigned int,"") - fi - fi - if test x$ac_cv_sizeof_int = x4; then -- AC_DEFINE(int32_t, signed int) -- AC_DEFINE(uint32_t, unsigned int) -+ AC_DEFINE(int32_t, signed int,"") -+ AC_DEFINE(uint32_t, unsigned int,"") - else - if test x$ac_cv_sizeof_long = x4; then -- AC_DEFINE(int32_t, signed long) -- AC_DEFINE(uint32_t, unsigned long) -+ AC_DEFINE(int32_t, signed long,"") -+ AC_DEFINE(uint32_t, unsigned long,"") - fi - fi - if test x$ac_cv_sizeof_long = x8; then -- AC_DEFINE(int64_t, signed long) -- AC_DEFINE(uint64_t, unsigned long) -- AC_DEFINE(SDL_HAS_64BIT_TYPE) -+ AC_DEFINE(int64_t, signed long,"") -+ AC_DEFINE(uint64_t, unsigned long,"") -+ AC_DEFINE(SDL_HAS_64BIT_TYPE,"") - else - if test x$ac_cv_sizeof_long_long = x8; then -- AC_DEFINE(int64_t, signed long long) -- AC_DEFINE(uint64_t, unsigned long long) -- AC_DEFINE(SDL_HAS_64BIT_TYPE) -+ AC_DEFINE(int64_t, signed long long,"") -+ AC_DEFINE(uint64_t, unsigned long long,"") -+ AC_DEFINE(SDL_HAS_64BIT_TYPE,"") - fi - fi -- AC_DEFINE(size_t, unsigned int) -- AC_DEFINE(uintptr_t, unsigned long) -+ AC_DEFINE(size_t, unsigned int,"") -+ AC_DEFINE(uintptr_t, unsigned long,"") - fi - - # Standard C sources -@@ -245,25 +245,25 @@ AC_ARG_ENABLE(audio, - AC_HELP_STRING([--enable-audio], [Enable the audio subsystem [[default=yes]]]), - , enable_audio=yes) - if test x$enable_audio != xyes; then -- AC_DEFINE(SDL_AUDIO_DISABLED) -+ AC_DEFINE(SDL_AUDIO_DISABLED,1,"") - fi - AC_ARG_ENABLE(video, - AC_HELP_STRING([--enable-video], [Enable the video subsystem [[default=yes]]]), - , enable_video=yes) - if test x$enable_video != xyes; then -- AC_DEFINE(SDL_VIDEO_DISABLED) -+ AC_DEFINE(SDL_VIDEO_DISABLED,1,"") - fi - AC_ARG_ENABLE(events, - AC_HELP_STRING([--enable-events], [Enable the events subsystem [[default=yes]]]), - , enable_events=yes) - if test x$enable_events != xyes; then -- AC_DEFINE(SDL_EVENTS_DISABLED) -+ AC_DEFINE(SDL_EVENTS_DISABLED,1,"") - fi - AC_ARG_ENABLE(joystick, - AC_HELP_STRING([--enable-joystick], [Enable the joystick subsystem [[default=yes]]]), - , enable_joystick=yes) - if test x$enable_joystick != xyes; then -- AC_DEFINE(SDL_JOYSTICK_DISABLED) -+ AC_DEFINE(SDL_JOYSTICK_DISABLED,1,"") - else - SOURCES="$SOURCES $srcdir/src/joystick/*.c" - fi -@@ -271,43 +271,43 @@ AC_ARG_ENABLE(cdrom, - AC_HELP_STRING([--enable-cdrom], [Enable the cdrom subsystem [[default=yes]]]), - , enable_cdrom=yes) - if test x$enable_cdrom != xyes; then -- AC_DEFINE(SDL_CDROM_DISABLED) -+ AC_DEFINE(SDL_CDROM_DISABLED,1,"") - fi - AC_ARG_ENABLE(threads, - AC_HELP_STRING([--enable-threads], [Enable the threading subsystem [[default=yes]]]), - , enable_threads=yes) - if test x$enable_threads != xyes; then -- AC_DEFINE(SDL_THREADS_DISABLED) -+ AC_DEFINE(SDL_THREADS_DISABLED,1,"") - fi - AC_ARG_ENABLE(timers, - AC_HELP_STRING([--enable-timers], [Enable the timer subsystem [[default=yes]]]), - , enable_timers=yes) - if test x$enable_timers != xyes; then -- AC_DEFINE(SDL_TIMERS_DISABLED) -+ AC_DEFINE(SDL_TIMERS_DISABLED,1,"") - fi - AC_ARG_ENABLE(file, - AC_HELP_STRING([--enable-file], [Enable the file subsystem [[default=yes]]]), - , enable_file=yes) - if test x$enable_file != xyes; then -- AC_DEFINE(SDL_FILE_DISABLED) -+ AC_DEFINE(SDL_FILE_DISABLED,1,"") - fi - AC_ARG_ENABLE(loadso, - AC_HELP_STRING([--enable-loadso], [Enable the shared object loading subsystem [[default=yes]]]), - , enable_loadso=yes) - if test x$enable_loadso != xyes; then -- AC_DEFINE(SDL_LOADSO_DISABLED) -+ AC_DEFINE(SDL_LOADSO_DISABLED,1,"") - fi - AC_ARG_ENABLE(cpuinfo, - AC_HELP_STRING([--enable-cpuinfo], [Enable the cpuinfo subsystem [[default=yes]]]), - , enable_cpuinfo=yes) - if test x$enable_cpuinfo != xyes; then -- AC_DEFINE(SDL_CPUINFO_DISABLED) -+ AC_DEFINE(SDL_CPUINFO_DISABLED,1,"") - fi - AC_ARG_ENABLE(assembly, - AC_HELP_STRING([--enable-assembly], [Enable assembly routines [[default=yes]]]), - , enable_assembly=yes) - if test x$enable_assembly = xyes; then -- AC_DEFINE(SDL_ASSEMBLY_ROUTINES) -+ AC_DEFINE(SDL_ASSEMBLY_ROUTINES,1,"") - fi - - dnl See if the OSS audio interface is supported -@@ -335,12 +335,12 @@ AC_HELP_STRING([--enable-oss], [support - int arg = SNDCTL_DSP_SETFRAGMENT; - ],[ - have_oss=yes -- AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H) -+ AC_DEFINE(SDL_AUDIO_DRIVER_OSS_SOUNDCARD_H,1,"") - ]) - fi - AC_MSG_RESULT($have_oss) - if test x$have_oss = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_OSS) -+ AC_DEFINE(SDL_AUDIO_DRIVER_OSS,1,"") - SOURCES="$SOURCES $srcdir/src/audio/dsp/*.c" - SOURCES="$SOURCES $srcdir/src/audio/dma/*.c" - have_audio=yes -@@ -407,7 +407,7 @@ CheckDMEDIA() - AC_MSG_RESULT($have_dmedia) - # Set up files for the audio library - if test x$have_dmedia = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA) -+ AC_DEFINE(SDL_AUDIO_DRIVER_DMEDIA,1,"") - SOURCES="$SOURCES $srcdir/src/audio/dmedia/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laudio" - have_audio=yes -@@ -444,7 +444,7 @@ CheckMME() - AC_MSG_RESULT($have_mme) - # Set up files for the audio library - if test x$have_mme = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO) -+ AC_DEFINE(SDL_AUDIO_DRIVER_MMEAUDIO,1,"") - SOURCES="$SOURCES $srcdir/src/audio/mme/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $MME_CFLAGS" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $MME_LIBS" -@@ -467,7 +467,7 @@ AC_HELP_STRING([--enable-esd-shared], [d - , enable_esd_shared=yes) - esd_lib=[`find_lib "libesd.so.*" "$ESD_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] - -- AC_DEFINE(SDL_AUDIO_DRIVER_ESD) -+ AC_DEFINE(SDL_AUDIO_DRIVER_ESD,1,"") - SOURCES="$SOURCES $srcdir/src/audio/esd/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $ESD_CFLAGS" - if test x$have_loadso != xyes && \ -@@ -477,7 +477,7 @@ AC_HELP_STRING([--enable-esd-shared], [d - if test x$have_loadso = xyes && \ - test x$enable_esd_shared = xyes && test x$esd_lib != x; then - echo "-- dynamic libesd -> $esd_lib" -- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib") -+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ESD_DYNAMIC, "$esd_lib", "") - else - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ESD_LIBS" - fi -@@ -564,7 +564,7 @@ AC_HELP_STRING([--enable-arts-shared], [ - , enable_arts_shared=yes) - arts_lib=[`find_lib "libartsc.so.*" "$ARTS_LIBS" | sed 's/.*\/\(.*\)/\1/; q'`] - -- AC_DEFINE(SDL_AUDIO_DRIVER_ARTS) -+ AC_DEFINE(SDL_AUDIO_DRIVER_ARTS,, "") - SOURCES="$SOURCES $srcdir/src/audio/arts/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $ARTS_CFLAGS" - if test x$have_loadso != xyes && \ -@@ -574,7 +574,7 @@ AC_HELP_STRING([--enable-arts-shared], [ - if test x$have_loadso = xyes && \ - test x$enable_arts_shared = xyes && test x$arts_lib != x; then - echo "-- dynamic libartsc -> $arts_lib" -- AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib") -+ AC_DEFINE_UNQUOTED(SDL_AUDIO_DRIVER_ARTS_DYNAMIC, "$arts_lib",1,"") - else - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $ARTS_LIBS" - fi -@@ -634,7 +634,7 @@ AC_HELP_STRING([--enable-nas-shared], [d - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $NAS_LIBS" - fi - -- AC_DEFINE(SDL_AUDIO_DRIVER_NAS) -+ AC_DEFINE(SDL_AUDIO_DRIVER_NAS,1,"") - SOURCES="$SOURCES $srcdir/src/audio/nas/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $NAS_CFLAGS" - have_audio=yes -@@ -649,7 +649,7 @@ CheckDiskAudio() - AC_HELP_STRING([--enable-diskaudio], [support the disk writer audio driver [[default=yes]]]), - , enable_diskaudio=yes) - if test x$enable_audio = xyes -a x$enable_diskaudio = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_DISK) -+ AC_DEFINE(SDL_AUDIO_DRIVER_DISK,1,"") - SOURCES="$SOURCES $srcdir/src/audio/disk/*.c" - fi - } -@@ -661,7 +661,7 @@ CheckDummyAudio() - AC_HELP_STRING([--enable-dummyaudio], [support the dummy audio driver [[default=yes]]]), - , enable_dummyaudio=yes) - if test x$enable_audio = xyes -a x$enable_dummyaudio = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY) -+ AC_DEFINE(SDL_AUDIO_DRIVER_DUMMY,1,"") - SOURCES="$SOURCES $srcdir/src/audio/dummy/*.c" - fi - } -@@ -677,7 +677,7 @@ AC_HELP_STRING([--enable-mintaudio], [su - AC_CHECK_HEADER(mint/falcon.h, have_mint_falcon_hdr=yes) - if test x$have_mint_falcon_hdr = xyes; then - mintaudio=yes -- AC_DEFINE(SDL_AUDIO_DRIVER_MINT) -+ AC_DEFINE(SDL_AUDIO_DRIVER_MINT,1,"") - SOURCES="$SOURCES $srcdir/src/audio/mint/*.c" - SOURCES="$SOURCES $srcdir/src/audio/mint/*.S" - have_audio=yes -@@ -746,7 +746,7 @@ AC_HELP_STRING([--enable-nasm], [use nas - CompileNASM unquoted-sections || NASM="" - - if test "x$NASM" != x -a "x$NASM" != x'"$NASM"'; then -- AC_DEFINE(SDL_HERMES_BLITTERS) -+ AC_DEFINE(SDL_HERMES_BLITTERS,1,"") - SOURCES="$SOURCES $srcdir/src/hermes/*.asm" - NASMFLAGS="$NASMFLAGS -I $srcdir/src/hermes/" - -@@ -840,9 +840,9 @@ AC_HELP_STRING([--enable-altivec], [use - CFLAGS="$save_CFLAGS" - - if test x$have_gcc_altivec = xyes; then -- AC_DEFINE(SDL_ALTIVEC_BLITTERS) -+ AC_DEFINE(SDL_ALTIVEC_BLITTERS,1,"") - if test x$have_altivec_h_hdr = xyes; then -- AC_DEFINE(HAVE_ALTIVEC_H) -+ AC_DEFINE(HAVE_ALTIVEC_H,1,"") - fi - EXTRA_CFLAGS="$EXTRA_CFLAGS $altivec_CFLAGS" - fi -@@ -920,7 +920,7 @@ AC_HELP_STRING([--enable-ipod], [configu - - if test x$enable_ipod = xyes; then - EXTRA_CFLAGS="$EXTRA_CFLAGS -DIPOD" -- AC_DEFINE(SDL_VIDEO_DRIVER_IPOD) -+ AC_DEFINE(SDL_VIDEO_DRIVER_IPOD,1,"") - SOURCES="$SOURCES $srcdir/src/video/ipod/*.c" - fi - } -@@ -954,7 +954,7 @@ CheckNANOX() - EXTRA_CFLAGS="$EXTRA_CFLAGS -DENABLE_NANOX_DIRECT_FB" - fi - -- AC_DEFINE(SDL_VIDEO_DRIVER_NANOX) -+ AC_DEFINE(SDL_VIDEO_DRIVER_NANOX,1,"") - SOURCES="$SOURCES $srcdir/src/video/nanox/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lnano-X" - have_video=yes -@@ -1020,7 +1020,7 @@ AC_HELP_STRING([--enable-x11-shared], [d - CFLAGS="$CFLAGS $X_CFLAGS" - LDFLAGS="$LDFLAGS $X_LIBS" - -- AC_DEFINE(SDL_VIDEO_DRIVER_X11) -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11,1,"") - SOURCES="$SOURCES $srcdir/src/video/x11/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $X_CFLAGS" - -@@ -1042,8 +1042,8 @@ AC_HELP_STRING([--enable-x11-shared], [d - test x$enable_x11_shared = xyes && test x$x11_lib != x && test x$x11ext_lib != x; then - echo "-- dynamic libX11 -> $x11_lib" - echo "-- dynamic libX11ext -> $x11ext_lib" -- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib") -- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib") -+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC, "$x11_lib","") -+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XEXT, "$x11ext_lib","") - else - enable_x11_shared=no - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $X_LIBS -lX11 -lXext" -@@ -1060,20 +1060,20 @@ AC_HELP_STRING([--enable-dga], [allow us - AC_HELP_STRING([--enable-video-dga], [use DGA 2.0 video driver [[default=yes]]]), - , enable_video_dga=yes) - if test x$enable_dga = xyes -a x$enable_video_dga = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_DGA) -+ AC_DEFINE(SDL_VIDEO_DRIVER_DGA,1,"") - SOURCES="$SOURCES $srcdir/src/video/dga/*.c" - fi - AC_ARG_ENABLE(video-x11-dgamouse, - AC_HELP_STRING([--enable-video-x11-dgamouse], [use X11 DGA for mouse events [[default=yes]]]), - , enable_video_x11_dgamouse=yes) - if test x$enable_dga = xyes -a x$enable_video_x11_dgamouse = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE) -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_DGAMOUSE,1,"") - fi - AC_ARG_ENABLE(video-x11-vm, - AC_HELP_STRING([--enable-video-x11-vm], [use X11 VM extension for fullscreen [[default=yes]]]), - , enable_video_x11_vm=yes) - if test x$enable_video_x11_vm = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE) -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_VIDMODE,1,"") - SOURCES="$SOURCES $srcdir/src/video/Xext/Xxf86vm/*.c" - fi - AC_ARG_ENABLE(video-x11-xv, -@@ -1087,14 +1087,14 @@ AC_HELP_STRING([--enable-video-x11-xv], - AC_HELP_STRING([--enable-video-x11-xinerama], [enable X11 Xinerama support [[default=yes]]]), - , enable_video_x11_xinerama=yes) - if test x$enable_video_x11_xinerama = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA) -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XINERAMA,1,"") - SOURCES="$SOURCES $srcdir/src/video/Xext/Xinerama/*.c" - fi - AC_ARG_ENABLE(video-x11-xme, - AC_HELP_STRING([--enable-video-x11-xme], [enable Xi Graphics XME for fullscreen [[default=yes]]]), - , enable_video_x11_xme=yes) - if test x$enable_video_x11_xme = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME) -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XME,1,"") - SOURCES="$SOURCES $srcdir/src/video/Xext/XME/*.c" - fi - AC_ARG_ENABLE(video-x11-xrandr, -@@ -1111,8 +1111,8 @@ AC_HELP_STRING([--enable-video-x11-xrand - if test x$enable_x11_shared = xyes && test x$xrandr_lib != x ; then - echo "-- dynamic libXrender -> $xrender_lib" - echo "-- dynamic libXrandr -> $xrandr_lib" -- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib") -- AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib") -+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRENDER, "$xrender_lib","") -+ AC_DEFINE_UNQUOTED(SDL_VIDEO_DRIVER_X11_DYNAMIC_XRANDR, "$xrandr_lib","") - definitely_enable_video_x11_xrandr=yes - else - AC_CHECK_LIB(Xrender, XRenderQueryExtension, have_xrender_lib=yes) -@@ -1125,7 +1125,7 @@ AC_HELP_STRING([--enable-video-x11-xrand - fi - fi - if test x$definitely_enable_video_x11_xrandr = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR) -+ AC_DEFINE(SDL_VIDEO_DRIVER_X11_XRANDR,1,"") - fi - fi - fi -@@ -1152,7 +1152,7 @@ AC_HELP_STRING([--enable-video-photon], - ]) - AC_MSG_RESULT($video_photon) - if test x$video_photon = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON) -+ AC_DEFINE(SDL_VIDEO_DRIVER_PHOTON,1,"") - SOURCES="$SOURCES $srcdir/src/video/photon/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lph" - have_video=yes -@@ -1166,7 +1166,7 @@ dnl Set up the BWindow video driver if e - CheckBWINDOW() - { - if test x$enable_video = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW) -+ AC_DEFINE(SDL_VIDEO_DRIVER_BWINDOW,1,"") - SOURCES="$SOURCES $srcdir/src/video/bwindow/*.cc" - have_video=yes - fi -@@ -1189,7 +1189,7 @@ AC_HELP_STRING([--enable-video-carbon], - ]) - AC_MSG_RESULT($have_carbon) - if test x$have_carbon = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX) -+ AC_DEFINE(SDL_VIDEO_DRIVER_TOOLBOX,1,"") - SOURCES="$SOURCES $srcdir/src/video/maccommon/*.c" - SOURCES="$SOURCES $srcdir/src/video/macrom/*.c" - have_video=yes -@@ -1218,7 +1218,7 @@ AC_HELP_STRING([--enable-video-cocoa], [ - AC_MSG_RESULT($have_cocoa) - CFLAGS="$save_CFLAGS" - if test x$have_cocoa = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ) -+ AC_DEFINE(SDL_VIDEO_DRIVER_QUARTZ,1,"") - SOURCES="$SOURCES $srcdir/src/video/quartz/*.m" - have_video=yes - fi -@@ -1245,7 +1245,7 @@ AC_HELP_STRING([--enable-video-fbcon], [ - AC_MSG_RESULT($video_fbcon) - if test x$video_fbcon = xyes; then - AC_CHECK_FUNCS(getpagesize) -- AC_DEFINE(SDL_VIDEO_DRIVER_FBCON) -+ AC_DEFINE(SDL_VIDEO_DRIVER_FBCON,1,"") - SOURCES="$SOURCES $srcdir/src/video/fbcon/*.c" - have_video=yes - fi -@@ -1296,7 +1296,7 @@ AC_HELP_STRING([--enable-video-directfb] - AC_MSG_RESULT($video_directfb) - - if test x$video_directfb = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB) -+ AC_DEFINE(SDL_VIDEO_DRIVER_DIRECTFB,1,"") - SOURCES="$SOURCES $srcdir/src/video/directfb/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $DIRECTFB_CFLAGS" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $DIRECTFB_LIBS" -@@ -1323,7 +1323,7 @@ AC_HELP_STRING([--enable-video-ps2gs], [ - ]) - AC_MSG_RESULT($video_ps2gs) - if test x$video_ps2gs = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS) -+ AC_DEFINE(SDL_VIDEO_DRIVER_PS2GS,1,"") - SOURCES="$SOURCES $srcdir/src/video/ps2gs/*.c" - have_video=yes - fi -@@ -1376,7 +1376,7 @@ AC_HELP_STRING([--enable-video-ggi], [us - ]) - AC_MSG_RESULT($video_ggi) - if test x$video_ggi = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_GGI) -+ AC_DEFINE(SDL_VIDEO_DRIVER_GGI,1,"") - SOURCES="$SOURCES $srcdir/src/video/ggi/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lggi -lgii -lgg" - have_video=yes -@@ -1406,7 +1406,7 @@ AC_HELP_STRING([--enable-video-svga], [u - ]) - AC_MSG_RESULT($video_svga) - if test x$video_svga = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB) -+ AC_DEFINE(SDL_VIDEO_DRIVER_SVGALIB,1,"") - SOURCES="$SOURCES $srcdir/src/video/svga/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvga" - have_video=yes -@@ -1438,7 +1438,7 @@ AC_HELP_STRING([--enable-video-vgl], [us - ]) - AC_MSG_RESULT($video_vgl) - if test x$video_vgl = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_VGL) -+ AC_DEFINE(SDL_VIDEO_DRIVER_VGL,1,"") - SOURCES="$SOURCES $srcdir/src/video/vgl/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lvgl" - have_video=yes -@@ -1466,7 +1466,7 @@ AC_HELP_STRING([--enable-video-wscons], - ]) - AC_MSG_RESULT($video_wscons) - if test x$video_wscons = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS) -+ AC_DEFINE(SDL_VIDEO_DRIVER_WSCONS,1,"") - SOURCES="$SOURCES $srcdir/src/video/wscons/*.c" - have_video=yes - fi -@@ -1491,7 +1491,7 @@ AC_HELP_STRING([--enable-video-aalib], [ - ]) - AC_MSG_RESULT($video_aalib) - if test x$video_aalib = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_AALIB) -+ AC_DEFINE(SDL_VIDEO_DRIVER_AALIB,1,"") - SOURCES="$SOURCES $srcdir/src/video/aalib/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -laa" - have_video=yes -@@ -1553,7 +1553,7 @@ AC_HELP_STRING([--enable-video-qtopia], - CXXFLAGS="$OLD_CXX" - AC_MSG_RESULT($video_qtopia) - if test x$video_qtopia = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA) -+ AC_DEFINE(SDL_VIDEO_DRIVER_QTOPIA,1,"") - SOURCES="$SOURCES $srcdir/src/video/qtopia/*.cc" - SDLMAIN_SOURCES="$srcdir/src/main/qtopia/*.cc" - SDLMAIN_LDFLAGS="-static" -@@ -1583,7 +1583,7 @@ AC_HELP_STRING([--enable-video-picogui], - ]) - AC_MSG_RESULT($video_picogui) - if test x$video_picogui = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI) -+ AC_DEFINE(SDL_VIDEO_DRIVER_PICOGUI,1,"") - SOURCES="$SOURCES $srcdir/src/video/picogui/*.c" - SDL_LIBS="$SDL_LIBS -lpgui" - have_video=yes -@@ -1607,7 +1607,7 @@ AC_HELP_STRING([--enable-video-xbios], [ - video_xbios=no - if test x$enable_video = xyes -a x$enable_video_xbios = xyes; then - video_xbios=yes -- AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS) -+ AC_DEFINE(SDL_VIDEO_DRIVER_XBIOS,1,"") - SOURCES="$SOURCES $srcdir/src/video/xbios/*.c" - have_video=yes - fi -@@ -1625,7 +1625,7 @@ AC_HELP_STRING([--enable-video-gem], [us - AC_CHECK_LIB(gem, appl_init, have_gem_lib=yes) - if test x$have_gem_hdr = xyes -a x$have_gem_lib = xyes; then - video_gem=yes -- AC_DEFINE(SDL_VIDEO_DRIVER_GEM) -+ AC_DEFINE(SDL_VIDEO_DRIVER_GEM,1,"") - SOURCES="$SOURCES $srcdir/src/video/gem/*.c" - SDL_LIBS="$SDL_LIBS -lgem" - have_video=yes -@@ -1640,7 +1640,7 @@ CheckDummyVideo() - AC_HELP_STRING([--enable-video-dummy], [use dummy video driver [[default=yes]]]), - , enable_video_dummy=yes) - if test x$enable_video_dummy = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY) -+ AC_DEFINE(SDL_VIDEO_DRIVER_DUMMY,1,"") - SOURCES="$SOURCES $srcdir/src/video/dummy/*.c" - have_video=yes - fi -@@ -1667,8 +1667,8 @@ CheckOpenGLX11() - ]) - AC_MSG_RESULT($video_opengl) - if test x$video_opengl = xyes; then -- AC_DEFINE(SDL_VIDEO_OPENGL) -- AC_DEFINE(SDL_VIDEO_OPENGL_GLX) -+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") -+ AC_DEFINE(SDL_VIDEO_OPENGL_GLX,1,"") - fi - fi - } -@@ -1687,7 +1687,7 @@ CheckOpenGLQNX() - ]) - AC_MSG_RESULT($video_opengl) - if test x$video_opengl = xyes; then -- AC_DEFINE(SDL_VIDEO_OPENGL) -+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" - fi - fi -@@ -1697,8 +1697,8 @@ dnl Check for Win32 OpenGL - CheckWIN32GL() - { - if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then -- AC_DEFINE(SDL_VIDEO_OPENGL) -- AC_DEFINE(SDL_VIDEO_OPENGL_WGL) -+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") -+ AC_DEFINE(SDL_VIDEO_OPENGL_WGL,1,"") - fi - } - -@@ -1706,7 +1706,7 @@ dnl Check for BeOS OpenGL - CheckBeGL() - { - if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then -- AC_DEFINE(SDL_VIDEO_OPENGL) -+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lGL" - fi - } -@@ -1715,7 +1715,7 @@ dnl Check for MacOS OpenGL - CheckMacGL() - { - if test x$enable_video = xyes -a x$enable_video_opengl = xyes; then -- AC_DEFINE(SDL_VIDEO_OPENGL) -+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") - case "$host" in - *-*-darwin*) - if test x$enable_video_cocoa = xyes; then -@@ -1747,8 +1747,8 @@ CheckAtariOSMesa() - OSMESA_CFLAGS=`$OSMESA_CONFIG --cflags` - OSMESA_LIBS=`$OSMESA_CONFIG --libs` - fi -- AC_DEFINE(SDL_VIDEO_OPENGL) -- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA) -+ AC_DEFINE(SDL_VIDEO_OPENGL,1,"") -+ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA,1,"") - SDL_CFLAGS="$SDL_CFLAGS $OSMESA_CFLAGS" - SDL_LIBS="$SDL_LIBS $OSMESA_LIBS" - -@@ -1758,7 +1758,7 @@ AC_HELP_STRING([--enable-osmesa-shared], - if test "x$enable_osmesa_shared" = "xyes" -a "x$enable_atari_ldg" = "xyes"; then - # Dynamic linking - if test "x$have_osmesa_hdr" = "xyes"; then -- AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC) -+ AC_DEFINE(SDL_VIDEO_OPENGL_OSMESA_DYNAMIC,1,"") - fi - fi - fi -@@ -1792,7 +1792,7 @@ AC_HELP_STRING([--enable-input-events], - ]) - AC_MSG_RESULT($use_input_events) - if test x$use_input_events = xyes; then -- AC_DEFINE(SDL_INPUT_LINUXEV) -+ AC_DEFINE(SDL_INPUT_LINUXEV,1,"") - fi - fi - } -@@ -1814,7 +1814,7 @@ AC_HELP_STRING([--enable-input-tslib], [ - ]) - AC_MSG_RESULT($enable_input_tslib) - if test x$enable_input_tslib = xyes; then -- AC_DEFINE(SDL_INPUT_TSLIB) -+ AC_DEFINE(SDL_INPUT_TSLIB,1,"") - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lts" - fi - fi -@@ -1837,7 +1837,7 @@ AC_HELP_STRING([--enable-pth], [use GNU - AC_MSG_CHECKING(pth) - AC_MSG_RESULT($use_pth) - if test "x$use_pth" = xyes; then -- AC_DEFINE(SDL_THREAD_PTH) -+ AC_DEFINE(SDL_THREAD_PTH,1,"") - SOURCES="$SOURCES $srcdir/src/thread/pth/*.c" - SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syssem.c" - SDL_CFLAGS="$SDL_CFLAGS `$PTH_CONFIG --cflags`" -@@ -1943,7 +1943,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ - - # Do futher testing if we have pthread support... - if test x$use_pthreads = xyes; then -- AC_DEFINE(SDL_THREAD_PTHREAD) -+ AC_DEFINE(SDL_THREAD_PTHREAD,1,"") - EXTRA_CFLAGS="$EXTRA_CFLAGS $pthread_cflags" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $pthread_lib" - SDL_CFLAGS="$SDL_CFLAGS $pthread_cflags" -@@ -1965,7 +1965,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ - pthread_mutexattr_settype(&attr, PTHREAD_MUTEX_RECURSIVE); - ],[ - has_recursive_mutexes=yes -- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX) -+ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX,1,"") - ]) - fi - if test x$has_recursive_mutexes = xno; then -@@ -1976,7 +1976,7 @@ AC_HELP_STRING([--enable-pthread-sem], [ - pthread_mutexattr_setkind_np(&attr, PTHREAD_MUTEX_RECURSIVE_NP); - ],[ - has_recursive_mutexes=yes -- AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP) -+ AC_DEFINE(SDL_THREAD_PTHREAD_RECURSIVE_MUTEX_NP,1,"") - ]) - fi - AC_MSG_RESULT($has_recursive_mutexes) -@@ -2065,7 +2065,7 @@ AC_HELP_STRING([--enable-stdio-redirect] - fi - - if test x$enable_video = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB) -+ AC_DEFINE(SDL_VIDEO_DRIVER_WINDIB,1,"") - SOURCES="$SOURCES $srcdir/src/video/wincommon/*.c" - SOURCES="$SOURCES $srcdir/src/video/windib/*.c" - have_video=yes -@@ -2087,7 +2087,7 @@ AC_HELP_STRING([--enable-directx], [use - have_directx=yes - fi - if test x$enable_video = xyes -a x$have_directx = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW) -+ AC_DEFINE(SDL_VIDEO_DRIVER_DDRAW,1,"") - SOURCES="$SOURCES $srcdir/src/video/windx5/*.c" - have_video=yes - fi -@@ -2118,7 +2118,7 @@ AC_HELP_STRING([--enable-sdl-dlopen], [u - AC_CHECK_LIB(c, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS", - AC_CHECK_LIB(dl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -ldl", - AC_CHECK_LIB(ltdl, dlopen, EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lltdl"))) -- AC_DEFINE(SDL_LOADSO_DLOPEN) -+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") - SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" - have_loadso=yes - fi -@@ -2135,7 +2135,7 @@ AC_HELP_STRING([--enable-atari-ldg], [us - AC_CHECK_HEADER(ldg.h, have_ldg_hdr=yes) - AC_CHECK_LIB(ldg, ldg_open, have_ldg_lib=yes, have_ldg_lib=no, -lgem) - if test x$have_ldg_hdr = xyes -a x$have_ldg_lib = xyes; then -- AC_DEFINE(SDL_LOADSO_LDG) -+ AC_DEFINE(SDL_LOADSO_LDG,1,"") - SOURCES="$SOURCES $srcdir/src/loadso/mint/*.c" - SDL_LIBS="$SDL_LIBS -lldg -lgem" - have_loadso=yes -@@ -2266,11 +2266,11 @@ CheckUSBHID() - have_machine_joystick=yes - ]) - if test x$have_machine_joystick = xyes; then -- AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H) -+ AC_DEFINE(SDL_JOYSTICK_USBHID_MACHINE_JOYSTICK_H,1,"") - fi - AC_MSG_RESULT($have_machine_joystick) - -- AC_DEFINE(SDL_JOYSTICK_USBHID) -+ AC_DEFINE(SDL_JOYSTICK_USBHID,1,"") - SOURCES="$SOURCES $srcdir/src/joystick/bsd/*.c" - EXTRA_CFLAGS="$EXTRA_CFLAGS $USB_CFLAGS" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS $USB_LIBS" -@@ -2289,7 +2289,7 @@ AC_HELP_STRING([--enable-clock_gettime], - if test x$enable_clock_gettime = xyes; then - AC_CHECK_LIB(rt, clock_gettime, have_clock_gettime=yes) - if test x$have_clock_gettime = xyes; then -- AC_DEFINE(HAVE_CLOCK_GETTIME) -+ AC_DEFINE(HAVE_CLOCK_GETTIME,1,"") - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lrt" - fi - fi -@@ -2320,7 +2320,7 @@ case "$host" in - CheckIPod - # Set up files for the timer library - if test x$enable_timers = xyes; then -- AC_DEFINE(SDL_TIMER_UNIX) -+ AC_DEFINE(SDL_TIMER_UNIX,1,"") - SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" - have_timers=yes - fi -@@ -2386,17 +2386,17 @@ case "$host" in - if test x$enable_audio = xyes; then - case $ARCH in - sysv5|solaris|hpux) -- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO) -+ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"") - SOURCES="$SOURCES $srcdir/src/audio/sun/*.c" - have_audio=yes - ;; - netbsd|openbsd) -- AC_DEFINE(SDL_AUDIO_DRIVER_BSD) -+ AC_DEFINE(SDL_AUDIO_DRIVER_BSD,1,"") - SOURCES="$SOURCES $srcdir/src/audio/bsd/*.c" - have_audio=yes - ;; - aix) -- AC_DEFINE(SDL_AUDIO_DRIVER_PAUD) -+ AC_DEFINE(SDL_AUDIO_DRIVER_PAUD,1,"") - SOURCES="$SOURCES $srcdir/src/audio/paudio/*.c" - have_audio=yes - ;; -@@ -2406,7 +2406,7 @@ case "$host" in - if test x$enable_joystick = xyes; then - case $ARCH in - linux) -- AC_DEFINE(SDL_JOYSTICK_LINUX) -+ AC_DEFINE(SDL_JOYSTICK_LINUX,1,"") - SOURCES="$SOURCES $srcdir/src/joystick/linux/*.c" - have_joystick=yes - ;; -@@ -2416,32 +2416,32 @@ case "$host" in - if test x$enable_cdrom = xyes; then - case $ARCH in - linux|solaris) -- AC_DEFINE(SDL_CDROM_LINUX) -+ AC_DEFINE(SDL_CDROM_LINUX,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/linux/*.c" - have_cdrom=yes - ;; - *freebsd*) -- AC_DEFINE(SDL_CDROM_FREEBSD) -+ AC_DEFINE(SDL_CDROM_FREEBSD,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/freebsd/*.c" - have_cdrom=yes - ;; - *openbsd*|*netbsd*) -- AC_DEFINE(SDL_CDROM_OPENBSD) -+ AC_DEFINE(SDL_CDROM_OPENBSD,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/openbsd/*.c" - have_cdrom=yes - ;; - bsdi) -- AC_DEFINE(SDL_CDROM_BSDI) -+ AC_DEFINE(SDL_CDROM_BSDI,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/bsdi/*.c" - have_cdrom=yes - ;; - aix) -- AC_DEFINE(SDL_CDROM_AIX) -+ AC_DEFINE(SDL_CDROM_AIX,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/aix/*.c" - have_cdrom=yes - ;; - osf) -- AC_DEFINE(SDL_CDROM_OSF) -+ AC_DEFINE(SDL_CDROM_OSF,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/osf/*.c" - have_cdrom=yes - ;; -@@ -2449,7 +2449,7 @@ case "$host" in - fi - # Set up files for the thread library - if test x$enable_threads = xyes -a x$use_pthreads != xyes -a x$use_pth != xyes -a x$ARCH = xirix; then -- AC_DEFINE(SDL_THREAD_SPROC) -+ AC_DEFINE(SDL_THREAD_SPROC,1,"") - SOURCES="$SOURCES $srcdir/src/thread/irix/*.c" - SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" - SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" -@@ -2457,7 +2457,7 @@ case "$host" in - fi - # Set up files for the timer library - if test x$enable_timers = xyes; then -- AC_DEFINE(SDL_TIMER_UNIX) -+ AC_DEFINE(SDL_TIMER_UNIX,1,"") - SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" - have_timers=yes - fi -@@ -2476,20 +2476,20 @@ case "$host" in - CheckPTHREAD - # Set up files for the audio library - if test x$enable_audio = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO) -+ AC_DEFINE(SDL_AUDIO_DRIVER_QNXNTO,1,"") - SOURCES="$SOURCES $srcdir/src/audio/nto/*.c" - EXTRA_LDFLAGS="$EXTRA_LDFLAGS -lasound" - have_audio=yes - fi - # Set up files for the cdrom library - if test x$enable_cdrom = xyes; then -- AC_DEFINE(SDL_CDROM_QNX) -+ AC_DEFINE(SDL_CDROM_QNX,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/qnx/*.c" - have_cdrom=yes - fi - # Set up files for the timer library - if test x$enable_timers = xyes; then -- AC_DEFINE(SDL_TIMER_UNIX) -+ AC_DEFINE(SDL_TIMER_UNIX,1,"") - SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" - have_timers=yes - fi -@@ -2514,29 +2514,29 @@ case "$host" in - CheckNASM - # Set up files for the audio library - if test x$enable_audio = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT) -+ AC_DEFINE(SDL_AUDIO_DRIVER_WAVEOUT,1,"") - SOURCES="$SOURCES $srcdir/src/audio/windib/*.c" - if test x$have_directx = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND) -+ AC_DEFINE(SDL_AUDIO_DRIVER_DSOUND,1,"") - SOURCES="$SOURCES $srcdir/src/audio/windx5/*.c" - fi - have_audio=yes - fi - # Set up files for the joystick library - if test x$enable_joystick = xyes; then -- AC_DEFINE(SDL_JOYSTICK_WINMM) -+ AC_DEFINE(SDL_JOYSTICK_WINMM,1,"") - SOURCES="$SOURCES $srcdir/src/joystick/win32/*.c" - have_joystick=yes - fi - # Set up files for the cdrom library - if test x$enable_cdrom = xyes; then -- AC_DEFINE(SDL_CDROM_WIN32) -+ AC_DEFINE(SDL_CDROM_WIN32,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/win32/*.c" - have_cdrom=yes - fi - # Set up files for the thread library - if test x$enable_threads = xyes; then -- AC_DEFINE(SDL_THREAD_WIN32) -+ AC_DEFINE(SDL_THREAD_WIN32,1,"") - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_sysmutex.c" - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_syssem.c" - SOURCES="$SOURCES $srcdir/src/thread/win32/SDL_systhread.c" -@@ -2545,13 +2545,13 @@ case "$host" in - fi - # Set up files for the timer library - if test x$enable_timers = xyes; then -- AC_DEFINE(SDL_TIMER_WIN32) -+ AC_DEFINE(SDL_TIMER_WIN32,1,"") - SOURCES="$SOURCES $srcdir/src/timer/win32/*.c" - have_timers=yes - fi - # Set up files for the shared object loading library - if test x$enable_loadso = xyes; then -- AC_DEFINE(SDL_LOADSO_WIN32) -+ AC_DEFINE(SDL_LOADSO_WIN32,1,"") - SOURCES="$SOURCES $srcdir/src/loadso/win32/*.c" - have_loadso=yes - fi -@@ -2622,25 +2622,25 @@ case "$host" in - CheckBeGL - # Set up files for the audio library - if test x$enable_audio = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO) -+ AC_DEFINE(SDL_AUDIO_DRIVER_BAUDIO,1,"") - SOURCES="$SOURCES $srcdir/src/audio/baudio/*.cc" - have_audio=yes - fi - # Set up files for the joystick library - if test x$enable_joystick = xyes; then -- AC_DEFINE(SDL_JOYSTICK_BEOS) -+ AC_DEFINE(SDL_JOYSTICK_BEOS,1,"") - SOURCES="$SOURCES $srcdir/src/joystick/beos/*.cc" - have_joystick=yes - fi - # Set up files for the cdrom library - if test x$enable_cdrom = xyes; then -- AC_DEFINE(SDL_CDROM_BEOS) -+ AC_DEFINE(SDL_CDROM_BEOS,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/beos/*.cc" - have_cdrom=yes - fi - # Set up files for the thread library - if test x$enable_threads = xyes; then -- AC_DEFINE(SDL_THREAD_BEOS) -+ AC_DEFINE(SDL_THREAD_BEOS,1,"") - SOURCES="$SOURCES $srcdir/src/thread/beos/*.c" - SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_sysmutex.c" - SOURCES="$SOURCES $srcdir/src/thread/generic/SDL_syscond.c" -@@ -2648,7 +2648,7 @@ case "$host" in - fi - # Set up files for the timer library - if test x$enable_timers = xyes; then -- AC_DEFINE(SDL_TIMER_BEOS) -+ AC_DEFINE(SDL_TIMER_BEOS,1,"") - SOURCES="$SOURCES $srcdir/src/timer/beos/*.c" - have_timers=yes - fi -@@ -2656,11 +2656,11 @@ case "$host" in - if test x$enable_loadso = xyes; then - case "$host" in - *-*-beos*) -- AC_DEFINE(SDL_LOADSO_BEOS) -+ AC_DEFINE(SDL_LOADSO_BEOS,1,"") - SOURCES="$SOURCES $srcdir/src/loadso/beos/*.c" - ;; - *-*-haiku*) -- AC_DEFINE(SDL_LOADSO_DLOPEN) -+ AC_DEFINE(SDL_LOADSO_DLOPEN,1,"") - SOURCES="$SOURCES $srcdir/src/loadso/dlopen/*.c" - ;; - esac -@@ -2696,7 +2696,7 @@ case "$host" in - # Set up files for the shared object loading library - # (this needs to be done before the dynamic X11 check) - if test x$enable_loadso = xyes -a x$have_dlopen != xyes; then -- AC_DEFINE(SDL_LOADSO_DLCOMPAT) -+ AC_DEFINE(SDL_LOADSO_DLCOMPAT,1,"") - SOURCES="$SOURCES $srcdir/src/loadso/macosx/*.c" - have_loadso=yes - fi -@@ -2714,26 +2714,26 @@ case "$host" in - - # Set up files for the audio library - if test x$enable_audio = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO) -+ AC_DEFINE(SDL_AUDIO_DRIVER_COREAUDIO,1,"") - SOURCES="$SOURCES $srcdir/src/audio/macosx/*.c" - have_audio=yes - fi - # Set up files for the joystick library - if test x$enable_joystick = xyes; then -- AC_DEFINE(SDL_JOYSTICK_IOKIT) -+ AC_DEFINE(SDL_JOYSTICK_IOKIT,1,"") - SOURCES="$SOURCES $srcdir/src/joystick/darwin/*.c" - have_joystick=yes - need_iokit_framework=yes - fi - # Set up files for the cdrom library - if test x$enable_cdrom = xyes; then -- AC_DEFINE(SDL_CDROM_MACOSX) -+ AC_DEFINE(SDL_CDROM_MACOSX,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/macosx/*.c" - have_cdrom=yes - fi - # Set up files for the timer library - if test x$enable_timers = xyes; then -- AC_DEFINE(SDL_TIMER_UNIX) -+ AC_DEFINE(SDL_TIMER_UNIX,1,"") - SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" - have_timers=yes - fi -@@ -2775,30 +2775,30 @@ case "$host" in - # Set up files for the audio library - if test x$enable_threads = xyes -a x$enable_pth = xyes; then - if test x$enable_audio = xyes; then -- AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO) -+ AC_DEFINE(SDL_AUDIO_DRIVER_SUNAUDIO,1,"") - SOURCES="$SOURCES $srcdir/src/audio/sun/*.c" - have_audio=yes - fi - fi - # Set up files for the joystick library - if test x$enable_joystick = xyes; then -- AC_DEFINE(SDL_JOYSTICK_MINT) -+ AC_DEFINE(SDL_JOYSTICK_MINT,1,"") - SOURCES="$SOURCES $srcdir/src/joystick/mint/*.c" - have_joystick=yes - fi - # Set up files for the cdrom library - if test x$enable_cdrom = xyes; then -- AC_DEFINE(SDL_CDROM_MINT) -+ AC_DEFINE(SDL_CDROM_MINT,1,"") - SOURCES="$SOURCES $srcdir/src/cdrom/mint/*.c" - have_cdrom=yes - fi - # Set up files for the timer library - if test x$enable_timers = xyes; then - if test x$enable_threads = xyes -a x$enable_pth = xyes; then -- AC_DEFINE(SDL_TIMER_UNIX) -+ AC_DEFINE(SDL_TIMER_UNIX,1,"") - SOURCES="$SOURCES $srcdir/src/timer/unix/*.c" - else -- AC_DEFINE(SDL_TIMER_MINT) -+ AC_DEFINE(SDL_TIMER_MIN,1,""T) - SOURCES="$SOURCES $srcdir/src/timer/mint/*.c" - SOURCES="$SOURCES $srcdir/src/timer/mint/*.S" - fi -@@ -2811,20 +2811,20 @@ case "$host" in - CheckPTHREAD - # Set up files for the video library - if test x$enable_video = xyes; then -- AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS) -+ AC_DEFINE(SDL_VIDEO_DRIVER_RISCOS,1,"") - SOURCES="$SOURCES $srcdir/src/video/riscos/*.c" - SOURCES="$SOURCES $srcdir/src/video/riscos/*.S" - have_video=yes - fi - # Set up files for the joystick library - if test x$enable_joystick = xyes; then -- AC_DEFINE(SDL_JOYSTICK_RISCOS) -+ AC_DEFINE(SDL_JOYSTICK_RISCOS,1,"") - SOURCES="$SOURCES $srcdir/src/joystick/riscos/*.c" - have_joystick=yes - fi - # Set up files for the timer library - if test x$enable_timers = xyes; then -- AC_DEFINE(SDL_TIMER_RISCOS) -+ AC_DEFINE(SDL_TIMER_RISCOS,1,"") - SOURCES="$SOURCES $srcdir/src/timer/riscos/*.c" - have_timers=yes - fi -@@ -2846,31 +2846,31 @@ CheckWarnAll - if test x$enable_joystick = xyes; then - if test x$have_joystick != xyes; then - # Wants joystick subsystem, but doesn't have a platform-specific backend... -- AC_DEFINE(SDL_JOYSTICK_DUMMY) -+ AC_DEFINE(SDL_JOYSTICK_DUMMY,1,"") - SOURCES="$SOURCES $srcdir/src/joystick/dummy/*.c" - fi - fi - if test x$have_cdrom != xyes; then - if test x$enable_cdrom = xyes; then -- AC_DEFINE(SDL_CDROM_DISABLED) -+ AC_DEFINE(SDL_CDROM_DISABLED,1,"") - fi - SOURCES="$SOURCES $srcdir/src/cdrom/dummy/*.c" - fi - if test x$have_threads != xyes; then - if test x$enable_threads = xyes; then -- AC_DEFINE(SDL_THREADS_DISABLED) -+ AC_DEFINE(SDL_THREADS_DISABLED,1,"") - fi - SOURCES="$SOURCES $srcdir/src/thread/generic/*.c" - fi - if test x$have_timers != xyes; then - if test x$enable_timers = xyes; then -- AC_DEFINE(SDL_TIMERS_DISABLED) -+ AC_DEFINE(SDL_TIMERS_DISABLED,1,"") - fi - SOURCES="$SOURCES $srcdir/src/timer/dummy/*.c" - fi - if test x$have_loadso != xyes; then - if test x$enable_loadso = xyes; then -- AC_DEFINE(SDL_LOADSO_DISABLED) -+ AC_DEFINE(SDL_LOADSO_DISABLED,1,"") - fi - SOURCES="$SOURCES $srcdir/src/loadso/dummy/*.c" - fi diff --git a/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index c0d5c6a96..9c0ec541e 100644 --- a/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/yocto-poky/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -12,21 +12,15 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" PROVIDES = "virtual/libsdl" -DEPENDS = "${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'virtual/libgl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/libx11 libxext libxrandr libxrender', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'libglu', '', d)} \ - tslib" -DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" - PR = "r3" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ - file://configure_tweak.patch \ file://libsdl-1.2.15-xdata32.patch \ file://pkgconfig.patch \ " +UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar" + S = "${WORKDIR}/SDL-${PV}" SRC_URI[md5sum] = "9d96df8417572a2afb781a7c4c811a85" @@ -38,21 +32,29 @@ inherit autotools lib_package binconfig-disabled pkgconfig EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers \ --enable-file --disable-oss --disable-esd --disable-arts \ - --disable-diskaudio --disable-nas --disable-esd-shared --disable-esdtest \ + --disable-diskaudio --disable-nas \ --disable-mintaudio --disable-nasm --disable-video-dga \ --disable-video-fbcon --disable-video-ps2gs --disable-video-ps3 \ --disable-xbios --disable-gem --disable-video-dummy \ - --enable-input-events --enable-input-tslib --enable-pthreads \ - ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', '--enable-video-directfb', '--disable-video-directfb', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '--enable-video-opengl', '--disable-video-opengl', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', '--enable-video-x11', '--disable-video-x11', d)} \ + --enable-input-events --enable-pthreads \ --disable-video-svga \ --disable-video-picogui --disable-video-qtopia --enable-sdl-dlopen \ - --disable-rpath \ - --disable-pulseaudio" + --disable-rpath" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pulseaudio', 'pulseaudio', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'directfb', 'directfb', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG_class-native = "x11" +PACKAGECONFIG_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" -PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," +PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib" +PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" +PACKAGECONFIG[tslib] = "--enable-input-tslib, --disable-input-tslib, tslib" +PACKAGECONFIG[directfb] = "--enable-video-directfb, --disable-video-directfb, directfb" +PACKAGECONFIG[opengl] = "--enable-video-opengl, --disable-video-opengl, virtual/libgl libglu" +PACKAGECONFIG[x11] = "--enable-video-x11 --disable-x11-shared, --disable-video-x11, virtual/libx11 libxext libxrandr libxrender" EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" @@ -65,4 +67,4 @@ do_configure_prepend() { export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } -BBCLASSEXTEND = "nativesdk" +BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch b/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch new file mode 100644 index 000000000..60185b131 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch @@ -0,0 +1,46 @@ +When building use the libtool intermediate .lo files instead of explicitly using +the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is +a static build, and .libs/foo.o is a shared build. + +If static libraries have been disabled globally then libtool won't generate them +and explicit references to foo.o won't be satisfied. + +Upstream-Status: Pending +RP +2016/1/16 + + +Index: SDL2-2.0.4/configure.in +=================================================================== +--- SDL2-2.0.4.orig/configure.in ++++ SDL2-2.0.4/configure.in +@@ -3464,23 +3464,23 @@ done + + VERSION_OBJECTS=`echo $VERSION_SOURCES` + VERSION_DEPENDS=`echo $VERSION_SOURCES` +-VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` ++VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` + VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ +-\\$(objects)/\\2.o: \\1/\\2.rc\\\\ ++\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ + \\$(WINDRES) \\$< \\$@,g"` + + SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` + SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` +-SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` ++SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` + SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ +-\\$(objects)/\\2.o: \\1/\\2.c\\\\ ++\\$(objects)/\\2.lo: \\1/\\2.c\\\\ + \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` + + SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` + SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` +-SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` ++SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` + SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ +-\\$(objects)/\\2.o: \\1/\\2.c\\\\ ++\\$(objects)/\\2.lo: \\1/\\2.c\\\\ + \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` + + # Set runtime shared library paths as needed diff --git a/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb index f138f9761..428230711 100644 --- a/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb +++ b/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb @@ -8,18 +8,19 @@ BUGTRACKER = "http://bugzilla.libsdl.org/" SECTION = "libs" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=67dcb7fae16952557bc5f96e9eb5d188" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b2304ad7e91711027590d3f102a754b7" PROVIDES = "virtual/libsdl2" DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" -SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz" +SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ + file://linkage.patch" S = "${WORKDIR}/SDL2-${PV}" -SRC_URI[md5sum] = "fe6c61d2e9df9ef570e7e80c6e822537" -SRC_URI[sha256sum] = "a5a69a6abf80bcce713fa873607735fe712f44276a7f048d60a61bb2f6b3c90c" +SRC_URI[md5sum] = "44fc4a023349933e7f5d7a582f7b886e" +SRC_URI[sha256sum] = "da55e540bf6331824153805d58b590a29c39d2d506c6d02fa409aedeab21174b" inherit autotools lib_package binconfig pkgconfig @@ -48,7 +49,7 @@ PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,vi PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" -PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland" +PACKAGECONFIG[wayland] = "--enable-video-wayland,--disable-video-wayland,wayland libxkbcommon" PACKAGECONFIG[x11] = "--enable-video-x11,--disable-video-x11,virtual/libx11 libxext libxrandr libxrender" EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" @@ -61,3 +62,5 @@ do_configure_prepend() { done export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } + +FILES_${PN}-dev += "${libdir}/cmake" diff --git a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch deleted file mode 100644 index 64b7efac2..000000000 --- a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/disable_Os_option.patch +++ /dev/null @@ -1,19 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Do not set Os optimization in target APP CFLAGS, since it may have potential -error if "--enable-target-optspace" is not set when configuring GCC. - -Signed-off-by: Dongxiao Xu <dongxiao.xu@intel.com> - -diff -ruN Xsettings-client-0.10-orig/configure.ac Xsettings-client-0.10/configure.ac ---- Xsettings-client-0.10-orig/configure.ac 2010-09-21 14:01:47.000000000 +0800 -+++ Xsettings-client-0.10/configure.ac 2010-09-21 14:02:01.000000000 +0800 -@@ -3,7 +3,7 @@ - AM_INIT_AUTOMAKE(Xsettings-client, 0.10) - AM_CONFIG_HEADER(config.h) - --CFLAGS="-Os -Wall" -+CFLAGS="-O2 -Wall" - - # Checks for programs. - AC_PROG_CC diff --git a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb index 670d9fcb9..67c5e2777 100644 --- a/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb +++ b/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb @@ -19,7 +19,6 @@ headers = "xsettings-common.h xsettings-client.h" SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-0.10.tar.gz \ file://MIT-style-license \ file://link-x11.patch;apply=yes \ - file://disable_Os_option.patch \ file://obsolete_automake_macros.patch \ " diff --git a/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb index 422d25595..aa768280a 100644 --- a/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +++ b/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb @@ -10,7 +10,7 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa SECTION = "x11/wm" DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes" -SRCREV = "29544f0e61cc281fc60061443a537271e1081b78" +SRCREV = "8178e70d5c742c4cd63b51df228cc8aa3594d518" PV = "1.2+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ diff --git a/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb b/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb index ab909f736..eb80cd3bb 100644 --- a/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb +++ b/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb @@ -10,7 +10,9 @@ DEPENDS = "glib-2.0 intltool-native libfm-extra" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz" -SRC_URI[md5sum] = "4a8e6c1a86d5e64ec725d850a4abfbad" -SRC_URI[sha256sum] = "ff7df437bbfd3119c5f662c6d209b98f15de03a7203308c6b56a4c1e1d419aaf" +SRC_URI[md5sum] = "a856ba860b16fdc8c69ee784bc4ade36" +SRC_URI[sha256sum] = "0ac72649919946070258320aafc320467dd040bcef7b3a225e2ab7241ddffd59" + +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/" inherit autotools gettext pkgconfig gtk-doc diff --git a/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch new file mode 100644 index 000000000..e4461ef17 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch @@ -0,0 +1,17 @@ +endianness check is OS wide and not specific to libc + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending +Index: mesa-11.1.1/src/gallium/include/pipe/p_config.h +=================================================================== +--- mesa-11.1.1.orig/src/gallium/include/pipe/p_config.h ++++ mesa-11.1.1/src/gallium/include/pipe/p_config.h +@@ -130,7 +130,7 @@ + * Endian detection. + */ + +-#ifdef __GLIBC__ ++#if defined(__linux__) + #include <endian.h> + + #if __BYTE_ORDER == __LITTLE_ENDIAN diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch index c96af12ac..09054cb75 100644 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch +++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch @@ -4,6 +4,9 @@ Date: Wed, 9 Jul 2014 14:30:33 +0200 Subject: [PATCH 2/9] Correctly implement with AC_WITH(glut) so that --without-glut works. +Signed-off-by: Ross Burton <ross.burton@intel.com> +Upstream-Status: Submitted (https://patchwork.freedesktop.org/patch/64417/) + --- configure.ac | 26 +++++++++++++++----------- 1 file changed, 15 insertions(+), 11 deletions(-) diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb index 0094f556f..557b8c65d 100644 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb +++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb @@ -24,7 +24,9 @@ SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061" SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/egl, virtual/libgl ... +REQUIRED_DISTRO_FEATURES = "opengl" PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew glu', '', d)}" diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb index fc2bca998..fc2bca998 100644 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_10.6.3.bb +++ b/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa.inc b/yocto-poky/meta/recipes-graphics/mesa/mesa.inc index af7a2c47f..442479ae6 100644 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa.inc +++ b/yocto-poky/meta/recipes-graphics/mesa/mesa.inc @@ -24,7 +24,7 @@ REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OECONF = "--enable-shared-glapi" -PACKAGECONFIG ??= "egl gles dri \ +PACKAGECONFIG ??= "egl gles dri ${MESA_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ " @@ -32,16 +32,14 @@ PACKAGECONFIG ??= "egl gles dri \ X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" -PACKAGECONFIG[wayland] = ",,wayland" +PACKAGECONFIG[wayland] = ",,wayland-native wayland" DRIDRIVERS = "swrast" DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" -PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS} --enable-gbm, --disable-dri, dri2proto libdrm" PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" -EXTRA_OECONF += "--enable-gbm" - PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" EGL_PLATFORMS = "drm" @@ -64,6 +62,12 @@ PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" +# Mesa requires one of the following crypto implementation, pick one of them +MESA_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" + # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" @@ -116,7 +120,9 @@ python __anonymous() { d.appendVar("RREPLACES_" + fullp, pkgs) d.appendVar("RPROVIDES_" + fullp, pkgs) d.appendVar("RCONFLICTS_" + fullp, pkgs) - + + d.appendVar("RRECOMMENDS_" + fullp, " mesa-megadriver") + # For -dev, the first element is both the Debian and original name fullp += "-dev" pkgs = p[1] + "-dev" @@ -153,7 +159,6 @@ PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " PACKAGES_DYNAMIC += "^mesa-driver-.*" -FILES_${PN}-dbg += "${libdir}/dri/.debug/*" FILES_${PN} += "${sysconfdir}/drirc" FILES_mesa-megadriver = "${libdir}/dri/*" FILES_libegl-mesa = "${libdir}/libEGL.so.*" @@ -181,5 +186,3 @@ FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftp FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ ${libdir}/pkgconfig/xatracker.pc" - -FILES_${PN}-dbg += "${libdir}/dri/.debug/* ${libdir}/egl/.debug/* ${libdir}/gbm/.debug/* ${libdir}/gallium-pipe/.debug" diff --git a/yocto-poky/meta/recipes-graphics/mesa/mesa_10.6.3.bb b/yocto-poky/meta/recipes-graphics/mesa/mesa_11.1.1.bb index 8c55064fd..502afcfd8 100644 --- a/yocto-poky/meta/recipes-graphics/mesa/mesa_10.6.3.bb +++ b/yocto-poky/meta/recipes-graphics/mesa/mesa_11.1.1.bb @@ -1,9 +1,11 @@ require ${BPN}.inc -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz" +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ + file://replace_glibc_check_with_linux.patch \ +" -SRC_URI[md5sum] = "553e525d2f20ed48fca8f1ec3176fd83" -SRC_URI[sha256sum] = "58592e07c350cd2e8969b73fa83048c657a39fe2f13f3b88f5e5818fe2e4676d" +SRC_URI[md5sum] = "1043dfb907beecb2a761272455960427" +SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER diff --git a/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb index ce35b61eb..5545c1e81 100644 --- a/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb +++ b/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb @@ -4,6 +4,9 @@ require mx.inc SRCREV = "9b1db6b8060bd00b121a692f942404a24ae2960f" PV = "1.4.7+git${SRCPV}" +# Exclude x.99.x versions from upstream checks +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)" + SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ file://fix-build-dir.patch \ file://fix-test-includes.patch \ diff --git a/yocto-poky/meta/recipes-graphics/mx/mx.inc b/yocto-poky/meta/recipes-graphics/mx/mx.inc index ee7f18623..4f1095793 100644 --- a/yocto-poky/meta/recipes-graphics/mx/mx.inc +++ b/yocto-poky/meta/recipes-graphics/mx/mx.inc @@ -1,14 +1,15 @@ SUMMARY = "Clutter based UI widget library" LICENSE = "LGPLv2.1" -inherit clutter autotools-brokensep +inherit clutter autotools-brokensep distro_features_check gobject-introspection +# depends on clutter-1.0 which depends on cogl-1.0 +REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" -EXTRA_OECONF = "--disable-introspection \ - --disable-gtk-doc \ +EXTRA_OECONF = "--disable-gtk-doc \ --disable-gtk-widgets \ --with-dbus \ --with-winsys=none \ diff --git a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index 9d67e5f89..5734b2785 100644 --- a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -7,7 +7,9 @@ LICENSE = "MIT" PR = "r6" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on clutter-* +REQUIRED_DISTRO_FEATURES = "opengl" PACKAGES = "\ ${PN}-core \ diff --git a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb index 53dc0ae19..a657a1a4e 100644 --- a/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb +++ b/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb @@ -11,7 +11,6 @@ RDEPENDS_${PN} = " \ directfb \ directfb-examples \ pango \ - pango-modules \ fontconfig \ ${TOUCH} \ " diff --git a/yocto-poky/meta/recipes-graphics/pango/pango.inc b/yocto-poky/meta/recipes-graphics/pango/pango.inc deleted file mode 100644 index df0fdf679..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango.inc +++ /dev/null @@ -1,99 +0,0 @@ -SUMMARY = "Framework for layout and rendering of internationalized text" -DESCRIPTION = "Pango is a library for laying out and rendering of text, \ -with an emphasis on internationalization. Pango can be used anywhere \ -that text layout is needed, though most of the work on Pango so far has \ -been done in the context of the GTK+ widget toolkit. Pango forms the \ -core of text and font handling for GTK+-2.x." -HOMEPAGE = "http://www.pango.org/" -BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "libs" -LICENSE = "LGPLv2.0+" - -X11DEPENDS = "virtual/libx11 libxft" -DEPENDS = "glib-2.0 fontconfig freetype zlib virtual/libiconv cairo harfbuzz qemu-native" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'ptest', '', d)}" - -PACKAGECONFIG[x11] = "--with-xft,--without-xft,${X11DEPENDS}" -PACKAGECONFIG[ptest] = "--enable-installed-tests,--disable-installed-tests,glib-2.0-native" - -BBCLASSEXTEND = "native" -DEPENDS_class-native = "glib-2.0-native cairo-native harfbuzz-native" - -PACKAGES_DYNAMIC += "^pango-module-.*" - -RRECOMMENDS_${PN} = "pango-module-basic-fc" - -inherit gnomebase gtk-doc qemu ptest - -# Create a pango-modules package -ALLOW_EMPTY_${BPN}-modules = "1" -PACKAGES += "${BPN}-modules" -RRECOMMENDS_${BPN}-modules = "${@" ".join([p for p in d.getVar('PACKAGES', True).split() if p.find("pango-module") != -1])}" - - -EXTRA_AUTORECONF = "" - -# seems to go wrong with default cflags -FULL_OPTIMIZATION_arm = "-O2" - -EXTRA_OECONF = "--disable-introspection \ - --enable-explicit-deps=no \ - --disable-debug \ - --with-mlprefix=${MLPREFIX}" - -LEAD_SONAME = "libpango-1.0*" -LIBV = "1.8.0" - -pango_postinst() { -if ! [ -e $D${sysconfdir}/pango ] ; then - mkdir -p $D${sysconfdir}/pango -fi - -if [ -n "$D" ]; then - ${@qemu_run_binary(d, '$D','${bindir}/${MLPREFIX}pango-querymodules')} \ - $D${libdir}/pango/${LIBV}/modules/*.so \ - > $D${sysconfdir}/pango/${MLPREFIX}pango.modules 2>/dev/null - - [ $? -ne 0 ] && exit 1 - - sed -i -e "s:$D::" $D${sysconfdir}/pango/${MLPREFIX}pango.modules - - exit 0 -else - ${bindir}/${MLPREFIX}pango-querymodules > /etc/pango/${MLPREFIX}pango.modules -fi -} - -# This binary needs to be compiled for the host architecture. This isn't pretty! -do_compile_prepend () { - if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then - make CC="${BUILD_CC}" CFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode - fi -} - -do_install_append () { - if [ "${MLPREFIX}" != "" ]; then - mv ${D}/${bindir}/pango-querymodules ${D}/${bindir}/${MLPREFIX}pango-querymodules - fi -} - - -python populate_packages_prepend () { - pango_postinst = d.getVar("pango_postinst", True) - - modules_root = d.expand('${libdir}/pango/${LIBV}/modules') - - do_split_packages(d, modules_root, '^pango-(.*)\.so$', 'pango-module-%s', 'Pango module %s', pango_postinst) -} - -FILES_${PN} = "${sysconfdir}/pango/* ${bindir}/* ${libdir}/libpango*${SOLIBS}" -FILES_${PN}-dbg += "${libdir}/pango/${LIBV}/modules/.debug" -FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" - -FILES_${PN}-ptest += "${libexecdir}/installed-tests/* \ - ${datadir}/installed-tests/pango" -FILES_${PN}-dbg += "${libexecdir}/installed-tests/.debug" - -RDEPENDS_${PN}-ptest += "gnome-desktop-testing liberation-fonts" diff --git a/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch b/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch new file mode 100644 index 000000000..812da21c5 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch @@ -0,0 +1,121 @@ +From 867a512eddbeb1899d3e7096df3da1dd0ce3e7b7 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 23 Oct 2015 14:06:17 +0300 +Subject: [PATCH] Drop introspection macros from acinclude.m4 + +They take precendence over our customized macros, and so +introspection doesn't work correctly. + +Upstream-Status: Pending [review on oe-core list] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + acinclude.m4 | 96 ------------------------------------------------------------ + 1 file changed, 96 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8899c7c..48fd5d8 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -55,99 +55,3 @@ AC_DEFUN([JH_CHECK_XML_CATALOG], + ]) + + +-dnl REMOVE THIS WHEN introspection.m4 is widely available +-dnl +-dnl -*- mode: autoconf -*- +-dnl Copyright 2009 Johan Dahlin +-dnl +-dnl This file is free software; the author(s) gives unlimited +-dnl permission to copy and/or distribute it, with or without +-dnl modifications, as long as this notice is preserved. +-dnl +- +-# serial 1 +- +-m4_define([_GOBJECT_INTROSPECTION_CHECK_INTERNAL], +-[ +- AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first +- AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first +- AC_BEFORE([LT_INIT],[$0])dnl setup libtool first +- +- dnl enable/disable introspection +- m4_if([$2], [require], +- [dnl +- enable_introspection=yes +- ],[dnl +- AC_ARG_ENABLE(introspection, +- AS_HELP_STRING([--enable-introspection[=@<:@no/auto/yes@:>@]], +- [Enable introspection for this build]),, +- [enable_introspection=auto]) +- ])dnl +- +- AC_MSG_CHECKING([for gobject-introspection]) +- +- dnl presence/version checking +- AS_CASE([$enable_introspection], +- [no], [dnl +- found_introspection="no (disabled, use --enable-introspection to enable)" +- ],dnl +- [yes],[dnl +- PKG_CHECK_EXISTS([gobject-introspection-1.0],, +- AC_MSG_ERROR([gobject-introspection-1.0 is not installed])) +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], +- found_introspection=yes, +- AC_MSG_ERROR([You need to have gobject-introspection >= $1 installed to build AC_PACKAGE_NAME])) +- ],dnl +- [auto],[dnl +- PKG_CHECK_EXISTS([gobject-introspection-1.0 >= $1], found_introspection=yes, found_introspection=no) +- ],dnl +- [dnl +- AC_MSG_ERROR([invalid argument passed to --enable-introspection, should be one of @<:@no/auto/yes@:>@]) +- ])dnl +- +- AC_MSG_RESULT([$found_introspection]) +- +- INTROSPECTION_SCANNER= +- INTROSPECTION_COMPILER= +- INTROSPECTION_GENERATE= +- INTROSPECTION_GIRDIR= +- INTROSPECTION_TYPELIBDIR= +- if test "x$found_introspection" = "xyes"; then +- INTROSPECTION_SCANNER=`$PKG_CONFIG --variable=g_ir_scanner gobject-introspection-1.0` +- INTROSPECTION_COMPILER=`$PKG_CONFIG --variable=g_ir_compiler gobject-introspection-1.0` +- INTROSPECTION_GENERATE=`$PKG_CONFIG --variable=g_ir_generate gobject-introspection-1.0` +- INTROSPECTION_GIRDIR=`$PKG_CONFIG --variable=girdir gobject-introspection-1.0` +- INTROSPECTION_TYPELIBDIR="$($PKG_CONFIG --variable=typelibdir gobject-introspection-1.0)" +- INTROSPECTION_CFLAGS=`$PKG_CONFIG --cflags gobject-introspection-1.0` +- INTROSPECTION_LIBS=`$PKG_CONFIG --libs gobject-introspection-1.0` +- INTROSPECTION_MAKEFILE=`$PKG_CONFIG --variable=datadir gobject-introspection-1.0`/gobject-introspection-1.0/Makefile.introspection +- fi +- AC_SUBST(INTROSPECTION_SCANNER) +- AC_SUBST(INTROSPECTION_COMPILER) +- AC_SUBST(INTROSPECTION_GENERATE) +- AC_SUBST(INTROSPECTION_GIRDIR) +- AC_SUBST(INTROSPECTION_TYPELIBDIR) +- AC_SUBST(INTROSPECTION_CFLAGS) +- AC_SUBST(INTROSPECTION_LIBS) +- AC_SUBST(INTROSPECTION_MAKEFILE) +- +- AM_CONDITIONAL(HAVE_INTROSPECTION, test "x$found_introspection" = "xyes") +-]) +- +- +-dnl Usage: +-dnl GOBJECT_INTROSPECTION_CHECK([minimum-g-i-version]) +- +-AC_DEFUN([GOBJECT_INTROSPECTION_CHECK], +-[ +- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1]) +-]) +- +-dnl Usage: +-dnl GOBJECT_INTROSPECTION_REQUIRE([minimum-g-i-version]) +- +- +-AC_DEFUN([GOBJECT_INTROSPECTION_REQUIRE], +-[ +- _GOBJECT_INTROSPECTION_CHECK_INTERNAL([$1], [require]) +-]) +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch b/yocto-poky/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch deleted file mode 100644 index ad414ddf3..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango/multilib-fix-clean.patch +++ /dev/null @@ -1,75 +0,0 @@ -Upstream-Status: Pending - -Updated to apply to pango-1.32.5 - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd pango-1.32.5/configure.ac pango-1.32.5/configure.ac ---- pango-1.32.5/configure.ac 2012-12-07 04:43:25.000000000 +0200 -+++ pango-1.32.5/configure.ac 2013-01-09 08:27:40.328516792 +0200 -@@ -213,6 +213,11 @@ - - AC_SUBST(PANGO_DEBUG_FLAGS) - -+AC_ARG_WITH(mlprefix, -+ AC_HELP_STRING([--with-mlprefix=<ARG>], [multilib prefix]), -+ mlprefix_str=$withval, mlprefix_str="") -+AC_DEFINE_UNQUOTED([MLPREFIX], ["$mlprefix_str"], [multilib prefix.]) -+ - AC_ARG_ENABLE(rebuilds, - [AC_HELP_STRING([--disable-rebuilds], - [disable all source autogeneration rules])],, -diff -Nurd pango-1.32.5/pango/modules.c pango-1.32.5/pango/modules.c ---- pango-1.32.5/pango/modules.c 2012-12-17 20:27:56.000000000 +0200 -+++ pango-1.32.5/pango/modules.c 2013-01-09 08:31:16.336512052 +0200 -@@ -555,11 +555,11 @@ - files = g_new (char *, 3); - - files[0] = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+ MLPREFIX "pango.modules", - NULL); - files[1] = g_build_filename (pango_get_lib_subdirectory (), - MODULE_VERSION, -- "modules.cache", -+ MLPREFIX "modules.cache", - NULL); - files[2] = NULL; - } -@@ -674,7 +674,8 @@ - if (!no_module_warning) - { - gchar *filename = g_build_filename (pango_get_sysconf_subdirectory (), -- "pango.modules", -+/* For multilib case, keep multiple config file for different libs */ -+ MLPREFIX "pango.modules", - NULL); - g_critical ("No modules found:\n" - "No builtin or dynamically loaded modules were found.\n" -diff -Nurd pango-1.32.5/pango/modules.c.rej pango-1.32.5/pango/modules.c.rej ---- pango-1.32.5/pango/modules.c.rej 1970-01-01 02:00:00.000000000 +0200 -+++ pango-1.32.5/pango/modules.c.rej 2013-01-09 08:27:40.328516792 +0200 -@@ -0,0 +1,12 @@ -+--- pango/modules.c 2010-09-22 03:37:01.000000000 +0800 -++++ pango/modules.c 2012-05-08 21:21:02.000000000 +0800 -+@@ -529,7 +529,8 @@ -+ -+ if (!file_str) -+ file_str = g_build_filename (pango_get_sysconf_subdirectory (), -+- "pango.modules", -++/* For multilib case, keep multiple config file for different libs */ -++ MLPREFIX "pango.modules", -+ NULL); -+ -+ files = pango_split_file_list (file_str); -diff -Nurd pango-1.32.5/pango/querymodules.c pango-1.32.5/pango/querymodules.c ---- pango-1.32.5/pango/querymodules.c 2012-08-28 15:27:18.000000000 +0300 -+++ pango-1.32.5/pango/querymodules.c 2013-01-09 08:31:47.828511359 +0200 -@@ -304,7 +304,7 @@ - - cache_file = g_build_filename (pango_get_lib_subdirectory (), - MODULE_VERSION, -- "modules.cache", -+ MLPREFIX "modules.cache", - NULL); - err = NULL; - if (!g_file_set_contents (cache_file, contents->str, -1, &err)) diff --git a/yocto-poky/meta/recipes-graphics/pango/pango_1.36.8.bb b/yocto-poky/meta/recipes-graphics/pango/pango_1.36.8.bb deleted file mode 100644 index f4e425040..000000000 --- a/yocto-poky/meta/recipes-graphics/pango/pango_1.36.8.bb +++ /dev/null @@ -1,10 +0,0 @@ -require pango.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" - -SRC_URI += "file://run-ptest \ - file://multilib-fix-clean.patch \ -" - -SRC_URI[archive.md5sum] = "217a9a753006275215fa9fa127760ece" -SRC_URI[archive.sha256sum] = "18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07" diff --git a/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb b/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb new file mode 100644 index 000000000..7fc65fd43 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb @@ -0,0 +1,52 @@ +SUMMARY = "Framework for layout and rendering of internationalized text" +DESCRIPTION = "Pango is a library for laying out and rendering of text, \ +with an emphasis on internationalization. Pango can be used anywhere \ +that text layout is needed, though most of the work on Pango so far has \ +been done in the context of the GTK+ widget toolkit. Pango forms the \ +core of text and font handling for GTK+-2.x." +HOMEPAGE = "http://www.pango.org/" +BUGTRACKER = "http://bugzilla.gnome.org" +SECTION = "libs" +LICENSE = "LGPLv2.0+" + +LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" + +inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection + +SRC_URI += "file://run-ptest \ + file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ +" + +SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d" +SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" + +DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" + +EXTRA_AUTORECONF = "" + +EXTRA_OECONF = " \ + --disable-debug \ + " + +LEAD_SONAME = "libpango-1.0*" +LIBV = "1.8.0" + +# This binary needs to be compiled for the host architecture. This isn't pretty! +do_compile_prepend_class-target () { + if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then + make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode + fi +} + +FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" +FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" + +RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" + +RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ + pango-module-basic-fc pango-module-arabic-lang" + +BBCLASSEXTEND = "native" diff --git a/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb b/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb index 55ad78c09..607f236c2 100644 --- a/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -5,8 +5,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" SRC_URI = "git://anongit.freedesktop.org/piglit \ file://0001-tests-Fix-missing-include-of-Xutil.h.patch" -# From 2014/12/04 -SRCREV = "126c7d049b8f32e541625d5a35fbc5f5e4e7fbf8" +# From 2015-02-19 +SRCREV = "c4585427913e4cb28994b4bfb11d49778273aa2c" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" @@ -34,10 +34,8 @@ do_configure_prepend() { fi } -FILES_${PN}-dbg += "${libdir}/piglit/*/.debug/" - RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \ - python-argparse python-importlib python-unixadmin \ + python-argparse python-importlib python-unixadmin python-xml \ python-multiprocessing python-textutils python-netserver python-shell \ mesa-demos bash \ " diff --git a/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb b/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb index 6d8c7dd7e..b0264c3b3 100644 --- a/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb +++ b/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb @@ -18,6 +18,7 @@ SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}. SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d" SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" +UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" inherit autotools pkgconfig @@ -45,7 +46,6 @@ DEBIAN_NOAUTONAME_tslib-calibrate = "1" RDEPENDS_${PN} = "tslib-conf" RRECOMMENDS_${PN} = "pointercal" -FILES_${PN}-dbg += "${libdir}/ts/.debug*" FILES_${PN}-dev += "${libdir}/ts/*.la" FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" diff --git a/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.1.bb b/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb index af8402053..f7db1bc95 100644 --- a/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.1.bb +++ b/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb @@ -6,8 +6,10 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=4c5154407c2490750dd461c50ad94797 \ SRC_URI = "http://waffle-gl.org/files/release/${BPN}-${PV}/${BPN}-${PV}.tar.xz \ file://0001-third_party-threads-Use-PTHREAD_MUTEX_RECURSIVE-by-d.patch \ " -SRC_URI[md5sum] = "c0d802bc3d0aba87c51e423a3a8bdd69" -SRC_URI[sha256sum] = "cbab0e926515064e818bf089a5af04be33307e5f40d07659fb40d59b2bfe20aa" +SRC_URI[md5sum] = "c669c91bf2f7e13a5d781c3dbb30fd8c" +SRC_URI[sha256sum] = "d2c096cf654bf0061323a4b9231a1ef5b749a1e5c7c5bfe067e964219c2a851c" + +UPSTREAM_CHECK_URI = "http://www.waffle-gl.org/releases.html" inherit cmake distro_features_check lib_package diff --git a/yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch b/yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch deleted file mode 100644 index df5ebcca0..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/libinput/libinput-configure.ac-add-arg-with-libunwind.patch +++ /dev/null @@ -1,50 +0,0 @@ -From cc6fce587f2628c8b342764e06fb0fc27c1e8274 Mon Sep 17 00:00:00 2001 -From: Jackie Huang <jackie.huang@windriver.com> -Date: Mon, 3 Aug 2015 20:33:44 -0700 -Subject: [PATCH] configure.ac: add arg --with-libunwind - -Add arg --with-libunwind for configure so it's optional to check -libunwind, which is helpfull to make deterministic builds. - -Upstream-Status: Submitted [wayland-devel] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - configure.ac | 19 ++++++++++++++----- - 1 file changed, 14 insertions(+), 5 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 314b0d4..242d251 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -60,13 +60,22 @@ PKG_PROG_PKG_CONFIG() - PKG_CHECK_MODULES(MTDEV, [mtdev >= 1.1.0]) - PKG_CHECK_MODULES(LIBUDEV, [libudev]) - PKG_CHECK_MODULES(LIBEVDEV, [libevdev >= 0.4]) --PKG_CHECK_MODULES(LIBUNWIND, -+ -+AC_ARG_WITH(libunwind, -+ AS_HELP_STRING([--without-libunwind],[Do not use libunwind])) -+ -+AS_IF([test "x$with_libunwind" != "xno"], -+ [PKG_CHECK_MODULES(LIBUNWIND, - [libunwind], - [HAVE_LIBUNWIND=yes], -- [HAVE_LIBUNWIND=no]) --if test "x$HAVE_LIBUNWIND" = "xyes"; then -- AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support]) --fi -+ [HAVE_LIBUNWIND=no])], -+ [HAVE_LIBUNWIND=no]) -+ -+AS_IF([test "x$HAVE_LIBUNWIND" = "xyes"], -+ [AC_DEFINE(HAVE_LIBUNWIND, 1, [Have libunwind support])], -+ [AS_IF([test "x$with_libunwind" = "xyes"], -+ [AC_MSG_ERROR([libunwind requested but not found])])]) -+ - AM_CONDITIONAL(HAVE_LIBUNWIND, [test "x$HAVE_LIBUNWIND" = xyes]) - AC_PATH_PROG(ADDR2LINE, [addr2line]) - if test "x$ADDR2LINE" != "x"; then --- -2.3.5 - diff --git a/yocto-poky/meta/recipes-graphics/wayland/libinput_0.21.0.bb b/yocto-poky/meta/recipes-graphics/wayland/libinput_1.1.4.bb index ac5a24982..4167679c2 100644 --- a/yocto-poky/meta/recipes-graphics/wayland/libinput_0.21.0.bb +++ b/yocto-poky/meta/recipes-graphics/wayland/libinput_1.1.4.bb @@ -8,11 +8,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f" DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://libinput-configure.ac-add-arg-with-libunwind.patch \ file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \ " -SRC_URI[md5sum] = "f91d8f4ced986f1ae16d52ea02bc7837" -SRC_URI[sha256sum] = "7cce7a9e510dfe5c4a19ad00e9350808d4f59f8611fd2b5e87213c507283f550" +SRC_URI[md5sum] = "0945318141c1a9f52857bbf65d175f32" +SRC_URI[sha256sum] = "302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6" inherit autotools pkgconfig @@ -21,4 +20,3 @@ PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3" FILES_${PN} += "${libdir}/udev/" -FILES_${PN}-dbg += "${libdir}/udev/.debug" diff --git a/yocto-poky/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch b/yocto-poky/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch deleted file mode 100644 index 5e0e6bf12..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/wayland/always-build-scanner.patch +++ /dev/null @@ -1,105 +0,0 @@ -build: always build wayland-scanner - -The previous idiom for building a cross-compiled Wayland is to build once for -the build host (with --enable-scanner --disable-libraries) to get a -wayland-scanner binary that can then be used in a cross-compile (with ---disable-scanner). The problem with this is that the cross wayland is missing -a wayland-scanner binary, which means you then can't do any Wayland development -on the target. - -Instead, always build wayland-scanner for the target and change ---enable/disable-scanner to --with/without-host-scanner. Normal builds use the -default of --without-host-scanner and run the wayland-scanner it just built, and -cross-compiled builds pass --with-host-scanner to use a previously built host -scanner but still get a wayland-scanner to install. - -(a theoretically neater solution would be to build two scanners if required (one -to run and one to install), but automake makes this overly complicated) - -Signed-off-by: Ross Burton <ross.burton@intel.com> -Upstream-Status: Submitted - -diff --git a/Makefile.am b/Makefile.am -index c19494f..c2d929b 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -64,16 +64,17 @@ nodist_libwayland_client_la_SOURCES = \ - - pkgconfig_DATA += src/wayland-client.pc src/wayland-server.pc - --if ENABLE_SCANNER --wayland_scanner = $(top_builddir)/wayland-scanner - bin_PROGRAMS = wayland-scanner - wayland_scanner_SOURCES = src/scanner.c - wayland_scanner_CFLAGS = $(EXPAT_CFLAGS) $(AM_CFLAGS) - wayland_scanner_LDADD = $(EXPAT_LIBS) libwayland-util.la --$(BUILT_SOURCES) : wayland-scanner - pkgconfig_DATA += src/wayland-scanner.pc --else -+ -+if HOST_SCANNER - wayland_scanner = wayland-scanner -+else -+$(BUILT_SOURCES) : wayland-scanner -+wayland_scanner = $(top_builddir)/wayland-scanner - endif - - protocol/%-protocol.c : $(top_srcdir)/protocol/%.xml -diff --git a/configure.ac b/configure.ac -index c2a804e..de0b02f 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -65,11 +65,11 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], - [[#include <time.h>]]) - AC_CHECK_HEADERS([execinfo.h]) - --AC_ARG_ENABLE([scanner], -- [AC_HELP_STRING([--disable-scanner], -- [Disable compilation of wayland-scanner])], -- [], -- [enable_scanner=yes]) -+AC_ARG_WITH([host-scanner], -+ [AC_HELP_STRING([--with-host-scanner], -+ [Use a host wayland-scanner])], -+ [], -+ [with_host_scanner=no]) - - AC_ARG_ENABLE([documentation], - [AC_HELP_STRING([--disable-documentation], -@@ -77,25 +77,23 @@ AC_ARG_ENABLE([documentation], - [], - [enable_documentation=yes]) - --AM_CONDITIONAL(ENABLE_SCANNER, test "x$enable_scanner" = xyes) -+AM_CONDITIONAL(HOST_SCANNER, test "x$with_host_scanner" = xyes) - - AC_ARG_WITH(icondir, [ --with-icondir=<dir> Look for cursor icons here], - [ ICONDIR=$withval], - [ ICONDIR=${datadir}/icons]) - AC_SUBST([ICONDIR]) - --if test "x$enable_scanner" = "xyes"; then -- PKG_CHECK_MODULES(EXPAT, [expat], [], -- [AC_CHECK_HEADERS(expat.h, [], -- [AC_MSG_ERROR([Can't find expat.h. Please install expat.])]) -- SAVE_LIBS="$LIBS" -- AC_SEARCH_LIBS(XML_ParserCreate, expat, [], -- [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) -- EXPAT_LIBS="$LIBS" -- LIBS="$SAVE_LIBS" -- AC_SUBST(EXPAT_LIBS) -- ]) --fi -+PKG_CHECK_MODULES(EXPAT, [expat], [], -+ [AC_CHECK_HEADERS(expat.h, [], -+ [AC_MSG_ERROR([Can't find expat.h. Please install expat.])]) -+ SAVE_LIBS="$LIBS" -+ AC_SEARCH_LIBS(XML_ParserCreate, expat, [], -+ [AC_MSG_ERROR([Can't find expat library. Please install expat.])]) -+ EXPAT_LIBS="$LIBS" -+ LIBS="$SAVE_LIBS" -+ AC_SUBST(EXPAT_LIBS) -+ ]) - - AC_PATH_PROG(XSLTPROC, xsltproc) - AM_CONDITIONAL([HAVE_XSLTPROC], [test "x$XSLTPROC" != "x"]) diff --git a/yocto-poky/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch b/yocto-poky/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch deleted file mode 100644 index cd8bc5584..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/wayland/disable-macro-checks-not-used-for-scanner.patch +++ /dev/null @@ -1,50 +0,0 @@ -disable macro checks not used for scanner - -We only build wayland-native for the scanner, so disable the bits we don't -actually need. This avoid build issue on older distro such as Centos 5.x: -| error: 'O_CLOEXEC' undeclared (first use in this function) -| error: sys/timerfd.h: No such file or directory -| error: 'CLOCK_MONOTONIC' undeclared (first use in this function) -| error: 'TFD_CLOEXEC' undeclared (first use in this function) -| error: 'SFD_CLOEXEC' undeclared (first use in this function) - -Upstream-Status: Pending - -Signed-off-by: Ting Liu <b28495@freescale.com> ---- - configure.ac | 20 ++++++++++---------- - 1 file changed, 10 insertions(+), 10 deletions(-) - -diff --git a/configure.ac b/configure.ac ---- a/configure.ac -+++ b/configure.ac -@@ -41,16 +41,16 @@ AC_SUBST(GCC_CFLAGS) - - AC_CHECK_FUNCS([accept4 mkostemp posix_fallocate]) - --AC_CHECK_DECL(SFD_CLOEXEC,[], -- [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], -- [[#include <sys/signalfd.h>]]) --AC_CHECK_DECL(TFD_CLOEXEC,[], -- [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")], -- [[#include <sys/timerfd.h>]]) --AC_CHECK_DECL(CLOCK_MONOTONIC,[], -- [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")], -- [[#include <time.h>]]) --AC_CHECK_HEADERS([execinfo.h]) -+##AC_CHECK_DECL(SFD_CLOEXEC,[], -+# [AC_MSG_ERROR("SFD_CLOEXEC is needed to compile wayland")], -+# [[#include <sys/signalfd.h>]]) -+#AC_CHECK_DECL(TFD_CLOEXEC,[], -+# [AC_MSG_ERROR("TFD_CLOEXEC is needed to compile wayland")], -+# [[#include <sys/timerfd.h>]]) -+#AC_CHECK_DECL(CLOCK_MONOTONIC,[], -+# [AC_MSG_ERROR("CLOCK_MONOTONIC is needed to compile wayland")], -+# [[#include <time.h>]]) -+#AC_CHECK_HEADERS([execinfo.h]) - - AC_ARG_ENABLE([scanner], - [AC_HELP_STRING([--disable-scanner], --- -1.8.3.2 - diff --git a/yocto-poky/meta/recipes-graphics/wayland/wayland_1.8.1.bb b/yocto-poky/meta/recipes-graphics/wayland/wayland_1.9.0.bb index 0f9a0aa02..d12ac186c 100644 --- a/yocto-poky/meta/recipes-graphics/wayland/wayland_1.8.1.bb +++ b/yocto-poky/meta/recipes-graphics/wayland/wayland_1.9.0.bb @@ -7,18 +7,14 @@ be traditional applications, X servers (rootless or fullscreen) or other \ display servers." HOMEPAGE = "http://wayland.freedesktop.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=1d4476a7d98dd5691c53d4d43a510c72 \ - file://src/wayland-server.c;endline=21;md5=079ae21dbf98ada52ec23744851b0a5c" - -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ - file://always-build-scanner.patch" -SRC_URI[md5sum] = "6e877877c3e04cfb865cfcd0733c9ab1" -SRC_URI[sha256sum] = "f17c938d1c24fd0a10f650a623a2775d329db3168b5732e498b08388ec776fc8" - -SRC_URI_append_class-native = " \ - file://disable-macro-checks-not-used-for-scanner.patch \ - " -EXTRA_OECONF_class-native = "--disable-documentation" +LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ + file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" + +SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" +SRC_URI[md5sum] = "5e141b3f2a7005d6c89d6f233c87c317" +SRC_URI[sha256sum] = "9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa" + +EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" inherit autotools pkgconfig diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb b/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb index 38b78bcd0..653541e3c 100644 --- a/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb +++ b/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb @@ -1,19 +1,28 @@ -SUMMARY = "Startup script for the Weston Wayland compositor" +SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" -SRC_URI = "file://init" +SRC_URI = "file://init \ + file://weston.service" S = "${WORKDIR}" do_install() { install -d ${D}/${sysconfdir}/init.d install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + + install -d ${D}${systemd_system_unitdir} + install -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir} } -inherit allarch update-rc.d +inherit allarch update-rc.d distro_features_check systemd + +# rdepends on weston which depends on virtual/egl +REQUIRED_DISTRO_FEATURES = "opengl" RDEPENDS_${PN} = "weston kbd" INITSCRIPT_NAME = "weston" INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." + +SYSTEMD_SERVICE_${PN} = "weston.service" diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service b/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service new file mode 100644 index 000000000..4f1f7ff10 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service @@ -0,0 +1,15 @@ +[Unit] +Description=Weston Wayland compositor startup +RequiresMountsFor=/run + +[Service] +User=root +EnvironmentFile=-/etc/default/weston +Environment="XDG_RUNTIME_DIR=/run/user/root" +ExecStartPre=/bin/mkdir -p /run/user/root +ExecStartPre=/bin/chmod 0700 /run/user/root +ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS + +[Install] +WantedBy=multi-user.target + diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch deleted file mode 100644 index 68ba38ba8..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/disable-wayland-scanner-pkg-check.patch +++ /dev/null @@ -1,17 +0,0 @@ -Index: git/configure.ac -=================================================================== ---- git.orig/configure.ac -+++ git/configure.ac -@@ -501,12 +501,6 @@ if test "x$have_lcms" = xyes; then - fi - AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) - --AC_PATH_PROG([wayland_scanner], [wayland-scanner]) --if test x$wayland_scanner = x; then -- PKG_CHECK_MODULES(WAYLAND_SCANNER, [wayland-scanner]) -- wayland_scanner=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` --fi -- - AC_CONFIG_FILES([Makefile src/version.h src/weston.pc]) - - AM_CONDITIONAL([HAVE_GIT_REPO], [test -f $srcdir/.git/logs/HEAD]) diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch new file mode 100644 index 000000000..a40eaf186 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch @@ -0,0 +1,70 @@ +From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001 +From: Frederico Cadete <frederico@cadete.eu> +Date: Mon, 28 Sep 2015 00:30:10 +0200 +Subject: configure.ac: add explicit enable/disable for systemd-login support + +Otherwise, auto-enable depending on whether the system has the necessary +libraries. + +[Updated help text as per pq suggestion -- bwh] + +Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> +Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> +Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> + +Upstream-Status: Backport +Backported from Weston git: +http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc + +Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> + +diff --git a/configure.ac b/configure.ac +index a9cd429..67e80d0 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization, + AS_IF([test "x$enable_resize_optimization" = "xyes"], + [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) + +-PKG_CHECK_MODULES(SYSTEMD_LOGIN, +- [libsystemd >= 209], +- [have_systemd_login_209=yes;have_systemd_login=yes], +- [have_systemd_login_209=no;have_systemd_login=no]) +- +-# Older versions of systemd package systemd-login separately. Fall back on that +-AS_IF([test x$have_systemd_login != xyes],[ +- PKG_CHECK_MODULES(SYSTEMD_LOGIN, +- [libsystemd-login >= 198], +- [have_systemd_login=yes], +- [have_systemd_login=no]) +- ]) ++AC_ARG_ENABLE(systemd-login, ++ AS_HELP_STRING([--enable-systemd-login], ++ [Enable logind support]),, ++ enable_systemd_login=auto) ++if test x$enable_systemd_login != xno; then ++ PKG_CHECK_MODULES(SYSTEMD_LOGIN, ++ [libsystemd >= 209], ++ [have_systemd_login_209=yes;have_systemd_login=yes], ++ [have_systemd_login_209=no;have_systemd_login=no]) ++ ++ # Older versions of systemd package systemd-login separately. Fall back on that ++ AS_IF([test x$have_systemd_login != xyes],[ ++ PKG_CHECK_MODULES(SYSTEMD_LOGIN, ++ [libsystemd-login >= 198], ++ [have_systemd_login=yes], ++ [have_systemd_login=no]) ++ ]) ++else ++ have_systemd_login=no ++fi ++ ++if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then ++ AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login]) ++fi + + AS_IF([test "x$have_systemd_login" = "xyes"], + [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) +-- +cgit v0.10.2 + diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch new file mode 100644 index 000000000..2d28d5689 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch @@ -0,0 +1,53 @@ +From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001 +From: Frederico Cadete <frederico@cadete.eu> +Date: Mon, 28 Sep 2015 00:30:09 +0200 +Subject: configure.ac: add support for new versions of systemd + +Starting from systemd version 209, a single libsystemd.pc is provided. +For previous versions, fall back on libsystemd-login.pc. + +Signed-off-by: Frederico Cadete <frederico@cadete.eu> +Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> +Reviewed-by: Derek Foreman <derekf@osg.samsung.com> + +Upstream-Status: Backport +Backported from Weston git: +http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025 + +Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> + +diff --git a/configure.ac b/configure.ac +index 045291c..a9cd429 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization, + AS_IF([test "x$enable_resize_optimization" = "xyes"], + [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) + +-PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], +- [have_systemd_login=yes], [have_systemd_login=no]) ++PKG_CHECK_MODULES(SYSTEMD_LOGIN, ++ [libsystemd >= 209], ++ [have_systemd_login_209=yes;have_systemd_login=yes], ++ [have_systemd_login_209=no;have_systemd_login=no]) ++ ++# Older versions of systemd package systemd-login separately. Fall back on that ++AS_IF([test x$have_systemd_login != xyes],[ ++ PKG_CHECK_MODULES(SYSTEMD_LOGIN, ++ [libsystemd-login >= 198], ++ [have_systemd_login=yes], ++ [have_systemd_login=no]) ++ ]) ++ + AS_IF([test "x$have_systemd_login" = "xyes"], + [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) + AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") + +-PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209], +- [have_systemd_login_209=yes], [have_systemd_login_209=no]) + AS_IF([test "x$have_systemd_login_209" = "xyes"], + [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) + +-- +cgit v0.10.2 + diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston/parallelmake.patch b/yocto-poky/meta/recipes-graphics/wayland/weston/parallelmake.patch deleted file mode 100644 index 42b5efbc3..000000000 --- a/yocto-poky/meta/recipes-graphics/wayland/weston/parallelmake.patch +++ /dev/null @@ -1,40 +0,0 @@ -Backport two patches from upstream to fix parallel builds - -- mkdir races (2eff22b8e6f6e5255a1915c33dfd91cecf02cbbc) -- weston.desktop race (315476fa7b1f1c44c1b35116036df54ac5cb9a03) - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/Makefile.am b/Makefile.am -index 5819b19..ff13b19 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -20,7 +20,7 @@ weston.ini : $(srcdir)/weston.ini.in - $< > $@ - - ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in -- $(AM_V_GEN)$(SED) \ -+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ - -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ -@@ -29,7 +29,7 @@ ivi-shell/weston.ini : $(srcdir)/ivi-shell/weston.ini.in - $< > $@ - - tests/weston-ivi.ini : $(srcdir)/ivi-shell/weston.ini.in -- $(AM_V_GEN)$(SED) \ -+ $(AM_V_GEN)$(MKDIR_P) $(dir $@) && $(SED) \ - -e 's|@bindir[@]|$(bindir)|g' \ - -e 's|@abs_top_builddir[@]|$(abs_top_builddir)|g' \ - -e 's|@abs_top_srcdir[@]|$(abs_top_srcdir)|g' \ -@@ -179,8 +179,7 @@ pkgconfigdir = $(libdir)/pkgconfig - pkgconfig_DATA = src/weston.pc - - wayland_sessiondir = $(datadir)/wayland-sessions --wayland_session_DATA = src/weston.desktop --dist_wayland_session_DATA = $(wayland_session_DATA) -+dist_wayland_session_DATA = src/weston.desktop - - westonincludedir = $(includedir)/weston - westoninclude_HEADERS = \ diff --git a/yocto-poky/meta/recipes-graphics/wayland/weston_1.8.0.bb b/yocto-poky/meta/recipes-graphics/wayland/weston_1.9.0.bb index 342c604b9..16a788d2a 100644 --- a/yocto-poky/meta/recipes-graphics/wayland/weston_1.8.0.bb +++ b/yocto-poky/meta/recipes-graphics/wayland/weston_1.9.0.bb @@ -2,8 +2,8 @@ SUMMARY = "Weston, a Wayland compositor" DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" HOMEPAGE = "http://wayland.freedesktop.org" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=275efac2559a224527bd4fd593d38466 \ - file://src/compositor.c;endline=23;md5=a9793f1edc8d1a4c344ca8ae252352fb" +LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ + file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331" SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ @@ -11,18 +11,20 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://make-lcms-explicitly-configurable.patch \ file://make-libwebp-explicitly-configurable.patch \ file://0001-make-error-portable.patch \ - file://parallelmake.patch \ + file://libsystemd.patch \ + file://explicit-enable-disable-systemd.patch \ " -SRC_URI[md5sum] = "24cb8a7ed0535b4fc3642643988dab36" -SRC_URI[sha256sum] = "8963e69f328e815cec42c58046c4af721476c7541bb7d9edc71740fada5ad312" +SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" +SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" -inherit autotools pkgconfig useradd +inherit autotools pkgconfig useradd distro_features_check +# depends on virtual/egl +REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland libinput virtual/egl pango" +DEPENDS += "wayland libinput virtual/egl pango wayland-native" EXTRA_OECONF = "--enable-setuid-install \ - --disable-xwayland \ --enable-simple-clients \ --enable-clients \ --enable-demo-clients-install \ @@ -39,6 +41,7 @@ EXTRA_OECONF_append_qemux86-64 = "\ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ " # # Compositor choices @@ -67,6 +70,12 @@ PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" # Weston with unwinding support PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" +# Weston with systemd-login support +PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus" +# Weston with Xwayland support +PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo" +# colord CMS support +PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/Xserver.in index 73570dfeb..b8eed7610 100644 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xserver +++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common/Xserver.in @@ -5,7 +5,7 @@ XSERVER=/usr/bin/Xorg . /etc/profile -ARGS=" -br -pn" +ARGS=" -br -pn @BLANK_ARGS@" DISPLAY=':0' diff --git a/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb index 156b32948..6d7c347c0 100644 --- a/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb +++ b/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb @@ -9,14 +9,21 @@ inherit distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "file://etc \ + file://Xserver.in \ file://gplv2-license.patch" S = "${WORKDIR}" +PACKAGECONFIG ??= "blank" +# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG +PACKAGECONFIG[blank] = "" + do_install() { cp -R ${S}/etc ${D}${sysconfdir} + sed -e 's/@BLANK_ARGS@/${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}/' \ + ${S}/Xserver.in > ${D}${sysconfdir}/X11/Xserver + chmod -R 755 ${D}${sysconfdir} - find ${D}${sysconfdir} -type f -name \*~ -exec rm -rf {} \; } RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" diff --git a/yocto-poky/meta/recipes-graphics/x11vnc/files/endian-fix.patch b/yocto-poky/meta/recipes-graphics/x11vnc/files/endian-fix.patch deleted file mode 100644 index f2a538bf6..000000000 --- a/yocto-poky/meta/recipes-graphics/x11vnc/files/endian-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -libvncserver: replace LIBVNCSERVER_WORDS_BIGENDIAN with WORDS_BIGENDIAN - -since macro AC_C_BIGENDIAN is used in autoconf and WORDS_BIGENDIAN is -automatically set for different arch, it is better to use WORDS_BIGENDIAN -instead of LIBVNCSERVER_WORDS_BIGENDIAN, which cuase issue in mips. - -Signed-off-by: Yu Ke <ke.yu@intel.com> - -Upstream-Status: Pending - -diff --git a/libvncserver/main.c b/libvncserver/main.c -index b6bd930..8bbb7bf 100644 ---- a/libvncserver/main.c -+++ b/libvncserver/main.c -@@ -47,7 +47,7 @@ static MUTEX(extMutex); - - static int rfbEnableLogging=1; - --#ifdef LIBVNCSERVER_WORDS_BIGENDIAN -+#ifdef WORDS_BIGENDIAN - char rfbEndianTest = (1==0); - #else - char rfbEndianTest = (1==1); - diff --git a/yocto-poky/meta/recipes-graphics/x11vnc/files/starting-fix.patch b/yocto-poky/meta/recipes-graphics/x11vnc/files/starting-fix.patch deleted file mode 100644 index f62e405dd..000000000 --- a/yocto-poky/meta/recipes-graphics/x11vnc/files/starting-fix.patch +++ /dev/null @@ -1,25 +0,0 @@ -"-gui" & "-rfbport" require "wish" installed, or else x11vnc fails to start. -Removing these 2 parameters makes x11vnc works well on poky sato image. - -Add also -skip_lockkeys option to ignore all Caps_Lock, Shift_Lock, Num_Lock, -Scroll_Lock keysyms received from viewers, in order to leave the lock state on -the server side unchanged. Yet, the keys will appear correctly. - -Signed-off-by: Zhai Edwin <edwin.zhai@intel.com> -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> - -Upstream-Status: Inappropriate [configuration] - -Index: x11vnc-0.9.12/x11vnc/x11vnc.desktop -=================================================================== ---- x11vnc-0.9.12.orig/x11vnc/x11vnc.desktop 2011-03-03 10:33:18.000000000 +0800 -+++ x11vnc-0.9.12/x11vnc/x11vnc.desktop 2011-03-03 10:35:20.000000000 +0800 -@@ -1,7 +1,7 @@ - [Desktop Entry] - Name=X11VNC Server - Comment=Share this desktop by VNC --Exec=x11vnc -gui tray=setpass -rfbport PROMPT -bg -o %%HOME/.x11vnc.log.%%VNCDISPLAY -+Exec=x11vnc -bg -rfbport 5900 -skip_lockkeys -o %%HOME/.x11vnc.log.%%VNCDISPLAY - Icon=computer - Terminal=false - Type=Application diff --git a/yocto-poky/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/yocto-poky/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb deleted file mode 100644 index ec0241fb2..000000000 --- a/yocto-poky/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Exports your X session on-the-fly via VNC" -HOMEPAGE = "http://www.karlrunge.com/x11vnc/" - -SECTION = "x11/utils" -AUTHOR = "Karl Runge" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=361b6b837cad26c6900a926b62aada5f \ - file://x11vnc/x11vnc.h;endline=33;md5=6f95dc6535467d7ee1563fd434fb372e" - -SRC_URI = "${SOURCEFORGE_MIRROR}/libvncserver/x11vnc/${PV}/x11vnc-${PV}.tar.gz\ - file://starting-fix.patch \ - file://endian-fix.patch " - -SRC_URI[md5sum] = "a372ec4fe8211221547b1c108cf56e4c" -SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a59f13b" - -DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst" - -inherit autotools-brokensep distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'zeroconf', 'avahi', '', d)}" -PACKAGECONFIG[avahi] = "--with-avahi,--without-avahi,avahi" -PACKAGECONFIG[xinerama] = "--with-xinerama,--without-xinerama,libxinerama" diff --git a/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch deleted file mode 100644 index cfac55c7b..000000000 --- a/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/fix_watch_cursor.patch +++ /dev/null @@ -1,17 +0,0 @@ -Fix typo in Makefile - -Upstream-Status: Pending - -Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am -=================================================================== ---- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:04.001435305 +0000 -+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:04.061435302 +0000 -@@ -79,7 +79,7 @@ - ul_angle \ - ur_angle \ - v_double_arrow \ -- watcha \ -+ watch \ - xterm - - CURSOR_DIR = $(datadir)/icons/xcursor-transparent/cursors diff --git a/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch deleted file mode 100644 index 5028fd6bf..000000000 --- a/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme-0.1.1/use-relative-symlinks.patch +++ /dev/null @@ -1,25 +0,0 @@ -Use relative symlink for link rather than absolute path which -doesn't work well in DESTDIR setting. - -Also fix out of tree builds to use correct srcdir. - -Upstream-Status: Pending - -RP 2013/3/8 - -Index: xcursor-transparent-theme-0.1.1/cursors/Makefile.am -=================================================================== ---- xcursor-transparent-theme-0.1.1.orig/cursors/Makefile.am 2013-03-07 22:25:03.933435307 +0000 -+++ xcursor-transparent-theme-0.1.1/cursors/Makefile.am 2013-03-07 22:25:27.293434755 +0000 -@@ -88,9 +88,9 @@ - - install-data-local: - $(mkinstalldirs) $(DESTDIR)$(CURSOR_DIR); -- $(INSTALL_DATA) $(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ -+ $(INSTALL_DATA) $(srcdir)/$(CURSOR_REAL) $(DESTDIR)$(CURSOR_DIR)/ - for CURSOR in $(CURSOR_NAMES); do \ - echo '-- Installing cursor '$$CURSOR; \ -- ln -s $(DESTDIR)$(CURSOR_DIR)/transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ -+ ln -s transp $(DESTDIR)$(CURSOR_DIR)/$$CURSOR; \ - done - diff --git a/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb index 5e668abd4..b871d89f9 100644 --- a/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_0.1.1.bb +++ b/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb @@ -6,14 +6,14 @@ LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" SECTION = "x11/base" -PR = "r4" -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/utils/xcursor-transparent-theme-${PV}.tar.gz \ - file://use-relative-symlinks.patch \ - file://fix_watch_cursor.patch" +SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06" +PV = "0.1.1+git${SRCPV}" -SRC_URI[md5sum] = "7b0c623049d4aab20600d6473f8aab23" -SRC_URI[sha256sum] = "b26adf2d503d01299718390ae39dab4691a67220de09423be0364e9a060bf7e4" -FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" +SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" + +S = "${WORKDIR}/git" inherit autotools allarch + +FILES_${PN} = "${datadir}/icons/xcursor-transparent/cursors/*" diff --git a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch new file mode 100644 index 000000000..9351331be --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch @@ -0,0 +1,33 @@ +Upstream-Status: Inappropriate [no longer maintained] + +From 93abf28d602da637376b78de8c88b7ab5cf13b4f Mon Sep 17 00:00:00 2001 +From: Jonathan David <jonathan.david@ni.com> +Date: Mon, 30 Nov 2015 12:12:20 -0600 +Subject: [PATCH] add geometry input when calibrating + +Send monitor geometry to xinput_calibrator when running the script + +Signed-off-by: Jonathan David <jonathan.david@ni.com> +--- + scripts/xinput_calibrator_pointercal.sh | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) + +diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh +index 0ada7da..6a3aded 100755 +--- a/scripts/xinput_calibrator_pointercal.sh ++++ b/scripts/xinput_calibrator_pointercal.sh +@@ -37,7 +37,10 @@ done + + [ "$USER" != "root" ] && CALFILE=$USER_CALFILE + +-CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` ++read RESOLUTION <<< $(xrandr | awk -F '[[:space:]+]' '/ connected/ \ ++ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }') ++ ++CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` + if [ ! -z "$CALDATA" ] ; then + echo $CALDATA > $CALFILE + echo "Calibration data stored in $CALFILE (log in $LOGFILE)" +-- +1.9.1 + diff --git a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index a9de3d7ef..ac5b70cba 100644 --- a/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -14,7 +14,8 @@ REQUIRED_DISTRO_FEATURES = "x11" SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" SRC_URI = "git://github.com/tias/xinput_calibrator.git \ file://30xinput_calibrate.sh \ - file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch" + file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \ + file://add-geometry-input-when-calibrating.patch" S = "${WORKDIR}/git" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb index 5befcc82d..25cd047bc 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.1.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-app/xinput_1.6.2.bb @@ -8,7 +8,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=881525f89f99cad39c9832bcb72e6fa5" DEPENDS += " libxi libxrandr libxinerama" - -SRC_URI[md5sum] = "305980ac78a6954e306a14d80a54c441" -SRC_URI[sha256sum] = "b7632d0f228a8a6be93b09857ea413940fcf44091e60f4a0fe9f5fd82efd871f" - +SRC_URI[md5sum] = "6a889412eff2e3c1c6bb19146f6fe84c" +SRC_URI[sha256sum] = "3694d29b4180952fbf13c6d4e59541310cbb11eef5bf888ff3d8b7f4e3aee5c4" diff --git a/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb b/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.1.bb index efac0699c..1c9835987 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-app/xkbcomp_1.3.1.bb @@ -15,5 +15,5 @@ DEPENDS += "libxkbfile" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "0012a8e3092cddf7f87b250f96bb38c5" -SRC_URI[sha256sum] = "cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a" +SRC_URI[md5sum] = "a4d8353daf6cb0a9c47379b7413c42c6" +SRC_URI[sha256sum] = "0304dc9e0d4ac10831a9ef5d5419722375ddbc3eac3ff4413094d57bc1f1923d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb index 66428df55..cf77ad209 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.2.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb @@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" DEPENDS += "mtdev libevdev" -SRC_URI[md5sum] = "99eebf171e6c7bffc42d4fc430d47454" -SRC_URI[sha256sum] = "792329b531afc6928ccda94e4b51a5520d4ddf8ef9a00890a5d0d31898acefec" +SRC_URI[md5sum] = "96d89d9406a02f5e36bdaa4edd9a243a" +SRC_URI[sha256sum] = "af9c2b47f5b272ae56b45da6bd84610fc9a3d80a4b32c8215842a39d862de017" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb new file mode 100644 index 000000000..0252baff1 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb @@ -0,0 +1,11 @@ +require xorg-driver-input.inc + +SUMMARY = "Generic input driver for the X.Org server based on libinput" +LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0" + +DEPENDS += "libinput" + +SRC_URI[md5sum] = "2c8cb520f88da7bafaceebc0b34ea1d4" +SRC_URI[sha256sum] = "fdade531e91e79acf6dce8ac55fa4f65abe3f1358c5d3d777ae48dbc74b76f49" + +FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb index 19c122fdf..b47c82cc6 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.2.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.3.bb @@ -10,9 +10,7 @@ advanced features of the touchpad to become available." LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" -SRC_URI[md5sum] = "8ed68e8cc674dd61adb280704764aafb" -SRC_URI[sha256sum] = "7b0e164ebd02a680e0c695955e783059f37edb0c2656398e0a972adc8e698c80" +SRC_URI[md5sum] = "4e3c8bed1ab4a67db2160c2c3d7e2a34" +SRC_URI[sha256sum] = "d39f100c74f3673778b53f17bab7690161925e25dd998a15dd8cc69b52e83f01" DEPENDS += "libxi mtdev libxtst libevdev" - -FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch new file mode 100644 index 000000000..35762192f --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch @@ -0,0 +1,65 @@ +From c43617b739e358064396912c7a7a8028ca91d201 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> +Date: Thu, 16 Apr 2015 20:40:39 +0300 +Subject: [PATCH] gen8: Fix the YUV->RGB shader +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Use the correct register (Yn_01) with first half of the +Y samples instead of using the register (Yn_23) with the +second half twice when computing the green channel. + +Also use the Yn_01 register name instead of Yn for the red +channel as well, just for a bit of extra consistency. + +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89807 +Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> +Tested-by: Chris Wilson <chris@chris-wilson.co.uk> + +Upstream-Status: Backport +Signed-off-by: Saul Wold <sgw@linux.intel.com> + +--- + src/render_program/exa_wm_yuv_rgb.g8a | 4 ++-- + src/render_program/exa_wm_yuv_rgb.g8b | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/render_program/exa_wm_yuv_rgb.g8a b/src/render_program/exa_wm_yuv_rgb.g8a +index 7def093..34973ba 100644 +--- a/src/render_program/exa_wm_yuv_rgb.g8a ++++ b/src/render_program/exa_wm_yuv_rgb.g8a +@@ -76,7 +76,7 @@ add (16) Cbn<1>F Cb<8,8,1>F -0.501961F { compr align1 }; + /* + * R = Y + Cr * 1.596 + */ +-mov (8) acc0<1>F Yn<8,8,1>F { compr align1 }; ++mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 }; + mac.sat(8) src_sample_r_01<1>F Crn_01<8,8,1>F 1.596F { compr align1 }; + + mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 }; +@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_23<1>F Crn_23<8,8,1>F 1.596F { compr align1 }; + /* + * G = Crn * -0.813 + Cbn * -0.392 + Y + */ +-mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 }; ++mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 }; + mac (8) acc0<1>F Crn_01<8,8,1>F -0.813F { compr align1 }; + mac.sat(8) src_sample_g_01<1>F Cbn_01<8,8,1>F -0.392F { compr align1 }; + +diff --git a/src/render_program/exa_wm_yuv_rgb.g8b b/src/render_program/exa_wm_yuv_rgb.g8b +index 4494953..2cd6fc4 100644 +--- a/src/render_program/exa_wm_yuv_rgb.g8b ++++ b/src/render_program/exa_wm_yuv_rgb.g8b +@@ -6,7 +6,7 @@ + { 0x80600048, 0x21c03ae8, 0x3e8d02c0, 0x3fcc49ba }, + { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, + { 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba }, +- { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, ++ { 0x00600001, 0x24003ae0, 0x008d0300, 0x00000000 }, + { 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 }, + { 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 }, + { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, +-- +2.5.0 + diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch new file mode 100644 index 000000000..29924bb90 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch @@ -0,0 +1,30 @@ +From 2c5063938cc809f624e56efd4673041fa8141e81 Mon Sep 17 00:00:00 2001 +From: Martin Peres <martin.peres@linux.intel.com> +Date: Thu, 9 Jul 2015 11:26:38 +0300 +Subject: [PATCH] uxa: fix the call to PixmapSyncDirtyHelper, broken by + xserver's 90db5ed + +[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie] +Signed-off-by: Martin Peres <martin.peres@linux.intel.com> + +Upstream-Status: Backport +Signed-off-by: Saul Wold <sgw@linux.intel.com> +--- + src/compat-api.h | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/compat-api.h b/src/compat-api.h +index aa93bee..293e9d7 100644 +--- a/src/compat-api.h ++++ b/src/compat-api.h +@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap) + #endif + + #endif ++ ++#if HAS_DIRTYTRACKING_ROTATION ++#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d) ++#endif +-- +2.5.0 + diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb index a2f145659..d75b44f17 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb @@ -13,6 +13,8 @@ SRC_URI += "file://disable-x11-dri3.patch \ file://always_include_xorg_server.h.patch \ file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \ file://udev-fstat.patch \ + file://0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch \ + file://0001-gen8-Fix-the-YUV-RGB-shader.patch \ " SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch deleted file mode 100644 index 41e77d3f1..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap/0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch +++ /dev/null @@ -1,31 +0,0 @@ -From fc653ca3b36435aea281ae409fb90f85e1bc0d81 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 7 Sep 2015 08:44:13 +0000 -Subject: [freedreno][PATCH] drmmode_output_dpms: Replace logical && with bitwise & - operation - -This is a mask calculation so bitbwise & should have been used - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Submitted - - src/drmmode_display.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index c3cf4f8..eb54b59 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -777,7 +777,7 @@ drmmode_output_dpms(xf86OutputPtr output, int mode) - - for (i = 0; i < koutput->count_props; i++) { - props = drmModeGetProperty(drmmode->fd, koutput->props[i]); -- if (props && (props->flags && DRM_MODE_PROP_ENUM)) { -+ if (props && (props->flags & DRM_MODE_PROP_ENUM)) { - if (!strcmp(props->name, "DPMS")) { - mode_id = koutput->props[i]; - drmModeFreeProperty(props); --- -2.5.1 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb index 76682ed57..78954497a 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.3.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.4.bb @@ -24,10 +24,8 @@ LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://COPYING;md5=10ce5de3b111315ea652a5f74ec0c602" DEPENDS += "virtual/libx11 libdrm xf86driproto" -SRC_URI += "file://0001-drmmode_output_dpms-Replace-logical-with-bitwise-ope.patch" - -SRC_URI[md5sum] = "be35daf6fa4b75092cc4a8978c437bc5" -SRC_URI[sha256sum] = "db1e0e69fd4c4c8fdca5ef2cb0447bccd7518a718495876a6904bef57b39986d" +SRC_URI[md5sum] = "a364e151a537948f75bb8c9b840a31da" +SRC_URI[sha256sum] = "a7192690b8638f5c8d611a1bae07cc13081e22edd4070f37a2f5c3f8d79e7ebc" CFLAGS += " -I${STAGING_INCDIR}/xorg " diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb index 0eeb870b3..7ebb960f1 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omapfb_git.bb @@ -13,6 +13,9 @@ SRCREV = "33e36c12dde336edbdd34626dd8adfcaebc8fbb8" PR = "${INC_PR}.7" PV = "0.1.1+gitr${SRCPV}" +# Blacklist debian-specific tags in upstream version check +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)(?!-)" + SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ file://0001-Prevents-omapfb-from-from-crashing-when-pixelclock-o.patch \ file://0001-Revert-Set-a-large-CRTC-upper-limit-to-not-prune-lar.patch \ @@ -26,7 +29,6 @@ SRC_URI = "git://anonscm.debian.org/collab-maint/xf86-video-omapfb.git \ S = "${WORKDIR}/git" -EXTRA_OECONF_armv7a = " --enable-neon " CFLAGS += " -I${STAGING_INCDIR}/xorg " # Use overlay 2 on omap3 to enable other apps to use overlay 1 (e.g. dmai or omapfbplay) diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb index 89b98eefc..8c891e6ae 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-vmware_13.1.0.bb @@ -15,4 +15,5 @@ SRC_URI[sha256sum] = "3c1d244e4b1b77e92126957965cdc9fb82de4c215c0706a3a8aaff6939 COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -EXTRA_OECONF += "--disable-vmwgfx" +PACKAGECONFIG ?= "" +PACKAGECONFIG[vmwgfx] = "--enable-vmwgfx, --disable-vmwgfx, libdrm virtual/mesa" diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 7ddd1c7da..57a4c827d 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -12,7 +12,6 @@ DEPENDS = "virtual/xserver xproto randrproto util-macros" SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" -FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" inherit autotools pkgconfig distro_features_check # depends on virtual/xserver diff --git a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc index fbec0643f..c4dba1b19 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-input.inc @@ -7,5 +7,6 @@ python add_xorg_abi_depends() { } PACKAGEFUNCS =+ "add_xorg_abi_depends" -FILES_${PN} += " ${libdir}/xorg/modules/input/*.so" -FILES_${PN}-dbg += " ${libdir}/xorg/modules/input/.debug" +FILES_${PN} += " ${libdir}/xorg/modules/input/*.so \ + ${datadir}/X11/xorg.conf.d \ + " diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb index e40ae77ab..0856c190a 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb @@ -4,28 +4,32 @@ for Xlib featuring a small footprint, latency hiding, direct access to \ the protocol, improved threading support, and extensibility." HOMEPAGE = "http://xcb.freedesktop.org" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" - -BBCLASSEXTEND = "native nativesdk" - SECTION = "x11/libs" -LICENSE = "MIT-X" -DEPENDS = "xcb-proto xproto libxau xcb-proto-native libpthread-stubs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ file://xcbincludedir.patch \ file://disable-check.patch \ file://gcc-mips-pr68302-mips-workaround.patch \ " +SRC_URI[md5sum] = "f97a65e6158775de518ac391935634c2" +SRC_URI[sha256sum] = "b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30" + +BBCLASSEXTEND = "native nativesdk" + +DEPENDS = "xcb-proto xproto libxau libpthread-stubs libxdmcp" PACKAGES_DYNAMIC = "^libxcb-.*" FILES_${PN} = "${libdir}/libxcb.so.*" -inherit autotools pkgconfig pythonnative distro_features_check +inherit autotools pkgconfig distro_features_check # The libxau and others requires x11 in DISTRO_FEATURES REQUIRED_DISTRO_FEATURES = "x11" +REQUIRED_DISTRO_FEATURES_class-native = "" python populate_packages_prepend () { do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb deleted file mode 100644 index c16270210..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb +++ /dev/null @@ -1,10 +0,0 @@ -include libxcb.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - - -DEPENDS += "libxdmcp" - -SRC_URI[md5sum] = "5a873ebd383d1a60612dd6ec6b42c781" -SRC_URI[sha256sum] = "03635d70045b9ede90778e67516135828a57de87ac508f987024f43c03620ff7" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_git.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_git.bb deleted file mode 100644 index 186636e1e..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_git.bb +++ /dev/null @@ -1,10 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -include libxcb.inc - -SRCREV = "625ed596cae6dd8175aeb6cb6f26784928042f22" -PV = "1.1.90.1+gitr${SRCPV}" -PR = "r1" - -SRC_URI = "git://anongit.freedesktop.org/git/xcb/libxcb" -S = "${WORKDIR}/git" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb index 07033a3e7..752347969 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.4.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxi_1.7.6.bb @@ -17,5 +17,5 @@ PE = "1" XORG_PN = "libXi" -SRC_URI[md5sum] = "9c4a69c34b19ec1e4212e849549544cb" -SRC_URI[sha256sum] = "2cffc2686618dc1803725636cd92b36342c512dc60a7a35cba34bf7192a42244" +SRC_URI[md5sum] = "510e555ecfffa8d2298a0f42b725e563" +SRC_URI[sha256sum] = "1f32a552cec0f056c0260bdb32e853cec0673d2f40646ce932ad5a9f0205b7ac" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb index a166b5760..de22a8197 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb @@ -12,6 +12,8 @@ SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158" SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c" +UPSTREAM_CHECK_URI = "http://xkbcommon.org/" + inherit autotools pkgconfig EXTRA_OECONF = "--disable-docs" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch index a60df5fc0..6b7c1e62a 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch @@ -11,7 +11,7 @@ problematic code in test/utils.c. Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Submitted +Upstream-Status: Backport [commit 4297e9058] --- Changes v1 -> v2: diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb index 317a568bd..553ce369b 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.6.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb @@ -7,6 +7,9 @@ including trapezoids, triangles, and rectangles." require xorg-lib-common.inc +# see http://cairographics.org/releases/ - only even minor versions are stable +UPSTREAM_CHECK_REGEX = "pixman-(?P<pver>\d+\.(\d*[02468])+(\.\d+)+)" + LICENSE = "MIT & MIT-style & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=14096c769ae0cbb5fcb94ec468be11b3 \ file://pixman/pixman-matrix.c;endline=25;md5=ba6e8769bfaaee2c41698755af04c4be \ @@ -19,13 +22,12 @@ PE = "1" IWMMXT = "--disable-arm-iwmmxt" LOONGSON_MMI = "--disable-loongson-mmi" -NEON = " --disable-arm-neon " -NEON_class-nativesdk = " --disable-arm-neon " -NEON_armv7a = " " -NEON_armv7a-vfp-neon = " " +# If target supports neon then disable the 'simd' (ie VFPv2) fallback, otherwise disable neon. +NEON = "${@bb.utils.contains("TUNE_FEATURES", "neon", "--disable-arm-simd", "--disable-arm-neon" ,d)}" EXTRA_OECONF = "--disable-gtk ${IWMMXT} ${LOONGSON_MMI} ${NEON}" EXTRA_OECONF_class-native = "--disable-gtk" +EXTRA_OECONF_class-nativesdk = "--disable-gtk" SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ @@ -34,7 +36,7 @@ SRC_URI += "\ file://0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch \ " -SRC_URI[md5sum] = "8a9e8f14743a39cf303803f369c1f344" -SRC_URI[sha256sum] = "201fc0d7d6bc0017496f2bd27b3ca14224aea0df6b624c5ee2dc0307a4ff14a4" +SRC_URI[md5sum] = "18d6b62abdb7bc0f8e6b0ddf48986b2c" +SRC_URI[sha256sum] = "5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1" REQUIRED_DISTRO_FEATURES = "" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch new file mode 100644 index 000000000..11e90940a --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image/clang.patch @@ -0,0 +1,24 @@ +Make clang happy since it squashes the control warning, ideally it will never reach that return value due to assert +but there is a chance when NDEBUG is defined + +| In file included from ../../xcb-util-image-0.4.0/image/xcb_image.c:37: +| ../../xcb-util-image-0.4.0/image/xcb_bitops.h:210:1: error: control may reach end of non-void function [-Werror,-Wreturn-type] +| } +| ^ +| 1 error generated. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending + +Index: xcb-util-image-0.4.0/image/xcb_bitops.h +=================================================================== +--- xcb-util-image-0.4.0.orig/image/xcb_bitops.h ++++ xcb-util-image-0.4.0/image/xcb_bitops.h +@@ -207,6 +207,7 @@ xcb_host_byte_order(void) { + return XCB_IMAGE_ORDER_LSB_FIRST; + } + assert(0); ++ return -1; + } + + #endif /* __XCB_BITOPS_H__ */ diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb index 91464b6c9..c6bb5a61c 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb @@ -6,5 +6,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://image/xcb_image.c;endline=24;md5=eafdf965cfb89955fdedf75054223fb4 \ file://image/xcb_image.h;beginline=4;endline=27;md5=48cd25ae55e7de525fe1e1a3a7672e1c" +SRC_URI += "file://clang.patch \ +" + SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87" -SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc"
\ No newline at end of file +SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb b/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb index f41699039..16a1f4f31 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.15.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb @@ -13,8 +13,8 @@ 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] = "4af1deeb7c5f4cad62e65957d98d6758" -SRC_URI[sha256sum] = "0e443cf7ca2f0b40846472c029647a05933fc705d611e1478c4db8a48a6f38bf" +SRC_URI[md5sum] = "bf6aa31195584cfce01b2194c3e5ea26" +SRC_URI[sha256sum] = "1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58" SECTION = "x11/libs" DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" diff --git a/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc b/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc index 09df0109c..6f4e44454 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-lib/xorg-lib-common.inc @@ -24,3 +24,4 @@ UNKNOWN_CONFIGURE_WHITELIST += "--enable-malloc0returnsnull --disable-malloc0ret " REQUIRED_DISTRO_FEATURES ?= "x11" +REQUIRED_DISTRO_FEATURES_class-native = "" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc index 2e1b57bae..8703d6391 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc @@ -9,17 +9,18 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" SECTION = "x11/libs" LICENSE = "MIT-X" -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2" +SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ + file://no-python-native.patch" -inherit autotools pkgconfig pythonnative +inherit autotools pkgconfig PACKAGES += "python-xcbgen" +FILES_${PN} = "" FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" -FILES_python-xcbgen = "${libdir}/python*" +FILES_python-xcbgen = "${libdir}/xcb-proto" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" -DEPENDS_append_class-native = " python-native" BBCLASSEXTEND = "native nativesdk" diff --git a/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch new file mode 100644 index 000000000..f808e1963 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch @@ -0,0 +1,27 @@ +Upstream uses AM_PATH_PYTHON to find a python binary and ask it where to install +libraries. This means we either need to depend on python-native (large build +dependency, early in the build) or use the host python (pythondir reflects the +host and not the target, breaks builds). + +The third option is to just hardcode the path where the module goes, as most +callers of the code use pkg-config to find where it was installed anyway. + +Upstream-Status: Inappropriate +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/configure.ac b/configure.ac +index d140bfe..c7b68da 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -14,7 +14,10 @@ if test "$XMLLINT" = "no"; then + AC_MSG_WARN([xmllint not found; unable to validate against schema.]) + fi + +-AM_PATH_PYTHON([2.5]) ++pythondir="${libdir}/xcb-proto" ++AC_SUBST(pythondir) ++PYTHON="python" ++AC_SUBST(PYTHON) + + xcbincludedir='${datadir}/xcb' + AC_SUBST(xcbincludedir) diff --git a/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb b/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb index ccf2f4b45..be3a66744 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-util/gccmakedep_1.0.3.bb @@ -14,4 +14,8 @@ PR = "r3" PE = "1" SRC_URI[md5sum] = "127ddb6131eb4a56fdf6644a63ade788" -SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548"
\ No newline at end of file +SRC_URI[sha256sum] = "f9e2e7a590e27f84b6708ab7a81e546399b949bf652fb9b95193e0e543e6a548" + +do_install_append() { + sed -i "s,--sysroot=${STAGING_DIR_TARGET},," ${D}${bindir}/gccmakedep +} diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 9881c942b..f4c5469b5 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -27,7 +27,7 @@ inherit distro_features_check REQUIRED_DISTRO_FEATURES = "x11" PROTO_DEPS = "randrproto renderproto fixesproto damageproto xextproto xproto xf86dgaproto xf86miscproto xf86vidmodeproto compositeproto recordproto resourceproto videoproto scrnsaverproto xineramaproto fontsproto kbproto inputproto bigreqsproto xcmiscproto presentproto" -LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess openssl libgcrypt" +LIB_DEPS = "pixman libxfont xtrans libxau libxext libxdmcp libdrm libxkbfile libpciaccess" DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" # Split out some modules and extensions from the main package @@ -44,8 +44,7 @@ DEPENDS = "${PROTO_DEPS} ${LIB_DEPS} font-util" # libextmod.so # libdbe.so -PACKAGES =+ "${PN}-security-policy \ - ${PN}-sdl \ +PACKAGES =+ "${PN}-sdl \ ${PN}-fbdev \ ${PN}-xvfb \ ${PN}-utils \ @@ -72,18 +71,15 @@ PACKAGES =+ "${PN}-security-policy \ SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" INSANE_SKIP_xf86-video-modesetting = "xorg-driver-abi" -RRECOMMENDS_${PN} += "${PN}-security-policy xkeyboard-config rgb xserver-xf86-config xkbcomp" +XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp" +RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" +RRECOMMENDS_${PN}-xwayland += "${XSERVER_RRECOMMENDS}" RDEPENDS_${PN}-xvfb += "xkeyboard-config" RDEPENDS_${PN}-module-exa = "${PN} (= ${EXTENDPKGV})" FILES_${PN} = "${bindir} ${libdir}/X11/Options ${libdir}/X11/Cards ${libdir}/X11/getconfig ${libdir}/X11/etc ${libdir}/modules/*.so ${libdir}/xorg/modules/*.so /etc/X11 ${libdir}/xorg/protocol.txt ${datadir}/X11/xorg.conf.d" FILES_${PN}-dev += "${libdir}/xorg/modules/*.la ${libdir}/xorg/modules/*/*.la" FILES_${PN}-doc += "${libdir}/X11/doc ${datadir}/X11/xkb/compiled/README.compiled ${localstatedir}/lib/xkb/README.compiled" -FILES_${PN}-dbg += "${libdir}/xorg/modules/.debug \ - ${libdir}/xorg/modules/*/.debug \ - ${libdir}/xorg/modules/*/*/.debug \ - " -FILES_${PN}-security-policy += "${libdir}/xserver/SecurityPolicy" FILES_${PN}-sdl = "${bindir}/Xsdl" FILES_${PN}-fbdev = "${bindir}/Xfbdev" FILES_${PN}-xvfb = "${bindir}/Xvfb" @@ -121,11 +117,12 @@ EXTRA_OECONF += "--with-fop=no \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ - --with-sha1=libcrypto \ " -PACKAGECONFIG ??= "dri2 udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ +PACKAGECONFIG ??= "dri2 udev ${XORG_CRYPTO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri glx', '', d)} \ ${@bb.utils.contains("DISTRO_FEATURES", "wayland", "xwayland", "", d)} \ + ${@bb.utils.contains("DISTRO_FEATURES", "systemd", "systemd", "", d)} \ " PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" @@ -133,14 +130,21 @@ PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86dripro PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" # DRI3 requires xshmfence to also be enabled PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" -PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtual/libgl virtual/libx11" +PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" PACKAGECONFIG[systemd-logind] = "--enable-systemd-logind=yes,--enable-systemd-logind=no,dbus," +PACKAGECONFIG[systemd] = "--with-systemd-daemon,--without-systemd-daemon,systemd" PACKAGECONFIG[xinerama] = "--enable-xinerama,--disable-xinerama,xineramaproto" PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,wayland libepoxy" +# Xorg requires a SHA1 implementation, pick one +XORG_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "--with-sha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "--with-sha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "--with-sha1=libgcrypt,,libgcrypt" + do_install_append () { # Its assumed base-files creates this for us rmdir ${D}${localstatedir}/log/ diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch deleted file mode 100644 index 21e4ed4d2..000000000 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-use-__GLIBC__-guard-for-glibc-specific-code.patch +++ /dev/null @@ -1,31 +0,0 @@ -From f242740f6488a25e6ca84968b0e2319a9a3975b4 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Apr 2015 20:52:50 -0700 -Subject: [PATCH] use __GLIBC__ guard for glibc specific code - -Using __linux__ is a tad bit wrong assumption since -linux != glibc - -Upstream-Status: Pending - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - hw/xfree86/os-support/xf86_OSlib.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/hw/xfree86/os-support/xf86_OSlib.h b/hw/xfree86/os-support/xf86_OSlib.h -index eb0a338..c366ffc 100644 ---- a/hw/xfree86/os-support/xf86_OSlib.h -+++ b/hw/xfree86/os-support/xf86_OSlib.h -@@ -178,7 +178,7 @@ - #include <sys/types.h> - #include <assert.h> - --#ifdef __linux__ -+#ifdef __GLIBC__ - #include <termio.h> - #else /* __GLIBC__ */ - #include <termios.h> --- -2.1.4 - diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch new file mode 100644 index 000000000..cd3099952 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch @@ -0,0 +1,50 @@ +From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 16 Nov 2015 16:18:40 +0200 +Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check + +REQUIRED_LIBS needs to be set to the correct systemd library, +otherwise the later check will either fail or use the wrong +pc file. + +Upstream-Status: Submitted [xorg-devel@lists.x.org] +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +--- + configure.ac | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 96c0242..f63eca1 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon], + [support systemd socket activation (default: auto)]), + [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto]) + PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], +- [HAVE_SYSTEMD_DAEMON=yes], ++ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon], + [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], +- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])]) ++ [REQUIRED_SYSTEMD_DAEMON=libsystemd], ++ [REQUIRED_SYSTEMD_DAEMON=])]) ++if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then ++ HAVE_SYSTEMD_DAEMON=no ++else ++ HAVE_SYSTEMD_DAEMON=yes ++fi ++ + if test "x$WITH_SYSTEMD_DAEMON" = xauto; then + WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON" + fi +@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then + AC_MSG_ERROR([systemd support requested but no library has been found]) + fi + AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available]) +- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon" ++ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON" + fi + AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"]) + +-- +2.1.4 + diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch new file mode 100644 index 000000000..5f186cb84 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch @@ -0,0 +1,30 @@ +From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Wed, 27 Jan 2016 11:50:13 -0500 +Subject: modesetting: Require sufficiently new libdrm + +Bugzilla: https://bugs.freedesktop.org/93883 +Signed-off-by: Adam Jackson <ajax@redhat.com> +Reviewed-by: Alex Deucher <alexander.deucher@amd.com> +Reviewed-by: Julien Cristau <jcristau@debian.org> + +Upstream-Status: Backport +Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com> + +diff --git a/configure.ac b/configure.ac +index ac3bb64..312fc69 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then + + if test "x$DRM" = xyes; then + dnl 2.4.46 is required for cursor hotspot support. +- PKG_CHECK_EXISTS(libdrm >= 2.4.46) +- XORG_DRIVER_MODESETTING=yes ++ PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no) + fi + + AC_SUBST([XORG_LIBS]) +-- +cgit v0.10.2 + diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch new file mode 100644 index 000000000..4be441fb7 --- /dev/null +++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/musl-arm-inb-outb.patch @@ -0,0 +1,18 @@ +inb/outb family for arm is only implemented on glibc +so assumption across linux is wrong + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Upstream-Status: Pending +Index: xorg-server-1.18.0/hw/xfree86/common/compiler.h +=================================================================== +--- xorg-server-1.18.0.orig/hw/xfree86/common/compiler.h ++++ xorg-server-1.18.0/hw/xfree86/common/compiler.h +@@ -758,7 +758,7 @@ inl(unsigned short port) + return xf86ReadMmio32Le((void *) ioBase, port); + } + +-#elif defined(__arm__) && defined(__linux__) ++#elif defined(__arm__) && defined(__GLIBC__) + + /* for Linux on ARM, we use the LIBC inx/outx routines */ + /* note that the appropriate setup via "ioperm" needs to be done */ diff --git a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb index 3039d303d..eb79b4046 100644 --- a/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.17.2.bb +++ b/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb @@ -1,9 +1,11 @@ require xserver-xorg.inc -SRC_URI += "file://0001-use-__GLIBC__-guard-for-glibc-specific-code.patch \ +SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \ + file://musl-arm-inb-outb.patch \ + file://modesetting_libdrm_requirements.patch \ " -SRC_URI[md5sum] = "397e405566651150490ff493e463f1ad" -SRC_URI[sha256sum] = "f61120612728f2c5034671d0ca3e2273438c60aba93b3dda4a8aa40e6a257993" +SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd" +SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb index 9b3c9e0c0..51839ddf7 100644 --- a/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb +++ b/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb @@ -4,7 +4,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ file://src/test-xvideo.c;beginline=1;endline=20;md5=6ae3b4c3c2ff9e51dbbc35bb237afa00" DEPENDS = "libxv" -SRCREV = "f8f320d0254c09ce483fc1d8ee99ecf5bc940965" +SRCREV = "7d38b881e99eb74169d292b40f7164e461a65092" PV = "0.1+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/test-xvideo" |