diff options
Diffstat (limited to 'meta/recipes-graphics')
107 files changed, 358 insertions, 1784 deletions
diff --git a/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch b/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch deleted file mode 100644 index 87297b25b4..0000000000 --- a/meta/recipes-graphics/cairo/cairo/0001-Remove-LTO-support.patch +++ /dev/null @@ -1,60 +0,0 @@ -From bdf15c249130568093676ed3b6c91f6f5e06f089 Mon Sep 17 00:00:00 2001 -From: Uli Schlachter <psychon@znc.in> -Date: Mon, 21 Jul 2014 17:10:16 +0200 -Subject: [PATCH] Remove LTO support - -This just never worked too well and caused too many issues. I don't think anyone -will miss this. - -As mentioned in the below bug report, proper LTO support also requires using -special versions of ranlib, nm and ar which support the LTO object files. -Otherwise, calling the normal ranlib on an .a library breaks the list of -exported symbols and thus completely breaks the static library. - -This (partly) reverts the following commits: - -c3645d97ebd24c6f7ad850785d585aebc706a11c configure.ac: Add a --disable-lto configure option -d486ea30f1a58640a1178de74f705a73845b1cda configure: Conditionally include -flto -0870c6fb5b39dcc04fa376123848adde2d06d2ce gcc-4.5 warnings and optimisation flags. - -(The last commit is the one which brought us -flto in the first place even -though it doesn't talk about this. It's also the one which is only reverted -partly.) - -Fixes: https://bugs.freedesktop.org/show_bug.cgi?id=77060 -CC: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Uli Schlachter <psychon@znc.in> -Reviewed-by: Bryce Harrington <b.harrington@samsung.com> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> - -Upstream-Status: Backport (will be in 1.14*) -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - build/configure.ac.warnings | 11 ----------- - 1 file changed, 11 deletions(-) - -diff --git a/build/configure.ac.warnings b/build/configure.ac.warnings -index f984eb2..2c4e34d 100644 ---- a/build/configure.ac.warnings -+++ b/build/configure.ac.warnings -@@ -35,17 +35,6 @@ MAYBE_WARN="$MAYBE_WARN -erroff=E_ENUM_TYPE_MISMATCH_ARG \ - - dnl We also abuse the warning-flag facility to enable other compiler - dnl options. Namely, the following: -- --dnl -flto working really needs a test link, not just a compile -- --safe_MAYBE_WARN="$MAYBE_WARN" --MAYBE_WARN="$MAYBE_WARN -flto" --AC_TRY_LINK([],[ -- int main(int argc, char **argv) { return 0; } --],[],[ -- MAYBE_WARN="$safe_MAYBE_WARN" --]) -- - MAYBE_WARN="$MAYBE_WARN -fno-strict-aliasing -fno-common" - - dnl Also to turn various gcc/glibc-specific preprocessor checks --- -2.0.2 - diff --git a/meta/recipes-graphics/cairo/cairo_1.12.16.bb b/meta/recipes-graphics/cairo/cairo_1.12.18.bb index 42f7682607..fd0bd8c36d 100644 --- a/meta/recipes-graphics/cairo/cairo_1.12.16.bb +++ b/meta/recipes-graphics/cairo/cairo_1.12.18.bb @@ -2,12 +2,10 @@ require cairo.inc LIC_FILES_CHKSUM = "file://COPYING;md5=e73e999e0c72b5ac9012424fa157ad77" -SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ - file://0001-Remove-LTO-support.patch \ -" +SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" -SRC_URI[md5sum] = "a1304edcdc99282f478b995ee5f8f854" -SRC_URI[sha256sum] = "2505959eb3f1de3e1841023b61585bfd35684b9733c7b6a3643f4f4cbde6d846" +SRC_URI[md5sum] = "8e4ff32b82c3b39387eb6f5c59ef848e" +SRC_URI[sha256sum] = "dc59f0b7ac945ce4e138a03c227a29260915a8b05a4226c1f6f1be586ba7f5b6" PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" diff --git a/meta/recipes-graphics/clutter/clutter-1.0.inc b/meta/recipes-graphics/clutter/clutter-1.0.inc index 77035d746f..da21cee8b5 100644 --- a/meta/recipes-graphics/clutter/clutter-1.0.inc +++ b/meta/recipes-graphics/clutter/clutter-1.0.inc @@ -2,7 +2,7 @@ SUMMARY = "Graphics library for creating hardware-accelerated user interfaces" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2.1+" -inherit clutter +inherit clutter ptest-gnome DEPENDS = "pango glib-2.0 json-glib atk udev cogl-1.0" PACKAGE_BEFORE_PN += "${PN}-examples" @@ -33,12 +33,15 @@ PACKAGECONFIG[wayland] = "--enable-wayland-backend,--disable-wayland-backend,${E PACKAGECONFIG[wayland-compositor] = "--enable-wayland-compositor,--disable-wayland-compositor,wayland" # Default configuration, distros might want to override -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)} \ +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/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch new file mode 100644 index 0000000000..80acab867c --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0/run-installed-tests-with-tap-output.patch @@ -0,0 +1,20 @@ +Configure output from installed-tests to be TAP compliant, such that gnome-desktop-testing-runner properly interprets the results. + +Upstream-status: Pending + +Signed-off-by: Tim Orling <TicoTimo@gmail.com> + +Index: clutter-1.20.0/build/autotools/glib-tap.mk +=================================================================== +--- clutter-1.20.0.orig/build/autotools/glib-tap.mk ++++ clutter-1.20.0/build/autotools/glib-tap.mk +@@ -128,7 +128,8 @@ installed_test_meta_DATA = $(installed_t + $(AM_V_GEN) (echo '[Test]' > $@.tmp; \ + echo 'Type=session' >> $@.tmp; \ + echo 'TestEnvironment=G_ENABLE_DIAGNOSTIC=0;CLUTTER_ENABLE_DIAGNOSTIC=0;' >> $@.tmp; \ +- echo 'Exec=$(installed_testdir)/$<' >> $@.tmp; \ ++ echo 'Exec=$(installed_testdir)/$< --tap' >> $@.tmp; \ ++ echo 'Output=TAP' >> $@.tmp; \ + mv $@.tmp $@) + + CLEANFILES += $(installed_test_meta_DATA) diff --git a/meta/recipes-graphics/clutter/clutter-1.0/run-ptest b/meta/recipes-graphics/clutter/clutter-1.0/run-ptest new file mode 100644 index 0000000000..98877e5226 --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0/run-ptest @@ -0,0 +1,3 @@ +#! /bin/sh + +gnome-desktop-testing-runner clutter diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb deleted file mode 100644 index 452e7eefd0..0000000000 --- a/meta/recipes-graphics/clutter/clutter-1.0_1.18.2.bb +++ /dev/null @@ -1,8 +0,0 @@ -require clutter-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "471f5ea423e20d4140c7771873daef29" -SRC_URI[archive.sha256sum] = "f9fe12e6148426063c90e67dfaeb56013bf1aea224ef502223d13eab6c1add63" - -SRC_URI += "file://install-examples.patch" diff --git a/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb b/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb new file mode 100644 index 0000000000..5f39a3a8ac --- /dev/null +++ b/meta/recipes-graphics/clutter/clutter-1.0_1.20.0.bb @@ -0,0 +1,10 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "a8a33a57a944c6d7c7c013ce9aa3222b" +SRC_URI[archive.sha256sum] = "cc940809e6e1469ce349c4bddb0cbcc2c13c087d4fc15cda9278d855ee2d1293" + +SRC_URI += "file://install-examples.patch \ + file://run-installed-tests-with-tap-output.patch \ + file://run-ptest" diff --git a/meta/recipes-graphics/cogl/cogl-1.0.inc b/meta/recipes-graphics/cogl/cogl-1.0.inc index b763dd5ba8..af06484903 100644 --- a/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -42,7 +42,7 @@ PACKAGECONFIG[gles2] = "--enable-gles2,--disable-gles2,${EDEPENDS_GLES2}, ${ERDE # EGL backends PACKAGECONFIG[egl-kms] = "--enable-kms-egl-platform,--disable-kms-egl-platform,${EDEPENDS_KMS}" PACKAGECONFIG[egl-null] = "--enable-null-egl-platform,--disable-null-egl-platform" -PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11}" +PACKAGECONFIG[egl-x11] = "--enable-xlib-egl-platform,--disable-xlib-egl-platform,${EDEPENDS_X11} ${EDEPENDS_EGL}" PACKAGECONFIG[egl-wayland] = "--enable-wayland-egl-platform,--disable-wayland-egl-platform,${EDEPENDS_WAYLAND}" # Wayland (server-side) @@ -55,7 +55,9 @@ PACKAGECONFIG[cogl-pango] = "--enable-cogl-pango,--disable-cogl-pango,pango" # default. PACKAGECONFIG ??= "cogl-pango gles2 \ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'egl-wayland', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx', '', d)}" + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'glx egl-x11', '', d)} \ + " + FILES_${PN}-examples = "${bindir}/* ${datadir}/cogl/examples-data/*" FILES_libcogl = "${libdir}/libcogl${SOLIBS}" @@ -69,18 +71,18 @@ FILES_libcogl-gles2 = "${libdir}/libcogl-gles2${SOLIBS}" FILES_libcogl-gles2-dev = "${includedir}/cogl/cogl-gles2 \ ${libdir}/libcogl-gles2${SOLIBSDEV} \ ${libdir}/libcogl-gles2.la \ - ${libdir}/pkgconfig/cogl-gles2-experimental.pc" + ${libdir}/pkgconfig/cogl-gles2-*.pc" FILES_libcogl-pango = "${libdir}/libcogl-pango${SOLIBS}" FILES_libcogl-pango-dev = "${includedir}/cogl/cogl-pango \ ${libdir}/libcogl-pango${SOLIBSDEV} \ ${libdir}/libcogl-pango.la \ - ${libdir}/pkgconfig/cogl-pango-1.0.pc" + ${libdir}/pkgconfig/cogl-pango-*.pc" FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" FILES_libcogl-path-dev = "${includedir}/cogl/cogl-path \ ${libdir}/libcogl-path${SOLIBSDEV} \ ${libdir}/libcogl-path.la \ - ${libdir}/pkgconfig/cogl-path-1.0.pc" + ${libdir}/pkgconfig/cogl-path-*.pc" # For backwards compatibility after Debian-renaming RPROVIDES_libcogl = "cogl-1.0" diff --git a/meta/recipes-graphics/directfb/directfb.inc b/meta/recipes-graphics/directfb/directfb.inc index 669c0ffd9d..13495b167d 100644 --- a/meta/recipes-graphics/directfb/directfb.inc +++ b/meta/recipes-graphics/directfb/directfb.inc @@ -9,7 +9,7 @@ LICENSE = "LGPLv2.1" LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib tslib" +DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" SRC_URI = "http://www.directfb.org/downloads/Core/DirectFB-1.7/DirectFB-${PV}.tar.gz \ file://configurefix.patch \ @@ -31,12 +31,13 @@ PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" EXTRA_OECONF = "\ --with-gfxdrivers=none \ - --enable-libmpeg3=no \ --enable-freetype=yes \ - --enable-sdl=no \ - --enable-vnc=no \ - --disable-x11 \ + --enable-zlib \ + --disable-imlib2 \ --disable-mesa \ + --disable-sdl \ + --disable-vnc \ + --disable-x11 \ " #Once -fno-omit-frame-pointer option of gcc is added into TARGET_CLFAGS as default diff --git a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch b/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch deleted file mode 100644 index 94a9ba5f02..0000000000 --- a/meta/recipes-graphics/directfb/directfb/fixsepbuild.patch +++ /dev/null @@ -1,19 +0,0 @@ -Fix out of tree builds - -Upstream-Status: Pending - -RP 2013/03/21 - -Index: DirectFB-1.6.1/configure.in -=================================================================== ---- DirectFB-1.6.1.orig/configure.in 2013-03-19 01:38:28.174004720 +0000 -+++ DirectFB-1.6.1/configure.in 2013-03-21 12:18:10.253113675 +0000 -@@ -111,7 +111,7 @@ - AC_PATH_TOOL(FLUXCOMP, fluxcomp) - AC_SUBST(FLUXCOMP) - if test -z "$FLUXCOMP"; then -- if ! test -e src/core/CoreDFB.cpp; then -+ if ! test -e $srcdir/src/core/CoreDFB.cpp; then - AC_MSG_ERROR([ - *** DirectFB compilation requires fluxcomp *** - diff --git a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch b/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch deleted file mode 100644 index 443df5a9da..0000000000 --- a/meta/recipes-graphics/directfb/directfb/rename-no-instrument-function-macro.patch +++ /dev/null @@ -1,345 +0,0 @@ -Rename __no_instrument_function__ macro to avoid conficting redefinitions -of the same symbol. - -Upstream-Status: Pending -Signed-off-by: Andrei Gherzan <andrei@gherzan.ro> - -Index: DirectFB-1.6.1/lib/direct/clock.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/clock.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/clock.c 2013-01-05 18:03:24.000000000 +0200 -@@ -36,28 +36,28 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_micros( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_SESSION ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_millis( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_SESSION ) / 1000LL; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_abs_micros( void ) - { - return direct_clock_get_time( DIRECT_CLOCK_REALTIME ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - long long - direct_clock_get_abs_millis( void ) - { -Index: DirectFB-1.6.1/lib/direct/debug.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/debug.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/debug.c 2013-01-05 18:03:49.000000000 +0200 -@@ -48,7 +48,7 @@ - - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_log( DirectLogDomain *domain, - unsigned int debug_level, /* 1-9, 0 = info */ -@@ -63,7 +63,7 @@ - va_end( ap ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_at( DirectLogDomain *domain, - const char *format, ... ) -@@ -77,7 +77,7 @@ - - #endif /* DIRECT_BUILD_DEBUGS */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_debug_at_always( DirectLogDomain *domain, - const char *format, ... ) -@@ -93,7 +93,7 @@ - - #if DIRECT_BUILD_DEBUGS /* Build with debug support? */ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_break( const char *func, - const char *file, -@@ -123,7 +123,7 @@ - direct_trap( "Break", SIGABRT ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_assertion( const char *exp, - const char *func, -@@ -144,7 +144,7 @@ - direct_trap( "Assertion", SIGTRAP ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_assumption( const char *exp, - const char *func, -Index: DirectFB-1.6.1/lib/direct/interface.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/interface.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/interface.c 2013-01-05 18:04:56.000000000 +0200 -@@ -522,7 +522,7 @@ - - /**************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static InterfaceDesc * - allocate_interface_desc( void ) - { -@@ -543,7 +543,7 @@ - return &alloc_list[alloc_count++]; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ void - fill_interface_desc( InterfaceDesc *desc, - const void *interface_ptr, -@@ -565,7 +565,7 @@ - - /**************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_dbg_interface_add( const char *func, - const char *file, -@@ -586,7 +586,7 @@ - direct_mutex_unlock( &alloc_lock ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_dbg_interface_remove( const char *func, - const char *file, -Index: DirectFB-1.6.1/lib/direct/log.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/log.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/log.c 2013-01-05 18:04:18.000000000 +0200 -@@ -128,7 +128,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_printf( DirectLog *log, - const char *format, ... ) -@@ -197,7 +197,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_log_lock( DirectLog *log ) - { -@@ -211,7 +211,7 @@ - direct_mutex_lock( &log->lock ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_log_unlock( DirectLog *log ) - { -@@ -262,7 +262,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectLog * - direct_log_default( void ) - { -Index: DirectFB-1.6.1/lib/direct/log_domain.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/log_domain.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/log_domain.c 2013-01-05 18:04:38.000000000 +0200 -@@ -69,7 +69,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ LogDomainEntry * - lookup_domain( const char *name, bool sub ); - -@@ -104,7 +104,7 @@ - return NULL; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static DirectLogLevel - check_domain( DirectLogDomain *domain ); - -@@ -207,7 +207,7 @@ - /* FIXME: merge following */ - - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_domain_vprintf( DirectLogDomain *domain, - DirectLogLevel level, -@@ -268,7 +268,7 @@ - return DR_OK; - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - direct_log_domain_log( DirectLogDomain *domain, - DirectLogLevel level, -Index: DirectFB-1.6.1/lib/direct/mem.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/mem.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/mem.c 2013-01-05 18:03:08.000000000 +0200 -@@ -121,7 +121,7 @@ - - /**********************************************************************************************************************/ - --__no_instrument_function__ -+__dfb_no_instrument_function__ - static __inline__ MemDesc * - fill_mem_desc( MemDesc *desc, int bytes, const char *func, const char *file, int line, DirectTraceBuffer *trace ) - { -Index: DirectFB-1.6.1/lib/direct/messages.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/messages.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/messages.c 2013-01-05 18:02:57.000000000 +0200 -@@ -40,7 +40,7 @@ - - #if DIRECT_BUILD_TEXT - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_info( const char *format, ... ) - { -@@ -57,7 +57,7 @@ - direct_log_printf( NULL, "(*) %s", buf ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_error( const char *format, ... ) - { -@@ -76,7 +76,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_derror( DirectResult result, const char *format, ... ) - { -@@ -95,7 +95,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_perror( int erno, const char *format, ... ) - { -@@ -114,7 +114,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_dlerror( const char *dlerr, const char *format, ... ) - { -@@ -133,7 +133,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_once( const char *func, - const char *file, -@@ -155,7 +155,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_unimplemented( const char *func, - const char *file, -@@ -166,7 +166,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_bug( const char *func, - const char *file, -@@ -188,7 +188,7 @@ - direct_trace_print_stack( NULL ); - } - --__no_instrument_function__ -+__dfb_no_instrument_function__ - void - direct_messages_warn( const char *func, - const char *file, -Index: DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/os/linux/glibc/types.h 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/os/linux/glibc/types.h 2013-01-05 18:06:04.000000000 +0200 -@@ -74,7 +74,7 @@ - - #define __inline__ inline - #define D_UNUSED __attribute__((unused)) --#define __no_instrument_function__ __attribute__((no_instrument_function)) -+#define __dfb_no_instrument_function__ __attribute__((no_instrument_function)) - #define __constructor__ __attribute__((constructor)) - #define __destructor__ __attribute__((destructor)) - #define __typeof__(x) typeof(x) -Index: DirectFB-1.6.1/lib/direct/util.c -=================================================================== ---- DirectFB-1.6.1.orig/lib/direct/util.c 2012-06-29 19:01:11.000000000 +0300 -+++ DirectFB-1.6.1/lib/direct/util.c 2013-01-05 18:03:59.000000000 +0200 -@@ -110,7 +110,7 @@ - /* - * translates errno to DirectResult - */ --__no_instrument_function__ -+__dfb_no_instrument_function__ - DirectResult - errno2result( int erno ) - { diff --git a/meta/recipes-graphics/directfb/directfb_1.7.4.bb b/meta/recipes-graphics/directfb/directfb_1.7.4.bb deleted file mode 100644 index 39b006e8b3..0000000000 --- a/meta/recipes-graphics/directfb/directfb_1.7.4.bb +++ /dev/null @@ -1,23 +0,0 @@ -require directfb.inc - -RV = "1.7-4" - -DEPENDS += "sysfsutils" - -SRC_URI += "file://fixsepbuild.patch" - -EXTRA_OECONF = "\ - --enable-freetype=yes \ - --enable-zlib \ - --with-gfxdrivers=none \ - --disable-sdl \ - --disable-vnc \ - --disable-x11 \ - --disable-imlib2 \ - --disable-mesa \ -" - -LEAD_SONAME = "libdirectfb-1.7.so.0" - -SRC_URI[md5sum] = "f5bdacde77fc653279819796ae11341e" -SRC_URI[sha256sum] = "20ccd60011c788e50c940ab566943d050679067bc84dc37ca447f1b4af08481b" diff --git a/meta/recipes-graphics/directfb/directfb_1.7.6.bb b/meta/recipes-graphics/directfb/directfb_1.7.6.bb new file mode 100644 index 0000000000..1b49112c37 --- /dev/null +++ b/meta/recipes-graphics/directfb/directfb_1.7.6.bb @@ -0,0 +1,8 @@ +require directfb.inc + +RV = "1.7-6" + +LEAD_SONAME = "libdirectfb-1.7.so.0" + +SRC_URI[md5sum] = "8a7bb06b3f58599b230b4cf314004512" +SRC_URI[sha256sum] = "44f32bacfb842ea234599532f8481fe41b5bd2310d2bd101508eb3a5df26c9e1" diff --git a/meta/recipes-graphics/drm/libdrm.inc b/meta/recipes-graphics/drm/libdrm.inc index 5ec63071ef..d3e1e92b61 100644 --- a/meta/recipes-graphics/drm/libdrm.inc +++ b/meta/recipes-graphics/drm/libdrm.inc @@ -21,8 +21,8 @@ inherit autotools pkgconfig EXTRA_OECONF += "--disable-cairo-tests \ --enable-omap-experimental-api \ - --enable-freedreno-experimental-api \ --enable-install-test-programs \ + --disable-manpages \ " ALLOW_EMPTY_${PN}-drivers = "1" PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ diff --git a/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch b/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch deleted file mode 100644 index 8eb1d5e1ea..0000000000 --- a/meta/recipes-graphics/drm/libdrm/GNU_SOURCE_definition.patch +++ /dev/null @@ -1,30 +0,0 @@ -uclibc headers need to know if _GNU_SOURCE is defined or not and its defined -in config.h so include it first to get the definition if its there fixed build -problems on uclibc - -test_decode.c:107:2: error: implicit declaration of function 'open_memstream' [-Werror=implicit-function-declaration] - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Index: libdrm-2.4.30/intel/test_decode.c -=================================================================== ---- libdrm-2.4.30.orig/intel/test_decode.c 2012-02-03 14:28:46.409355918 -0800 -+++ libdrm-2.4.30/intel/test_decode.c 2012-02-03 14:29:02.357356689 -0800 -@@ -21,6 +21,8 @@ - * IN THE SOFTWARE. - */ - -+#include "config.h" -+ - #include <string.h> - #include <stdlib.h> - #include <stdio.h> -@@ -31,7 +33,6 @@ - #include <sys/mman.h> - #include <err.h> - --#include "config.h" - #include "intel_bufmgr.h" - #include "intel_chipset.h" - diff --git a/meta/recipes-graphics/drm/libdrm/installtests.patch b/meta/recipes-graphics/drm/libdrm/installtests.patch index 7d443af663..03d6254cbd 100644 --- a/meta/recipes-graphics/drm/libdrm/installtests.patch +++ b/meta/recipes-graphics/drm/libdrm/installtests.patch @@ -18,6 +18,6 @@ index bf1987f..d909e19 100644 drmstat +check_PROGRAMS = - SUBDIRS = modeprint + SUBDIRS = modeprint proptest if HAVE_LIBKMS diff --git a/meta/recipes-graphics/drm/libdrm_2.4.54.bb b/meta/recipes-graphics/drm/libdrm_2.4.54.bb deleted file mode 100644 index 12eefc7751..0000000000 --- a/meta/recipes-graphics/drm/libdrm_2.4.54.bb +++ /dev/null @@ -1,8 +0,0 @@ -require libdrm.inc - -SRC_URI += "file://installtests.patch \ - file://GNU_SOURCE_definition.patch \ - " -SRC_URI[md5sum] = "56e98a9c2073c3fab7f95e003b657f46" -SRC_URI[sha256sum] = "d94001ebfbe80e1523d1228ee2df57294698d1c734fad9ccf53efde8932fe4e9" - diff --git a/meta/recipes-graphics/drm/libdrm_2.4.59.bb b/meta/recipes-graphics/drm/libdrm_2.4.59.bb new file mode 100644 index 0000000000..14bf44affb --- /dev/null +++ b/meta/recipes-graphics/drm/libdrm_2.4.59.bb @@ -0,0 +1,6 @@ +require libdrm.inc + +SRC_URI += "file://installtests.patch " + +SRC_URI[md5sum] = "d32a1d37c2546ee11fc5924abeedb23e" +SRC_URI[sha256sum] = "68d26e1fd85582f4243d66864f9b43ca4ee93662825de32b5506fc8e181ea41b" diff --git a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb index 18fc8938d6..3427fdf420 100644 --- a/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb +++ b/meta/recipes-graphics/eglinfo/eglinfo-x11_1.0.bb @@ -5,4 +5,8 @@ include eglinfo.inc DEPENDS += "virtual/libx11" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + SUMMARY += "(X11 version)" diff --git a/meta/recipes-graphics/freetype/freetype_2.5.3.bb b/meta/recipes-graphics/freetype/freetype_2.5.4.bb index 2c861de63a..b5f0362eb3 100644 --- a/meta/recipes-graphics/freetype/freetype_2.5.3.bb +++ b/meta/recipes-graphics/freetype/freetype_2.5.4.bb @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=c017ff17fc6f0794adf93db5559ccd56 SECTION = "libs" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2" -SRC_URI[md5sum] = "d6b60f06bfc046e43ab2a6cbfd171d65" -SRC_URI[sha256sum] = "c0848b29d52ef3ca27ad92e08351f023c5e24ce8cea7d8fe69fc96358e65f75e" +SRC_URI[md5sum] = "438585445a2f1f71c77590155fd96616" +SRC_URI[sha256sum] = "3b4e2c666b33b32ad29ff0fe5c6538e757d3c73368e5dfa88bd59b4bc95cbabb" BINCONFIG = "${bindir}/freetype-config" diff --git a/meta/recipes-graphics/fstests/fstests_git.bb b/meta/recipes-graphics/fstests/fstests_git.bb index 57ff9f6d54..95c33f410b 100644 --- a/meta/recipes-graphics/fstests/fstests_git.bb +++ b/meta/recipes-graphics/fstests/fstests_git.bb @@ -13,4 +13,6 @@ LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac S = "${WORKDIR}/git/tests" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch index a20fbfce00..70a99aeeee 100644 --- a/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch +++ b/meta/recipes-graphics/glew/glew/fix-glew.pc-install.patch @@ -39,7 +39,8 @@ Index: glew-1.11.0/glew.pc.in -Version: @version@ -Cflags: -I${includedir} @cflags@ -Libs: -L${libdir} -l@libname@ +-Requires: @requireslib@ +Version: @VERSION@ +Cflags: -I${includedir} @CFLAGS@ +Libs: -L${libdir} -lGLEW - Requires: @requireslib@ ++Requires: glu diff --git a/meta/recipes-graphics/glew/glew_1.11.0.bb b/meta/recipes-graphics/glew/glew_1.12.0.bb index 4231320dbd..eb28c4d4f3 100644 --- a/meta/recipes-graphics/glew/glew_1.11.0.bb +++ b/meta/recipes-graphics/glew/glew_1.12.0.bb @@ -15,7 +15,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://fix-glew.pc-install.patch \ " -SRC_URI[md5sum] = "f6d72c7426a5f66580ad09e50816450a" -SRC_URI[sha256sum] = "69bbce306ac281c4fa806a7a7d02c0596281a2d8f9d70690e98126f23ba513d6" +SRC_URI[md5sum] = "01246c7ecd135d99be031aa63f86dca1" +SRC_URI[sha256sum] = "af58103f4824b443e7fa4ed3af593b8edac6f3a7be3b30911edbc7344f48e4bf" -inherit autotools lib_package pkgconfig +inherit autotools lib_package pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.38.bb index 2329b2ffc8..90794c71d3 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.35.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_0.9.38.bb @@ -11,8 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ SECTION = "libs" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" -SRC_URI[md5sum] = "531ee8650626ecddcd90b2a4637e31d4" -SRC_URI[sha256sum] = "0aa1a8aba6f502321cf6fef3c9d2c73dde48389c5ed1d3615a7691944c2a06ed" +SRC_URI[md5sum] = "8839e574be8089c0de83768798bf7916" +SRC_URI[sha256sum] = "6736f383b4edfcaaeb6f3292302ca382d617d8c79948bb2dd2e8f86cdccfd514" + inherit autotools pkgconfig lib_package DEPENDS = "glib-2.0 cairo freetype" diff --git a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb index 4acac39f0d..f2eb675600 100644 --- a/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb +++ b/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb @@ -16,7 +16,9 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BP SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" PACKAGECONFIG ??= "jpeg png xft xsettings" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" diff --git a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb index e544b60eae..266bd42467 100644 --- a/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -53,8 +53,6 @@ EXTRA_OECONF = "--disable-static --enable-cdrom --enable-threads --enable-timers PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," -PARALLEL_MAKE = "" - EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" do_configure_prepend() { diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb index 38304a96a4..197f962824 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.0.3.bb @@ -42,8 +42,6 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'alsa', 'alsa', '', d)}" PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," -PARALLEL_MAKE = "" - EXTRA_AUTORECONF += "--include=acinclude --exclude=autoheader" do_configure_prepend() { diff --git a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb index d7a80305e8..670d9fcb9c 100644 --- a/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb +++ b/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb @@ -28,7 +28,9 @@ SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599 S = "${WORKDIR}/Xsettings-client-0.10" -inherit autotools gettext +inherit autotools gettext distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" do_configure_prepend() { # This package doesn't ship with its own COPYING file and diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch b/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch deleted file mode 100644 index 800bf3b559..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/configure_fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: matchbox-window-manager/configure.ac -=================================================================== ---- matchbox-window-manager.orig/configure.ac 2007-11-14 12:02:28.000000000 +0000 -+++ matchbox-window-manager/configure.ac 2007-11-14 12:18:55.000000000 +0000 -@@ -283,7 +283,7 @@ - yes) - - case "$expat" in -- yes) -+ yes|"") - EXPAT_LIBS="-lexpat" - ;; - *) diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 b/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 deleted file mode 100644 index aca7c7da45..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm/gconf-2.m4 +++ /dev/null @@ -1,39 +0,0 @@ -dnl AM_GCONF_SOURCE_2 -dnl Defines GCONF_SCHEMA_CONFIG_SOURCE which is where you should install schemas -dnl (i.e. pass to gconftool-2 -dnl Defines GCONF_SCHEMA_FILE_DIR which is a filesystem directory where -dnl you should install foo.schemas files -dnl - -AC_DEFUN([AM_GCONF_SOURCE_2], -[ - if test "x$GCONF_SCHEMA_INSTALL_SOURCE" = "x"; then - GCONF_SCHEMA_CONFIG_SOURCE=`gconftool-2 --get-default-source` - else - GCONF_SCHEMA_CONFIG_SOURCE=$GCONF_SCHEMA_INSTALL_SOURCE - fi - - AC_ARG_WITH(gconf-source, - [ --with-gconf-source=sourceaddress Config database for installing schema files.],GCONF_SCHEMA_CONFIG_SOURCE="$withval",) - - AC_SUBST(GCONF_SCHEMA_CONFIG_SOURCE) - AC_MSG_RESULT([Using config source $GCONF_SCHEMA_CONFIG_SOURCE for schema installation]) - - if test "x$GCONF_SCHEMA_FILE_DIR" = "x"; then - GCONF_SCHEMA_FILE_DIR='$(sysconfdir)/gconf/schemas' - fi - - AC_ARG_WITH(gconf-schema-file-dir, - [ --with-gconf-schema-file-dir=dir Directory for installing schema files.],GCONF_SCHEMA_FILE_DIR="$withval",) - - AC_SUBST(GCONF_SCHEMA_FILE_DIR) - AC_MSG_RESULT([Using $GCONF_SCHEMA_FILE_DIR as install directory for schema files]) - - AC_ARG_ENABLE(schemas-install, - [ --disable-schemas-install Disable the schemas installation], - [case ${enableval} in - yes|no) ;; - *) AC_MSG_ERROR(bad value ${enableval} for --enable-schemas-install) ;; - esac]) - AM_CONDITIONAL([GCONF_SCHEMAS_INSTALL], [test "$enable_schemas_install" != no]) -]) diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb deleted file mode 100644 index 8ee42c34b0..0000000000 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.bb +++ /dev/null @@ -1,39 +0,0 @@ -SUMMARY = "Matchbox lightweight window manager" -SECTION = "x11/wm" -LICENSE = "GPLv2.0+" -DEPENDS = "libmatchbox virtual/libx11 libxext libxcomposite libxfixes libxcursor xdamage libxrender startup-notification expat" -PR = "r5" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/${PV}/matchbox-window-manager-${PV}.tar.bz2 \ - file://configure_fix.patch \ - file://kbdconfig \ - file://gconf-2.m4" - -SRC_URI[md5sum] = "3e158dcf57823b55c926d95b245500fb" -SRC_URI[sha256sum] = "81a23a4af797cf350759fd5ac738797015a66dd5dba2f3d9f3c6908506c1ceff" - -S = "${WORKDIR}/matchbox-window-manager-${PV}" - -inherit autotools pkgconfig - -FILES_${PN} = "${bindir}/* \ - ${datadir}/matchbox \ - ${sysconfdir}/matchbox \ - ${datadir}/themes/blondie/matchbox \ - ${datadir}/themes/Default/matchbox \ - ${datadir}/themes/MBOpus/matchbox" - -EXTRA_OECONF = " --enable-startup-notification \ - --disable-xrm \ - --enable-expat \ - --with-expat-lib=${STAGING_LIBDIR} \ - --with-expat-includes=${STAGING_INCDIR}" - - -do_configure_prepend () { - cp ${WORKDIR}/gconf-2.m4 ${S}/ -} - -do_install_prepend() { - install ${WORKDIR}/kbdconfig ${S}/data/kbdconfig -} diff --git a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb index 154b967d2c..422d255951 100644 --- a/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +++ b/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb @@ -18,7 +18,9 @@ SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ S = "${WORKDIR}/git" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" FILES_${PN} = "${bindir}/* \ ${datadir}/matchbox \ diff --git a/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch b/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch deleted file mode 100644 index 74a04074ec..0000000000 --- a/meta/recipes-graphics/menu-cache/files/Fix-segfault.patch +++ /dev/null @@ -1,31 +0,0 @@ -From a497ea6aae3994b7f6527ef7599dd95baf2ad841 Mon Sep 17 00:00:00 2001 -From: Laurentiu Palcu <laurentiu.palcu@intel.com> -Date: Mon, 29 Apr 2013 12:04:20 +0300 -Subject: [PATCH] Fix segfault - -Apparently, g_io_channel_unref() was called twice: once in the -menu-cache's on_client_closed() callback and once from the finalize -function, g_io_unix_finalize()/g_io_win32_finalize(), which is called -anyway when the source is removed. - -Upstream-Status: Pending -Signed-off-by: Laurentiu Palcu <laurentiu.palcu@intel.com> ---- - menu-cache-daemon/menu-cached.c | 1 - - 1 file changed, 1 deletion(-) - -diff --git a/menu-cache-daemon/menu-cached.c b/menu-cache-daemon/menu-cached.c -index e246bb4..a10b6db 100644 ---- a/menu-cache-daemon/menu-cached.c -+++ b/menu-cache-daemon/menu-cached.c -@@ -579,7 +579,6 @@ static void on_client_closed(gpointer user_data) - } - } - /* DEBUG("client closed"); */ -- g_io_channel_unref(ch); - } - - static gboolean on_client_data_in(GIOChannel* ch, GIOCondition cond, gpointer user_data) --- -1.7.9.5 - diff --git a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb b/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb deleted file mode 100644 index 98bbe76412..0000000000 --- a/meta/recipes-graphics/menu-cache/menu-cache_0.4.1.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Library for caching application menus" -DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus" -HOMEPAGE = "http://lxde.sourceforge.net/" - -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://libmenu-cache/menu-cache.h;endline=29;md5=26571532593adb17a37eac396260532c \ - file://menu-cache-daemon/menu-cached.c;endline=22;md5=fcecb7d315c57ef804103fa9cdab7111" - -SECTION = "x11/libs" -DEPENDS = "glib-2.0 zlib" - -SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.gz \ - file://Fix-segfault.patch \ - " - -SRC_URI[md5sum] = "20fed982f5d8e6ec8a56a5b48894ecf0" -SRC_URI[sha256sum] = "4fa9408e353fedba5b7314cbf6b6cd06d873a1424e281aa050d88bb9c0a0191e" - - -inherit autotools pkgconfig gtk-doc diff --git a/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb b/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb new file mode 100644 index 0000000000..ab909f7361 --- /dev/null +++ b/meta/recipes-graphics/menu-cache/menu-cache_1.0.0.bb @@ -0,0 +1,16 @@ +SUMMARY = "Library for caching application menus" +DESCRIPTION = "A library creating and utilizing caches to speed up freedesktop.org application menus" +HOMEPAGE = "http://lxde.sourceforge.net/" + +LICENSE = "LGPLv2.1+" +LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" + +SECTION = "x11/libs" +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" + +inherit autotools gettext pkgconfig gtk-doc diff --git a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch index e02f1ab4ec..4b07193a7f 100644 --- a/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch +++ b/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch @@ -95,11 +95,16 @@ diff --git a/src/Makefile.am b/src/Makefile.am index 1647d64..754c47c 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -23,14 +23,13 @@ +@@ -23,14 +23,18 @@ # Eric Anholt <eric@anholt.net> ++if HAVE_GLEW ++UTIL = util ++endif ++ SUBDIRS = \ - util \ ++ $(UTIL) \ data \ demos \ egl \ @@ -111,7 +116,7 @@ index 1647d64..754c47c 100644 objviewer \ osdemos \ perf \ -@@ -40,8 +39,13 @@ SUBDIRS = \ +@@ -40,8 +39,12 @@ SUBDIRS = \ slang \ tests \ tools \ @@ -125,7 +130,6 @@ index 1647d64..754c47c 100644 +SUBDIRS += \ + vp \ + vpglsl \ -+ util \ + trivial +endif diff --git a/src/demos/Makefile.am b/src/demos/Makefile.am diff --git a/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb b/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb index 2acc21dce5..2acc21dce5 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_10.1.3.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_10.4.4.bb diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 1857f3c220..97ed02ff34 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc @@ -59,12 +59,11 @@ GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" -PACKAGECONFIG[gallium-egl] = "--enable-gallium-egl, --disable-gallium-egl" -PACKAGECONFIG[gallium-gbm] = "--enable-gallium-gbm, --disable-gallium-gbm" MESA_LLVM_RELEASE ?= "3.3" -PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --with-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ +PACKAGECONFIG[gallium-llvm] = "--enable-gallium-llvm --enable-llvm-shared-libs, --disable-gallium-llvm, llvm${MESA_LLVM_RELEASE} \ ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" +PACKAGECONFIG[xa] = "--enable-xa, --disable-xa" # llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" @@ -84,9 +83,9 @@ PACKAGES =+ "libegl-mesa libegl-mesa-dev \ libgles2-mesa libgles2-mesa-dev \ libgles3-mesa libgles3-mesa-dev \ libwayland-egl libwayland-egl-dev \ - libegl-gallium libgbm-gallium \ libopenvg libopenvg-dev \ libxvmcsoftpipe libxvmcsoftpipe-dev \ + libxatracker libxatracker-dev \ mesa-megadriver \ " @@ -167,10 +166,9 @@ FILES_libgl-mesa = "${libdir}/libGL.so.*" FILES_libglapi = "${libdir}/libglapi.so.*" FILES_libosmesa = "${libdir}/libOSMesa.so.*" FILES_libwayland-egl = "${libdir}/libwayland-egl.so.*" -FILES_libegl-gallium = "${libdir}/egl/egl_gallium.so*" -FILES_libgbm-gallium = "${libdir}/gbm/gbm_gallium_drm.so*" FILES_libopenvg = "${libdir}/libOpenVG.so.*" FILES_libxvmcsoftpipe = "${libdir}/libXvMCsoftpipe.so.*" +FILES_libxatracker = "${libdir}/libxatracker.so.*" FILES_${PN}-dev = "${libdir}/pkgconfig/dri.pc" FILES_libegl-mesa-dev = "${libdir}/libEGL.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" @@ -185,5 +183,8 @@ FILES_libwayland-egl-dev = "${libdir}/pkgconfig/wayland-egl.pc ${libdir}/libwayl FILES_libopenvg-dev = "${libdir}/libOpenVG.so ${libdir}/libOpenVG.la* \ ${includedir}/VG ${libdir}/pkgconfig/vg.pc" FILES_libxvmcsoftpipe-dev = "${libdir}/libXvMCsoftpipe.so ${libdir}/libXvMCsoftpipe.la" +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/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch b/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch deleted file mode 100644 index 2df5e61d21..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch +++ /dev/null @@ -1,52 +0,0 @@ -From debac5531f7107d239530ff6e29eeda72b9ec1e9 Mon Sep 17 00:00:00 2001 -From: Martin Jansa <Martin.Jansa@gmail.com> -Date: Sat, 29 Jun 2013 11:20:51 +0200 -Subject: [PATCH 2/4] pipe_loader_sw: include xlib_sw_winsys.h only when - HAVE_PIPE_LOADER_XLIB - -* HAVE_WINSYS_XLIB was removed in - commit b3f1f665b0fef178ae193e6b111f14c9a5ad3b25 - Author: Matt Turner <mattst88@gmail.com> - Date: Sun Jan 20 15:32:08 2013 -0800 - build: Get rid of GALLIUM_WINSYS_DIRS - -* HAVE_PIPE_LOADER_XLIB is set correctly: - if test "x$NEED_WINSYS_XLIB" = xyes; then - GALLIUM_PIPE_LOADER_DEFINES="$GALLIUM_PIPE_LOADER_DEFINES -DHAVE_PIPE_LOADER_XLIB" - GALLIUM_PIPE_LOADER_LIBS="$GALLIUM_PIPE_LOADER_LIBS \$(top_builddir)/src/gallium/winsys/sw/xlib/libws_xlib.la" - fi - -* fixes build of pipe_loader_sw without libx11 headers available - -Upstream-Status: Submitted https://bugs.freedesktop.org/show_bug.cgi?id=66357 -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c | 4 +++- - 1 file changed, 3 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -index c2b78c6..0da3f4d 100644 ---- a/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -+++ b/src/gallium/auxiliary/pipe-loader/pipe_loader_sw.c -@@ -31,7 +31,9 @@ - #include "util/u_dl.h" - #include "sw/null/null_sw_winsys.h" - #include "target-helpers/inline_sw_helper.h" -+#ifdef HAVE_PIPE_LOADER_XLIB - #include "state_tracker/xlib_sw_winsys.h" -+#endif - - struct pipe_loader_sw_device { - struct pipe_loader_device base; -@@ -44,7 +46,7 @@ struct pipe_loader_sw_device { - static struct pipe_loader_ops pipe_loader_sw_ops; - - static struct sw_winsys *(*backends[])() = { --#ifdef HAVE_WINSYS_XLIB -+#ifdef HAVE_PIPE_LOADER_XLIB - x11_sw_create, - #endif - null_sw_create --- -1.8.2.1 - diff --git a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch b/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch deleted file mode 100644 index 30a3d98758..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch +++ /dev/null @@ -1,362 +0,0 @@ -From 06c1ba29de8a26fffb73ee99f0fc54c704e9fee4 Mon Sep 17 00:00:00 2001 -From: Daniel Stone <daniel@fooishbar.org> -Date: Fri, 24 May 2013 17:20:27 +0100 -Subject: [PATCH 3/5] EGL: Mutate NativeDisplayType depending on config - -If we go through ./configure without enabling X11 anywhere, then set the -fallback types for EGL NativeDisplay and friends, rather than assuming -X11/Xlib. - -Upstream-Status: Backport (slightly different solution was applied in master -https://bugs.freedesktop.org/show_bug.cgi?id=64959) - -Signed-off-by: Daniel Stone <daniel@fooishbar.org> -Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> ---- - configure.ac | 9 +++ - include/EGL/eglplatform.h | 146 ------------------------------------------- - include/EGL/eglplatform.h.in | 146 +++++++++++++++++++++++++++++++++++++++++++ - 3 files changed, 155 insertions(+), 146 deletions(-) - delete mode 100644 include/EGL/eglplatform.h - create mode 100644 include/EGL/eglplatform.h.in - -diff --git a/configure.ac b/configure.ac -index 2b4a374..d4c7a95 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1565,12 +1565,20 @@ fi - - EGL_PLATFORMS="$egl_platforms" - -+if echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1; then -+ MESA_EGL_NO_X11_HEADERS=0 -+else -+ MESA_EGL_NO_X11_HEADERS=1 -+fi -+ - AM_CONDITIONAL(HAVE_EGL_PLATFORM_X11, echo "$egl_platforms" | grep 'x11' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_WAYLAND, echo "$egl_platforms" | grep 'wayland' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_DRM, echo "$egl_platforms" | grep 'drm' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_FBDEV, echo "$egl_platforms" | grep 'fbdev' >/dev/null 2>&1) - AM_CONDITIONAL(HAVE_EGL_PLATFORM_NULL, echo "$egl_platforms" | grep 'null' >/dev/null 2>&1) - -+AC_SUBST([MESA_EGL_NO_X11_HEADERS]) -+ - AM_CONDITIONAL(HAVE_EGL_DRIVER_DRI2, test "x$HAVE_EGL_DRIVER_DRI2" != "x") - AM_CONDITIONAL(HAVE_EGL_DRIVER_GLX, test "x$HAVE_EGL_DRIVER_GLX" != "x") - -@@ -2042,6 +2050,7 @@ CXXFLAGS="$CXXFLAGS $USER_CXXFLAGS" - - dnl Substitute the config - AC_CONFIG_FILES([Makefile -+ include/EGL/eglplatform.h - src/Makefile - src/egl/Makefile - src/egl/drivers/Makefile -diff --git a/include/EGL/eglplatform.h b/include/EGL/eglplatform.h -deleted file mode 100644 -index 17fdc61..0000000 ---- a/include/EGL/eglplatform.h -+++ /dev/null -@@ -1,146 +0,0 @@ --#ifndef __eglplatform_h_ --#define __eglplatform_h_ -- --/* --** Copyright (c) 2007-2009 The Khronos Group Inc. --** --** Permission is hereby granted, free of charge, to any person obtaining a --** copy of this software and/or associated documentation files (the --** "Materials"), to deal in the Materials without restriction, including --** without limitation the rights to use, copy, modify, merge, publish, --** distribute, sublicense, and/or sell copies of the Materials, and to --** permit persons to whom the Materials are furnished to do so, subject to --** the following conditions: --** --** The above copyright notice and this permission notice shall be included --** in all copies or substantial portions of the Materials. --** --** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, --** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF --** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. --** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY --** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, --** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE --** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. --*/ -- --/* Platform-specific types and definitions for egl.h -- * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -- * -- * Adopters may modify khrplatform.h and this file to suit their platform. -- * You are encouraged to submit all modifications to the Khronos group so that -- * they can be included in future versions of this file. Please submit changes -- * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -- * by filing a bug against product "EGL" component "Registry". -- */ -- --#include <KHR/khrplatform.h> -- --/* Macros used in EGL function prototype declarations. -- * -- * EGL functions should be prototyped as: -- * -- * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -- * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -- * -- * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -- */ -- --#ifndef EGLAPI --#define EGLAPI KHRONOS_APICALL --#endif -- --#ifndef EGLAPIENTRY --#define EGLAPIENTRY KHRONOS_APIENTRY --#endif --#define EGLAPIENTRYP EGLAPIENTRY* -- --/* The types NativeDisplayType, NativeWindowType, and NativePixmapType -- * are aliases of window-system-dependent types, such as X Display * or -- * Windows Device Context. They must be defined in platform-specific -- * code below. The EGL-prefixed versions of Native*Type are the same -- * types, renamed in EGL 1.3 so all types in the API start with "EGL". -- * -- * Khronos STRONGLY RECOMMENDS that you use the default definitions -- * provided below, since these changes affect both binary and source -- * portability of applications using EGL running on different EGL -- * implementations. -- */ -- --#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ --#ifndef WIN32_LEAN_AND_MEAN --#define WIN32_LEAN_AND_MEAN 1 --#endif --#include <windows.h> -- --typedef HDC EGLNativeDisplayType; --typedef HBITMAP EGLNativePixmapType; --typedef HWND EGLNativeWindowType; -- --#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ -- --typedef int EGLNativeDisplayType; --typedef void *EGLNativeWindowType; --typedef void *EGLNativePixmapType; -- --#elif defined(WL_EGL_PLATFORM) -- --typedef struct wl_display *EGLNativeDisplayType; --typedef struct wl_egl_pixmap *EGLNativePixmapType; --typedef struct wl_egl_window *EGLNativeWindowType; -- --#elif defined(__GBM__) -- --typedef struct gbm_device *EGLNativeDisplayType; --typedef struct gbm_bo *EGLNativePixmapType; --typedef void *EGLNativeWindowType; -- --#elif defined(ANDROID) /* Android */ -- --struct ANativeWindow; --struct egl_native_pixmap_t; -- --typedef struct ANativeWindow *EGLNativeWindowType; --typedef struct egl_native_pixmap_t *EGLNativePixmapType; --typedef void *EGLNativeDisplayType; -- --#elif defined(__unix__) -- --#ifdef MESA_EGL_NO_X11_HEADERS -- --typedef void *EGLNativeDisplayType; --typedef khronos_uint32_t EGLNativePixmapType; --typedef khronos_uint32_t EGLNativeWindowType; -- --#else -- --/* X11 (tentative) */ --#include <X11/Xlib.h> --#include <X11/Xutil.h> -- --typedef Display *EGLNativeDisplayType; --typedef Pixmap EGLNativePixmapType; --typedef Window EGLNativeWindowType; -- --#endif /* MESA_EGL_NO_X11_HEADERS */ -- --#else --#error "Platform not recognized" --#endif -- --/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ --typedef EGLNativeDisplayType NativeDisplayType; --typedef EGLNativePixmapType NativePixmapType; --typedef EGLNativeWindowType NativeWindowType; -- -- --/* Define EGLint. This must be a signed integral type large enough to contain -- * all legal attribute names and values passed into and out of EGL, whether -- * their type is boolean, bitmask, enumerant (symbolic constant), integer, -- * handle, or other. While in general a 32-bit integer will suffice, if -- * handles are 64 bit types, then EGLint should be defined as a signed 64-bit -- * integer type. -- */ --typedef khronos_int32_t EGLint; -- --#endif /* __eglplatform_h */ -diff --git a/include/EGL/eglplatform.h.in b/include/EGL/eglplatform.h.in -new file mode 100644 -index 0000000..5126c92 ---- /dev/null -+++ b/include/EGL/eglplatform.h.in -@@ -0,0 +1,146 @@ -+#ifndef __eglplatform_h_ -+#define __eglplatform_h_ -+ -+/* -+** Copyright (c) 2007-2009 The Khronos Group Inc. -+** -+** Permission is hereby granted, free of charge, to any person obtaining a -+** copy of this software and/or associated documentation files (the -+** "Materials"), to deal in the Materials without restriction, including -+** without limitation the rights to use, copy, modify, merge, publish, -+** distribute, sublicense, and/or sell copies of the Materials, and to -+** permit persons to whom the Materials are furnished to do so, subject to -+** the following conditions: -+** -+** The above copyright notice and this permission notice shall be included -+** in all copies or substantial portions of the Materials. -+** -+** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -+** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -+** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -+** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -+** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -+** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -+** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -+*/ -+ -+/* Platform-specific types and definitions for egl.h -+ * $Revision: 12306 $ on $Date: 2010-08-25 09:51:28 -0700 (Wed, 25 Aug 2010) $ -+ * -+ * Adopters may modify khrplatform.h and this file to suit their platform. -+ * You are encouraged to submit all modifications to the Khronos group so that -+ * they can be included in future versions of this file. Please submit changes -+ * by sending them to the public Khronos Bugzilla (http://khronos.org/bugzilla) -+ * by filing a bug against product "EGL" component "Registry". -+ */ -+ -+#include <KHR/khrplatform.h> -+ -+/* Macros used in EGL function prototype declarations. -+ * -+ * EGL functions should be prototyped as: -+ * -+ * EGLAPI return-type EGLAPIENTRY eglFunction(arguments); -+ * typedef return-type (EXPAPIENTRYP PFNEGLFUNCTIONPROC) (arguments); -+ * -+ * KHRONOS_APICALL and KHRONOS_APIENTRY are defined in KHR/khrplatform.h -+ */ -+ -+#ifndef EGLAPI -+#define EGLAPI KHRONOS_APICALL -+#endif -+ -+#ifndef EGLAPIENTRY -+#define EGLAPIENTRY KHRONOS_APIENTRY -+#endif -+#define EGLAPIENTRYP EGLAPIENTRY* -+ -+/* The types NativeDisplayType, NativeWindowType, and NativePixmapType -+ * are aliases of window-system-dependent types, such as X Display * or -+ * Windows Device Context. They must be defined in platform-specific -+ * code below. The EGL-prefixed versions of Native*Type are the same -+ * types, renamed in EGL 1.3 so all types in the API start with "EGL". -+ * -+ * Khronos STRONGLY RECOMMENDS that you use the default definitions -+ * provided below, since these changes affect both binary and source -+ * portability of applications using EGL running on different EGL -+ * implementations. -+ */ -+ -+#if defined(_WIN32) || defined(__VC32__) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) /* Win32 and WinCE */ -+#ifndef WIN32_LEAN_AND_MEAN -+#define WIN32_LEAN_AND_MEAN 1 -+#endif -+#include <windows.h> -+ -+typedef HDC EGLNativeDisplayType; -+typedef HBITMAP EGLNativePixmapType; -+typedef HWND EGLNativeWindowType; -+ -+#elif defined(__WINSCW__) || defined(__SYMBIAN32__) /* Symbian */ -+ -+typedef int EGLNativeDisplayType; -+typedef void *EGLNativeWindowType; -+typedef void *EGLNativePixmapType; -+ -+#elif defined(WL_EGL_PLATFORM) -+ -+typedef struct wl_display *EGLNativeDisplayType; -+typedef struct wl_egl_pixmap *EGLNativePixmapType; -+typedef struct wl_egl_window *EGLNativeWindowType; -+ -+#elif defined(__GBM__) -+ -+typedef struct gbm_device *EGLNativeDisplayType; -+typedef struct gbm_bo *EGLNativePixmapType; -+typedef void *EGLNativeWindowType; -+ -+#elif defined(ANDROID) /* Android */ -+ -+struct ANativeWindow; -+struct egl_native_pixmap_t; -+ -+typedef struct ANativeWindow *EGLNativeWindowType; -+typedef struct egl_native_pixmap_t *EGLNativePixmapType; -+typedef void *EGLNativeDisplayType; -+ -+#elif defined(__unix__) -+ -+#if @MESA_EGL_NO_X11_HEADERS@ -+ -+typedef void *EGLNativeDisplayType; -+typedef khronos_uint32_t EGLNativePixmapType; -+typedef khronos_uint32_t EGLNativeWindowType; -+ -+#else -+ -+/* X11 (tentative) */ -+#include <X11/Xlib.h> -+#include <X11/Xutil.h> -+ -+typedef Display *EGLNativeDisplayType; -+typedef Pixmap EGLNativePixmapType; -+typedef Window EGLNativeWindowType; -+ -+#endif /* MESA_EGL_NO_X11_HEADERS */ -+ -+#else -+#error "Platform not recognized" -+#endif -+ -+/* EGL 1.2 types, renamed for consistency in EGL 1.3 */ -+typedef EGLNativeDisplayType NativeDisplayType; -+typedef EGLNativePixmapType NativePixmapType; -+typedef EGLNativeWindowType NativeWindowType; -+ -+ -+/* Define EGLint. This must be a signed integral type large enough to contain -+ * all legal attribute names and values passed into and out of EGL, whether -+ * their type is boolean, bitmask, enumerant (symbolic constant), integer, -+ * handle, or other. While in general a 32-bit integer will suffice, if -+ * handles are 64 bit types, then EGLint should be defined as a signed 64-bit -+ * integer type. -+ */ -+typedef khronos_int32_t EGLint; -+ -+#endif /* __eglplatform_h */ --- -1.8.2.1 - diff --git a/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch b/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch deleted file mode 100644 index 88a4fb0636..0000000000 --- a/meta/recipes-graphics/mesa/mesa/0006-fix-out-of-tree-egl.patch +++ /dev/null @@ -1,48 +0,0 @@ -Fix out of tree compilation failure due to -0003-EGL-Mutate-NativeDisplayType-depending-on-config.patch. - -Upstream-Status: Inappropriate (upstream has different solution to root problem) -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/src/egl/drivers/dri2/Makefile.am b/src/egl/drivers/dri2/Makefile.am -index 45f7dfa..ed0e777 100644 ---- a/src/egl/drivers/dri2/Makefile.am -+++ b/src/egl/drivers/dri2/Makefile.am -@@ -21,6 +21,7 @@ - - AM_CFLAGS = \ - -I$(top_srcdir)/include \ -+ -I$(top_builddir)/include \ - -I$(top_srcdir)/src/egl/main \ - -I$(top_srcdir)/src/gbm/main \ - -I$(top_srcdir)/src/gbm/backends/dri \ -diff --git a/src/egl/drivers/glx/Makefile.am b/src/egl/drivers/glx/Makefile.am -index 6bf67ea..7b87047 100644 ---- a/src/egl/drivers/glx/Makefile.am -+++ b/src/egl/drivers/glx/Makefile.am -@@ -21,6 +21,7 @@ - - AM_CFLAGS = \ - -I$(top_srcdir)/include \ -+ -I$(top_builddir)/include \ - -I$(top_srcdir)/src/egl/main \ - $(X11_CFLAGS) \ - $(DEFINES) -diff --git a/src/egl/main/Makefile.am b/src/egl/main/Makefile.am -index ca5257a..13a5734 100644 ---- a/src/egl/main/Makefile.am -+++ b/src/egl/main/Makefile.am -@@ -27,6 +27,7 @@ endif - - AM_CFLAGS = \ - -I$(top_srcdir)/include \ -+ -I$(top_builddir)/include \ - -I$(top_srcdir)/src/gbm/main \ - $(DEFINES) \ - $(EGL_CFLAGS) \ -@@ -135,4 +136,4 @@ egl_HEADERS = \ - $(top_srcdir)/include/EGL/eglext.h \ - $(top_srcdir)/include/EGL/egl.h \ - $(top_srcdir)/include/EGL/eglmesaext.h \ -- $(top_srcdir)/include/EGL/eglplatform.h -+ $(top_builddir)/include/EGL/eglplatform.h diff --git a/meta/recipes-graphics/mesa/mesa_10.1.3.bb b/meta/recipes-graphics/mesa/mesa_10.4.4.bb index abc450a9c5..8140411752 100644 --- a/meta/recipes-graphics/mesa/mesa_10.1.3.bb +++ b/meta/recipes-graphics/mesa/mesa_10.4.4.bb @@ -1,12 +1,9 @@ require ${BPN}.inc -SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2 \ - file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ - file://0006-fix-out-of-tree-egl.patch \ - " +SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/MesaLib-${PV}.tar.bz2" -SRC_URI[md5sum] = "ba6dbe2b9cab0b4de840c996b9b6a3ad" -SRC_URI[sha256sum] = "b2615e236ef25d0fb94b8420bdd2e2a520b7dd5ca2d4b93306154f7fd4adecc3" +SRC_URI[md5sum] = "62faf98ac79c5587f8e917e187419e6c" +SRC_URI[sha256sum] = "f18a967e9c4d80e054b2fdff8c130ce6e6d1f8eecfc42c9f354f8628d8b4df1c" S = "${WORKDIR}/Mesa-${PV}" diff --git a/meta/recipes-graphics/mesa/mesa_git.bb b/meta/recipes-graphics/mesa/mesa_git.bb index 59b0d1cdeb..cbe891118d 100644 --- a/meta/recipes-graphics/mesa/mesa_git.bb +++ b/meta/recipes-graphics/mesa/mesa_git.bb @@ -2,16 +2,10 @@ require ${BPN}.inc DEFAULT_PREFERENCE = "-1" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=f69a4626e9efc40fa0d3cc3b02c9eacf" +SRCREV = "62eb27ac8bbd979796f50e253f6c786d7d791242" +PV = "10.4.4+git${SRCPV}" -PR = "${INC_PR}.0" -SRCREV = "0028eb1083e6adc110a23a5f02c993cda217067a" -PV = "10.1.3+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa \ - file://0002-pipe_loader_sw-include-xlib_sw_winsys.h-only-when-HA.patch \ - file://0006-fix-out-of-tree-egl.patch \ - " +SRC_URI = "git://anongit.freedesktop.org/git/mesa/mesa;branch=10.4" S = "${WORKDIR}/git" diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index 2eff3713bc..17301a0527 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb @@ -3,7 +3,9 @@ DESCRIPTION = "Packages required to set up a basic working X11 session" LICENSE = "MIT" PR = "r1" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on matchbox-wm +REQUIRED_DISTRO_FEATURES = "x11" RDEPENDS_${PN} = "\ packagegroup-core-x11-xserver \ diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb index 2d68e97383..c53f1b758d 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb @@ -8,7 +8,9 @@ PR = "r40" PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on XSERVER +REQUIRED_DISTRO_FEATURES = "x11" XSERVER ?= "xserver-xorg xf86-video-fbdev xf86-input-evdev" XSERVERCODECS ?= "" diff --git a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index fde5144b46..3537d8cbba 100644 --- a/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -5,7 +5,9 @@ LICENSE = "MIT" PR = "r40" -inherit packagegroup +inherit packagegroup distro_features_check +# rdepends on x11-common +REQUIRED_DISTRO_FEATURES = "x11" PACKAGES = "${PN} ${PN}-utils" diff --git a/meta/recipes-graphics/pango/pango_1.36.6.bb b/meta/recipes-graphics/pango/pango_1.36.8.bb index 61ae359e93..4605c768a5 100644 --- a/meta/recipes-graphics/pango/pango_1.36.6.bb +++ b/meta/recipes-graphics/pango/pango_1.36.8.bb @@ -8,5 +8,5 @@ SRC_URI += "file://run-ptest \ file://multilib-fix-clean.patch \ " -SRC_URI[archive.md5sum] = "1c27523c3f3a4efe4d9d303d0d240320" -SRC_URI[archive.sha256sum] = "4c53c752823723875078b91340f32136aadb99e91c0f6483f024f978a02c8624"
\ No newline at end of file +SRC_URI[archive.md5sum] = "217a9a753006275215fa9fa127760ece" +SRC_URI[archive.sha256sum] = "18dbb51b8ae12bae0ab7a958e7cf3317c9acfc8a1e1103ec2f147164a0fc2d07" diff --git a/meta/recipes-graphics/piglit/piglit_git.bb b/meta/recipes-graphics/piglit/piglit_git.bb index f468120f80..68ac7e7677 100644 --- a/meta/recipes-graphics/piglit/piglit_git.bb +++ b/meta/recipes-graphics/piglit/piglit_git.bb @@ -13,7 +13,9 @@ S = "${WORKDIR}/git" DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native" -inherit cmake pythonnative +inherit cmake pythonnative distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" # As piglit doesn't install, enforce in-tree builds so that we can easily copy # contents out of $S and $B. diff --git a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb index fe886f536d..0e1a7928f2 100644 --- a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb +++ b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb @@ -2,6 +2,10 @@ SUMMARY = "A clock combined with a game of pong" LICENSE = "GPLv2+" DEPENDS = "virtual/libx11 xdmcp xau" +inherit distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI = "file://pong-clock-no-flicker.c" LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3" diff --git a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb index 363bdcd706..6c1b93cd0a 100644 --- a/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb +++ b/meta/recipes-graphics/startup-notification/startup-notification_0.12.bb @@ -17,7 +17,9 @@ SECTION = "libs" DEPENDS = "virtual/libx11 libsm xcb-util" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "http://www.freedesktop.org/software/startup-notification/releases/${BPN}-${PV}.tar.gz \ file://obsolete_automake_macros.patch \ diff --git a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb index 89fa4b211d..708f59e89b 100644 --- a/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb +++ b/meta/recipes-graphics/ttf-fonts/liberation-fonts_1.04.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" PR = "r4" PE = "1" -inherit fontcache +inherit allarch fontcache FONT_PACKAGES = "${PN}" diff --git a/meta/recipes-graphics/waffle/waffle_1.3.0.bb b/meta/recipes-graphics/waffle/waffle_1.3.0.bb index a6d1acdf31..fe9609c5b0 100644 --- a/meta/recipes-graphics/waffle/waffle_1.3.0.bb +++ b/meta/recipes-graphics/waffle/waffle_1.3.0.bb @@ -26,7 +26,4 @@ PACKAGECONFIG[gbm] = "-Dwaffle_has_wayland=1,,virtual/libgl udev" # I say virtual/libgl, actually wants egl.pc PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,,virtual/libgl libxcb" -# Take the flags added by PACKAGECONFIG and pass them to cmake. -EXTRA_OECMAKE = "${EXTRA_OECONF}" - FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake" diff --git a/meta/recipes-graphics/wayland/libinput_0.7.0.bb b/meta/recipes-graphics/wayland/libinput_0.7.0.bb new file mode 100644 index 0000000000..98d29426e6 --- /dev/null +++ b/meta/recipes-graphics/wayland/libinput_0.7.0.bb @@ -0,0 +1,14 @@ +SUMMARY = "Library to handle input devices in Wayland compositors" +HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" +SECTION = "libs" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=673e626420c7f859fbe2be3a9c13632d" + +DEPENDS = "libevdev udev mtdev" + +SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz" +SRC_URI[md5sum] = "381b61396de28c12716ef7a5475fea50" +SRC_URI[sha256sum] = "129f485afe5e4a9394641293991c97cb99f5f3338340d0d65b704ff463d1579e" + +inherit autotools pkgconfig diff --git a/meta/recipes-graphics/wayland/wayland_1.5.0.bb b/meta/recipes-graphics/wayland/wayland_1.6.0.bb index b1ae59ef13..00713bff3f 100644 --- a/meta/recipes-graphics/wayland/wayland_1.5.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.6.0.bb @@ -11,8 +11,8 @@ 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" -SRC_URI[md5sum] = "1d882776b27329b91d2d500b6d66dd1d" -SRC_URI[sha256sum] = "0069e1e9af888b3e05384380ad8cc6c976ea3e81d08ba19b7675ce1d693a41b5" +SRC_URI[md5sum] = "d34c141c975084e4fb668e77b38f840e" +SRC_URI[sha256sum] = "a7d5102dcf53d08c059d24bc62de491d7cd482070abeb6737a20d0d86ba6fc7f" SRC_URI_append_class-native = " \ file://disable-macro-checks-not-used-for-scanner.patch \ " @@ -23,7 +23,6 @@ inherit autotools pkgconfig # We need wayland-native for the wayland-scanner utility BBCLASSEXTEND = "native" -DEPENDS_class-native = "expat-native libffi-native" DEPENDS = "expat libffi wayland-native" EXTRA_OECONF = "--disable-documentation --disable-scanner" diff --git a/meta/recipes-graphics/wayland/weston_1.5.0.bb b/meta/recipes-graphics/wayland/weston_1.6.0.bb index 4a8584f79a..d30e48bfa0 100644 --- a/meta/recipes-graphics/wayland/weston_1.5.0.bb +++ b/meta/recipes-graphics/wayland/weston_1.6.0.bb @@ -12,8 +12,8 @@ SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://make-lcms-explicitly-configurable.patch \ file://make-libwebp-explicitly-configurable.patch \ " -SRC_URI[md5sum] = "8eb40d230efc2411f083c20656534780" -SRC_URI[sha256sum] = "06388ba04ac79aa72d685cc1a8e646ddb2b8cfe11fcc742294f9addac48b7684" +SRC_URI[md5sum] = "c60ce9dde99a089db0539d8f6b557827" +SRC_URI[sha256sum] = "dc3ea5d13bbf025fabc006216c5ddc0d80d5f4ebe778912b8c4d1d4acaaa614d" inherit autotools pkgconfig useradd @@ -60,6 +60,8 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" # Weston with webp support PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" +# Weston with libinput backend +PACKAGECONFIG[libinput] = "--enable-libinput-backend,--disable-libinput-backend,libinput" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them @@ -77,7 +79,7 @@ do_install_append() { PACKAGES += "${PN}-examples" -FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${datadir}" +FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libdir}/weston ${datadir}" FILES_${PN}-examples = "${bindir}/*" RDEPENDS_${PN} += "xkeyboard-config" diff --git a/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/meta/recipes-graphics/x11-common/x11-common_0.1.bb index a2d8885cc7..156b329486 100644 --- a/meta/recipes-graphics/x11-common/x11-common_0.1.bb +++ b/meta/recipes-graphics/x11-common/x11-common_0.1.bb @@ -4,6 +4,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" SECTION = "x11" PR = "r47" +inherit distro_features_check +# rdepends on xdypinfo xmodmap xinit +REQUIRED_DISTRO_FEATURES = "x11" + SRC_URI = "file://etc \ file://gplv2-license.patch" diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm index ef6c11c3f2..2e3e090777 100755 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm @@ -48,6 +48,7 @@ case "$1" in stop) echo "Stopping XServer" killproc xinit + chvt 1 ;; restart) diff --git a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb index 3d98172442..ec0241fb28 100644 --- a/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb +++ b/meta/recipes-graphics/x11vnc/x11vnc_0.9.13.bb @@ -16,7 +16,9 @@ SRC_URI[sha256sum] = "f6829f2e629667a5284de62b080b13126a0736499fe47cdb447aedb07a DEPENDS = "openssl virtual/libx11 libxext jpeg zlib libxfixes libxrandr libxdamage libxtst" -inherit autotools-brokensep +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" diff --git a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 562434f16a..a9de3d7ef2 100644 --- a/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -7,7 +7,9 @@ DEPENDS = "virtual/libx11 libxi" PV = "0.7.5+git${SRCPV}" PR = "r6" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" SRCREV = "c01c5af807cb4b0157b882ab07a893df9a810111" SRC_URI = "git://github.com/tias/xinput_calibrator.git \ diff --git a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb index 65f74c21c5..31cf186767 100644 --- a/meta/recipes-graphics/xorg-app/mkfontscale_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/mkfontscale_1.1.2.bb @@ -14,5 +14,5 @@ BBCLASSEXTEND = "native" LIC_FILES_CHKSUM = "file://COPYING;md5=2e0d129d05305176d1a790e0ac1acb7f" -SRC_URI[md5sum] = "03de3f15db678e277f5ef9c013aca1ad" -SRC_URI[sha256sum] = "244017992477ced2397a44fd0ddcfb0f1d9899128613f5c4db81471163b0b731" +SRC_URI[md5sum] = "9bdd6ebfa62b1bbd474906ac86a40fd8" +SRC_URI[sha256sum] = "8c6d5228af885477b9aec60ca6f172578e7d2de42234357af62fb00439453f20" diff --git a/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb b/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb index 26d4f1b5ba..87268046e6 100644 --- a/meta/recipes-graphics/xorg-app/rgb_1.0.5.bb +++ b/meta/recipes-graphics/xorg-app/rgb_1.0.6.bb @@ -9,9 +9,8 @@ format." DEPENDS += " xproto util-macros" LIC_FILES_CHKSUM = "file://COPYING;md5=ef598adbe241bd0b0b9113831f6e249a" PE = "1" -PR = "${INC_PR}.0" -SRC_URI[md5sum] = "bcd820d967eaa51bd25b86c0ee682d4e" -SRC_URI[sha256sum] = "8e936e648ffddce2e7184790efa15e4fa2bcb47f9da5469515d212c61bc8f857" +SRC_URI[md5sum] = "eab5bbd7642e5c784429307ec210d198" +SRC_URI[sha256sum] = "bbca7c6aa59939b9f6a0fb9fff15dfd62176420ffd4ae30c8d92a6a125fbe6b0" FILES_${PN} += "${datadir}/X11" diff --git a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb index 96ea030be1..84d0cb8044 100644 --- a/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb +++ b/meta/recipes-graphics/xorg-app/xeyes_1.1.1.bb @@ -11,4 +11,4 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3ea51b365051ac32d1813a7dbaa4bfc6" SRC_URI[md5sum] = "a3035dcecdbdb89e864177c080924981" SRC_URI[sha256sum] = "975e98680cd59e1f9439016386609546ed08c284d0f05a95276f96aca6e8a521" -DEPENDS += " virtual/libx11 libxau libxt libxext libxmu libxrender" +DEPENDS += "libxau libxt libxext libxmu libxrender" diff --git a/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb b/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb index 583ea87eeb..93185188ee 100644 --- a/meta/recipes-graphics/xorg-app/xinit_1.3.3.bb +++ b/meta/recipes-graphics/xorg-app/xinit_1.3.4.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" PE = "1" -SRC_URI[md5sum] = "3b8da0e6237aee9828cc809c647510a7" -SRC_URI[sha256sum] = "74b2878de6e3d5b5948f1562a77e7f53b4e10621e505ddb278050c7f3cae00af" +SRC_URI[md5sum] = "4e928452dfaf73851413a2d8b8c76388" +SRC_URI[sha256sum] = "75d88d7397a07e01db253163b7c7a00b249b3d30e99489f2734cac9a0c7902b3" EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" diff --git a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb b/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb index 5c274b133e..efac0699c9 100644 --- a/meta/recipes-graphics/xorg-app/xkbcomp_1.2.4.bb +++ b/meta/recipes-graphics/xorg-app/xkbcomp_1.3.0.bb @@ -15,5 +15,5 @@ DEPENDS += "libxkbfile" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "a0fc1ac3fc4fe479ade09674347c5aa0" -SRC_URI[sha256sum] = "91d0c9ab445d21dfe1892dbae5ae5264f39bae68223dd092ffc547c9450b5a2d" +SRC_URI[md5sum] = "0012a8e3092cddf7f87b250f96bb38c5" +SRC_URI[sha256sum] = "cfac973778fabf5216121ad60b7af8ab74ce7513af0f9260cf8c5309e1622b2a" diff --git a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch b/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch deleted file mode 100644 index 40f81f0f74..0000000000 --- a/meta/recipes-graphics/xorg-app/xmodmap/gnu-source.patch +++ /dev/null @@ -1,60 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 42f99a7a7b836f6f9704a7b1747eb722c93446ec Mon Sep 17 00:00:00 2001 -From: Alan Coopersmith <alan.coopersmith@oracle.com> -Date: Mon, 23 Apr 2012 14:28:39 +0000 -Subject: include config.h before stdio.h & other system headers - -Ensures definitions like _GNU_SOURCE are visible when needed. - -Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> ---- -diff --git a/exec.c b/exec.c -index dbcb669..419b10e 100644 ---- a/exec.c -+++ b/exec.c -@@ -54,6 +54,10 @@ from The Open Group. - * original xmodmap, written by David Rosenthal, of Sun Microsystems. - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> -diff --git a/pf.c b/pf.c -index 0eb0f55..3f0c3f4 100644 ---- a/pf.c -+++ b/pf.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> -diff --git a/xmodmap.c b/xmodmap.c -index 58a8e70..0f89629 100644 ---- a/xmodmap.c -+++ b/xmodmap.c -@@ -26,6 +26,10 @@ from The Open Group. - - */ - -+#ifdef HAVE_CONFIG_H -+# include "config.h" -+#endif -+ - #include <X11/Xos.h> - #include <X11/Xlib.h> - #include <stdio.h> --- -cgit v0.9.0.2-2-gbebe diff --git a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb index 65a55e3560..87efb76022 100644 --- a/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb +++ b/meta/recipes-graphics/xorg-app/xmodmap_1.0.8.bb @@ -13,7 +13,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" PE = "1" -SRC_URI += "file://gnu-source.patch" - SRC_URI[md5sum] = "5511da3361eea4eaa21427652c559e1c" SRC_URI[sha256sum] = "efe2e3c89858a2db3bdcf969f55f55d0af4f5007789198344de0595249a99fc3" diff --git a/meta/recipes-graphics/xorg-app/xorg-app-common.inc b/meta/recipes-graphics/xorg-app/xorg-app-common.inc index 524a2d3077..3529cb26ef 100644 --- a/meta/recipes-graphics/xorg-app/xorg-app-common.inc +++ b/meta/recipes-graphics/xorg-app/xorg-app-common.inc @@ -5,12 +5,13 @@ SECTION = "x11/apps" LICENSE = "MIT-X" DEPENDS = "util-macros-native virtual/libx11" +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + INC_PR = "r8" SRC_URI = "${XORG_MIRROR}/individual/app/${BPN}-${PV}.tar.bz2" -S = "${WORKDIR}/${BPN}-${PV}" - -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check FILES_${PN} += " ${libdir}/X11/${BPN} ${datadir}/X11/app-defaults/" diff --git a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb index efbb1b3f6c..d78bf0451c 100644 --- a/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb +++ b/meta/recipes-graphics/xorg-app/xprop_1.2.2.bb @@ -10,7 +10,7 @@ formatting information." LIC_FILES_CHKSUM = "file://COPYING;md5=e226ab8db88ac0bc0391673be40c9f91" -DEPENDS += " libxmu virtual/libx11" +DEPENDS += "libxmu" PE = "1" diff --git a/meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb b/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb index 84f01b02dd..41bd42069c 100644 --- a/meta/recipes-graphics/xorg-app/xrandr_1.4.2.bb +++ b/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb @@ -11,5 +11,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" DEPENDS += "libxrandr libxrender" PE = "1" -SRC_URI[md5sum] = "78fd973d9b532106f8777a3449176148" -SRC_URI[sha256sum] = "b2e76ee92ff827f1c52ded7c666fe6f2704ca81cdeef882397da4e3e8ab490bc" +SRC_URI[md5sum] = "441fdb98d2abc6051108b7075d948fc7" +SRC_URI[sha256sum] = "7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb index 4ab6ad1d66..6d71ba8186 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.9.1.bb @@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" DEPENDS += "mtdev libevdev" -SRC_URI[md5sum] = "9076ae2646f7aeb30963056e0bbfccf0" -SRC_URI[sha256sum] = "0c0c4aa393cb027a2304967944867a21a340bcad2e5efe630291b6906c3abc35" +SRC_URI[md5sum] = "8f73a98e32dccc9d054b54727cc4093f" +SRC_URI[sha256sum] = "0ce30328adfeac90a6f4b508d992fb834d8e50b484b29d3d58cf6683fa8502f9" diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch deleted file mode 100644 index f36bb7579d..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics/always_include_xorg_server.h.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 96e60a4ea242d2decf109835981ae186cc36f642 Mon Sep 17 00:00:00 2001 -From: Peter Hutterer <peter.hutterer@who-t.net> -Date: Fri, 29 Aug 2014 07:57:41 +1000 -Subject: Include xorg-server.h to fix build errors on newest glibc - -In file included from /usr/include/string.h:634:0, - from /usr/include/xorg/os.h:53, - from /usr/include/xorg/misc.h:115, - from /usr/include/xorg/xf86str.h:37, - from /usr/include/xorg/xf86Xinput.h:54, - from synproto.h:36, - from synproto.c:24: -/usr/include/xorg/os.h:579:1: error: expected identifier or '(' before '__extension__' - strndup(const char *str, size_t n); - -See http://lists.freedesktop.org/archives/xorg-devel/2014-July/043070.html - -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -Status: Backport - -Index: xf86-input-synaptics-1.8.0/src/eventcomm.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/eventcomm.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/eventcomm.h 2014-08-28 18:40:28.620070587 -0700 -@@ -27,6 +27,8 @@ - #ifndef _EVENTCOMM_H_ - #define _EVENTCOMM_H_ - -+#include <xorg-server.h> -+ - #include <linux/input.h> - #include <linux/version.h> - #include <xf86Xinput.h> -Index: xf86-input-synaptics-1.8.0/src/ps2comm.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/ps2comm.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/ps2comm.h 2014-08-28 18:40:28.620070587 -0700 -@@ -22,6 +22,8 @@ - #ifndef _PS2COMM_H_ - #define _PS2COMM_H_ - -+#include <xorg-server.h> -+ - #include <unistd.h> - #include <sys/ioctl.h> - #include "xf86_OSproc.h" -Index: xf86-input-synaptics-1.8.0/src/synproto.h -=================================================================== ---- xf86-input-synaptics-1.8.0.orig/src/synproto.h 2014-08-28 18:40:28.628070587 -0700 -+++ xf86-input-synaptics-1.8.0/src/synproto.h 2014-08-28 18:40:28.624070587 -0700 -@@ -31,6 +31,8 @@ - #include "config.h" - #endif - -+#include <xorg-server.h> -+ - #include <unistd.h> - #include <sys/ioctl.h> - #include <xf86Xinput.h> diff --git a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb index 90baf8fbf3..19be77aadb 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.0.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-input-synaptics_1.8.1.bb @@ -1,7 +1,5 @@ require xorg-driver-input.inc -#SRC_URI += "file://configurefix.patch" - SUMMARY = "X.Org X server -- synaptics touchpad input driver" DESCRIPTION = "synaptics is an Xorg input driver for the touchpads from \ @@ -12,10 +10,8 @@ advanced features of the touchpad to become available." LIC_FILES_CHKSUM = "file://COPYING;md5=55aacd3535a741824955c5eb8f061398" -SRC_URI += "file://always_include_xorg_server.h.patch" - -SRC_URI[md5sum] = "27a3f2b31606a13dd6b58d419978d64f" -SRC_URI[sha256sum] = "9bf27632aaa6c5e62621ca9c2ca00f9b309c85b039ee33cd592b189fc872c37a" +SRC_URI[md5sum] = "ed70d0cba94262a4008dcef654ab34a9" +SRC_URI[sha256sum] = "d74fdaf29e9888a2cb494e16d0a9ddb24265c5c765b05392b69c50e84ffbf09a" DEPENDS += "libxi mtdev libxtst libevdev" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch deleted file mode 100644 index 3a42d1377c..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/compat-api-Map-changes-of-DamageUnregister-API-in-1..patch +++ /dev/null @@ -1,29 +0,0 @@ -Upstream-Status: Backport - -From 524a45da56e2a052ffafa3887891caa90ba39f76 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Sat, 5 Oct 2013 18:42:24 +0100 -Subject: [PATCH] compat-api: Map changes of DamageUnregister API in 1.14.99.2 - -Reported-by: Emmanuel Benisty <benisty.e@gmail.com> -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> ---- - src/compat-api.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/compat-api.h b/src/compat-api.h -index 8eb46ef..244a486 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -162,4 +162,8 @@ static inline void FreePixmap(PixmapPtr pixmap) - if ((d)->pScreen->SourceValidate) (d)->pScreen->SourceValidate(d, x, y, w, h) - #endif - -+#if XORG_VERSION_CURRENT >= XORG_VERSION_NUMERIC(1,14,99,2,0) -+#define DamageUnregister(d, dd) DamageUnregister(dd) -+#endif -+ - #endif --- -1.7.9.5 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch deleted file mode 100644 index 7fa9443d93..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/configure-dri.patch +++ /dev/null @@ -1,166 +0,0 @@ -Add the ability to enable/disable specific versions of the DRI support. - -This is the following two commits from master squashed: - 7bc669dd4b7e3e5978e95e4131d1f9215afbc041 - 5a0cb1049c2fa0586708719210a2d2cffa7a4491 - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index b3b6e8e..bd654f3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -296,6 +296,21 @@ AC_ARG_ENABLE(dri, - [Disable DRI support [[default=auto]]]), - [DRI=$enableval], - [DRI=auto]) -+AC_ARG_ENABLE(dri1, -+ AS_HELP_STRING([--disable-dri1], -+ [Disable DRI1 support [[default=yes]]]), -+ [DRI1=$enableval], -+ [DRI1=yes]) -+AC_ARG_ENABLE(dri2, -+ AS_HELP_STRING([--disable-dri2], -+ [Disable DRI2 support [[default=yes]]]), -+ [DRI2=$enableval], -+ [DRI2=yes]) -+AC_ARG_ENABLE(dri3, -+ AS_HELP_STRING([--disable-dri3], -+ [Disable DRI3 support [[default=yes]]]), -+ [DRI3=$enableval], -+ [DRI3=yes]) - - AC_ARG_ENABLE(xvmc, AS_HELP_STRING([--disable-xvmc], - [Disable XvMC support [[default=yes]]]), -@@ -461,15 +476,15 @@ if test "x$UMS" = "xyes"; then - AC_DEFINE(UMS,1,[Assume UMS support]) - fi - --DRI1=no -+have_dri1=no - XORG_DRIVER_CHECK_EXT(XF86DRI, xf86driproto) --if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then -- PKG_CHECK_MODULES(DRI1, [xf86driproto], [DRI1=$DRI], [DRI1=no]) -+if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$DRI1" != "xno" -a "x$UMS" = "xyes"; then -+ PKG_CHECK_MODULES(DRI1, [xf86driproto], [have_dri1=$DRI], [have_dri1=no]) - save_CFLAGS="$CFLAGS" - save_CPPFLAGS="$CPPFLAGS" - CFLAGS="$CFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" - CPPFLAGS="$CPPFLAGS $XORG_CFLAGS $DRI1_CFLAGS $DRM_CFLAGS" -- AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [DRI1=no], -+ AC_CHECK_HEADERS([dri.h sarea.h dristruct.h], [], [have_dri1=no], - [/* for dri.h */ - #include <xf86str.h> - /* for dristruct.h */ -@@ -486,49 +501,55 @@ if test "x$_EXT_CHECK" != "xno" -a "x$DRI" != "xno" -a "x$UMS" = "xyes"; then - fi - - AC_MSG_CHECKING([whether to include DRI1 support]) --AC_MSG_RESULT([$DRI1]) -+AC_MSG_RESULT([$have_dri1]) - --AM_CONDITIONAL(DRI1, test "x$DRI1" != "xno") --if test "x$DRI1" != "xno"; then -+AM_CONDITIONAL(DRI1, test "x$have_dri1" != "xno") -+if test "x$have_dri1" != "xno"; then - AC_DEFINE(HAVE_DRI1,1,[Enable DRI1 driver support]) - dri_msg="$dri_msg DRI1" - else - DRI1_CFLAGS="" - DRI1_LIBS="" - -- if test "x$DRI" = "xyes" -a "x$UMS" = "xyes"; then -+ if test "x$DRI" = "xyes" -a "x$UMS" = "xyes" -a "x$DRI1" != "xno"; then - AC_MSG_ERROR([DRI1 requested but prerequisites not found]) - fi - fi - --DRI2=no --DRI3=no -+have_dri2=no -+have_dri3=no - if test "x$DRI" != "xno"; then -- PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [DRI2=$DRI], [DRI2=no]) -- dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` -- if test "x$dridriverdir" = "x"; then -- dridriverdir="$libdir/dri" -- fi -- AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default DRI2 driver path]) - if test "x$DRI2" != "xno"; then -+ PKG_CHECK_MODULES(DRI2, [dri2proto >= 2.6], [have_dri2=$DRI], [have_dri2=no]) -+ fi -+ if test "x$have_dri2" != "xno"; then - save_CFLAGS=$CFLAGS - CFLAGS="$XORG_CFLAGS $DRM_CFLAGS $DRI1_CFLAGS $DRI2_CFLAGS" -- AC_CHECK_HEADERS([dri2.h], [], [DRI2=no], [ -+ AC_CHECK_HEADERS([dri2.h], [], [have_dri2=no], [ - #include <dixstruct.h> - #include <drm.h> - ]) - CFLAGS=$save_CFLAGS - fi -- -- XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) -- if test "x$_EXT_CHECK" != "xno"; then -- PKG_CHECK_MODULES(DRI3, [dri3proto], [DRI3=$DRI], []) -+ if test "x$have_dri2" != "xno"; then -+ dridriverdir=`$PKG_CONFIG --variable=dridriverdir dri` -+ if test "x$dridriverdir" = "x"; then -+ dridriverdir="$libdir/dri" -+ fi -+ AC_DEFINE_DIR(DRI_DRIVER_PATH, dridriverdir, [Default have_dri2 driver path]) - fi -+ - if test "x$DRI3" != "xno"; then -+ XORG_DRIVER_CHECK_EXT(DRI3, dri3proto) -+ if test "x$_EXT_CHECK" != "xno"; then -+ PKG_CHECK_MODULES(DRI3, [dri3proto], [have_dri3=$DRI], []) -+ fi -+ fi -+ if test "x$have_dri3" != "xno"; then - save_CFLAGS=$CFLAGS - CFLAGS="$XORG_CFLAGS $DRI3_CFLAGS" -- AC_CHECK_DECL(DRI3, [], [DRI3=no], [#include <xorg-server.h>]) -- AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [DRI3=no], [ -+ AC_CHECK_DECL(DRI3, [], [have_dri3=no], [#include <xorg-server.h>]) -+ AC_CHECK_HEADERS([misyncstr.h misyncshm.h], [], [have_dri3=no], [ - #include <xorg-server.h> - #include <xf86str.h> - #include <misync.h> -@@ -538,13 +559,13 @@ if test "x$DRI" != "xno"; then - fi - - AC_MSG_CHECKING([whether to include DRI2 support]) --AM_CONDITIONAL(DRI2, test "x$DRI2" != "xno") --AC_MSG_RESULT([$DRI2]) --if test "x$DRI2" != "xno"; then -+AM_CONDITIONAL(DRI2, test "x$have_dri2" != "xno") -+AC_MSG_RESULT([$have_dri2]) -+if test "x$have_dri2" != "xno"; then - AC_DEFINE(HAVE_DRI2,1,[Enable DRI2 driver support]) - dri_msg="$dri_msg DRI2" - else -- if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then -+ if test "x$DRI" = "xyes" -a "x$DRI2" != "xno" -a "x$KMS" = "xyes"; then - AC_MSG_ERROR([DRI2 requested but prerequisites not found]) - fi - -@@ -553,13 +574,13 @@ else - fi - - AC_MSG_CHECKING([whether to include DRI3 support]) --AM_CONDITIONAL(DRI3, test "x$DRI3" != "xno") --AC_MSG_RESULT([$DRI3]) --if test "x$DRI3" != "xno"; then -+AM_CONDITIONAL(DRI3, test "x$have_dri3" != "xno") -+AC_MSG_RESULT([$have_dri3]) -+if test "x$have_dri3" != "xno"; then - AC_DEFINE(HAVE_DRI3,1,[Enable DRI3 driver support]) - dri_msg="$dri_msg DRI3" - else -- if test "x$DRI" = "xyes" -a "x$KMS" = "xyes"; then -+ if test "x$DRI" = "xyes" -a "x$DRI3" != "xno" -a "x$KMS" = "xyes"; then - AC_MSG_ERROR([DRI3 requested but prerequisites not found]) - fi - fi diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch b/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch deleted file mode 100644 index 9e93ca875c..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-dri2-tests.patch +++ /dev/null @@ -1,50 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From ec91cfe7e5efdd5e1b1fbb85eea8f07b50e24c4b Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 11 Sep 2013 21:12:37 +0100 -Subject: [PATCH] test: only build DRI2 tests if DRI2 is enabled - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - test/Makefile.am | 10 ++++++++++ - 1 file changed, 10 insertions(+) - -diff --git a/test/Makefile.am b/test/Makefile.am -index f51967b..18528a9 100644 ---- a/test/Makefile.am -+++ b/test/Makefile.am -@@ -16,9 +16,14 @@ stress_TESTS = \ - render-copyarea-size \ - render-copy-alphaless \ - mixed-stress \ -+ $(NULL) -+ -+if DRI2 -+stress_TESTS += \ - dri2-swap \ - dri2-race \ - $(NULL) -+endif - - check_PROGRAMS = $(stress_TESTS) - -@@ -34,9 +39,14 @@ libtest_la_SOURCES = \ - test_image.c \ - test_log.c \ - test_render.c \ -+ $(NULL) -+ -+if DRI2 -+libtest_la_SOURCES += \ - dri2.c \ - dri2.h \ - $(NULL) -+endif - - vsync.avi: mkvsync.sh - ./mkvsync.sh $@ --- -1.7.10.4 - diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb deleted file mode 100644 index cd8fd63b51..0000000000 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.21.15.bb +++ /dev/null @@ -1,32 +0,0 @@ -require xorg-driver-video.inc - -SUMMARY = "X.Org X server -- Intel integrated graphics chipsets driver" - -DESCRIPTION = "intel is an Xorg driver for Intel integrated graphics \ -chipsets. The driver supports depths 8, 15, 16 and 24. On some chipsets, \ -the driver supports hardware accelerated 3D via the Direct Rendering \ -Infrastructure (DRI)." - -LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" - -DEPENDS += "virtual/libx11 drm libpciaccess pixman" - -SRC_URI += "file://disable-dri2-tests.patch \ - file://compat-api-Map-changes-of-DamageUnregister-API-in-1..patch \ - " - -PACKAGECONFIG ??= "sna udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" - -PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,xf86driproto dri2proto" -PACKAGECONFIG[sna] = "--enable-sna,--disable-sna" -PACKAGECONFIG[uxa] = "--enable-uxa,--disable-uxa" -PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" -PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" - -# --enable-kms-only option is required by ROOTLESS_X -EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' - -COMPATIBLE_HOST = '(i.86|x86_64).*-linux' - -SRC_URI[md5sum] = "8b646d257ace8197d6ab4e5ddeb8efb2" -SRC_URI[sha256sum] = "7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb index a10cd9e278..26b68b461c 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.912.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb @@ -9,13 +9,12 @@ Infrastructure (DRI)." LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" -SRC_URI += "file://configure-dri.patch \ - file://disable-x11-dri3.patch \ +SRC_URI += "file://disable-x11-dri3.patch \ file://always_include_xorg_server.h.patch \ " -SRC_URI[md5sum] = "88d1a884f9b7bd07bf0755cfa34052d4" -SRC_URI[sha256sum] = "7c8ffc492d59f34cac64093deb70717b4d9223cf416ecc6fa016ab2e8bde9501" +SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" +SRC_URI[sha256sum] = "00b781eea055582820a123c47b62411bdf6aabf4f03dc0568faec55faf9667c9" DEPENDS += "virtual/libx11 drm libpciaccess pixman" diff --git a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.1.bb b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.9.0.bb index 5bb89266cd..b22078792a 100644 --- a/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.8.1.bb +++ b/meta/recipes-graphics/xorg-driver/xf86-video-modesetting_0.9.0.bb @@ -4,5 +4,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5e53d3fcadb1c23d122ad63cb099a918" SUMMARY = "X.Org X server -- modesetting display driver" DESCRIPTION = "Provides a generic kernel modesetting display driver for the X.Org X server." -SRC_URI[md5sum] = "eb275e1ff0031897bcf23e2e5cb8655a" -SRC_URI[sha256sum] = "3ba8d8d7cb679497abc6486e2e843f8ea1582d830a27448ed4c90413e58312ca" +SRC_URI[md5sum] = "da588d4f54111c2deae035998058ce10" +SRC_URI[sha256sum] = "90cf085573203dfadd48ea69bd694c4d04ccbe088b6855e9c85c34bb8a95d75c" diff --git a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index 17fac8b8c0..7ddd1c7da5 100644 --- a/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -11,12 +11,12 @@ DEPENDS = "virtual/xserver xproto randrproto util-macros" SRC_URI = "${XORG_MIRROR}/individual/driver/${BPN}-${PV}.tar.bz2" -S = "${WORKDIR}/${BPN}-${PV}" - FILES_${PN} += " ${libdir}/xorg/modules/drivers/*.so" FILES_${PN}-dbg += " ${libdir}/xorg/modules/drivers/.debug" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/xserver +REQUIRED_DISTRO_FEATURES = "x11" # FIXME: We don't want to include the libtool archives (*.la) from modules # directory, as they serve no useful purpose. Upstream should fix Makefile.am diff --git a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb index 8b42991d1c..03f70bfe67 100644 --- a/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb +++ b/meta/recipes-graphics/xorg-font/font-util_1.3.0.bb @@ -16,11 +16,12 @@ RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" PR = "${INC_PR}.0" -do_configure_prepend() { - sed -i "s#MAPFILES_PATH=\`pkg-config#MAPFILES_PATH=\`PKG_CONFIG_PATH=\"${STAGING_LIBDIR_NATIVE}/pkg-config\" pkg-config#g" ${S}/fontutil.m4.in -} - BBCLASSEXTEND = "native" SRC_URI[md5sum] = "ddfc8a89d597651408369d940d03d06b" SRC_URI[sha256sum] = "dfa9e55625a4e0250f32fabab1fd5c8ffcd2d1ff2720d6fcf0f74bc8a5929195" + +SYSROOT_PREPROCESS_FUNCS += "fontutil_sysroot_preprocess" +fontutil_sysroot_preprocess () { + sysroot_stage_dir ${D}${datadir}/fonts/ ${SYSROOT_DESTDIR}${datadir}/fonts/ +} diff --git a/meta/recipes-graphics/xorg-font/xorg-font-common.inc b/meta/recipes-graphics/xorg-font/xorg-font-common.inc index 55adde3608..d3b995a358 100644 --- a/meta/recipes-graphics/xorg-font/xorg-font-common.inc +++ b/meta/recipes-graphics/xorg-font/xorg-font-common.inc @@ -15,13 +15,7 @@ S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig -EXTRA_OEMAKE += "FCCACHE=/bin/true" - -do_configure_prepend() { - if [ -f "${S}"/configure.ac ] ; then - sed -i "s#^MAPFILES_PATH=.*#MAPFILES_PATH=\"${STAGING_DIR_TARGET}/\$(pkg-config --variable=mapdir fontutil)\"#g" "${S}"/configure.ac - fi -} +EXTRA_OEMAKE += "FCCACHE=/bin/true UTIL_DIR=${STAGING_DIR_TARGET}\$\(MAPFILES_PATH\)" do_install_append() { find ${D}${libdir}/X11/fonts -type f -name fonts.dir | xargs rm -f diff --git a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index 3688685509..bee500b43a 100644 --- a/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -15,13 +15,15 @@ PR = "r2" inherit allarch +S = "${WORKDIR}/misc" + PACKAGES = "${PN}" FILES_${PN} = "${libdir}/X11/ ${datadir}/fonts/X11/" RDEPENDS_${PN} += "font-alias" do_install() { install -d ${D}/${datadir}/fonts/X11/misc - install -m 0644 ${WORKDIR}/misc/* ${D}/${datadir}/fonts/X11/misc/ + install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/ install -d ${D}/${libdir}/X11 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s } diff --git a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb index d837bbd047..bbba24eb9a 100644 --- a/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.2.bb +++ b/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.3.bb @@ -8,7 +8,7 @@ require xorg-lib-common.inc LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" -SRC_URI[md5sum] = "b7c0d3afce14eedca57312a3141ec13a" -SRC_URI[sha256sum] = "abab8c2b050afb89bc29280e9c6b50ec5867174960d88bfb81a01036ec20de19" +SRC_URI[md5sum] = "1f65be5ffc55641c1846c2f41d180d00" +SRC_URI[sha256sum] = "6cd76ccae4e06eee47d3ead84a118740e9406e2a9b7adc9b08e92c69ce89c2e3" REQUIRED_DISTRO_FEATURES = "" diff --git a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb index 3e7ef27bed..5514c7f5e8 100644 --- a/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb +++ b/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.3.bb @@ -7,7 +7,6 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" -PARALLEL_MAKE = "" #DEPENDS = "xcb-proto xproto libxau libxslt-native" # DEPENDS += "xsltproc-native gperf-native" diff --git a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb index 180acfae0b..1925136369 100644 --- a/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb @@ -11,7 +11,12 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=c0fb37f44e02bdbde80546024400728d" -DEPENDS += "libice xproto xtrans e2fsprogs" +DEPENDS += "libice xproto xtrans" + +# libSM can work without libuuid, we explicitly disable it to break the following circular dependency +# when DISTRO_FEATURES contains 'systemd' and 'x11'. +# systemd -> dbus -> libsm -> util-linux -> systemd +EXTRA_OECONF += "--without-libuuid" PE = "1" diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb deleted file mode 100644 index d88b025e1f..0000000000 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.10.bb +++ /dev/null @@ -1,10 +0,0 @@ -include libxcb.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" - - -DEPENDS += "libxdmcp" - -SRC_URI[md5sum] = "074c335cc4453467eeb234e3dadda700" -SRC_URI[sha256sum] = "98d9ab05b636dd088603b64229dd1ab2d2cc02ab807892e107d674f9c3f2d5b5" diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb new file mode 100644 index 0000000000..c162702105 --- /dev/null +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.11.bb @@ -0,0 +1,10 @@ +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/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb b/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb index ec66175684..efa8b65ace 100644 --- a/meta/recipes-graphics/xorg-lib/libxext_1.3.2.bb +++ b/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb @@ -22,5 +22,5 @@ XORG_PN = "libXext" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "4376101e51bb2c6c44d9ab14344e85ad" -SRC_URI[sha256sum] = "f829075bc646cdc085fa25d98d5885d83b1759ceb355933127c257e8e50432e0" +SRC_URI[md5sum] = "52df7c4c1f0badd9f82ab124fb32eb97" +SRC_URI[sha256sum] = "b518d4d332231f313371fdefac59e3776f4f0823bcb23cf7c7305bfb57b16e35" diff --git a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb index 0dd295678e..a166b57603 100644 --- a/meta/recipes-graphics/xorg-lib/libxkbcommon_0.4.3.bb +++ b/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb @@ -2,15 +2,15 @@ SUMMARY = "Generic XKB keymap library" DESCRIPTION = "libxkbcommon is a keymap compiler and support library which \ processes a reduced subset of keymaps as defined by the XKB specification." HOMEPAGE = "http://www.xkbcommon.org" -LIC_FILES_CHKSUM = "file://COPYING;md5=9c0b824e72a22f9d2c40b9c93b1f0ddc" +LIC_FILES_CHKSUM = "file://COPYING;md5=09457b156e3155972abebcaaaa0cb434" LICENSE = "MIT & MIT-style" DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "26c57ff21438ed45de2a4ca609177db9" -SRC_URI[sha256sum] = "9a52d5d0419e76c49c0ece86208c205ffacb1cf0ff8ffbaba98d3d4dd40c4e41" +SRC_URI[md5sum] = "2e1faeafcc609c30af3a561a91e84158" +SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c" inherit autotools pkgconfig diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb index 1d36893f93..91464b6c98 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-image_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-image_0.4.0.bb @@ -6,6 +6,5 @@ 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[md5sum] = "fabb80b36490b00fc91289e2c7f66770" -SRC_URI[sha256sum] = "d35a3c0eaae171f5081ec127fb9cec174b716ce5d78196a87f2785376da021df" - +SRC_URI[md5sum] = "08fe8ffecc8d4e37c0ade7906b3f4c87" +SRC_URI[sha256sum] = "2db96a37d78831d643538dd1b595d7d712e04bdccf8896a5e18ce0f398ea2ffc"
\ No newline at end of file diff --git a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb index 39ead34e92..bca64ed61f 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util-keysyms_0.4.0.bb @@ -3,8 +3,7 @@ require xcb-util.inc LICENSE = "MIT" LIC_FILES_CHKSUM = "file://keysyms/keysyms.c;endline=30;md5=2f8de023ed823bb92f0b47900574ea9e \ " - -SRC_URI[md5sum] = "64e4aad2d48cd4a92e2da13b9f35bfd2" -SRC_URI[sha256sum] = "7be1acf053bd68a1910fc861b2cbcbad7637b5618590dd5484d43a96f7995c6e" +SRC_URI[md5sum] = "1022293083eec9e62d5659261c29e367" +SRC_URI[sha256sum] = "0ef8490ff1dede52b7de533158547f8b454b241aa3e4dcca369507f66f216dd9" diff --git a/meta/recipes-graphics/xorg-lib/xcb-util.inc b/meta/recipes-graphics/xorg-lib/xcb-util.inc index 7dad545c33..d15cf9fba1 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util.inc +++ b/meta/recipes-graphics/xorg-lib/xcb-util.inc @@ -16,8 +16,6 @@ SECTION = "x11/libs" DEPENDS = "libxcb" DEPENDS += "gperf-native" -PARALLEL_MAKE = "" - SRC_URI = "http://xcb.freedesktop.org/dist/${BPN}-${PV}.tar.bz2" inherit autotools pkgconfig diff --git a/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb b/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb index c5d8858115..206f07a65c 100644 --- a/meta/recipes-graphics/xorg-lib/xcb-util_0.3.9.bb +++ b/meta/recipes-graphics/xorg-lib/xcb-util_0.4.0.bb @@ -4,5 +4,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://src/xcb_aux.c;endline=30;md5=ae305b9c2a38f9ba27060191046a6460 \ file://src/xcb_event.h;endline=27;md5=627be355aee59e1b8ade80d5bd90fad9" -SRC_URI[md5sum] = "01dcc7a16d5020530552712710646ea2" -SRC_URI[sha256sum] = "c611259c0ab20fd76f79f48f4684843c18ea9c967eba78a45e8b3636315c18c4" +SRC_URI[md5sum] = "2e97feed81919465a04ccc71e4073313" +SRC_URI[sha256sum] = "46e49469cb3b594af1d33176cd7565def2be3fa8be4371d62271fabb5eae50e9" diff --git a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.bb index 61e38470c1..5536b6217a 100644 --- a/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.12.bb +++ b/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.13.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] = "1fd54ceb9092d1dbcaabaf03653092bc" -SRC_URI[sha256sum] = "65b62b95b77b609cb6c0439e0148c48c3ab7dcb5c90eb8d34cf1cb8f360cca44" +SRC_URI[md5sum] = "a415775ca8ecf4dfafc9488b8cbd7114" +SRC_URI[sha256sum] = "7b5be9f2b9a30102512b15308aec55f7f54289df24ac21de82ebb4bf145f9fce" SECTION = "x11/libs" DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" @@ -23,7 +23,7 @@ EXTRA_OECONF = "--with-xkb-rules-symlink=xorg --disable-runtime-deps" FILES_${PN} += "${datadir}/X11/xkb" -inherit autotools pkgconfig +inherit autotools pkgconfig gettext do_install_append () { install -d ${D}${datadir}/X11/xkb/compiled diff --git a/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb index f2b89217bb..d5b7f1a2c6 100644 --- a/meta/recipes-graphics/xorg-lib/xtrans_1.3.4.bb +++ b/meta/recipes-graphics/xorg-lib/xtrans_1.3.5.bb @@ -20,5 +20,5 @@ inherit gettext BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "a615e17d9fee6f097fc3b716eacb3dca" -SRC_URI[sha256sum] = "054d4ee3efd52508c753e9f7bc655ef185a29bd2850dd9e2fc2ccc33544f583a" +SRC_URI[md5sum] = "c5ba432dd1514d858053ffe9f4737dd8" +SRC_URI[sha256sum] = "adbd3b36932ce4c062cd10f57d78a156ba98d618bdb6f50664da327502bc8301" diff --git a/meta/recipes-graphics/xorg-proto/presentproto_git.bb b/meta/recipes-graphics/xorg-proto/presentproto_git.bb index 7fca51d31e..dbb6f32bc0 100644 --- a/meta/recipes-graphics/xorg-proto/presentproto_git.bb +++ b/meta/recipes-graphics/xorg-proto/presentproto_git.bb @@ -17,6 +17,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=47e508ca280fde97906eacb77892c3ac" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/presentproto" S = "${WORKDIR}/git" -inherit autotools-brokensep +PR = "r1" + +inherit autotools BBCLASSEXTEND = "native" diff --git a/meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb b/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb index 0b67b5703e..5bc5a112e5 100644 --- a/meta/recipes-graphics/xorg-proto/xcb-proto_1.10.bb +++ b/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb @@ -5,5 +5,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" -SRC_URI[md5sum] = "ade74b8e9c870dc7515adfa209e66063" -SRC_URI[sha256sum] = "7ef40ddd855b750bc597d2a435da21e55e502a0fefa85b274f2c922800baaf05" +SRC_URI[md5sum] = "6bf2797445dc6d43e9e4707c082eff9c" +SRC_URI[sha256sum] = "b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb index 549c7c89bf..5420b7d23e 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb @@ -7,6 +7,8 @@ PR = "r33" SRC_URI = "file://xorg.conf" +S = "${WORKDIR}" + CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index dd60884992..f0da488412 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -117,6 +117,7 @@ EXTRA_OECONF += "--with-fop=no \ " PACKAGECONFIG ??= "udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 glx', '', d)}" + PACKAGECONFIG[udev] = "--enable-config-udev,--disable-config-udev,udev" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,glproto virtual/mesa xf86driproto" PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" @@ -126,6 +127,7 @@ PACKAGECONFIG[glx] = "--enable-glx --enable-glx-tls,--disable-glx,glproto virtua 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," do_install_append () { # Its assumed base-files creates this for us diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch new file mode 100644 index 0000000000..604d23a376 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/Fix-subwindow-in-Xi-emulated-events.patch @@ -0,0 +1,41 @@ +From db424318d0bb29cbcdf3a07fcc2e023586f1219f Mon Sep 17 00:00:00 2001 +From: Olivier Fourdan <fourdan@xfce.org> +Date: Fri, 2 Jan 2015 18:50:17 +0100 +Subject: [PATCH] Fix subwindow in Xi emulated events + +Bug: 70790 +Upstream status: Submitted + https://bugs.freedesktop.org/show_bug.cgi?id=70790 + +Signed-off-by: Olivier Fourdan <fourdan@xfce.org> +--- + Xi/exevents.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) + +diff --git a/Xi/exevents.c b/Xi/exevents.c +index b0bc47e..0857bce 100644 +--- a/Xi/exevents.c ++++ b/Xi/exevents.c +@@ -1403,7 +1403,7 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, + + if (grab->ownerEvents) { + WindowPtr focus = NullWindow; +- WindowPtr sprite_win = dev->spriteInfo->sprite->win; ++ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); + + deliveries = DeliverDeviceEvents(sprite_win, ptrev, grab, focus, dev); + } +@@ -1429,8 +1429,9 @@ DeliverTouchEmulatedEvent(DeviceIntPtr dev, TouchPointInfoPtr ti, + } + else { + GrabPtr devgrab = dev->deviceGrab.grab; ++ WindowPtr sprite_win = DeepestSpriteWin(dev->spriteInfo->sprite); + +- DeliverDeviceEvents(win, ptrev, grab, win, dev); ++ DeliverDeviceEvents(sprite_win, ptrev, grab, win, dev); + /* FIXME: bad hack + * Implicit passive grab activated in response to this event. Store + * the event. +-- +2.1.0 + diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch deleted file mode 100644 index 2f98bb8c89..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/crosscompile.patch +++ /dev/null @@ -1,22 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -diff --git a/configure.ac b/configure.ac -index b3b752c..600500b 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -523,13 +523,9 @@ dnl Uses --default-font-path if set, otherwise checks for /etc/X11/fontpath.d, - dnl otherwise uses standard subdirectories of FONTROOTDIR. When cross - dnl compiling, assume default font path uses standard FONTROOTDIR directories. - DEFAULT_FONT_PATH="${FONTMISCDIR}/,${FONTTTFDIR}/,${FONTOTFDIR}/,${FONTTYPE1DIR}/,${FONT100DPIDIR}/,${FONT75DPIDIR}/" --if test "$cross_compiling" != yes; then -- AC_CHECK_FILE([${sysconfdir}/X11/fontpath.d], -- [DEFAULT_FONT_PATH='catalogue:${sysconfdir}/X11/fontpath.d'], -- [case $host_os in -+ case $host_os in - darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; -- esac]) --fi -+ esac - AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]), - [ FONTPATH="$withval" ], - [ FONTPATH="${DEFAULT_FONT_PATH}" ]) diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch deleted file mode 100644 index 168368e6c3..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/mips64-compiler.patch +++ /dev/null @@ -1,29 +0,0 @@ -on mips64/n64 pointers are 64bit therefore the pointer conversions to int dont work well -so we end up with incompatible conversion errors - -This patch choses the right values for mips64 - -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Upstream-Status: Pending -Index: xorg-server-1.13.0/hw/xfree86/common/compiler.h -=================================================================== ---- xorg-server-1.13.0-orig/hw/xfree86/common/compiler.h 2012-06-14 23:04:29.000000000 +0300 -+++ xorg-server-1.13.0/hw/xfree86/common/compiler.h 2012-11-08 10:06:50.865831783 +0200 -@@ -101,6 +101,7 @@ - #if defined(NO_INLINE) || defined(DO_PROTOTYPES) - #if !defined(__arm__) - #if !defined(__sparc__) && !defined(__sparc) && !defined(__arm32__) && !defined(__nds32__) \ -+ && !defined(__mips64) \ - && !(defined(__alpha__) && defined(linux)) \ - && !(defined(__ia64__) && defined(linux)) \ - -@@ -721,7 +722,7 @@ - } - - #elif defined(__mips__) || (defined(__arm32__) && !defined(__linux__)) --#ifdef __arm32__ -+#if defined (__arm32__) || defined (__mips64) - #define PORT_SIZE long - #else - #define PORT_SIZE short diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch deleted file mode 100644 index 13f3caf768..0000000000 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/present-module.patch +++ /dev/null @@ -1,66 +0,0 @@ -[ YOCTO #6583 ] - -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 746be5a03ebbda4ab411ca3efb2ed95f99e9ea46 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 28 May 2014 08:13:59 +0100 -Subject: xfree86: Report DRI3 as a built-in module - -This is so that drivers can do a runtime check that DRI3 is available, -similar to existing runtime checks performed by the drivers for DRI and -DRI2. - -v2: Only add DRI3 to the list if the module was actually built into the -server (Mark Kettenis). - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Cc: Mark Kettenis <mark.kettenis@xs4all.nl> -Signed-off-by: Keith Packard <keithp@keithp.com> - -diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c -index 092bf57..f92ad8d 100644 ---- a/hw/xfree86/loader/loadmod.c -+++ b/hw/xfree86/loader/loadmod.c -@@ -838,6 +838,9 @@ static const char *compiled_in_modules[] = { - "extmod", - "dri", - "dri2", -+#if DRI3 -+ "dri3", -+#endif - NULL - }; - --- -cgit v0.10.2 - - -From 7ca458493aa2f0aa091c989ea0768611e0730bf5 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Wed, 28 May 2014 08:14:00 +0100 -Subject: xfree86: Report Present as a built-in module - -This is so that drivers can do a runtime check that Present is available, -similar to existing runtime checks performed by the drivers for DRI. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Signed-off-by: Keith Packard <keithp@keithp.com> - -diff --git a/hw/xfree86/loader/loadmod.c b/hw/xfree86/loader/loadmod.c -index f92ad8d..e1f649a 100644 ---- a/hw/xfree86/loader/loadmod.c -+++ b/hw/xfree86/loader/loadmod.c -@@ -841,6 +841,9 @@ static const char *compiled_in_modules[] = { - #if DRI3 - "dri3", - #endif -+#if PRESENT -+ "present", -+#endif - NULL - }; - --- -cgit v0.10.2 diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch new file mode 100644 index 0000000000..e6dba04919 --- /dev/null +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/xtrans.patch @@ -0,0 +1,38 @@ +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> + +Since _XSERVTransClose frees the connection pointer passed to it, +remove that pointer from the array, so we don't try to double free it +if we come back into CloseWellKnownConnections again. + +Should fix https://bugzilla.yoctoproject.org/show_bug.cgi?id=6665 in which +the shutdown section of the main() loop called CloseWellKnownConnections() +and then moved on to ddxGiveUp(), which failed to release the VT and thus +called AbortServer(), which called CloseWellKnownConnections() again. + +Signed-off-by: Alan Coopersmith <alan.coopersmith@oracle.com> +Reviewed-by: Adam Jackson <ajax@redhat.com> +--- + os/connection.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/os/connection.c b/os/connection.c +index ddfe50a..7ff44e1 100644 +--- a/os/connection.c ++++ b/os/connection.c +@@ -513,8 +513,13 @@ CloseWellKnownConnections(void) + { + int i; + +- for (i = 0; i < ListenTransCount; i++) +- _XSERVTransClose(ListenTransConns[i]); ++ for (i = 0; i < ListenTransCount; i++) { ++ if (ListenTransConns[i] != NULL) { ++ _XSERVTransClose(ListenTransConns[i]); ++ ListenTransConns[i] = NULL; ++ } ++ } ++ ListenTransCount = 0; + } + + static void diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb index 3bba3ce0bf..9d9ede2afc 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.15.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.16.3.bb @@ -1,16 +1,15 @@ require xserver-xorg.inc # Misc build failure for master HEAD -SRC_URI += "file://crosscompile.patch \ - file://fix_open_max_preprocessor_error.patch \ - file://mips64-compiler.patch \ +SRC_URI += "file://fix_open_max_preprocessor_error.patch \ file://xorg-CVE-2013-6424.patch \ file://xshmfence-option.patch \ - file://present-module.patch \ + file://Fix-subwindow-in-Xi-emulated-events.patch \ + file://xtrans.patch \ " -SRC_URI[md5sum] = "e4c70262ed89764be8f8f5d699ed9227" -SRC_URI[sha256sum] = "626db6882602ebe1ff81f7a4231c7ccc6ceb5032f2b5b3954bf749e1567221e2" +SRC_URI[md5sum] = "afd93977235584a9caa7528a737c1b52" +SRC_URI[sha256sum] = "5e0f443238af1078b48f6eea98a382861b59187da221c2cf714d31c1d560b0fb" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/meta/recipes-graphics/xrestop/xrestop_0.4.bb b/meta/recipes-graphics/xrestop/xrestop_0.4.bb index 20d66be55b..ce5df03936 100644 --- a/meta/recipes-graphics/xrestop/xrestop_0.4.bb +++ b/meta/recipes-graphics/xrestop/xrestop_0.4.bb @@ -19,4 +19,6 @@ SRC_URI = "http://downloads.yoctoproject.org/releases/xrestop/xrestop-${PV}.tar. SRC_URI[md5sum] = "d8a54596cbaf037e62b80c4585a3ca9b" SRC_URI[sha256sum] = "67c2fc94a7ecedbaae0d1837e82e93d1d98f4a6d759828860e552119af3ce257" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb index 7e01775ce4..4bfddf06b5 100644 --- a/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb +++ b/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb @@ -23,7 +23,9 @@ SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1" -inherit autotools pkgconfig +inherit autotools pkgconfig distro_features_check +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" do_install_append() { install -d ${D}${sysconfdir}/X11/Xsession.d/ |