diff options
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics')
166 files changed, 2049 insertions, 3309 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh b/import-layers/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh index 001a03357..4e509a701 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh +++ b/import-layers/yocto-poky/meta/recipes-graphics/builder/files/builder_session.sh @@ -23,8 +23,8 @@ if [ ! -d /home/builder/.local/share/applications ]; then xdg-mime default epiphany.desktop x-scheme-handler/https xdg-mime default epiphany.desktop text/html - #register text files with leafpad text editor - xdg-mime default leafpad.desktop text/plain + #register text files with l3afpad text editor + xdg-mime default l3afpad.desktop text/plain fi cd /home/builder/poky diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo.inc b/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo.inc index c7e686d5a..c4b6f329e 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo.inc @@ -36,7 +36,7 @@ EXTRA_OECONF += "${@get_cairo_fpu_setting(bb, d)} \ --enable-tee \ " -inherit autotools pkgconfig +inherit autotools pkgconfig upstream-version-is-even gtk-doc # We don't depend on binutils so we need to disable this export ac_cv_lib_bfd_bfd_openr="no" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb b/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb index 20b46689f..d2c1e12cd 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.6.bb @@ -7,8 +7,6 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz" SRC_URI[md5sum] = "23a0b2f0235431d35238df1d3a517fdb" SRC_URI[sha256sum] = "613cb38447b76a93ff7235e17acd55a78b52ea84a9df128c3f2257f8eaa7b252" -UPSTREAM_CHECK_REGEX = "cairo-(?P<pver>\d+(\.\d+)+)\.tar" - PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" SUMMARY_${PN} = "The Cairo 2D vector graphics library" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb index 127f0a1c3..e3e4cde2c 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_git.bb @@ -10,10 +10,11 @@ SECTION = "fonts" LICENSE = "OFL-1.1" LIC_FILES_CHKSUM = "file://COPYING;md5=df91e3ffcab8cfb972a66bf11255188d" -PV = "0.0.21+git${SRCPV}" +PV = "0.0.24" -SRCREV = "611c169df5287c059d63b0c8f0570647c75c9189" +SRCREV = "07b6ea2cbbebfc360aa4668612a376be5e214eaa" SRC_URI = "git://git.gnome.org/cantarell-fonts;protocol=git;branch=master" +UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(?!0\.13)(?!0\.10\.1)\d+\.\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch new file mode 100644 index 000000000..7b3c1980b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch @@ -0,0 +1,143 @@ +From 3a0404dfbc65c6a864e01d1200a48074e19d5def Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 2 Sep 2016 14:28:38 +0300 +Subject: [PATCH] Remove clutter.types as it is build configuration-specific. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + doc/reference/clutter.types | 122 -------------------------------------------- + 1 file changed, 122 deletions(-) + delete mode 100644 doc/reference/clutter.types + +diff --git a/doc/reference/clutter.types b/doc/reference/clutter.types +deleted file mode 100644 +index 0037acc..0000000 +--- a/doc/reference/clutter.types ++++ /dev/null +@@ -1,122 +0,0 @@ +-cally_actor_get_type +-cally_clone_get_type +-cally_group_get_type +-cally_rectangle_get_type +-cally_root_get_type +-cally_stage_get_type +-cally_text_get_type +-cally_texture_get_type +-cally_util_get_type +-clutter_action_get_type +-clutter_actor_box_get_type +-clutter_actor_get_type +-clutter_actor_meta_get_type +-clutter_align_constraint_get_type +-clutter_alpha_get_type +-clutter_animatable_get_type +-clutter_animation_get_type +-clutter_animator_get_type +-clutter_animator_key_get_type +-clutter_backend_get_type +-clutter_behaviour_depth_get_type +-clutter_behaviour_ellipse_get_type +-clutter_behaviour_get_type +-clutter_behaviour_opacity_get_type +-clutter_behaviour_path_get_type +-clutter_behaviour_rotate_get_type +-clutter_behaviour_scale_get_type +-clutter_bin_layout_get_type +-clutter_bind_constraint_get_type +-clutter_binding_pool_get_type +-clutter_blur_effect_get_type +-clutter_box_get_type +-clutter_box_layout_get_type +-clutter_brightness_contrast_effect_get_type +-clutter_cairo_texture_get_type +-clutter_canvas_get_type +-clutter_child_meta_get_type +-clutter_click_action_get_type +-clutter_clip_node_get_type +-clutter_clone_get_type +-clutter_color_get_type +-clutter_color_node_get_type +-clutter_colorize_effect_get_type +-clutter_constraint_get_type +-clutter_container_get_type +-clutter_content_get_type +-clutter_deform_effect_get_type +-clutter_desaturate_effect_get_type +-clutter_device_manager_get_type +-clutter_drag_action_get_type +-clutter_drop_action_get_type +-clutter_effect_get_type +-clutter_event_get_type +-clutter_event_sequence_get_type +-clutter_fixed_layout_get_type +-clutter_flow_layout_get_type +-clutter_fog_get_type +-clutter_geometry_get_type +-clutter_gesture_action_get_type +-clutter_glx_texture_pixmap_get_type +-clutter_grid_layout_get_type +-clutter_group_get_type +-clutter_image_get_type +-clutter_input_device_get_type +-clutter_interval_get_type +-clutter_keyframe_transition_get_type +-clutter_knot_get_type +-clutter_layout_manager_get_type +-clutter_layout_meta_get_type +-clutter_list_model_get_type +-clutter_margin_get_type +-clutter_media_get_type +-clutter_model_get_type +-clutter_model_iter_get_type +-clutter_offscreen_effect_get_type +-clutter_page_turn_effect_get_type +-clutter_paint_node_get_type +-clutter_paint_volume_get_type +-clutter_pan_action_get_type +-clutter_param_color_get_type +-clutter_param_fixed_get_type +-clutter_param_units_get_type +-clutter_path_constraint_get_type +-clutter_path_get_type +-clutter_path_node_get_type +-clutter_perspective_get_type +-clutter_pipeline_node_get_type +-clutter_point_get_type +-clutter_property_transition_get_type +-clutter_rect_get_type +-clutter_rectangle_get_type +-clutter_rotate_action_get_type +-clutter_score_get_type +-clutter_script_get_type +-clutter_scriptable_get_type +-clutter_scroll_actor_get_type +-clutter_settings_get_type +-clutter_shader_effect_get_type +-clutter_shader_float_get_type +-clutter_shader_get_type +-clutter_shader_int_get_type +-clutter_shader_matrix_get_type +-clutter_size_get_type +-clutter_snap_constraint_get_type +-clutter_stage_get_type +-clutter_stage_manager_get_type +-clutter_state_get_type +-clutter_state_key_get_type +-clutter_swipe_action_get_type +-clutter_table_layout_get_type +-clutter_tap_action_get_type +-clutter_text_buffer_get_type +-clutter_text_get_type +-clutter_text_node_get_type +-clutter_texture_get_type +-clutter_texture_node_get_type +-clutter_timeline_get_type +-clutter_transition_get_type +-clutter_transition_group_get_type +-clutter_units_get_type +-clutter_vertex_get_type +-clutter_zoom_action_get_type +-- +2.9.3 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch deleted file mode 100644 index c4edff395..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/0001-build-Use-AC_COMPILE_IFELSE.patch +++ /dev/null @@ -1,105 +0,0 @@ -From 483a4bb00e7dd2f14d86e167c8013c8638723c33 Mon Sep 17 00:00:00 2001 -From: Emmanuele Bassi <ebassi@gnome.org> -Date: Thu, 18 Feb 2016 17:19:09 +0000 -Subject: [PATCH] build: Use AC_COMPILE_IFELSE - -Instead of AC_TRY_COMPILE, which has been deprecated by newer autoconf. ---- -Upstream-Status: Backport -Signed-off-by: Khem Raj <raj.khem@gmail.com> - - configure.ac | 66 ++++++++++++++++++++++++++++++------------------------------ - 1 file changed, 33 insertions(+), 33 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 4d72e0c..8ca3f94 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -348,24 +348,25 @@ AS_IF([test "x$enable_wayland" != xno], - # We need to manually check for Wayland support in Cogl because - # the windowing systems are not exposed in the pkg-config file - saved_CFLAGS="${CFLAGS}" -- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" -+ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" - - AC_MSG_CHECKING([for Wayland Cogl backend]) -- AC_TRY_COMPILE([#include <cogl/cogl.h>], -- [ -- #ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT -- #error "No Wayland support in Cogl" -- #endif -- int main (void) { return 0; } -- ], -- [ -- AC_MSG_RESULT(yes) -- have_cogl_wayland=yes -- ], -- [ -- AC_MSG_RESULT(no) -- have_cogl_wayland=no -- ]) -+ -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#include <cogl/cogl.h> -+]], -+[[ -+#ifndef COGL_HAS_EGL_PLATFORM_WAYLAND_SUPPORT -+#error Cogl compiled without Wayland support -+#endif -+]])], [ -+ AC_MSG_RESULT(yes) -+ have_cogl_wayland=yes -+ ], [ -+ AC_MSG_RESULT(no) -+ have_cogl_wayland=no -+ ]) -+ - CFLAGS="${saved_CFLAGS}" - AS_IF([test "x$have_cogl_wayland" = xyes], - [ -@@ -499,26 +500,25 @@ AS_IF([test "x$enable_mir" = "xyes"], - # We need to manually check for Mir support in Cogl because - # the windowing systems are not exposed in the pkg-config file - saved_CFLAGS="${CFLAGS}" -- CFLAGS="`$PKG_CONFIG --cflags $CLUTTER_BASE_PC_FILES`" -+ CFLAGS="`$PKG_CONFIG --cflags cogl-1.0`" - - AC_MSG_CHECKING([for Mir Cogl backend]) -- AC_TRY_COMPILE([#include <cogl/cogl.h>], -- [ -- #ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT -- #error "No Mir support in Cogl" -- #endif -- int main (void) { return 0; } -- ], -- [ -- AC_MSG_RESULT(yes) -- have_cogl_mir=yes -- ], -- [ -- AC_MSG_RESULT(no) -- have_cogl_mir=no -- ]) - -- CFLAGS="${saved_CFLAGS}" -+ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ -+#include <cogl/cogl.h> -+]], -+[[ -+#ifndef COGL_HAS_EGL_PLATFORM_MIR_SUPPORT -+#error Cogl compiled without Mir support -+#endif -+]])], [ -+ AC_MSG_RESULT(yes) -+ have_cogl_mir=yes -+ ], [ -+ AC_MSG_RESULT(no) -+ have_cogl_mir=no -+ ]) -+ - AS_IF([test "x$have_cogl_mir" = xno], [AC_MSG_ERROR("*** Cogl is missing Mir support.")]) - - PKG_CHECK_EXISTS([mirclient], --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb deleted file mode 100644 index c53b3e71b..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.24.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require clutter-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -SRC_URI[archive.md5sum] = "3b98e1b33719982a5736ae42cbf7183e" -SRC_URI[archive.sha256sum] = "9631c98cb4bcbfec15e1bbe9eaa6eef0f127201552fce40d7d28f2133803cd63" -SRC_URI += "file://install-examples.patch \ - file://run-installed-tests-with-tap-output.patch \ - file://0001-build-Use-AC_COMPILE_IFELSE.patch \ - file://run-ptest" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.0.bb new file mode 100644 index 000000000..dfa1cfe77 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0_1.26.0.bb @@ -0,0 +1,10 @@ +require clutter-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" + +SRC_URI[archive.md5sum] = "b065e9ca53d1f6bc1ec26aeb27338bb7" +SRC_URI[archive.sha256sum] = "67514e7824b3feb4723164084b36d6ce1ae41cb3a9897e9f1a56c8334993ce06" +SRC_URI += "file://install-examples.patch \ + file://run-installed-tests-with-tap-output.patch \ + file://0001-Remove-clutter.types-as-it-is-build-configuration-sp.patch \ + file://run-ptest" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.18.bb index fcf5242c5..9626cd905 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.16.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.18.bb @@ -3,5 +3,5 @@ require clutter-gst-3.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ file://clutter-gst/clutter-gst.h;beginline=1;endline=24;md5=95baacba194e814c110ea3bdf25ddbf4" -SRC_URI[archive.md5sum] = "ca24eb92a0d34fc9e66fd686a965d51c" -SRC_URI[archive.sha256sum] = "803e8b7265e63e0581e21fd0c6064792dfe951512e9f515e9e7a9b452caaf9f0" +SRC_URI[archive.md5sum] = "3e4f64477f26d9cfd2db06d3aaed203a" +SRC_URI[archive.sha256sum] = "0aec0d0c6020cd19a5bb0dab1165a92748f81a9a3acdfabb0f966d5f53bc8093" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb deleted file mode 100644 index 23257bb9c..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.6.6.bb +++ /dev/null @@ -1,6 +0,0 @@ -require clutter-gtk-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI[archive.md5sum] = "79dc3d7a8645f87d83a9ccca8a08aa8e" -SRC_URI[archive.sha256sum] = "9440a68600f58d00fe0af35383738943e8ead9907f4cf507a102d96822434a28" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb new file mode 100644 index 000000000..675365cbb --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.0.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI[archive.md5sum] = "351cf9229cf941d36b441ede2236d742" +SRC_URI[archive.sha256sum] = "742ef9d68ece36cbb1b2e1a4a6fbdad932f6645360be7e6de75abbb140dfbf1d" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc b/import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc index 690ea3b86..7a79aa789 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/cogl/cogl-1.0.inc @@ -73,3 +73,5 @@ FILES_libcogl-path = "${libdir}/libcogl-path${SOLIBS}" RPROVIDES_libcogl = "cogl-1.0" RCONFLICTS_libcogl = "cogl-1.0" RREPLACES_libcogl = "cogl-1.0" + +COMPATIBLE_HOST_armv4 = 'null' diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch deleted file mode 100644 index 0717ea6f8..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb-examples/configure.in-Fix-string-argument-syntax.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 88077ed156a714f32bb408f422278d61611ffd41 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Sat, 26 Jul 2014 16:57:46 -0300 -Subject: [PATCH] configure.in: Fix string argument syntax - -Upstream-Status: Submitted - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index bfe1b82..e939bbd 100644 ---- a/configure.in -+++ b/configure.in -@@ -65,7 +65,7 @@ fi) - - DIRECTFB_REQUIRED_VERSION=1.4.14 - --PKG_CHECK_MODULES(DIRECTFB, directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], -+PKG_CHECK_MODULES([DIRECTFB], directfb >= $DIRECTFB_REQUIRED_VERSION,[ WATER=`$PKG_CONFIG --variable=water directfb` ], - AC_MSG_ERROR([$DIRECTFB_PKG_ERRORS - *** DirectFB $DIRECTFB_REQUIRED_VERSION or newer is required. The latest version - *** of DirectFB is available from http://www.directfb.org/.])) --- -1.7.10.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb deleted file mode 100644 index 7907c5c0d..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb-examples_1.7.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Example DirectFB applications" -DESCRIPTION = "The DirectFB-examples package contains a set of simple DirectFB \ - applications that can be used to test and demonstrate various DirectFB \ - features" -DEPENDS = "directfb" -SECTION = "libs" -LICENSE = "MIT" - -SRC_URI = " \ - http://downloads.yoctoproject.org/mirror/sources/DirectFB-examples-${PV}.tar.gz \ - file://configure.in-Fix-string-argument-syntax.patch \ - " - -LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f" - -S = "${WORKDIR}/DirectFB-examples-${PV}" - -inherit autotools pkgconfig - -SRC_URI[md5sum] = "8b60c867af295481c32a8c7fc5802307" -SRC_URI[sha256sum] = "9a2104cc4da8123c8371813551b66b943198979f745cbebc034bb5e10844122a" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb.inc b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb.inc deleted file mode 100644 index f6b7cbe1a..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb.inc +++ /dev/null @@ -1,79 +0,0 @@ -SUMMARY = "Graphics abstraction library for the Linux Framebuffer Device" -DESCRIPTION = "DirectFB is a thin library that provides developers \ -with hardware graphics acceleration, input device handling and \ -abstraction, an integrated windowing system with support for \ -translucent windows and multiple display layers on top of the \ -Linux framebuffer device." -SECTION = "libs" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" - -HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib tslib sysfsutils" - -SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ - file://configurefix.patch \ - file://fusion.patch \ - file://bashism.patch \ - file://0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch \ - file://compar_fn_t.patch \ - file://union-sigval.patch \ - file://use-PTHREAD_MUTEX_RECURSIVE.patch \ - " - -S = "${WORKDIR}/DirectFB-${PV}" - -LDFLAGS_append =" -lts -lm" - -# Workaround for linking issues seen with armv7a + gold -LDFLAGS_append_arm = "${@base_contains('DISTRO_FEATURES', 'ld-is-gold', ' -fuse-ld=bfd ', '', d)}" - -BINCONFIG = "${bindir}/directfb-config" - -inherit autotools binconfig-disabled pkgconfig - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" -PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" -PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" - -EXTRA_OECONF = "\ - --with-gfxdrivers=none \ - --enable-freetype=yes \ - --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 -#this will cause directfb build failure on x86 arch, so filter out it. -TARGET_CFLAGS_remove_x86 = "-fno-omit-frame-pointer" - -#PACKAGES_DYNAMIC += "^directfb-inputdrivers-.*" -# -#python populate_packages_prepend () { -# inputdrivers_libdir = d.expand('${libdir}/directfb-${RV}/inputdrivers') -# do_split_packages(d, inputdrivers_libdir, '*.so$', 'directfb-inputdrivers-%s', 'Directfb plugin for %s') -#} - -# NOTE: monolithic packaging for now, should improve that eventually - -FILES_${PN}-dev += "\ - ${bindir}/directfb-config \ - ${libdir}/directfb-${RV}/systems/*.la \ - ${libdir}/directfb-${RV}/inputdrivers/*.la \ - ${libdir}/directfb-${RV}/interfaces/*/*.la \ - ${libdir}/directfb-${RV}/wm/*.la \ -" - -FILES_${PN} += "\ - ${libdir}/directfb-${RV}/systems/*.so \ - ${libdir}/directfb-${RV}/inputdrivers/*.so \ - ${libdir}/directfb-${RV}/interfaces/*/*.so \ - ${libdir}/directfb-${RV}/wm/*.so \ - ${datadir}/directfb-${PV} \ -" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch deleted file mode 100644 index 76e0f7530..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/0001-gfx-direct-Aboid-usng-VLAs-and-printf-formats.patch +++ /dev/null @@ -1,61 +0,0 @@ -From f43ef44806ffb8e3b35d99070dde9b6cc1714d3d Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 8 Sep 2015 21:32:20 +0000 -Subject: [PATCH] gfx,direct: Aboid usng VLAs and printf formats - -VLAs are flagged by clang when using non-POD types, therefore replace -the usage with alloca which is exact same allocation on stack - - __attribute__((__format__ (__printf__))) is not portable as used here - therefore disable the check for clang here, we lose no functionality - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- -Upstream-Status: Pending - - lib/direct/util.h | 2 +- - src/gfx/util.cpp | 8 ++++---- - 2 files changed, 5 insertions(+), 5 deletions(-) - -diff --git a/lib/direct/util.h b/lib/direct/util.h -index 72941e9..8e7fa4a 100644 ---- a/lib/direct/util.h -+++ b/lib/direct/util.h -@@ -98,7 +98,7 @@ - #define D_CONST_FUNC - #endif - --#if __GNUC__ >= 3 -+#if __GNUC__ >= 3 && !defined __clang__ - #define D_FORMAT_PRINTF(n) __attribute__((__format__ (__printf__, n, n+1))) - #define D_FORMAT_VPRINTF(n) __attribute__((__format__ (__printf__, n, 0))) - #else -diff --git a/src/gfx/util.cpp b/src/gfx/util.cpp -index 40032bc..d1015d4 100644 ---- a/src/gfx/util.cpp -+++ b/src/gfx/util.cpp -@@ -294,8 +294,8 @@ dfb_gfx_copy_regions_stereo( CoreSurface *source, - { - unsigned int i, n = 0; - DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h }; -- DFBRectangle rects[num]; -- DFBPoint points[num]; -+ DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num); -+ DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num); - - for (i=0; i<num; i++) { - DFB_REGION_ASSERT( ®ions[i] ); -@@ -351,8 +351,8 @@ dfb_gfx_copy_regions_client( CoreSurface *source, - { - unsigned int i, n = 0; - DFBRectangle rect = { 0, 0, source->config.size.w, source->config.size.h }; -- DFBRectangle rects[num]; -- DFBPoint points[num]; -+ DFBRectangle *rects = (DFBRectangle*)alloca( sizeof(struct DFBRectangle) * num); -+ DFBPoint *points = (DFBPoint*)alloca( sizeof(struct DFBPoint) * num); - CoreGraphicsStateClient *client = _client ? _client : &StateClient::Get()->client; - CardState *state = client->state; - CardState backup; --- -2.5.1 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/bashism.patch b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/bashism.patch deleted file mode 100644 index 2ef4e9385..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/bashism.patch +++ /dev/null @@ -1,18 +0,0 @@ -${x//y/} is a bash syntax. Replace with something dash compatible - -RP 2015/5/3 -Upstream-Status: Pending - -Index: DirectFB-1.7.7/configure.in -=================================================================== ---- DirectFB-1.7.7.orig/configure.in -+++ DirectFB-1.7.7/configure.in -@@ -2696,7 +2696,7 @@ AM_CONDITIONAL(BUILD_TOOLS, test "$with_ - AM_CONDITIONAL(CROSS_COMPILING, test "$cross_compiling" = "yes") - - CFLAGS="$CFLAGS $DFB_INTERNAL_CFLAGS" --CXXFLAGS="$CXXFLAGS ${CFLAGS//-Werror-implicit-function-declaration/}" -+CXXFLAGS="$CXXFLAGS $(printf '%s\n' "$CFLAGS" | sed 's/-Werror-implicit-function-declaration//g')" - DFB_LDFLAGS="$LDFLAGS $ZLIB_LIBS" - - CFLAGS="$CFLAGS $CFLAGS_STD" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch deleted file mode 100644 index ee4d900ba..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/compar_fn_t.patch +++ /dev/null @@ -1,62 +0,0 @@ -test for __compar_fn_t and if not defined by libc then define it -help make directfb compile with musl - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -Index: DirectFB-1.7.7/configure.in -=================================================================== ---- DirectFB-1.7.7.orig/configure.in -+++ DirectFB-1.7.7/configure.in -@@ -112,6 +112,17 @@ AC_CHECK_SIZEOF(long) - AC_CHECK_SIZEOF(long long) - AC_CHECK_FUNCS(fork) - -+AC_CACHE_CHECK([for compar_fn_t in stdlib.h],ccache_cv_COMPAR_FN_T, [ -+ AC_TRY_COMPILE( -+ [#include <stdlib.h>], -+ [void test_fn(void) { qsort(NULL, 0, 0, (__compar_fn_t)NULL); }], -+ ccache_cv_COMPAR_FN_T=yes, -+ ccache_cv_COMPAR_FN_T=no)]) -+if test x"$ccache_cv_COMPAR_FN_T" = x"yes"; then -+ AC_DEFINE(HAVE_COMPAR_FN_T, 1, -+ Define to 1 if you have the `__compar_fn_t' typedef.) -+fi -+ - AC_PATH_PROGS(PERL, perl5 perl) - - AC_PATH_PROG(MAN2HTML, man2html, no) -Index: DirectFB-1.7.7/inputdrivers/lirc/lirc.c -=================================================================== ---- DirectFB-1.7.7.orig/inputdrivers/lirc/lirc.c -+++ DirectFB-1.7.7/inputdrivers/lirc/lirc.c -@@ -59,6 +59,11 @@ - - #include <core/input_driver.h> - -+#if HAVE_COMPAR_FN_T -+#define COMPAR_FN_T __compar_fn_t -+#else -+typedef int (*COMPAR_FN_T)(const void *, const void *); -+#endif - - DFB_INPUT_DRIVER( lirc ) - -@@ -97,7 +102,7 @@ static DFBInputDeviceKeySymbol lirc_pars - qsort ( keynames, - D_ARRAY_SIZE( keynames ), - sizeof(keynames[0]), -- (__compar_fn_t) keynames_sort_compare ); -+ (COMPAR_FN_T) keynames_sort_compare ); - keynames_sorted = true; - } - -@@ -124,7 +129,7 @@ static DFBInputDeviceKeySymbol lirc_pars - symbol_name = bsearch( name, keynames, - D_ARRAY_SIZE( keynames ), - sizeof(keynames[0]), -- (__compar_fn_t) keynames_compare ); -+ (COMPAR_FN_T) keynames_compare ); - if (symbol_name) - return symbol_name->symbol; - break; diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/configurefix.patch b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/configurefix.patch deleted file mode 100644 index dd8c01905..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/configurefix.patch +++ /dev/null @@ -1,60 +0,0 @@ -Libtool needs these set correctly else we end up with pointless rpaths -such as the QA warnings: - -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfblayer contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbmaster contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgifft contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbdump contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinput contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbfx contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbscreen contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdgiff contains probably-redundant RPATH /usr/libWARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinspector contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/mkdfiff contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbinfo contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbpenmount contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/bin/dfbg contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6 contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libdirectfb-1.4.so.6 contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/libfusion-1.4.so.6.0.9 contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_fbdev.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_devmem.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/systems/libdirectfb_dummy.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_v4l.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBVideoProvider/libidirectfbvideoprovider_gif.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/ICoreResourceManager/libicoreresourcemanager_test.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_jpeg.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_png.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_dfiff.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBImageProvider/libidirectfbimageprovider_gif.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_ft2.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/interfaces/IDirectFBFont/libidirectfbfont_dgiff.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/wm/libdirectfbwm_default.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_zytronic.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_penmount.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_linux_input.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_serialmouse.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_mutouch.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_tslib.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_joystick.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_sonypi.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_lirc.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_wm97xx_ts.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_ps2mouse.so contains probably-redundant RPATH /usr/lib -WARNING: QA Issue: directfb: /work/i586-poky-linux/directfb-1.4.15-r1/packages-split/directfb/usr/lib/directfb-1.4-6/inputdrivers/libdirectfb_keyboard.so contains probably-redundant RPATH /usr/lib - -Upstream-Status: Pending - -RP 2012/03/16 - -Index: DirectFB-1.4.15/configure.in -=================================================================== ---- DirectFB-1.4.15.orig/configure.in 2012-03-16 13:32:23.692402879 +0000 -+++ DirectFB-1.4.15/configure.in 2012-03-16 13:33:22.312400960 +0000 -@@ -97,13 +97,6 @@ - AC_CHECK_SIZEOF(long long) - AC_CHECK_FUNCS(fork) - -- --## Work around libstuhl during cross build... --if test "$host" != "$build"; then -- sys_lib_dlsearch_path_spec="" -- sys_lib_search_path_spec="" --fi -- - AC_PATH_PROGS(PERL, perl5 perl) - - AC_PATH_PROG(MAN2HTML, man2html, no) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/fusion.patch b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/fusion.patch deleted file mode 100644 index 1f81a6796..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/fusion.patch +++ /dev/null @@ -1,36 +0,0 @@ -directfb: Fix for hangs in direct_test, fusion_skirmish on exit - -Upstream-Status: Pending -Signed-off-by: Lauren Post <lauren.post@freescale.com> - ---- a/lib/fusion/fusion.c 2013-01-18 22:57:11.000000000 +0800 -+++ b/lib/fusion/fusion.c 2013-07-04 10:42:56.502699119 +0800 -@@ -2853,9 +2853,14 @@ - direct_mutex_lock( &world->event_dispatcher_mutex ); - - while (1) { -- if (!world->event_dispatcher_buffers) -+ if (!world->event_dispatcher_buffers){ - direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); -- -+ if (world->dispatch_stop) { -+ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); -+ direct_mutex_unlock( &world->event_dispatcher_mutex ); -+ return NULL; -+ } -+ } - buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; - D_MAGIC_ASSERT( buf, FusionEventDispatcherBuffer ); - -@@ -2872,6 +2877,11 @@ - //D_INFO("waiting...\n"); - D_ASSERT( buf->read_pos == buf->write_pos ); - direct_waitqueue_wait( &world->event_dispatcher_cond, &world->event_dispatcher_mutex ); -+ if (world->dispatch_stop) { -+ D_DEBUG_AT( Fusion_Main_Dispatch, " -> IGNORING (dispatch_stop!)\n" ); -+ direct_mutex_unlock( &world->event_dispatcher_mutex ); -+ return NULL; -+ } - } - - buf = (FusionEventDispatcherBuffer *)world->event_dispatcher_buffers; diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch deleted file mode 100644 index 29f45c797..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/union-sigval.patch +++ /dev/null @@ -1,19 +0,0 @@ -This patch is taken from gentoo musl overlay -sigval_t is glibc only construct, we use a union of sigval -which pretty much is same effect as sigval_t - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> - -diff -Naur DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c ---- DirectFB-1.7.6.orig/lib/direct/os/linux/glibc/system.c 2014-07-15 02:54:58.000000000 -0400 -+++ DirectFB-1.7.6/lib/direct/os/linux/glibc/system.c 2015-07-18 16:55:35.077989166 -0400 -@@ -111,7 +111,7 @@ - void - direct_trap( const char *domain, int sig ) - { -- sigval_t val; -+ union sigval val; - - if (direct_config->delay_trap_ms) { - D_LOG( Direct_Trap, VERBOSE, "NOT RAISING signal %d from %s, waiting for %dms... attach gdb --pid=%d\n", sig, domain, direct_config->delay_trap_ms, getpid() ); diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch deleted file mode 100644 index ac48f68db..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb/use-PTHREAD_MUTEX_RECURSIVE.patch +++ /dev/null @@ -1,116 +0,0 @@ -Remove use of DIRECT_RECURSIVE_MUTEX_INITIALIZER its not portable -use portable way to initialize recursive mutex using pthread_once() and direct_recursive_mutex_init() - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Index: DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h -=================================================================== ---- DirectFB-1.7.7.orig/lib/direct/os/linux/glibc/mutex.h -+++ DirectFB-1.7.7/lib/direct/os/linux/glibc/mutex.h -@@ -46,7 +46,6 @@ struct __D_DirectMutex { - /**********************************************************************************************************************/ - - #define DIRECT_MUTEX_INITIALIZER(name) { PTHREAD_MUTEX_INITIALIZER } --#define DIRECT_RECURSIVE_MUTEX_INITIALIZER(name) { PTHREAD_RECURSIVE_MUTEX_INITIALIZER_NP } - - #endif - -Index: DirectFB-1.7.7/lib/direct/trace.c -=================================================================== ---- DirectFB-1.7.7.orig/lib/direct/trace.c -+++ DirectFB-1.7.7/lib/direct/trace.c -@@ -89,8 +89,15 @@ struct __D_DirectTraceBuffer { - /**************************************************************************************************/ - - static DirectLink *buffers; --static DirectMutex buffers_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(buffers_lock); - -+static pthread_once_t buffers_lock_init_once = PTHREAD_ONCE_INIT; -+static DirectMutex buffers_lock; -+ -+static void -+buffers_lock_init( void ) -+{ -+ direct_recursive_mutex_init(&buffers_lock); -+} - /**************************************************************************************************/ - - __dfb_no_instrument_function__ -@@ -113,6 +120,7 @@ get_trace_buffer( void ) - - D_MAGIC_SET( buffer, DirectTraceBuffer ); - -+ pthread_once(&buffers_lock_init_once, buffers_lock_init); - direct_mutex_lock( &buffers_lock ); - direct_list_append( &buffers, &buffer->link ); - direct_mutex_unlock( &buffers_lock ); -@@ -138,8 +146,14 @@ typedef struct { - } SymbolTable; - - static DirectLink *tables = NULL; --static DirectMutex tables_lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(tables_lock); -+static pthread_once_t tables_lock_init_once = PTHREAD_ONCE_INIT; -+static DirectMutex tables_lock; - -+static void -+tables_lock_init( void ) -+{ -+ direct_recursive_mutex_init(&tabless_lock); -+} - - __dfb_no_instrument_function__ - static void -@@ -370,6 +384,7 @@ direct_trace_lookup_symbol( const char * - Symbol *symbol; - SymbolTable *table; - -+ pthread_once(&tables_lock_init_once, tables_lock_init); - direct_mutex_lock( &tables_lock ); - - table = find_table( filename ); -@@ -514,6 +529,7 @@ direct_trace_print_stacks() - DirectTraceBuffer *b; - DirectTraceBuffer *buffer = get_trace_buffer(); - -+ pthread_once(&buffers_lock_init_once, buffers_lock_init); - direct_mutex_lock( &buffers_lock ); - - if (buffer && buffer->level) -@@ -611,6 +627,7 @@ direct_trace_free_buffer( DirectTraceBuf - D_MAGIC_ASSERT( buffer, DirectTraceBuffer ); - - if (buffer->thread) { -+ pthread_once(&buffers_lock_init_once, buffers_lock_init); - direct_mutex_lock( &buffers_lock ); - direct_list_remove( &buffers, &buffer->link ); - direct_mutex_unlock( &buffers_lock ); -Index: DirectFB-1.7.7/src/directfb.c -=================================================================== ---- DirectFB-1.7.7.orig/src/directfb.c -+++ DirectFB-1.7.7/src/directfb.c -@@ -99,6 +99,15 @@ const unsigned int directfb_micro_versio - const unsigned int directfb_binary_age = DIRECTFB_BINARY_AGE; - const unsigned int directfb_interface_age = DIRECTFB_INTERFACE_AGE; - -+static pthread_once_t lock_init_once = PTHREAD_ONCE_INIT; -+static DirectMutex lock; -+ -+static void -+lock_init( void ) -+{ -+ direct_recursive_mutex_init(&lock); -+} -+ - const char * - DirectFBCheckVersion( unsigned int required_major, - unsigned int required_minor, -@@ -215,8 +224,7 @@ DirectFBCreate( IDirectFB **interface_pt - if (dfb_config->remote.host) - return CreateRemote( dfb_config->remote.host, dfb_config->remote.port, interface_ptr ); - -- static DirectMutex lock = DIRECT_RECURSIVE_MUTEX_INITIALIZER(lock); -- -+ pthread_once(&lock_init_once, lock_init); - direct_mutex_lock( &lock ); - - if (!dfb_config->no_singleton && idirectfb_singleton) { diff --git a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb_1.7.7.bb b/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb_1.7.7.bb deleted file mode 100644 index c6c070eda..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/directfb/directfb_1.7.7.bb +++ /dev/null @@ -1,8 +0,0 @@ -require directfb.inc - -RV = "1.7-7" - -LEAD_SONAME = "libdirectfb-1.7.so.0" - -SRC_URI[md5sum] = "152cf1863b1a3a28aa1370e9053440bf" -SRC_URI[sha256sum] = "b785c638dc31b8fe3a7c81be1475c89b2255ab3d67b777c747d3fbc52f8027a3" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch new file mode 100644 index 000000000..bf526370b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch @@ -0,0 +1,56 @@ +From e6bd4205b0b546afe991ae6f72256645f4404ad4 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Mon, 5 Sep 2016 14:41:37 +0300 +Subject: [PATCH libdrm] configure.ac: Allow explicit enabling of cunit tests + +Add --with-cunit to make it easier to do reproducible builds. Default +is still to probe cunit and build opportunistically. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Submitted [mailing list] +--- + configure.ac | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index e3048c7..918d21d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -137,6 +137,12 @@ AC_ARG_ENABLE(install-test-programs, + [Install test programs (default: no)]), + [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no]) + ++AC_ARG_WITH([cunit], ++ [AS_HELP_STRING([--with-cunit], ++ [Build tests that use cunit (default: auto)])], ++ [], ++ [with_cunit=auto]) ++ + dnl =========================================================================== + dnl check compiler flags + AC_DEFUN([LIBDRM_CC_TRY_FLAG], [ +@@ -372,7 +378,7 @@ if test "x$RADEON" = xyes; then + AC_DEFINE(HAVE_RADEON, 1, [Have radeon support]) + fi + +-if test "x$AMDGPU" != xno; then ++if test "x$with_cunit" != xno -a "x$AMDGPU" != xno; then + # Detect cunit library + PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) + # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We +@@ -399,7 +406,11 @@ if test "x$AMDGPU" = xyes; then + AC_DEFINE(HAVE_CUNIT, [test "x$have_cunit" != "xno"], [Enable CUNIT Have amdgpu support]) + + if test "x$have_cunit" = "xno"; then +- AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) ++ if test "x$with_cunit" = "xyes"; then ++ AC_MSG_ERROR([Could not find cunit library but --with-cunit was given]) ++ elif test "x$with_cunit" = "xauto"; then ++ AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) ++ fi + fi + fi + +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch index 286e548bc..4708bf1eb 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/fix_O_CLOEXEC_undeclared.patch @@ -19,6 +19,6 @@ diff -Naur libdrm-2.4.66-orig/tests/drmdevice.c libdrm-2.4.66/tests/drmdevice.c */ +#include <config.h> + #include <errno.h> #include <stdio.h> #include <stdlib.h> - #include <sys/stat.h> diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.67.bb b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.70.bb index ddd697f34..a2b5282ea 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.67.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.70.bb @@ -13,14 +13,16 @@ DEPENDS = "libpthread-stubs udev libpciaccess" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ file://installtests.patch \ file://fix_O_CLOEXEC_undeclared.patch \ + file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \ " -SRC_URI[md5sum] = "b844c6af34e613ebf52f80b3cd8d7055" -SRC_URI[sha256sum] = "ee5b71e1113be37544d0752681c12f040c01f782e2933df7d7bc21fd0d10cebe" +SRC_URI[md5sum] = "920957cfe25a80efb02be9bd90bf3c1e" +SRC_URI[sha256sum] = "b17d4b39ed97ca0e4cffa0db06ff609e617bac94646ec38e8e0579d530540e7b" inherit autotools pkgconfig EXTRA_OECONF += "--disable-cairo-tests \ + --without-cunit \ --enable-omap-experimental-api \ --enable-install-test-programs \ --disable-manpages \ diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch b/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch deleted file mode 100644 index f2fd5d473..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch +++ /dev/null @@ -1,132 +0,0 @@ -From 46ec6a52d4cc447cc3ff4a13b2067ecb76c9db2e Mon Sep 17 00:00:00 2001 -From: Behdad Esfahbod <behdad@behdad.org> -Date: Fri, 26 Jun 2015 17:02:13 -0700 -Subject: [PATCH] Revert changes made to FcConfigAppFontAddDir() recently - -In 32ac7c75e8db0135ef37cf86f92d8b9be000c8bb the behavior of -FcConfigAppFontAddFile/Dir() were changed to return false -if not fonts were found. While this is welldefined and useful -for AddFile(), it's quite problematic for AddDir(). For example, -if the directory is empty, is that a failure or success? Worse, -the false value from AddDir() was being propagated all the way -to FcInit() returning false now. This only happened upon memory -allocation failure before, and some clients assert that FcInit() -is successful. - -With this change, AddDir() is reverted back to what it was. -AddFont() change (which was actually in fcdir.c) from the original -commit is left in. - -Upstream-Status: backport - -Signed-off-by: Li Zhou <li.zhou@windriver.com> ---- - doc/fcconfig.fncs | 2 +- - src/fccfg.c | 29 +++++++++++------------------ - src/fcint.h | 3 --- - src/fcstr.c | 8 -------- - 4 files changed, 12 insertions(+), 30 deletions(-) - -Index: fontconfig-2.11.94/doc/fcconfig.fncs -=================================================================== ---- fontconfig-2.11.94.orig/doc/fcconfig.fncs -+++ fontconfig-2.11.94/doc/fcconfig.fncs -@@ -232,7 +232,7 @@ the current configuration is used. - @DESC@ - Scans the specified directory for fonts, adding each one found to the - application-specific set of fonts. Returns FcFalse --if the fonts cannot be added (due to allocation failure or no fonts found). -+if the fonts cannot be added (due to allocation failure). - Otherwise returns FcTrue. If <parameter>config</parameter> is NULL, - the current configuration is used. - @@ -Index: fontconfig-2.11.94/src/fccfg.c -=================================================================== ---- fontconfig-2.11.94.orig/src/fccfg.c -+++ fontconfig-2.11.94/src/fccfg.c -@@ -368,7 +368,6 @@ FcConfigAddDirList (FcConfig *config, Fc - FcStrList *dirlist; - FcChar8 *dir; - FcCache *cache; -- FcBool ret = FcFalse; - - dirlist = FcStrListCreate (dirSet); - if (!dirlist) -@@ -383,10 +382,9 @@ FcConfigAddDirList (FcConfig *config, Fc - continue; - FcConfigAddCache (config, cache, set, dirSet); - FcDirCacheUnload (cache); -- ret = FcTrue; - } - FcStrListDone (dirlist); -- return ret; -+ return FcTrue; - } - - /* -@@ -2199,7 +2197,6 @@ FcConfigAppFontAddFile (FcConfig *con - FcStrSet *subdirs; - FcStrList *sublist; - FcChar8 *subdir; -- FcBool ret = FcFalse; - - if (!config) - { -@@ -2229,19 +2226,16 @@ FcConfigAppFontAddFile (FcConfig *con - FcStrSetDestroy (subdirs); - return FcFalse; - } -- if (subdirs->num == 0) -- ret = FcTrue; -- else if ((sublist = FcStrListCreate (subdirs))) -+ if ((sublist = FcStrListCreate (subdirs))) - { - while ((subdir = FcStrListNext (sublist))) - { -- if (FcConfigAppFontAddDir (config, subdir)) -- ret = FcTrue; -+ FcConfigAppFontAddDir (config, subdir); - } - FcStrListDone (sublist); - } - FcStrSetDestroy (subdirs); -- return ret; -+ return FcTrue; - } - - FcBool -@@ -2250,7 +2244,6 @@ FcConfigAppFontAddDir (FcConfig *con - { - FcFontSet *set; - FcStrSet *dirs; -- FcBool ret = FcTrue; - - if (!config) - { -@@ -2269,8 +2262,8 @@ FcConfigAppFontAddDir (FcConfig *con - set = FcFontSetCreate (); - if (!set) - { -- ret = FcFalse; -- goto bail; -+ FcStrSetDestroy (dirs); -+ return FcFalse; - } - FcConfigSetFonts (config, set, FcSetApplication); - } -@@ -2278,10 +2271,12 @@ FcConfigAppFontAddDir (FcConfig *con - FcStrSetAddFilename (dirs, dir); - - if (!FcConfigAddDirList (config, FcSetApplication, dirs)) -- ret = FcFalse; --bail: -+ { -+ FcStrSetDestroy (dirs); -+ return FcFalse; -+ } - FcStrSetDestroy (dirs); -- return ret; -+ return FcTrue; - } - - void diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb b/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb index b427947a9..115f558ee 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.11.94.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.1.bb @@ -14,7 +14,7 @@ BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=fontconfig" LICENSE = "MIT-style & MIT & PD" LIC_FILES_CHKSUM = "file://COPYING;md5=7a0449e9bc5370402a94c00204beca3d \ file://src/fcfreetype.c;endline=45;md5=5d9513e3196a1fbfdfa94051c09dfc84 \ - file://src/fccache.c;beginline=1199;endline=1214;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" + file://src/fccache.c;beginline=1360;endline=1375;md5=0326cfeb4a7333dd4dd25fbbc4b9f27f" SECTION = "libs" @@ -22,10 +22,9 @@ DEPENDS = "expat freetype zlib" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://revert-static-pkgconfig.patch \ - file://0001-Revert-changes-made-to-FcConfigAppFontAddDir-recentl.patch \ " -SRC_URI[md5sum] = "479be870c7f83f15f87bac085b61d641" -SRC_URI[sha256sum] = "73f6d323c7bcfbde25d78397675191d55b8f4139132c6a9444410f3a2d8a9a95" +SRC_URI[md5sum] = "ce55e525c37147eee14cc2de6cc09f6c" +SRC_URI[sha256sum] = "a9f42d03949f948a3a4f762287dbc16e53a927c91a07ee64207ebd90a9e5e292" PACKAGES =+ "fontconfig-utils" FILES_${PN} =+ "${datadir}/xml/*" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.5.bb index 3ed907012..97dde3a62 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.6.5.bb @@ -9,14 +9,17 @@ SECTION = "libs" LICENSE = "FreeType | GPLv2+" LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \ - file://docs/FTL.TXT;md5=d479e83797f699fe873b38dadd0fcd4c \ + file://docs/FTL.TXT;md5=13b25413274c9b3b09b63e4028216ff4 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://use-right-libtool.patch" -SRC_URI[md5sum] = "0037b25a8c090bc8a1218e867b32beb1" -SRC_URI[sha256sum] = "371e707aa522acf5b15ce93f11183c725b8ed1ee8546d7b3af549863045863a2" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/freetype/files/freetype2/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + +SRC_URI[md5sum] = "6a386964e18ba28cb93370e57a19031b" +SRC_URI[sha256sum] = "e20a6e1400798fd5e3d831dd821b61c35b1f9a6465d6b18a53a9df4cf441acf0" inherit autotools pkgconfig binconfig-disabled multilib_header @@ -43,4 +46,4 @@ do_install_append() { BINCONFIG = "${bindir}/freetype-config" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_1.13.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_2.0.0.bb index a25c405f3..489dd7c8f 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_1.13.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_2.0.0.bb @@ -11,8 +11,8 @@ DEPENDS = "virtual/libx11 virtual/libgl libglu libxext libxi libxmu" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://no-strip.patch" -SRC_URI[md5sum] = "7cbada3166d2aadfc4169c4283701066" -SRC_URI[sha256sum] = "aa25dc48ed84b0b64b8d41cdd42c8f40f149c37fa2ffa39cd97f42c78d128bc7" +SRC_URI[md5sum] = "2a2cd7c98f13854d2fcddae0d2b20411" +SRC_URI[sha256sum] = "c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew" UPSTREAM_CHECK_REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/" @@ -29,7 +29,7 @@ EXTRA_OEMAKE = "SYSTEM='linux' \ LDFLAGS.EXTRA='${LDFLAGS}' \ POPT='${CFLAGS}' \ GLEW_PREFIX='${prefix}' BINDIR='${bindir}' \ - LIBDIR='${libdir}' INCDIR='${includedir}/GL'" + LIBDIR='${libdir}' INCDIR='${includedir}/GL' PKGDIR='${libdir}/pkgconfig'" do_compile() { oe_runmake diff --git a/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.3.0.bb index cfe885fe7..f24c443a7 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.2.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.3.0.bb @@ -12,10 +12,10 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" -SRC_URI[md5sum] = "da8d97e262e6ef8288e1ae76369421bd" -SRC_URI[sha256sum] = "8216d2404aaab7fde87be0365a90d64aa6c55928e104557cfcb37b54a096cb8c" +SRC_URI[md5sum] = "a82d49ff67197bc3c96ea34b98880c52" +SRC_URI[sha256sum] = "b04be31633efee2cae1d62d46434587302554fa837224845a62565ec68a0334d" -inherit autotools pkgconfig lib_package +inherit autotools pkgconfig lib_package gtk-doc PACKAGECONFIG ??= "icu" PACKAGECONFIG[icu] = "--with-icu,--without-icu,icu" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-directfb.bb b/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-directfb.bb deleted file mode 100644 index 5641195e8..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-directfb.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "An image that uses DirectFB instead of X11" -LICENSE = "MIT" - - -LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690 \ - file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -inherit core-image distro_features_check - -REQUIRED_DISTRO_FEATURES = "directfb" -CONFLICT_DISTRO_FEATURES = "x11" - -IMAGE_INSTALL += "\ - ${CORE_IMAGE_BASE_INSTALL} \ - packagegroup-core-full-cmdline \ - packagegroup-core-directfb \ -" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb b/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb index 52e271dac..e36655ffc 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/images/core-image-weston.bb @@ -9,3 +9,4 @@ inherit core-image distro_features_check REQUIRED_DISTRO_FEATURES = "wayland" CORE_IMAGE_BASE_INSTALL += "weston weston-init weston-examples gtk+3-demo clutter-1.0-examples" +CORE_IMAGE_BASE_INSTALL += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'weston-xwayland matchbox-terminal', '', d)}" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb index 485943194..c9e70d73d 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_8d+1.4.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.0.bb @@ -1,23 +1,21 @@ +SUMMARY = "Hardware accelerated JPEG compression/decompression library" DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructions (MMX, SSE2, NEON) to accelerate baseline JPEG compression and decompression" HOMEPAGE = "http://libjpeg-turbo.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=12;md5=cad955d15145c3fdceec6855e078e953 \ - file://jpeglib.h;endline=14;md5=dfc803dc51ae21178d1376ec73c4454d \ - file://djpeg.c;endline=9;md5=e93a8f2061e8a0ac71c7a485c10489e2 \ +LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=05bab7c7ad899d85bfba60da1a1271f2 \ + file://jpeglib.h;endline=16;md5=f67d70e547a2662c079781c72f877f72 \ + file://djpeg.c;endline=11;md5=b90b6d2b4119f9e5807cd273f525d2af \ " - DEPENDS = "nasm-native" -BASEPV = "${@d.getVar('PV',True).split('+')[1]}" - -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${BASEPV}.tar.gz" -SRC_URI[md5sum] = "86b0d5f7507c2e6c21c00219162c3c44" -SRC_URI[sha256sum] = "521bb5d3043e7ac063ce3026d9a59cc2ab2e9636c655a2515af5f4706122233e" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI[md5sum] = "3fc5d9b6a8bce96161659ae7a9939257" +SRC_URI[sha256sum] = "9f397c31a67d2b00ee37597da25898b03eb282ccd87b135a50a69993b6a2035f" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" -S = "${WORKDIR}/${BPN}-${BASEPV}" +PE= "1" # Drop-in replacement for jpeg PROVIDES = "jpeg" @@ -30,6 +28,13 @@ inherit autotools pkgconfig # Work around missing x32 ABI support EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "--without-simd", "", d)}" +# Work around missing non-floating point ABI support in MIPS +EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf", "--without-simd", "", d)}" + +# Provide a workaround if Altivec unit is not present in PPC +EXTRA_OECONF_append_class-target_powerpc = "${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" +EXTRA_OECONF_append_class-target_powerpc64 = "${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" + PACKAGES =+ "jpeg-tools libturbojpeg" DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library." diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch b/import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch deleted file mode 100644 index 8cd507f79..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox/libpng.patch +++ /dev/null @@ -1,69 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 19c3d242034748b3c60765683e1ff4e2df970205 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Tue, 10 Dec 2013 11:37:32 +0000 -Subject: [PATCH] configure: improve libpng detection - -Instead of looking for "libpng12" explicitly though pkg-config and then falling -back to library hunting, just use pkg-config to find "libpng" which is provided -by both libpng12 and libpng16. - -This also makes the libpng detection deterministic. - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - configure.ac | 29 +++++------------------------ - 1 file changed, 5 insertions(+), 24 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 8a28076..65d7c79 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -34,7 +34,7 @@ AC_ARG_ENABLE(jpeg, - enable_jpeg=$enableval, enable_jpeg=no) - - AC_ARG_ENABLE(png, -- [ --disable-png disable png support [default=no]], -+ [ --disable-png disable PNG support [default=enabled]], - enable_png=$enableval, enable_png=yes ) - - AC_ARG_ENABLE(doxygen-docs, -@@ -156,29 +156,10 @@ fi - dnl ------ Check for PNG --------------------------------------------------- - - if test x$enable_png != xno; then -- AC_MSG_CHECKING(for libpng12) -- if test x$PKG_CONFIG != xno && $PKG_CONFIG --exists libpng12; then -- AC_MSG_RESULT(yes) -- PNG_LIBS=`$PKG_CONFIG --libs libpng12` -- PNG_CFLAGS=`$PKG_CONFIG --cflags libpng12` -- AC_DEFINE(USE_PNG, [1], [Use Png]) -- SUPPORTS_PNG=1 -- PNG_REQUIRED="libpng12" -- else -- AC_MSG_RESULT(no) -- # AC_CHECK_HEADERS(png.h, [ have_png_h="yes" ], [ have_png_h="no" ] ) -- AC_CHECK_LIB([png], [png_create_read_struct], [have_png="yes"], [have_png="no"]) -- -- if test x$have_png=xyes && test x$have_png_h=xyes; then -- AC_DEFINE(USE_PNG, [1], [Use Png]) -- SUPPORTS_PNG=1 -- PNG_LIBS="-lpng -lz" -- MB_EXTRA_LIBS="$MB_EXTRA_LIBS $PNG_LIBS" -- else -- AC_MSG_WARN([*** Cannot find PNG, disabling support]) -- enable_png=no -- fi -- fi -+ PKG_CHECK_MODULES(PNG, libpng) -+ AC_DEFINE(USE_PNG, [1], [Use PNG]) -+ SUPPORTS_PNG=1 -+ PNG_REQUIRED="libpng" - fi - - --- -1.8.5 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb b/import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb index f2eb67560..ce45e4814 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.11.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/libmatchbox/libmatchbox_1.12.bb @@ -3,26 +3,26 @@ SECTION = "x11/libs" HOMEPAGE = "http://matchbox-project.org/" BUGTRACKER = "http://bugzilla.yoctoproject.com/" -LICENSE = "LGPLv2+" +LICENSE = "LGPLv2+ & MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34 \ + file://COPYING.MIT;md5=f45ed9332b4f50a35adf2065adde4ca7 \ file://libmb/mbexp.c;endline=20;md5=28c0aef3b23e308464f5dae6a11b0d2f \ - file://libmb/mbdotdesktop.c;endline=21;md5=5a287156b3207e851c1d68d09c439b51" + file://libmb/xsettings-client.c;endline=20;md5=4b106a387602db8d91a50d5cdfd65031" DEPENDS = "virtual/libx11 libxext" -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/${BPN}/${PV}/${BPN}-${PV}.tar.bz2 \ - file://libpng.patch" +#SRCREV for 1.12 +SRCREV = "e846ee434f8e23d9db38af13c523f791495e0e87" +SRC_URI = "git://git.yoctoproject.org/${BPN}" -SRC_URI[md5sum] = "fc6cc807f55a3e7c752d8013176875d7" -SRC_URI[sha256sum] = "254cab52e304a3512c8df4be59d690cf3921bbb68a28ede7fe26b93534217b53" +S = "${WORKDIR}/git" inherit autotools pkgconfig distro_features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" -PACKAGECONFIG ??= "jpeg png xft xsettings" +PACKAGECONFIG ??= "jpeg png xft" PACKAGECONFIG[jpeg] = "--enable-jpeg,--disable-jpeg,jpeg" PACKAGECONFIG[pango] = "--enable-pango,--disable-pango,pango" PACKAGECONFIG[png] = "--enable-png,--disable-png,libpng" PACKAGECONFIG[xft] = "--enable-xft,--disable-xft,libxft" -PACKAGECONFIG[xsettings] = "--enable-xsettings,--disable-xsettings,libxsettings-client" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch new file mode 100644 index 000000000..44e6d4df9 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-src-video-make-it-compatible-with-wayland-1.10.patch @@ -0,0 +1,57 @@ +From b1ed3533433501ec52c8289a5b3a294e57e7f798 Mon Sep 17 00:00:00 2001 +From: Martin Jansa <martin.jansa@gmail.com> +Date: Thu, 26 May 2016 11:31:52 +0000 +Subject: [PATCH] src/video: make it compatible with wayland 1.10 + +| build/.libs/SDL_waylandevents.o: In function `wl_registry_bind': +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| build/.libs/SDL_waylandkeyboard.o: In function `wl_registry_bind': +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| build/.libs/SDL_waylandvideo.o: In function `wl_registry_bind': +| /usr/include/wayland-client-protocol.h:305: undefined reference to `wl_proxy_marshal_constructor_versioned' +| collect2: error: ld returned 1 exit status +| make: *** [build/libSDL2.la] Error 1 +| ERROR: oe_runmake failed + +Upstream-Status: Pending +Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +--- + src/video/wayland/SDL_waylanddyn.h | 1 + + src/video/wayland/SDL_waylandsym.h | 4 ++++ + src/video/webos/SDL_waylanddyn.h | 1 + + src/video/webos/SDL_waylandsym.h | 4 ++++ + 4 files changed, 10 insertions(+) + +diff --git a/src/video/wayland/SDL_waylanddyn.h b/src/video/wayland/SDL_waylanddyn.h +index 8d9313a..c7b0157 100644 +--- a/src/video/wayland/SDL_waylanddyn.h ++++ b/src/video/wayland/SDL_waylanddyn.h +@@ -79,6 +79,7 @@ void SDL_WAYLAND_UnloadSymbols(void); + #define wl_proxy_get_user_data (*WAYLAND_wl_proxy_get_user_data) + #define wl_proxy_add_listener (*WAYLAND_wl_proxy_add_listener) + #define wl_proxy_marshal_constructor (*WAYLAND_wl_proxy_marshal_constructor) ++#define wl_proxy_marshal_constructor_versioned (*WAYLAND_wl_proxy_marshal_constructor_versioned) + + #define wl_seat_interface (*WAYLAND_wl_seat_interface) + #define wl_surface_interface (*WAYLAND_wl_surface_interface) +diff --git a/src/video/wayland/SDL_waylandsym.h b/src/video/wayland/SDL_waylandsym.h +index c3b4fa5..b9a0d97 100644 +--- a/src/video/wayland/SDL_waylandsym.h ++++ b/src/video/wayland/SDL_waylandsym.h +@@ -55,6 +55,10 @@ SDL_WAYLAND_SYM(void, wl_list_insert_list, (struct wl_list *, struct wl_list *)) + SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_4) + SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor, (struct wl_proxy *, uint32_t opcode, const struct wl_interface *interface, ...)) + ++/* These functions are available in Wayland >= 1.10 */ ++SDL_WAYLAND_MODULE(WAYLAND_CLIENT_1_10) ++SDL_WAYLAND_SYM(struct wl_proxy *, wl_proxy_marshal_constructor_versioned, (struct wl_proxy *proxy, uint32_t opcode, const struct wl_interface *interface, uint32_t version, ...)) ++ + SDL_WAYLAND_INTERFACE(wl_seat_interface) + SDL_WAYLAND_INTERFACE(wl_surface_interface) + SDL_WAYLAND_INTERFACE(wl_shm_pool_interface) +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb index 428230711..844ff333c 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.4.bb @@ -15,7 +15,9 @@ PROVIDES = "virtual/libsdl2" DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtual/nativesdk-libx11 nativesdk-libxrandr nativesdk-libxrender nativesdk-libxext', '', d)}" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ - file://linkage.patch" + file://linkage.patch \ + file://0001-src-video-make-it-compatible-with-wayland-1.10.patch \ +" S = "${WORKDIR}/SDL2-${PV}" @@ -44,7 +46,7 @@ PACKAGECONFIG ??= " \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ " PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," -PACKAGECONFIG[directfb] = "--enable-video-directfb --disable-video-directfb,directfb" +PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,virtual/libgles2" PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license b/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license deleted file mode 100644 index 628de9830..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/MIT-style-license +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright © 2001 Red Hat, Inc. - * - * Permission to use, copy, modify, distribute, and sell this software and its - * documentation for any purpose is hereby granted without fee, provided that - * the above copyright notice appear in all copies and that both that - * copyright notice and this permission notice appear in supporting - * documentation, and that the name of Red Hat not be used in advertising or - * publicity pertaining to distribution of the software without specific, - * written prior permission. Red Hat makes no representations about the - * suitability of this software for any purpose. It is provided "as is" - * without express or implied warranty. - * - * RED HAT DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE, INCLUDING ALL - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS, IN NO EVENT SHALL RED HAT - * BE LIABLE FOR ANY SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES - * WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION - * OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN - * CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. - * - * Author: Owen Taylor, Red Hat, Inc. - */ diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch b/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch deleted file mode 100644 index d08d0d5b9..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/link-x11.patch +++ /dev/null @@ -1,13 +0,0 @@ -Upstream-Status: Inappropriate [configuration] - -Index: Xsettings-client-0.10/Makefile.am -=================================================================== ---- Xsettings-client-0.10.orig/Makefile.am 2008-02-07 14:49:54.000000000 +0000 -+++ Xsettings-client-0.10/Makefile.am 2008-02-07 14:50:00.000000000 +0000 -@@ -9,4 +9,4 @@ - - libXsettings_client_la_SOURCES= $(source_c) $(source_h) - --libXsettings_client_la_LIBADD = @X_LIBS@ -\ No newline at end of file -+libXsettings_client_la_LIBADD = @X_LIBS@ -lX11 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch b/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch deleted file mode 100644 index 905d08e61..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client/obsolete_automake_macros.patch +++ /dev/null @@ -1,14 +0,0 @@ -Upstream-Status: Pending - -Signed-off-by: Marko Lindqvist <cazfi74@gmail.com> -diff -Nurd Xsettings-client-0.10/configure.ac Xsettings-client-0.10/configure.ac ---- Xsettings-client-0.10/configure.ac 2003-03-28 12:39:51.000000000 +0200 -+++ Xsettings-client-0.10/configure.ac 2013-01-11 07:37:21.491597743 +0200 -@@ -1,7 +1,7 @@ - # Process this file with autoconf to produce a configure script. - AC_INIT(xsettings-client.c) - AM_INIT_AUTOMAKE(Xsettings-client, 0.10) --AM_CONFIG_HEADER(config.h) -+AC_CONFIG_HEADERS(config.h) - - CFLAGS="-Os -Wall" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb b/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb deleted file mode 100644 index 67c5e2777..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libxsettings-client/libxsettings-client_0.10.bb +++ /dev/null @@ -1,40 +0,0 @@ -SUMMARY = "utility functions for the Xsettings protocol" -DESCRIPTION = "Libraries used for applications making use of the Xsettings configuration \ -setting propagation protocol. Controls setting of double click timeout, drag-and-drop \ -threshold, and default foreground and background colors for all applications running within a \ -desktop." -HOMEPAGE = "http://matchbox-project.org/sources/optional-dependencies/" -BUGTRACKER = "http://bugzilla.yoctoproject.org/" -SECTION = "x/libs" -LICENSE = "MIT-style" -LIC_FILES_CHKSUM = "file://COPYING;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ - file://xsettings-client.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b \ - file://xsettings-common.h;endline=22;md5=7cfac9d2d4dc3694cc7eb605cf32a69b" -DEPENDS = "virtual/libx11" - -PR = "r5" - -headers = "xsettings-common.h xsettings-client.h" - -SRC_URI = "http://downloads.yoctoproject.org/releases/matchbox/optional-dependencies/Xsettings-client-0.10.tar.gz \ - file://MIT-style-license \ - file://link-x11.patch;apply=yes \ - file://obsolete_automake_macros.patch \ -" - -SRC_URI[md5sum] = "c14aa9db6c097e0306dac97fb7da1add" -SRC_URI[sha256sum] = "f274a4bc969ae192994a856b7f786c6fce96bae77f96c1c2b71dd97599e06e43" - -S = "${WORKDIR}/Xsettings-client-0.10" - -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 - # autotools will install a GPLv2 one instead of the actual MIT-style license here. - # Add the correct license here to avoid confusion. - cp -f ${WORKDIR}/MIT-style-license ${S}/COPYING -} - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.1.bb index aa768280a..c3d2d23db 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/matchbox-wm/matchbox-wm_1.2.1.bb @@ -10,9 +10,8 @@ LIC_FILES_CHKSUM = "file://src/wm.h;endline=21;md5=a7e844465edbcf79c282369f93caa SECTION = "x11/wm" DEPENDS = "libmatchbox virtual/libx11 libxext libxrender startup-notification expat gconf libxcursor libxfixes" -SRCREV = "8178e70d5c742c4cd63b51df228cc8aa3594d518" -PV = "1.2+git${SRCPV}" - +# SRCREV tagged 1.2.1 +SRCREV = "9fd1806dfa7c8f2202db18b7bc880857a3019f8c" SRC_URI = "git://git.yoctoproject.org/matchbox-window-manager \ file://kbdconfig" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb index eb80cd3bb..a1a8e26e0 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.1.bb @@ -6,7 +6,7 @@ LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=0964c689fcf4c21c6797ea87408416b6" SECTION = "x11/libs" -DEPENDS = "glib-2.0 intltool-native libfm-extra" +DEPENDS = "glib-2.0 libfm-extra" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/clang-compile-PR89599.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/clang-compile-PR89599.patch new file mode 100644 index 000000000..48bd32567 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/clang-compile-PR89599.patch @@ -0,0 +1,116 @@ +From 5ec140c17b54c25920091501b665b9aa809cc5e8 Mon Sep 17 00:00:00 2001 +From: Matt Turner <mattst88@gmail.com> +Date: Mon, 11 Jul 2016 10:44:25 -0700 +Subject: mapi: Massage code to allow clang to compile. +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +According to https://llvm.org/bugs/show_bug.cgi?id=19778#c3 this code +was violating the spec, resulting in it failing to compile. + +Cc: mesa-stable@lists.freedesktop.org +Co-authored-by: Tomasz PaweĹ‚ Gajc <tpgxyz@gmail.com> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89599 +Reviewed-by: Emil Velikov <emil.velikov@collabora.com> + +Upstream-Status: Backport +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +diff --git a/configure.ac b/configure.ac +index 3799d8d..1ca8359 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -226,6 +226,7 @@ AX_GCC_FUNC_ATTRIBUTE([packed]) + AX_GCC_FUNC_ATTRIBUTE([pure]) + AX_GCC_FUNC_ATTRIBUTE([returns_nonnull]) + AX_GCC_FUNC_ATTRIBUTE([unused]) ++AX_GCC_FUNC_ATTRIBUTE([visibility]) + AX_GCC_FUNC_ATTRIBUTE([warn_unused_result]) + AX_GCC_FUNC_ATTRIBUTE([weak]) + +diff --git a/src/mapi/entry_x86-64_tls.h b/src/mapi/entry_x86-64_tls.h +index 38faccc..c5262a1 100644 +--- a/src/mapi/entry_x86-64_tls.h ++++ b/src/mapi/entry_x86-64_tls.h +@@ -25,6 +25,11 @@ + * Chia-I Wu <olv@lunarg.com> + */ + ++#ifdef HAVE_FUNC_ATTRIBUTE_VISIBIITY ++#define HIDDEN __attribute__((visibility("hidden"))) ++#else ++#define HIDDEN ++#endif + + __asm__(".text\n" + ".balign 32\n" +@@ -54,8 +59,8 @@ entry_patch_public(void) + { + } + +-static char +-x86_64_entry_start[]; ++extern char ++x86_64_entry_start[] HIDDEN; + + mapi_func + entry_get_public(int slot) +diff --git a/src/mapi/entry_x86_tls.h b/src/mapi/entry_x86_tls.h +index 46d2ece..231b409 100644 +--- a/src/mapi/entry_x86_tls.h ++++ b/src/mapi/entry_x86_tls.h +@@ -27,6 +27,12 @@ + + #include <string.h> + ++#ifdef HAVE_FUNC_ATTRIBUTE_VISIBIITY ++#define HIDDEN __attribute__((visibility("hidden"))) ++#else ++#define HIDDEN ++#endif ++ + __asm__(".text"); + + __asm__("x86_current_tls:\n\t" +@@ -71,8 +77,8 @@ __asm__(".text"); + extern unsigned long + x86_current_tls(); + +-static char x86_entry_start[]; +-static char x86_entry_end[]; ++extern char x86_entry_start[] HIDDEN; ++extern char x86_entry_end[] HIDDEN; + + void + entry_patch_public(void) +diff --git a/src/mapi/entry_x86_tsd.h b/src/mapi/entry_x86_tsd.h +index ea7bacb..03d9735 100644 +--- a/src/mapi/entry_x86_tsd.h ++++ b/src/mapi/entry_x86_tsd.h +@@ -25,6 +25,11 @@ + * Chia-I Wu <olv@lunarg.com> + */ + ++#ifdef HAVE_FUNC_ATTRIBUTE_VISIBIITY ++#define HIDDEN __attribute__((visibility("hidden"))) ++#else ++#define HIDDEN ++#endif + + #define X86_ENTRY_SIZE 32 + +@@ -58,8 +63,8 @@ __asm__(".balign 32\n" + #include <string.h> + #include "u_execmem.h" + +-static const char x86_entry_start[]; +-static const char x86_entry_end[]; ++extern const char x86_entry_start[] HIDDEN; ++extern const char x86_entry_end[] HIDDEN; + + void + entry_patch_public(void) +-- +cgit v0.10.2 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch new file mode 100644 index 000000000..d2d67558b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/disable-asm-on-non-gcc.patch @@ -0,0 +1,29 @@ +Configure checks for compiler to be gcc and then it enables asm_offsets +generation. see + +https://cgit.freedesktop.org/mesa/mesa/commit/?id=73c9b4b0e05fc66629ba250846948dc55c0e7a0d + +However, we missed the check when enabling this on cross compilation +when architecture for both host and target is x86 + +Fixes errors like +./gen_matypes > matypes.h +/bin/bash: ./gen_matypes: No such file or directory + +-Khem + +Upstream-Status: Submitted + +Index: mesa-12.0.1/configure.ac +=================================================================== +--- mesa-12.0.1.orig/configure.ac ++++ mesa-12.0.1/configure.ac +@@ -732,7 +732,7 @@ test "x$enable_asm" = xno && AC_MSG_RESU + if test "x$enable_asm" = xyes -a "x$cross_compiling" = xyes; then + case "$host_cpu" in + i?86 | x86_64 | amd64) +- if test "x$host_cpu" != "x$target_cpu"; then ++ if test "x$host_cpu" != "x$target_cpu" -o "x$acv_mesa_CLANG" = xyes; then + enable_asm=no + AC_MSG_RESULT([no, cross compiling]) + fi diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch deleted file mode 100644 index 09054cb75..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 36829a8d7ad2888515fbee95c2a70b3d636d7538 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 9 Jul 2014 14:30:33 +0200 -Subject: [PATCH 2/9] Correctly implement with AC_WITH(glut) so that - --without-glut works. - -Signed-off-by: Ross Burton <ross.burton@intel.com> -Upstream-Status: Submitted (https://patchwork.freedesktop.org/patch/64417/) - ---- - configure.ac | 26 +++++++++++++++----------- - 1 file changed, 15 insertions(+), 11 deletions(-) - -diff --git a/configure.ac b/configure.ac -index c4ee12b..9445424 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -67,21 +67,25 @@ DEMO_CFLAGS="$DEMO_CFLAGS $GL_CFLAGS" - DEMO_LIBS="$DEMO_LIBS $GL_LIBS" - - dnl Check for GLUT --GLUT_CFLAGS="" --GLUT_LIBS=-lglut --glut_enabled=yes -+glut_enabled=no - AC_ARG_WITH([glut], - [AS_HELP_STRING([--with-glut=DIR], - [glut install directory])], - [GLUT_CFLAGS="-I$withval/include" -- GLUT_LIBS="-L$withval/lib -lglut"]) --AC_CHECK_HEADER([GL/glut.h], -- [], -- [glut_enabled=no]) --AC_CHECK_LIB([glut], -- [glutInit], -- [], -- [glut_enabled=no]) -+ GLUT_LIBS="-L$withval/lib -lglut"], -+ [GLUT_CFLAGS="" -+ GLUT_LIBS="-lglut"] -+ ) -+AS_IF([test "x$with_glut" != xno], -+ [AC_CHECK_HEADER([GL/glut.h], -+ [], -+ [glut_enabled=no]) -+ AC_CHECK_LIB([glut], -+ [glutInit], -+ [], -+ [glut_enabled=no]) -+ glut_enabled=yes -+]) - - dnl Check for FreeGLUT 2.6 or later - AC_EGREP_HEADER([glutInitContextProfile], --- -2.0.0 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch index 6b58c2b77..f6b59a11f 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch @@ -1,8 +1,7 @@ -From b25e9c675cf560b8b037dc855c6b3b1d09957867 Mon Sep 17 00:00:00 2001 +From 779438770bedf3d53e6ad8f7cd6889b7f50daf3b Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Wed, 9 Jul 2014 14:23:41 +0200 -Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or - GLU +Subject: [PATCH] configure: Allow to disable demos which require GLEW or GLU * in some systems without X11 support we don't have GLEW, but mesa-demos are still useful @@ -10,17 +9,20 @@ Subject: [PATCH 3/9] configure: Allow to disable demos which require GLEW or Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +Port to 8.3.0 +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- configure.ac | 49 ++++++++++++++++++++--------- - src/Makefile.am | 14 ++++++--- + src/Makefile.am | 18 ++++++++--- src/demos/Makefile.am | 73 ++++++++++++++++++++++++------------------- src/egl/Makefile.am | 8 +++-- - src/egl/opengles1/Makefile.am | 44 +++++++++++++++----------- - src/egl/opengles2/Makefile.am | 33 ++++++++++--------- - 6 files changed, 135 insertions(+), 86 deletions(-) + src/egl/opengles1/Makefile.am | 10 ++++-- + src/egl/opengles2/Makefile.am | 29 ++++++++--------- + 6 files changed, 117 insertions(+), 70 deletions(-) diff --git a/configure.ac b/configure.ac -index 9445424..bc4c8d1 100644 +index 0525b09..28834cd 100644 --- a/configure.ac +++ b/configure.ac @@ -93,25 +93,44 @@ AC_EGREP_HEADER([glutInitContextProfile], @@ -92,10 +94,11 @@ index 9445424..bc4c8d1 100644 AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") diff --git a/src/Makefile.am b/src/Makefile.am -index 1647d64..754c47c 100644 +index 1647d64..8b89dee 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -23,14 +23,18 @@ +@@ -22,15 +22,19 @@ + # Authors: # Eric Anholt <eric@anholt.net> +if HAVE_GLEW @@ -116,7 +119,7 @@ index 1647d64..754c47c 100644 objviewer \ osdemos \ perf \ -@@ -40,8 +39,12 @@ SUBDIRS = \ +@@ -40,8 +44,12 @@ SUBDIRS = \ slang \ tests \ tools \ @@ -289,10 +292,10 @@ index d64a49e..4fe1ca8 100644 + openvg +endif diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am -index 7a9828d..3455e75 100644 +index fa397c2..21853e8 100644 --- a/src/egl/opengles1/Makefile.am +++ b/src/egl/opengles1/Makefile.am -@@ -36,28 +36,43 @@ AM_LDFLAGS = \ +@@ -36,9 +36,12 @@ AM_LDFLAGS = \ $(EGL_LIBS) \ -lm @@ -301,42 +304,13 @@ index 7a9828d..3455e75 100644 if HAVE_EGL if HAVE_GLESV1 -noinst_PROGRAMS = \ -- bindtex \ -- clear \ -+noinst_PROGRAMS += \ - drawtex_screen \ -+ gears_screen \ -+ torus_screen \ -+ tri_screen -+ -+drawtex_screen_SOURCES = drawtex.c -+gears_screen_SOURCES = gears.c -+torus_screen_SOURCES = torus.c -+tri_screen_SOURCES = tri.c -+ -+drawtex_screen_LDADD = ../eglut/libeglut_screen.la -+gears_screen_LDADD = ../eglut/libeglut_screen.la -+torus_screen_LDADD = ../eglut/libeglut_screen.la -+tri_screen_LDADD = ../eglut/libeglut_screen.la -+ +if HAVE_X11 -+noinst_PROGRAMS += \ -+ clear -+ +bin_PROGRAMS = \ -+ bindtex \ + bindtex \ + clear \ drawtex_x11 \ - eglfbdev \ - es1_info \ -- gears_screen \ - gears_x11 \ - msaa \ - pbuffer\ - render_tex \ - texture_from_pixmap \ -- torus_screen \ +@@ -52,8 +55,6 @@ noinst_PROGRAMS = \ torus_x11 \ -- tri_screen \ tri_x11 \ two_win -endif @@ -344,26 +318,7 @@ index 7a9828d..3455e75 100644 bindtex_LDADD = $(X11_LIBS) es1_info_LDADD = $(X11_LIBS) -@@ -71,22 +86,15 @@ two_win_LDADD = $(X11_LIBS) - clear_LDADD = ../eglut/libeglut_x11.la $(EGL_LIBS) $(X11_LIBS) - clear_LDFLAGS = - --drawtex_screen_SOURCES = drawtex.c --gears_screen_SOURCES = gears.c --torus_screen_SOURCES = torus.c --tri_screen_SOURCES = tri.c -- - drawtex_x11_SOURCES = drawtex.c - gears_x11_SOURCES = gears.c - torus_x11_SOURCES = torus.c - tri_x11_SOURCES = tri.c - --drawtex_screen_LDADD = ../eglut/libeglut_screen.la --gears_screen_LDADD = ../eglut/libeglut_screen.la --torus_screen_LDADD = ../eglut/libeglut_screen.la --tri_screen_LDADD = ../eglut/libeglut_screen.la -- - drawtex_x11_LDADD = ../eglut/libeglut_x11.la +@@ -76,3 +77,6 @@ drawtex_x11_LDADD = ../eglut/libeglut_x11.la gears_x11_LDADD = ../eglut/libeglut_x11.la torus_x11_LDADD = ../eglut/libeglut_x11.la tri_x11_LDADD = ../eglut/libeglut_x11.la @@ -371,35 +326,35 @@ index 7a9828d..3455e75 100644 +endif +endif diff --git a/src/egl/opengles2/Makefile.am b/src/egl/opengles2/Makefile.am -index 41c1b80..74af460 100644 +index b80ba50..17f8d49 100644 --- a/src/egl/opengles2/Makefile.am +++ b/src/egl/opengles2/Makefile.am -@@ -36,26 +36,29 @@ AM_LDFLAGS = \ +@@ -33,27 +33,28 @@ AM_LDFLAGS = \ + $(EGL_LIBS) \ + -lm + ++bin_PROGRAMS = ++ if HAVE_EGL if HAVE_GLESV2 - bin_PROGRAMS = \ +-bin_PROGRAMS = +-if HAVE_X11 +-bin_PROGRAMS += \ - es2_info \ -- es2gears_screen \ - es2gears_x11 \ - es2tri -+ es2gears_screen -+ -+es2gears_screen_SOURCES = es2gears.c -+es2gears_screen_LDADD = ../eglut/libeglut_screen.la -+ +-endif if HAVE_WAYLAND bin_PROGRAMS += es2gears_wayland -endif -endif --endif - --es2_info_LDADD = $(X11_LIBS) --es2tri_LDADD = $(X11_LIBS) ++ +es2gears_wayland_SOURCES = es2gears.c +es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la -+endif + endif --es2gears_screen_SOURCES = es2gears.c +-es2_info_LDADD = $(X11_LIBS) +-es2tri_LDADD = $(X11_LIBS) +if HAVE_X11 +bin_PROGRAMS += \ + es2tri \ @@ -409,8 +364,6 @@ index 41c1b80..74af460 100644 +es2_info_LDADD = $(X11_LIBS) es2gears_x11_SOURCES = es2gears.c - --es2gears_screen_LDADD = ../eglut/libeglut_screen.la -- es2gears_x11_LDADD = ../eglut/libeglut_x11.la +es2tri_LDADD = $(X11_LIBS) +endif @@ -420,5 +373,5 @@ index 41c1b80..74af460 100644 -es2gears_wayland_SOURCES = es2gears.c -es2gears_wayland_LDADD = ../eglut/libeglut_wayland.la -- -2.0.0 +2.1.4 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch deleted file mode 100644 index aac2a3729..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch +++ /dev/null @@ -1,267 +0,0 @@ -From 453353a221de9c64479f4372565d2cd8591b36cc Mon Sep 17 00:00:00 2001 -From: Frank Binns <frank.binns@imgtec.com> -Date: Fri, 29 Jun 2012 11:26:04 +0100 -Subject: [PATCH 5/9] Fix build when EGL_MESA_screen_surface extension isn't - present - -The EGL demos won't build against EGL implementations that don't support -the EGL_MESA_screen_surface extension. Fix this, in most cases, by -wrapping relevant bits of code in #ifdef EGL_MESA_screen_surface. - -Signed-off-by: Frank Binns <frank.binns@imgtec.com> - -Applied and fixed up in Yocto by... - -Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> - -Upstream-Status: Pending ---- - src/egl/eglut/eglut.c | 9 +++++++-- - src/egl/eglut/eglut_screen.c | 14 ++++++++++++++ - src/egl/opengl/demo1.c | 2 ++ - src/egl/opengl/demo2.c | 7 ++++++- - src/egl/opengl/demo3.c | 7 ++++++- - 5 files changed, 35 insertions(+), 4 deletions(-) - -diff --git a/src/egl/eglut/eglut.c b/src/egl/eglut/eglut.c -index 2ee6f15..f6a2ad4 100644 ---- a/src/egl/eglut/eglut.c -+++ b/src/egl/eglut/eglut.c -@@ -76,8 +76,9 @@ _eglutNow(void) - static void - _eglutDestroyWindow(struct eglut_window *win) - { -- if (_eglut->surface_type != EGL_PBUFFER_BIT && -- _eglut->surface_type != EGL_SCREEN_BIT_MESA) -+ -+ if (_eglut->surface_type == EGL_WINDOW_BIT || -+ _eglut->surface_type == EGL_PIXMAP_BIT) - eglDestroySurface(_eglut->dpy, win->surface); - - _eglutNativeFiniWindow(win); -@@ -175,7 +176,9 @@ _eglutCreateWindow(const char *title, int x, int y, int w, int h) - win->config, win->native.u.pixmap, NULL); - break; - case EGL_PBUFFER_BIT: -+#ifdef EGL_MESA_screen_surface - case EGL_SCREEN_BIT_MESA: -+#endif - win->surface = win->native.u.surface; - break; - default: -@@ -289,8 +292,10 @@ eglutDestroyWindow(int win) - if (window->index != win) - return; - -+#ifdef EGL_MESA_screen_surface - /* XXX it causes some bug in st/egl KMS backend */ - if ( _eglut->surface_type != EGL_SCREEN_BIT_MESA) -+#endif - eglMakeCurrent(_eglut->dpy, EGL_NO_SURFACE, EGL_NO_SURFACE, EGL_NO_CONTEXT); - - _eglutDestroyWindow(_eglut->current); -diff --git a/src/egl/eglut/eglut_screen.c b/src/egl/eglut/eglut_screen.c -index 021a8f1..094a4e2 100644 ---- a/src/egl/eglut/eglut_screen.c -+++ b/src/egl/eglut/eglut_screen.c -@@ -35,26 +35,33 @@ - - #define MAX_MODES 100 - -+#ifdef EGL_MESA_screen_surface - static EGLScreenMESA kms_screen; - static EGLModeMESA kms_mode; - static EGLint kms_width, kms_height; -+#endif - - void - _eglutNativeInitDisplay(void) - { -+#ifdef EGL_MESA_screen_surface - _eglut->native_dpy = EGL_DEFAULT_DISPLAY; - _eglut->surface_type = EGL_SCREEN_BIT_MESA; -+#endif - } - - void - _eglutNativeFiniDisplay(void) - { -+#ifdef EGL_MESA_screen_surface - kms_screen = 0; - kms_mode = 0; - kms_width = 0; - kms_height = 0; -+#endif - } - -+#ifdef EGL_MESA_screen_surface - static void - init_kms(void) - { -@@ -94,19 +101,23 @@ init_kms(void) - kms_width = width; - kms_height = height; - } -+#endif - - void - _eglutNativeInitWindow(struct eglut_window *win, const char *title, - int x, int y, int w, int h) - { -+#ifdef EGL_MESA_screen_surface - EGLint surf_attribs[16]; - EGLint i; -+#endif - const char *exts; - - exts = eglQueryString(_eglut->dpy, EGL_EXTENSIONS); - if (!exts || !strstr(exts, "EGL_MESA_screen_surface")) - _eglutFatal("EGL_MESA_screen_surface is not supported\n"); - -+#ifdef EGL_MESA_screen_surface - init_kms(); - - i = 0; -@@ -128,14 +139,17 @@ _eglutNativeInitWindow(struct eglut_window *win, const char *title, - - win->native.width = kms_width; - win->native.height = kms_height; -+#endif - } - - void - _eglutNativeFiniWindow(struct eglut_window *win) - { -+#ifdef EGL_MESA_screen_surface - eglShowScreenSurfaceMESA(_eglut->dpy, - kms_screen, EGL_NO_SURFACE, 0); - eglDestroySurface(_eglut->dpy, win->native.u.surface); -+#endif - } - - void -diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c -index d892734..3a3564c 100644 ---- a/src/egl/opengl/demo1.c -+++ b/src/egl/opengl/demo1.c -@@ -18,6 +18,7 @@ - static void - TestScreens(EGLDisplay dpy) - { -+#ifdef EGL_MESA_screen_surface - #define MAX 8 - EGLScreenMESA screens[MAX]; - EGLint numScreens; -@@ -28,6 +29,7 @@ TestScreens(EGLDisplay dpy) - for (i = 0; i < numScreens; i++) { - printf(" Screen %d handle: %d\n", i, (int) screens[i]); - } -+#endif - } - - /** -diff --git a/src/egl/opengl/demo2.c b/src/egl/opengl/demo2.c -index 505b474..bfef59e 100644 ---- a/src/egl/opengl/demo2.c -+++ b/src/egl/opengl/demo2.c -@@ -16,6 +16,7 @@ - - /*#define FRONTBUFFER*/ - -+#ifdef EGL_MESA_screen_surface - static void _subset_Rectf(GLfloat x1, GLfloat y1, GLfloat x2, GLfloat y2, - GLfloat r, GLfloat g, GLfloat b) - { -@@ -95,12 +96,13 @@ TestScreens(EGLDisplay dpy) - printf(" Screen %d handle: %d\n", i, (int) screens[i]); - } - } -- -+#endif - - int - main(int argc, char *argv[]) - { - int maj, min; -+#ifdef EGL_MESA_screen_surface - EGLContext ctx; - EGLSurface pbuffer, screen_surf; - EGLConfig configs[10]; -@@ -115,6 +117,7 @@ main(int argc, char *argv[]) - EGLModeMESA mode; - EGLScreenMESA screen; - EGLint count; -+#endif - - EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY); - assert(d); -@@ -132,6 +135,7 @@ main(int argc, char *argv[]) - exit(1); - } - -+#ifdef EGL_MESA_screen_surface - eglGetConfigs(d, configs, 10, &numConfigs); - printf("Got %d EGL configs:\n", numConfigs); - for (i = 0; i < numConfigs; i++) { -@@ -211,6 +215,7 @@ main(int argc, char *argv[]) - eglDestroySurface(d, pbuffer); - eglDestroyContext(d, ctx); - eglTerminate(d); -+#endif - - return 0; - } -diff --git a/src/egl/opengl/demo3.c b/src/egl/opengl/demo3.c -index f84ca23..31b5d8b 100644 ---- a/src/egl/opengl/demo3.c -+++ b/src/egl/opengl/demo3.c -@@ -46,7 +46,7 @@ GLubyte OpenGL_bits[] = { - 0x3e, 0x00, 0x00, 0xf8, 0x0c, 0x00, - }; - -- -+#ifdef EGL_MESA_screen_surface - static void Init(void) - { - -@@ -551,11 +551,13 @@ write_ppm(const char *filename, const GLubyte *buffer, int width, int height) - fclose(f); - } - } -+#endif - - int - main(int argc, char *argv[]) - { - int maj, min; -+#ifdef EGL_MESA_screen_surface - EGLContext ctx; - EGLSurface screen_surf; - EGLConfig configs[10]; -@@ -566,6 +568,7 @@ main(int argc, char *argv[]) - const GLubyte *bitmap; - EGLint screenAttribs[32]; - EGLint i; -+#endif - - EGLDisplay d = eglGetDisplay(EGL_DEFAULT_DISPLAY); - assert(d); -@@ -583,6 +586,7 @@ main(int argc, char *argv[]) - exit(1); - } - -+#ifdef EGL_MESA_screen_surface - eglGetConfigs(d, configs, 10, &numConfigs); - eglGetScreensMESA(d, &screen, 1, &count); - eglGetModesMESA(d, screen, &mode, 1, &count); -@@ -642,6 +646,7 @@ main(int argc, char *argv[]) - eglDestroySurface(d, screen_surf); - eglDestroyContext(d, ctx); - eglTerminate(d); -+#endif - - return 0; - } --- -2.0.0 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch deleted file mode 100644 index 12e0805f1..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch +++ /dev/null @@ -1,41 +0,0 @@ -From 6a19dba1d275579c73e7763b0554410ff4e1e650 Mon Sep 17 00:00:00 2001 -From: Frank Binns <frank.binns@imgtec.com> -Date: Fri, 29 Jun 2012 12:00:26 +0100 -Subject: [PATCH 6/9] Query display for EGL_MESA_screen_surface extension - before using it - -This code makes heavy use of the EGL_MESA_screen_surface extension so -check the display to determine if it's supported by the underlying EGL -implementation. If it doesn't then bail. - -Signed-off-by: Frank Binns <frank.binns@imgtec.com> - -Applied and fixed up in Yocto by... - -Integrated-by: Tom Zanussi <tom.zanussi@linux.intel.com> - -Upstream-Status: Pending ---- - src/egl/opengl/demo1.c | 6 ++++++ - 1 file changed, 6 insertions(+) - -diff --git a/src/egl/opengl/demo1.c b/src/egl/opengl/demo1.c -index 3a3564c..06e2138 100644 ---- a/src/egl/opengl/demo1.c -+++ b/src/egl/opengl/demo1.c -@@ -110,6 +110,12 @@ main(int argc, char *argv[]) - printf("EGL version = %d.%d\n", maj, min); - printf("EGL_VENDOR = %s\n", eglQueryString(d, EGL_VENDOR)); - -+ if (!strstr(eglQueryString(d, EGL_EXTENSIONS), -+ "EGL_MESA_screen_surface")) { -+ printf("EGL_MESA_screen_surface is not supported\n"); -+ exit(1); -+ } -+ - eglGetConfigs(d, NULL, 0, &numConfigs); - configs = malloc(sizeof(*configs) *numConfigs); - eglGetConfigs(d, configs, numConfigs, &numConfigs); --- -2.0.0 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch index 89d2fac4f..6b676cdd2 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0007-Install-few-more-test-programs.patch @@ -1,11 +1,13 @@ -From d930b2da57f7c9efb80c8cef8f8adad15bbbc0d3 Mon Sep 17 00:00:00 2001 +From c59e286fa4e818ca015dd40e4725636309970ea8 Mon Sep 17 00:00:00 2001 From: Martin Jansa <Martin.Jansa@gmail.com> Date: Thu, 10 Jul 2014 14:30:52 +0200 -Subject: [PATCH 7/9] Install few more test programs +Subject: [PATCH] Install few more test programs Upstream-Status: Pending Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- src/egl/opengl/Makefile.am | 2 +- src/egl/opengles1/Makefile.am | 10 ++++------ @@ -13,7 +15,7 @@ Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> 3 files changed, 6 insertions(+), 8 deletions(-) diff --git a/src/egl/opengl/Makefile.am b/src/egl/opengl/Makefile.am -index 0c7228f..87b2f1a 100644 +index fe7faa9..3e48141 100644 --- a/src/egl/opengl/Makefile.am +++ b/src/egl/opengl/Makefile.am @@ -50,7 +50,7 @@ endif @@ -22,42 +24,11 @@ index 0c7228f..87b2f1a 100644 if HAVE_EGL -noinst_PROGRAMS = \ +bin_PROGRAMS = \ - demo1 \ - demo2 \ - demo3 \ -diff --git a/src/egl/opengles1/Makefile.am b/src/egl/opengles1/Makefile.am -index 3455e75..516e516 100644 ---- a/src/egl/opengles1/Makefile.am -+++ b/src/egl/opengles1/Makefile.am -@@ -36,11 +36,11 @@ AM_LDFLAGS = \ - $(EGL_LIBS) \ - -lm - --noinst_PROGRAMS = -+bin_PROGRAMS = - - if HAVE_EGL - if HAVE_GLESV1 --noinst_PROGRAMS += \ -+bin_PROGRAMS += \ - drawtex_screen \ - gears_screen \ - torus_screen \ -@@ -57,10 +57,8 @@ torus_screen_LDADD = ../eglut/libeglut_screen.la - tri_screen_LDADD = ../eglut/libeglut_screen.la - - if HAVE_X11 --noinst_PROGRAMS += \ -- clear -- --bin_PROGRAMS = \ -+bin_PROGRAMS += \ -+ clear \ - bindtex \ - drawtex_x11 \ - eglfbdev \ + eglinfo \ + peglgears \ + $(EGL_DRM_DEMOS) \ diff --git a/src/egl/openvg/Makefile.am b/src/egl/openvg/Makefile.am -index 7318a43..b545225 100644 +index b0f1212..5fd1cf8 100644 --- a/src/egl/openvg/Makefile.am +++ b/src/egl/openvg/Makefile.am @@ -49,7 +49,7 @@ endif @@ -66,9 +37,9 @@ index 7318a43..b545225 100644 if HAVE_VG -noinst_PROGRAMS = \ +bin_PROGRAMS = \ - lion_screen \ - sp_screen \ $(EGL_X11_DEMOS) + endif + endif -- -2.0.0 +2.1.4 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch deleted file mode 100644 index 04e1b446f..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0010-sharedtex_mt-fix-rendering-thread-hang.patch +++ /dev/null @@ -1,43 +0,0 @@ -From 525fa9ded72d22b53c5eb366f61e2ac1d407a2db Mon Sep 17 00:00:00 2001 -From: Awais Belal <awais_belal@mentor.com> -Date: Thu, 8 Oct 2015 13:49:31 +0500 -Subject: [PATCH] sharedtex_mt: fix rendering thread hang - -XNextEvent is a blocking call which locks up the display mutex -this causes the rendering threads to hang when they try call -glXSwapBuffers() as that tries to take the same mutex in -underlying calls through XCopyArea(). -So we only go to XNextEvent when it has at least one event -and we wouldn't lock indefinitely. - -Signed-off-by: Awais Belal <awais_belal@mentor.com> -Upstream-Status: Backport (2b304e765695d385fd3bf414e6e444020bedb0a8) - ---- - src/xdemos/sharedtex_mt.c | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/src/xdemos/sharedtex_mt.c b/src/xdemos/sharedtex_mt.c -index a90903a..1d503c4 100644 ---- a/src/xdemos/sharedtex_mt.c -+++ b/src/xdemos/sharedtex_mt.c -@@ -420,9 +420,14 @@ Resize(struct window *h, unsigned int width, unsigned int height) - static void - EventLoop(void) - { -+ int i; -+ XEvent event; - while (1) { -- int i; -- XEvent event; -+ /* Do we have an event? */ -+ if (XPending(gDpy) == 0) { -+ usleep(10000); -+ continue; -+ } - XNextEvent(gDpy, &event); - for (i = 0; i < NumWindows; i++) { - struct window *h = &Windows[i]; --- -1.9.1 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch new file mode 100644 index 000000000..c68764740 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch @@ -0,0 +1,44 @@ +From 3aa84c47e88a4c38446ce1323abf6f2c77389104 Mon Sep 17 00:00:00 2001 +From: Prabhu <prabhu.sundararaj@freescale.com> +Date: Mon, 16 Nov 2015 17:09:32 -0600 +Subject: [PATCH] mesa-demos: OpenVG demos with single frame need eglSwapBuffer + +sp and text demos rendering single frame. to display the +single frame rendered needed a eglSwapBuffer to diplay to window. +Hence added eglutPostRedisplay to display the frame + +Upstream-Status: Pending + +Signed-off-by: Prabhu <prabhu.sundararaj@freescale.com> +--- + src/egl/openvg/sp.c | 1 + + src/egl/openvg/text.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/src/egl/openvg/sp.c b/src/egl/openvg/sp.c +index a20c0a3..468e91e 100644 +--- a/src/egl/openvg/sp.c ++++ b/src/egl/openvg/sp.c +@@ -500,6 +500,7 @@ draw(void) + } + + vgFlush(); ++ eglutPostRedisplay(); + } + + +diff --git a/src/egl/openvg/text.c b/src/egl/openvg/text.c +index f5c6de8..492581c 100644 +--- a/src/egl/openvg/text.c ++++ b/src/egl/openvg/text.c +@@ -360,6 +360,7 @@ display(void) + { + vgClear(0, 0, width, height); + glyph_string_draw(10.0, 10.0); ++ eglutPostRedisplay(); + } + + +-- +2.5.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch new file mode 100644 index 000000000..e7be4dfbe --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos/0013-only-build-GLX-demos-if-needed.patch @@ -0,0 +1,62 @@ +From 322af294390a7f4e1524c5a79312be6cbebce988 Mon Sep 17 00:00:00 2001 +From: Awais Belal <awais_belal@mentor.com> +Date: Wed, 11 Nov 2015 17:22:12 +0500 +Subject: [PATCH] only build GLX demos if needed + +There are platforms that default to EGL only configurations +in which case the GLX applications are not required +at all. Allow the user to control generation of these +demos as needed through a configure switch. + +Signed-off-by: Awais Belal <awais_belal@mentor.com> +Upstream-Status: Pending +--- + configure.ac | 9 +++++++++ + src/Makefile.am | 6 +++++- + 2 files changed, 14 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index f8ec7e3..1a4d96d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -132,6 +132,11 @@ if test "x$enable_glu" = xyes; then + DEMO_LIBS="$DEMO_LIBS $GLU_LIBS" + fi + ++AC_ARG_ENABLE([glx-demos], ++ [AS_HELP_STRING([--enable-glx-demos], ++ [enable GLX demos @<:@default=auto@:>@])], ++ [glx_demos_enabled="$enableval"], ++ [glx_demos_enabled=yes]) + AC_ARG_ENABLE([egl], + [AS_HELP_STRING([--enable-egl], + [enable EGL library @<:@default=auto@:>@])], +@@ -325,6 +333,7 @@ AC_SUBST([WAYLAND_LIBS]) + + AM_CONDITIONAL(HAVE_GLU, test "x$glu_enabled" = "xyes") + AM_CONDITIONAL(HAVE_GLEW, test "x$glew_enabled" = "xyes") ++AM_CONDITIONAL(HAVE_GLX, test "x$glx_demos_enabled" = "xyes") + AM_CONDITIONAL(HAVE_EGL, test "x$egl_enabled" = "xyes") + AM_CONDITIONAL(HAVE_GLESV1, test "x$glesv1_enabled" = "xyes") + AM_CONDITIONAL(HAVE_GLESV2, test "x$glesv2_enabled" = "xyes") +diff --git a/src/Makefile.am b/src/Makefile.am +index 8b89dee..a4d7e8f 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -44,8 +44,12 @@ SUBDIRS = \ + slang \ + tests \ + tools \ +- wgl \ ++ wgl ++ ++if HAVE_GLX ++SUBDIRS += \ + xdemos ++endif + + if HAVE_GLEW + SUBDIRS += \ +-- +1.9.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb index 557b8c65d..fab0bdb2e 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.2.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-demos_8.3.0.bb @@ -10,26 +10,24 @@ LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=9142 file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/demos/${PV}/${BPN}-${PV}.tar.bz2 \ - file://0001-mesa-demos-Add-missing-data-files.patch \ - file://0002-Correctly-implement-with-AC_WITH-glut-so-that-withou.patch \ - file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \ - file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ - file://0005-Fix-build-when-EGL_MESA_screen_surface-extension-isn.patch \ - file://0006-Query-display-for-EGL_MESA_screen_surface-extension-.patch \ - file://0007-Install-few-more-test-programs.patch \ - file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \ - file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \ - file://0010-sharedtex_mt-fix-rendering-thread-hang.patch \ -" -SRC_URI[md5sum] = "72613a2c8c013716db02e3ff59d29061" -SRC_URI[sha256sum] = "e4bfecb5816ddd4b7b37c1bc876b63f1f7f06fda5879221a9774d0952f90ba92" + file://0001-mesa-demos-Add-missing-data-files.patch \ + file://0003-configure-Allow-to-disable-demos-which-require-GLEW-.patch \ + file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ + file://0007-Install-few-more-test-programs.patch \ + file://0008-glsl-perf-Add-few-missing-.glsl-.vert-.frag-files-to.patch \ + file://0009-glsl-perf-Install-.glsl-.vert-.frag-files.patch \ + file://0012-mesa-demos-OpenVG-demos-with-single-frame-need-eglSw.patch \ + file://0013-only-build-GLX-demos-if-needed.patch \ + " +SRC_URI[md5sum] = "628e75c23c17394f11a316c36f8e4164" +SRC_URI[sha256sum] = "c173154bbd0d5fb53d732471984def42fb1b14ac85fcb834138fb9518b3e0bef" inherit autotools pkgconfig distro_features_check # depends on virtual/egl, virtual/libgl ... -REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES = "opengl x11" PACKAGECONFIG ?= "drm osmesa freetype2 gbm egl gles1 gles2 \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 glew glu', '', d)}" + x11 glew glu glx" # The Wayland code doesn't work with Wayland 1.0, so disable it for now #${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}" @@ -49,6 +47,7 @@ PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,virtual/libgl wayla PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11" PACKAGECONFIG[glew] = "--enable-glew,--disable-glew,glew" PACKAGECONFIG[glu] = "--enable-glu,--disable-glu,virtual/libgl" +PACKAGECONFIG[glx] = "--enable-glx-demos,--disable-glx-demos" do_install_append() { # it can be completely empty when all PACKAGECONFIG options are disabled diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb index fc2bca998..f06a3e9b5 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_11.1.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_12.0.1.bb @@ -8,6 +8,6 @@ PROVIDES = "virtual/libgl virtual/mesa" S = "${WORKDIR}/mesa-${PV}" -PACKAGECONFIG ??= "dri ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" +PACKAGECONFIG ??= "dri ${MESA_CRYPTO} ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}" EXCLUDE_FROM_WORLD = "1" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc index 442479ae6..e4880ffed 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc @@ -10,7 +10,7 @@ HOMEPAGE = "http://mesa3d.org" BUGTRACKER = "https://bugs.freedesktop.org" SECTION = "x11" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.html;md5=6a23445982a7a972ac198e93cc1cb3de" +LIC_FILES_CHKSUM = "file://docs/license.html;md5=899fbe7e42d494c7c8c159c7001693d5" PE = "2" @@ -24,11 +24,13 @@ REQUIRED_DISTRO_FEATURES = "opengl" EXTRA_OECONF = "--enable-shared-glapi" -PACKAGECONFIG ??= "egl gles dri ${MESA_CRYPTO} \ +PACKAGECONFIG ??= "gbm egl gles dri ${MESA_CRYPTO} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)}\ ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'wayland', '', d)}\ " +PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" + X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" @@ -37,7 +39,7 @@ PACKAGECONFIG[wayland] = ",,wayland-native wayland" DRIDRIVERS = "swrast" DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" -PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS} --enable-gbm, --disable-dri, dri2proto libdrm" +PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, dri2proto libdrm" PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto libxshmfence" PACKAGECONFIG[gles] = "--enable-gles1 --enable-gles2, --disable-gles1 --disable-gles2" @@ -140,16 +142,17 @@ python mesa_populate_packages() { d.setVar("RREPLACES_%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) import re - dri_drivers_root = os.path.join(d.getVar('libdir', True), "dri") - dri_pkgs = os.listdir(d.getVar('PKGD', True) + dri_drivers_root) - lib_name = d.expand("${MLPREFIX}mesa-megadriver") - for p in dri_pkgs: - m = re.match('^(.*)_dri\.so$', p) - if m: - pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) - d.appendVar("RPROVIDES_%s" % lib_name, pkg_name) - d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) - d.appendVar("RREPLACES_%s" % lib_name, pkg_name) + dri_drivers_root = oe.path.join(d.getVar('PKGD', True), d.getVar('libdir', True), "dri") + if os.path.isdir(dri_drivers_root): + dri_pkgs = os.listdir(dri_drivers_root) + lib_name = d.expand("${MLPREFIX}mesa-megadriver") + for p in dri_pkgs: + m = re.match('^(.*)_dri\.so$', p) + if m: + pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) + d.appendVar("RPROVIDES_%s" % lib_name, pkg_name) + d.appendVar("RCONFLICTS_%s" % lib_name, pkg_name) + d.appendVar("RREPLACES_%s" % lib_name, pkg_name) pipe_drivers_root = os.path.join(d.getVar('libdir', True), "gallium-pipe") do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_11.1.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_12.0.1.bb index 502afcfd8..80189e3ff 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_11.1.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_12.0.1.bb @@ -2,10 +2,12 @@ require ${BPN}.inc SRC_URI = "ftp://ftp.freedesktop.org/pub/mesa/${PV}/mesa-${PV}.tar.xz \ file://replace_glibc_check_with_linux.patch \ + file://clang-compile-PR89599.patch \ + file://disable-asm-on-non-gcc.patch \ " -SRC_URI[md5sum] = "1043dfb907beecb2a761272455960427" -SRC_URI[sha256sum] = "64db074fc514136b5fb3890111f0d50604db52f0b1e94ba3fcb0fe8668a7fd20" +SRC_URI[md5sum] = "972fd5ad5a63aeabf173fb9adefc6522" +SRC_URI[sha256sum] = "bab24fb79f78c876073527f515ed871fc9c81d816f66c8a0b051d8d653896389" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch deleted file mode 100644 index 3c8a83202..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0/fix-build-dir.patch +++ /dev/null @@ -1,46 +0,0 @@ -Fix build for S != B - -This patch is specific to version 1.4.x -Upstream-Status: Submitted @ https://github.com/clutter-project/mx/issues/81 -Signed-off-by: Tomas Frydrych <tomas@sleepfive.com> --- -Index: git/docs/reference/libmx-gtk/Makefile.am -=================================================================== ---- git.orig/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:07:02.027154788 +0100 -+++ git/docs/reference/libmx-gtk/Makefile.am 2013-05-08 15:14:33.684318650 +0100 -@@ -1,3 +1,6 @@ -+EXTRA_DIST= -+CLEANFILES= -+ - ## Process this file with automake to produce Makefile.in - - # We require automake 1.6 at least. -@@ -77,7 +80,7 @@ - GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx-gtk/libmx-gtk-$(MX_API_VERSION).la - - # This includes the standard gtk-doc make rules, copied by gtkdocize. --include $(top_srcdir)/gtk-doc.make -+include $(top_builddir)/gtk-doc.make - - # Other files to distribute - EXTRA_DIST += version.xml.in -Index: git/docs/reference/libmx/Makefile.am -=================================================================== ---- git.orig/docs/reference/libmx/Makefile.am 2013-05-08 15:07:02.027154788 +0100 -+++ git/docs/reference/libmx/Makefile.am 2013-05-08 15:14:24.456378135 +0100 -@@ -1,3 +1,6 @@ -+EXTRA_DIST= -+CLEANFILES= -+ - ## Process this file with automake to produce Makefile.in - - # We require automake 1.6 at least. -@@ -106,7 +109,7 @@ - GTKDOC_LIBS=$(MX_LIBS) $(top_builddir)/mx/libmx-$(MX_API_VERSION).la - - # This includes the standard gtk-doc make rules, copied by gtkdocize. --include $(top_srcdir)/gtk-doc.make -+include $(top_builddir)/gtk-doc.make - - # Other files to distribute - EXTRA_DIST += version.xml.in diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb index 5545c1e81..58a6997ff 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx-1.0_1.4.7.bb @@ -8,7 +8,6 @@ PV = "1.4.7+git${SRCPV}" UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>^\d+(\.(?!99)\d+)+)" SRC_URI = "git://github.com/clutter-project/mx.git;branch=mx-1.4 \ - file://fix-build-dir.patch \ file://fix-test-includes.patch \ " S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx.inc b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx.inc index 4f1095793..d30483748 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mx/mx.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/mx/mx.inc @@ -1,16 +1,15 @@ SUMMARY = "Clutter based UI widget library" LICENSE = "LGPLv2.1" -inherit clutter autotools-brokensep distro_features_check gobject-introspection +inherit clutter autotools distro_features_check gobject-introspection gtk-doc # depends on clutter-1.0 which depends on cogl-1.0 REQUIRED_DISTRO_FEATURES = "opengl" -DEPENDS = "clutter-1.0 dbus-glib gdk-pixbuf" +DEPENDS = "intltool-native clutter-1.0 dbus-glib gdk-pixbuf" SRC_URI = "http://source.clutter-project.org/sources/mx/${@get_verdir("${PV}")}/mx-${PV}.tar.xz" -EXTRA_OECONF = "--disable-gtk-doc \ - --disable-gtk-widgets \ +EXTRA_OECONF = "--disable-gtk-widgets \ --with-dbus \ --with-winsys=none \ --without-clutter-imcontext \ diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb index 5734b2785..87c700e02 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-clutter.bb @@ -3,7 +3,6 @@ # SUMMARY = "Clutter package groups" -LICENSE = "MIT" PR = "r6" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb deleted file mode 100644 index a657a1a4e..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-directfb.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "DirectFB without X11" -LICENSE = "MIT" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -inherit packagegroup - -TOUCH = ' ${@bb.utils.contains("MACHINE_FEATURES", "touchscreen", "tslib tslib-calibrate tslib-tests", "",d)}' - -RDEPENDS_${PN} = " \ - directfb \ - directfb-examples \ - pango \ - fontconfig \ - ${TOUCH} \ -" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb index 17301a052..7ea72d55a 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-base.bb @@ -1,6 +1,5 @@ SUMMARY = "Basic X11 session" DESCRIPTION = "Packages required to set up a basic working X11 session" -LICENSE = "MIT" PR = "r1" inherit packagegroup distro_features_check @@ -11,7 +10,6 @@ RDEPENDS_${PN} = "\ packagegroup-core-x11-xserver \ packagegroup-core-x11-utils \ dbus \ - pointercal \ matchbox-terminal \ matchbox-wm \ mini-x-session \ diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb index c53f1b758..6b5002856 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11-xserver.bb @@ -3,7 +3,6 @@ # SUMMARY = "X11 display server" -LICENSE = "MIT" PR = "r40" PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb index 3537d8cbb..42914246d 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/packagegroups/packagegroup-core-x11.bb @@ -2,7 +2,6 @@ # Copyright (C) 2011 Intel Corporation # -LICENSE = "MIT" PR = "r40" inherit packagegroup distro_features_check diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch new file mode 100644 index 000000000..6784a105a --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch @@ -0,0 +1,147 @@ +From 526a6a9fc9a1cfe75c521c8bb39b61754fe42fe8 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 2 Sep 2016 14:00:24 +0300 +Subject: [PATCH] Enforce recreation of docs/pango.types; it is build + configuration-specific. + +In particular, it needs to exclude references to PangoXft if Xft is not available. + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + docs/Makefile.am | 17 ++++-------- + docs/pango.types | 80 -------------------------------------------------------- + 2 files changed, 5 insertions(+), 92 deletions(-) + delete mode 100644 docs/pango.types + +diff --git a/docs/Makefile.am b/docs/Makefile.am +index f5f1317..8947a99 100644 +--- a/docs/Makefile.am ++++ b/docs/Makefile.am +@@ -49,6 +49,10 @@ IGNORE_HFILES= \ + pangocoretext-private.h \ + pangoatsui-private.h + ++if !HAVE_XFT ++IGNORE_HFILES += pangoxft pangoxft-render.h ++endif ++ + # CFLAGS and LDFLAGS for compiling scan program. Only needed + # if $(DOC_MODULE).types is non-empty. + INCLUDES = \ +@@ -103,16 +107,6 @@ include $(top_srcdir)/gtk-doc.make + # This line really belongs in gtk-doc.mk + $(REPORT_FILES): sgml-build.stamp + +-pango.types: +- @echo "Rebuilding $@" +- @LANG=C; LIST=$$(grep 'pango_[_a-zA-Z0-9]*_get_type' $(HFILE_GLOB) | grep -v '\(private\|atsui\|core_text\|win32\)' | sed 's/\([^:]*:\).*\(pango[_a-zA-Z0-9]*_get_type\).*/\1\2/') && \ +- echo "$$LIST" | sed 's/.*\/\(pango\/.*\):.*/#include <\1>/' | sort -u > $@.tmp && \ +- echo >> $@.tmp && \ +- echo "$$LIST" | cut -d : -f 2 | sort -u >> $@.tmp && \ +- mv $@.tmp $@ +- +-BUILT_SOURCES = pango.types +- + ######################################################################## + + MAINTAINERCLEANFILES = $(BUILT_SOURCES) +@@ -120,8 +114,7 @@ EXTRA_DIST += \ + layout.fig \ + layout.eps \ + version.xml.in \ +- check.docs \ +- pango.types ++ check.docs + + # force doc rebulid after configure + dist-hook-local: dist-local-check-no-cross-references all-local +diff --git a/docs/pango.types b/docs/pango.types +deleted file mode 100644 +index 7d93cda..0000000 +--- a/docs/pango.types ++++ /dev/null +@@ -1,80 +0,0 @@ +-#include <pango/pango-attributes.h> +-#include <pango/pango-context.h> +-#include <pango/pango-engine.h> +-#include <pango/pango-enum-types.h> +-#include <pango/pango-font.h> +-#include <pango/pango-fontmap.h> +-#include <pango/pango-fontset.h> +-#include <pango/pango-glyph-item.h> +-#include <pango/pango-glyph.h> +-#include <pango/pango-item.h> +-#include <pango/pango-language.h> +-#include <pango/pango-layout.h> +-#include <pango/pango-matrix.h> +-#include <pango/pango-ot.h> +-#include <pango/pango-renderer.h> +-#include <pango/pango-tabs.h> +-#include <pango/pangocairo-fc.h> +-#include <pango/pangocairo.h> +-#include <pango/pangofc-decoder.h> +-#include <pango/pangofc-font.h> +-#include <pango/pangofc-fontmap.h> +-#include <pango/pangoft2.h> +-#include <pango/pangoxft-render.h> +-#include <pango/pangoxft.h> +- +-pango_alignment_get_type +-pango_attr_list_get_type +-pango_attr_type_get_type +-pango_bidi_type_get_type +-pango_cairo_fc_font_map_get_type +-pango_cairo_font_get_type +-pango_cairo_font_map_get_type +-pango_color_get_type +-pango_context_get_type +-pango_coverage_level_get_type +-pango_direction_get_type +-pango_ellipsize_mode_get_type +-pango_engine_get_type +-pango_engine_lang_get_type +-pango_engine_shape_get_type +-pango_fc_decoder_get_type +-pango_fc_font_get_type +-pango_fc_font_map_get_type +-pango_font_description_get_type +-pango_font_face_get_type +-pango_font_family_get_type +-pango_font_get_type +-pango_font_map_get_type +-pango_font_mask_get_type +-pango_font_metrics_get_type +-pango_fontset_get_type +-pango_fontset_simple_get_type +-pango_ft2_font_map_get_type +-pango_glyph_item_get_type +-pango_glyph_item_iter_get_type +-pango_glyph_string_get_type +-pango_gravity_get_type +-pango_gravity_hint_get_type +-pango_item_get_type +-pango_language_get_type +-pango_layout_get_type +-pango_layout_iter_get_type +-pango_layout_line_get_type +-pango_matrix_get_type +-pango_ot_info_get_type +-pango_ot_ruleset_get_type +-pango_render_part_get_type +-pango_renderer_get_type +-pango_script_get_type +-pango_stretch_get_type +-pango_style_get_type +-pango_tab_align_get_type +-pango_tab_array_get_type +-pango_underline_get_type +-pango_variant_get_type +-pango_weight_get_type +-pango_wrap_mode_get_type +-pango_xft_font_get_type +-pango_xft_font_map_get_type +-pango_xft_renderer_get_type +-- +2.9.3 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.1.bb index 7fc65fd43..f9f344a86 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.38.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.1.bb @@ -15,10 +15,10 @@ inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspec SRC_URI += "file://run-ptest \ file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ + file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ " - -SRC_URI[archive.md5sum] = "7fde35d4a127b55ce8bbcefe109bc80d" -SRC_URI[archive.sha256sum] = "1320569f6c6d75d6b66172b2d28e59c56ee864ee9df202b76799c4506a214eb7" +SRC_URI[archive.md5sum] = "6fc88c6529890d6c8e03074d57a3eceb" +SRC_URI[archive.sha256sum] = "e27af54172c72b3ac6be53c9a4c67053e16c905e02addcf3a603ceb2005c1a40" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" @@ -36,8 +36,8 @@ LIBV = "1.8.0" # This binary needs to be compiled for the host architecture. This isn't pretty! do_compile_prepend_class-target () { - if ${@base_contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then - make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode + if ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'true', 'false', d)}; then + make CC="${BUILD_CC}" CFLAGS="" LDFLAGS="${BUILD_LDFLAGS}" AM_CPPFLAGS="$(pkg-config-native --cflags glib-2.0)" gen_all_unicode_LDADD="$(pkg-config-native --libs glib-2.0)" -C ${B}/tests gen-all-unicode fi } diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch new file mode 100644 index 000000000..2e1c9476f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-test-utils-with-ldl.patch @@ -0,0 +1,41 @@ +Backport patch to fix build with gold linker. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Backport + + + +From 93a7113485cf1c55fd7076116faf5b3a690706b2 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 30 Aug 2016 17:17:28 +0300 +Subject: [PATCH] cmake: Link test utils with "-ldl" + +Without this linking CXX executables (e.g. fbo-blit-stretch) fails +with gold linker: + +| libpiglitutil_gl.so.0: error: undefined reference to 'dlsym' +| libpiglitutil_gl.so.0: error: undefined reference to 'dlerror' +| libpiglitutil_gl.so.0: error: undefined reference to 'dlopen' + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Reviewed-by: Emil Velikov <emil.velikov@collabora.com> +--- + tests/util/CMakeLists.txt | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt +index e1f8073..3d5bef5 100644 +--- a/tests/util/CMakeLists.txt ++++ b/tests/util/CMakeLists.txt +@@ -11,6 +11,8 @@ set_source_files_properties( + PROPERTIES GENERATED 1 + ) + ++link_libraries(${CMAKE_DL_LIBS}) ++ + if(HAVE_LIBCACA) + link_libraries(caca) + endif() +-- +2.9.3 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch new file mode 100644 index 000000000..845804dd6 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-Link-utils-with-xcb-explicitly.patch @@ -0,0 +1,54 @@ +From 73e4fbc5777eddd89bb0fb16e90343551fe3e0ef Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Tue, 5 Jul 2016 10:56:23 +0300 +Subject: [PATCH] cmake: Link utils with xcb explicitly + +Linking with g++ can reportedly lead to: + +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_connect' +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_get_setup' +libpiglitutil_gl.so.0: error: undefined reference to 'xcb_setup_roots_iterator' + +This may have appeared now because xcb-dri2 used to overlink publicly +but now does not. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Accepted +--- + CMakeLists.txt | 1 + + tests/util/CMakeLists.txt | 2 ++ + 2 files changed, 3 insertions(+) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e2abba..2e1a473 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -151,6 +151,7 @@ IF(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + + pkg_check_modules(LIBDRM QUIET libdrm) + pkg_check_modules(LIBDRM_INTEL QUIET libdrm_intel) ++ pkg_check_modules(XCB QUIET xcb) + pkg_check_modules(XCB_DRI2 QUIET xcb-dri2) + pkg_check_modules(GLPROTO QUIET glproto) + ELSEIF(${CMAKE_SYSTEM_NAME} MATCHES "Windows") +diff --git a/tests/util/CMakeLists.txt b/tests/util/CMakeLists.txt +index fb22ffa..e1f8073 100644 +--- a/tests/util/CMakeLists.txt ++++ b/tests/util/CMakeLists.txt +@@ -121,11 +121,13 @@ if(${CMAKE_SYSTEM_NAME} MATCHES "Linux") + + list(APPEND UTIL_GL_LIBS + ${LIBDRM_LDFLAGS} ++ ${XCB_LDFLAGS} + ${XCB_DRI2_LDFLAGS} + ) + + list(APPEND UTIL_GL_INCLUDES + ${LIBDRM_INCLUDE_DIRS} ++ ${XCB_INCLUDE_DIRS} + ${XCB_DRI2_INCLUDE_DIRS} + ) + +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch new file mode 100644 index 000000000..e07e810a7 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-cmake-install-bash-completions-in-the-right-place.patch @@ -0,0 +1,35 @@ +From 26faa2c157a27a18a9f767976730fe0c115e3af4 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 13 Jul 2016 19:19:02 +0300 +Subject: [PATCH] cmake: install bash-completions in the right place + +The completionsdir variable is a full path and should not be +prefixed. + +This does mean the files may be installed outside of +CMAKE_INSTALL_PREFIX -- the alternative is more difficult and +means that bash completion files may be installed where +bash-completion can't find them. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Submitted [mailing list] +--- + CMakeLists.txt | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8e2abba..784a8f9 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -532,7 +532,7 @@ install ( + if (BASH_COMPLETION_FOUND) + install( + FILES completions/bash/piglit +- DESTINATION ${CMAKE_INSTALL_PREFIX}/${BASH_COMPLETION_COMPLETIONSDIR}/ ++ DESTINATION ${BASH_COMPLETION_COMPLETIONSDIR}/ + ) + endif (BASH_COMPLETION_FOUND) + +-- +2.8.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch deleted file mode 100644 index c27cc04f0..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Fix-missing-include-of-Xutil.h.patch +++ /dev/null @@ -1,28 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> - -From e40e0a25f996d2e205c4bdec2c8a5cc7f74e5065 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Mon, 15 Jun 2015 16:25:30 -0300 -Subject: tests: Fix missing include of Xutil.h - -The EGL tests rely on Xutil.h being included. Some EGL implementation -does not explitly include it by default and then the build fails. - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> -Reviewed-by: Neil Roberts <neil@linux.intel.com> - -diff --git a/tests/egl/egl-configless-context.c b/tests/egl/egl-configless-context.c -index 0504a26..154b55c 100644 ---- a/tests/egl/egl-configless-context.c -+++ b/tests/egl/egl-configless-context.c -@@ -32,6 +32,7 @@ - /* Chunks of code in this file are taken from egl-util.c */ - - #include <X11/Xlib.h> -+#include <X11/Xutil.h> - - #include "piglit-util-gl.h" - #include "piglit-util-egl.h" --- -cgit v0.10.2 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch new file mode 100644 index 000000000..f851a92ce --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch @@ -0,0 +1,54 @@ +From 0fc2c2932699cfd68be96c820fddfdd79b48b788 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 9 Jul 2016 07:52:19 +0000 +Subject: [PATCH] tests: Use FE_UPWARD only if its defined in fenv.h + +On ARM, musl does not define FE_* when arch does not have +VFP, (which is right interpretation), therefore check if +its defined before using it + +Fixes errors like + +tests/general/roundmode-pixelstore.c:82:19: error: 'FE_UPWARD' undeclared (first use in this function) + ret = fesetround(FE_UPWARD); + ^~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + tests/general/roundmode-getintegerv.c | 2 ++ + tests/general/roundmode-pixelstore.c | 2 ++ + 2 files changed, 4 insertions(+) + +diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c +index 28ecfaf..5c27579 100644 +--- a/tests/general/roundmode-getintegerv.c ++++ b/tests/general/roundmode-getintegerv.c +@@ -81,7 +81,9 @@ piglit_init(int argc, char **argv) + { + int ret; + bool pass = true; ++#ifdef FE_UPWARD + ret = fesetround(FE_UPWARD); ++#endif + if (ret != 0) { + printf("Couldn't set rounding mode\n"); + piglit_report_result(PIGLIT_SKIP); +diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c +index 9284f43..3fcb396 100644 +--- a/tests/general/roundmode-pixelstore.c ++++ b/tests/general/roundmode-pixelstore.c +@@ -79,7 +79,9 @@ piglit_init(int argc, char **argv) + { + int ret; + bool pass = true; ++#ifdef FE_UPWARD + ret = fesetround(FE_UPWARD); ++#endif + if (ret != 0) { + printf("Couldn't set rounding mode\n"); + piglit_report_result(PIGLIT_SKIP); +-- +1.8.3.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb index 607f236c2..82adcdeca 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -3,18 +3,22 @@ LICENSE = "MIT & LGPLv2+ & GPLv3 & GPLv2+ & BSD-3-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=b2beded7103a3d8a442a2a0391d607b0" SRC_URI = "git://anongit.freedesktop.org/piglit \ - file://0001-tests-Fix-missing-include-of-Xutil.h.patch" - -# From 2015-02-19 -SRCREV = "c4585427913e4cb28994b4bfb11d49778273aa2c" + file://0001-cmake-install-bash-completions-in-the-right-place.patch \ + file://0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch \ + file://0001-cmake-Link-utils-with-xcb-explicitly.patch \ + file://0001-cmake-Link-test-utils-with-ldl.patch \ + " + +# From 2016-07-07 +SRCREV = "c39e41a86551eb390b8da23232dc8577639403d0" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" S = "${WORKDIR}/git" -DEPENDS = "virtual/libx11 libxrender waffle virtual/libgl libglu python-mako-native python-numpy-native" +DEPENDS = "libpng virtual/libx11 libxrender waffle virtual/libgl libglu python3-mako-native python3-numpy-native python3-six-native" -inherit cmake pythonnative distro_features_check +inherit cmake python3native distro_features_check bash-completion # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" @@ -34,10 +38,15 @@ do_configure_prepend() { fi } -RDEPENDS_${PN} = "waffle python python-mako python-json python-subprocess \ - python-argparse python-importlib python-unixadmin python-xml \ - python-multiprocessing python-textutils python-netserver python-shell \ +do_install() { + oe_runmake -C ${B} 'DESTDIR=${D}' install/strip +} + +RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \ + python3-subprocess python3-misc python3-importlib \ + python3-unixadmin python3-xml python3-multiprocessing \ + python3-six python3-shell python3-io python3-argparse \ mesa-demos bash \ " -INSANE_SKIP_${PN} += "dev-so" +INSANE_SKIP_${PN} += "dev-so already-stripped" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb index 0e1a7928f..6c3bcd831 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb @@ -13,7 +13,7 @@ LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd S = "${WORKDIR}" do_compile () { - ${CC} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp` + ${CC} ${CFLAGS} ${LDFLAGS} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp` } do_install () { diff --git a/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib/ts.conf b/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib/ts.conf deleted file mode 100644 index 1b0da937e..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib/ts.conf +++ /dev/null @@ -1,25 +0,0 @@ -# Uncomment if you wish to use the linux input layer event interface -module_raw input - -# Uncomment if you're using a Sharp Zaurus SL-5500/SL-5000d -# module_raw collie - -# Uncomment if you're using a Sharp Zaurus SL-C700/C750/C760/C860 -# module_raw corgi - -# Uncomment if you're using a device with a UCB1200/1300/1400 TS interface -# module_raw ucb1x00 - -# Uncomment if you're using an HP iPaq h3600 or similar -# module_raw h3600 - -# Uncomment if you're using a Hitachi Webpad -# module_raw mk712 - -# Uncomment if you're using an IBM Arctic II -# module_raw arctic2 - -module pthres pmin=1 -module variance delta=30 -module dejitter delta=100 -module linear diff --git a/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib/tslib.sh b/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib/tslib.sh deleted file mode 100644 index 7068e8d92..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib/tslib.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/bin/sh - -if [ -e /dev/input/touchscreen0 ]; then - TSLIB_TSDEVICE=/dev/input/touchscreen0 - - export TSLIB_TSDEVICE -fi - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb deleted file mode 100644 index b0264c3b3..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/tslib/tslib_1.1.bb +++ /dev/null @@ -1,53 +0,0 @@ -SUMMARY = "An abstraction layer for touchscreen panel events" -DESCRIPTION = "Tslib is an abstraction layer for touchscreen panel \ -events, as well as a filter stack for the manipulation of those events. \ -Tslib is generally used on embedded devices to provide a common user \ -space interface to touchscreen functionality." -HOMEPAGE = "http://tslib.berlios.de/" - -AUTHOR = "Russell King w/ plugins by Chris Larson et. al." -SECTION = "base" -LICENSE = "LGPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=f30a9716ef3762e3467a2f62bf790f0a" - -SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}.tar.xz;downloadfilename=tslib-${PV}.tar.xz \ - file://ts.conf \ - file://tslib.sh \ -" - -SRC_URI[md5sum] = "14771f8607b341bb4b297819d37e837d" -SRC_URI[sha256sum] = "fe35e5f710ea933b118f710e2ce4403ac076fe69926b570333867d4de082a51c" - -UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" - -inherit autotools pkgconfig - -EXTRA_OECONF = "--enable-shared --disable-h3600 --enable-input --disable-corgi --disable-collie --disable-mk712 --disable-arctic2 --disable-ucb1x00" - -do_install_prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf -} - -do_install_append() { - install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ -} - -# People should consider using udev's /dev/input/touchscreen0 symlink -# instead of detect-stylus -#RDEPENDS_tslib-conf_weird-machine = "detect-stylus" -RPROVIDES_tslib-conf = "libts-0.0-conf" - -PACKAGES =+ "tslib-conf tslib-tests tslib-calibrate" -DEBIAN_NOAUTONAME_tslib-conf = "1" -DEBIAN_NOAUTONAME_tslib-tests = "1" -DEBIAN_NOAUTONAME_tslib-calibrate = "1" - -RDEPENDS_${PN} = "tslib-conf" -RRECOMMENDS_${PN} = "pointercal" - -FILES_${PN}-dev += "${libdir}/ts/*.la" -FILES_tslib-conf = "${sysconfdir}/ts.conf ${sysconfdir}/profile.d/tslib.sh ${datadir}/tslib" -FILES_${PN} = "${libdir}/*.so.* ${libdir}/ts/*.so*" -FILES_tslib-calibrate += "${bindir}/ts_calibrate" -FILES_tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_test" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch index 97c63bd37..b52b4962b 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput/touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch @@ -1,7 +1,7 @@ This is a workaround upstream suggests for use with kernel 4.1. Upstream-Status: Inappropriate [temporary work-around] -Signed-Off-By: Jussi Kukkonen <jussi.kukkonen@intel.com> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.1.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.4.1.bb index 4167679c2..358039226 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.1.4.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.4.1.bb @@ -10,13 +10,16 @@ DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ file://touchpad-serial-synaptics-need-to-fake-new-touches-on-TRIPLETAP.patch \ " -SRC_URI[md5sum] = "0945318141c1a9f52857bbf65d175f32" -SRC_URI[sha256sum] = "302cb76209b9c57a5a318e178f9bc446eede8ea79386103b5291cbfaa5fab5b6" +SRC_URI[md5sum] = "2e7ba577ed74d8d1baeb07dbd4fb912a" +SRC_URI[sha256sum] = "26e7b3ab499358caba499705680ea7e5851af2bd37dc32f2be64181610d6392a" inherit autotools pkgconfig PACKAGECONFIG ??= "" PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" +PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom" PACKAGECONFIG[gui] = "--enable-event-gui,--disable-event-gui,cairo gtk+3" -FILES_${PN} += "${libdir}/udev/" +UDEVDIR = "`pkg-config --variable=udevdir udev`" + +EXTRA_OECONF += "--with-udev-dir=${UDEVDIR}" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.7.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.7.bb new file mode 100644 index 000000000..1d2f0db8f --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.7.bb @@ -0,0 +1,20 @@ +SUMMARY = "Collection of additional Wayland protocols" +DESCRIPTION = "Wayland protocols that add functionality not \ +available in the Wayland core protocol. Such protocols either add \ +completely new functionality, or extend the functionality of some other \ +protocol either in Wayland core, or some other protocol in \ +wayland-protocols." +HOMEPAGE = "http://wayland.freedesktop.org" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ + file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" + +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + " +SRC_URI[md5sum] = "9acfc9556f7cfedc44d97af60da66a5f" +SRC_URI[sha256sum] = "635f2a937d318f1fecb97b54074ca211486e38af943868dd0fa82ea38d091c1f" + +inherit allarch autotools pkgconfig + +PACKAGES = "${PN}" +FILES_${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch new file mode 100644 index 000000000..dece95c76 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland/0001-scanner-Use-unit32_t-instead-of-uint.patch @@ -0,0 +1,30 @@ +From 5516d32e694badca35b6c71b02a3f08f650308bf Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 15 Jul 2016 16:23:48 -0700 +Subject: [PATCH] scanner: Use unit32_t instead of uint + +uint32_t is C99 defined stdint type + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Submitted +--- + src/scanner.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scanner.c b/src/scanner.c +index 5f06e8e..10a4023 100644 +--- a/src/scanner.c ++++ b/src/scanner.c +@@ -808,7 +808,7 @@ find_enumeration(struct protocol *protocol, + struct interface *i; + struct enumeration *e; + char *enum_name; +- uint idx = 0, j; ++ uint32_t idx = 0, j; + + for (j = 0; j + 1 < strlen(enum_attribute); j++) { + if (enum_attribute[j] == '.') { +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.9.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.11.0.bb index d12ac186c..3413406d0 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.9.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.11.0.bb @@ -10,9 +10,11 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "5e141b3f2a7005d6c89d6f233c87c317" -SRC_URI[sha256sum] = "9c8770720aa0034479735f58a4dc4ca9b172ecfede28f5134312e135b7301efa" +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://0001-scanner-Use-unit32_t-instead-of-uint.patch \ + " +SRC_URI[md5sum] = "fccf680be066e234729d5b69e0bd0fa9" +SRC_URI[sha256sum] = "9540925f7928becfdf5e3b84c70757f6589bf1ceef09bea78784d8e4772c0db0" EXTRA_OECONF_class-native = "--disable-documentation --disable-libraries" @@ -20,7 +22,7 @@ inherit autotools pkgconfig BBCLASSEXTEND = "native nativesdk" -DEPENDS = "expat libffi wayland-native" +DEPENDS = "expat libxml2 libffi wayland-native" EXTRA_OECONF = "--disable-documentation --with-host-scanner" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb index 653541e3c..291cd16b2 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init.bb @@ -3,16 +3,19 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/LICENSE;md5=4d92cd373abda3937c2bc47fbc49d690" SRC_URI = "file://init \ - file://weston.service" + file://weston.service \ + file://weston-start" S = "${WORKDIR}" do_install() { - install -d ${D}/${sysconfdir}/init.d - install -m755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston + install -Dm0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service - install -d ${D}${systemd_system_unitdir} - install -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir} + # Install weston-start script + install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start + sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start + sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start } inherit allarch update-rc.d distro_features_check systemd diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/init b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/init index 2e938f430..d3e87c6ce 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/init +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/init @@ -31,14 +31,7 @@ case "$1" in start) . /etc/profile - # This is all a nasty hack - if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/root - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - - openvt -s weston -- $OPTARGS + weston-start -- $OPTARGS ;; stop) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston-start b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston-start new file mode 100755 index 000000000..e72fbaaac --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston-start @@ -0,0 +1,69 @@ +#!/bin/sh +# Copyright (C) 2016 O.S. Systems Software LTDA. +# Copyright (C) 2016 Freescale Semiconductor + +export PATH="/sbin:/usr/sbin:/bin:/usr/bin" + +usage() { + cat <<EOF + $0 [<openvt arguments>] [-- <weston options>] +EOF +} + +## Module support +modules_dir=@DATADIR@/weston-start + +# Add weston extra argument +add_weston_argument() { + weston_args="$weston_args $1" +} + +# Add openvt extra argument +add_openvt_argument() { + openvt_args="$openvt_args $1" +} + +if [ -n "$WAYLAND_DISPLAY" ]; then + echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." + exit 1 +fi +if [ -n "$DISPLAY" ]; then + launcher="weston" +else + launcher="weston-launch --" +fi + +openvt_args="-s" +while [ -n "$1" ]; do + if [ "$1" = "--" ]; then + shift + break + fi + openvt_args="$openvt_args $1" + shift +done + +weston_args=$* + +# Load and run modules +if [ -d "$modules_dir" ]; then + for m in "$modules_dir"/*; do + # Skip backup files + if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then + continue + fi + + # process module + . $m + done +fi + +if test -z "$XDG_RUNTIME_DIR"; then + export XDG_RUNTIME_DIR=/run/user/`id -u` + if ! test -d "$XDG_RUNTIME_DIR"; then + mkdir --parents $XDG_RUNTIME_DIR + chmod 0700 $XDG_RUNTIME_DIR + fi +fi + +exec openvt $openvt_args -- $launcher $weston_args --log=@LOCALSTATEDIR@/log/weston.log diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service index 4f1f7ff10..689ce4106 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston-init/weston.service @@ -1,14 +1,11 @@ [Unit] -Description=Weston Wayland compositor startup +Description=Weston Wayland Compositor RequiresMountsFor=/run [Service] User=root EnvironmentFile=-/etc/default/weston -Environment="XDG_RUNTIME_DIR=/run/user/root" -ExecStartPre=/bin/mkdir -p /run/user/root -ExecStartPre=/bin/chmod 0700 /run/user/root -ExecStart=/usr/bin/openvt -v -e /usr/bin/weston -- $OPTARGS +ExecStart=/usr/bin/weston-start -v -e -- $OPTARGS [Install] WantedBy=multi-user.target diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch new file mode 100644 index 000000000..00118d78b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch @@ -0,0 +1,34 @@ +From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Wed, 11 May 2016 16:16:30 +0300 +Subject: [PATCH] configure.ac: Fix wayland-protocols path + +The wayland-protocols directory is used during build: Fix the path +to point to sysroot specified in recipe. + +Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that +breaks multilib weston as it would point to multilib sysroot when the +(allarch) wayland-protocols is actually in the machine sysroot. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Inappropriate [embedded specific] +--- + configure.ac | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index bc7c329..15a05d3 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [libinput >= 0.8.0]) + PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) + + PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.2], +- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) ++ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) + AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) + + AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch new file mode 100644 index 000000000..91ef727d3 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-shared-include-stdint.h-for-int32_t.patch @@ -0,0 +1,28 @@ +From ba02b8abe4e2afac2bfbf2559972d5059d75a041 Mon Sep 17 00:00:00 2001 +From: Jussi Kukkonen <jussi.kukkonen@intel.com> +Date: Sat, 16 Jul 2016 22:50:19 +0300 +Subject: [PATCH weston] shared: include stdint.h for int32_t + +This fixes build on musl. + +Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> +Upstream-Status: Submitted +--- + shared/xalloc.h | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/shared/xalloc.h b/shared/xalloc.h +index 85fccb4..484de2d 100644 +--- a/shared/xalloc.h ++++ b/shared/xalloc.h +@@ -30,6 +30,7 @@ + extern "C" { + #endif + ++#include <stdint.h> + #include <stdlib.h> + #include <string.h> + +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch new file mode 100644 index 000000000..5542036be --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-weston-launch-Provide-a-default-version-that-doesn-t.patch @@ -0,0 +1,173 @@ +From d02226b3d5872b184c1d50c7f4706ac9467ffb81 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Fri, 15 Jul 2016 11:00:15 +0300 +Subject: [PATCH] weston-launch: Provide a default version that doesn't require + PAM + +weston-launch requires PAM for starting weston as a non-root user. + +Since starting weston as root is a valid use case by itself, if +PAM is not available, provide a default version of weston-launch +without non-root-user support. + +Upstream-Status: Pending + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +--- + configure.ac | 9 +++++++-- + src/weston-launch.c | 20 ++++++++++++++++++++ + 2 files changed, 27 insertions(+), 2 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 32fdde7..240966f 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -416,13 +416,17 @@ AC_ARG_ENABLE(resize-optimization, + AS_IF([test "x$enable_resize_optimization" = "xyes"], + [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) + ++AC_ARG_WITH(pam, ++ AS_HELP_STRING([--with-pam], [Use PAM]), ++ [use_pam=$withval], [use_pam=yes]) + AC_ARG_ENABLE(weston-launch, [ --enable-weston-launch],, enable_weston_launch=yes) + AM_CONDITIONAL(BUILD_WESTON_LAUNCH, test x$enable_weston_launch == xyes) +-if test x$enable_weston_launch == xyes; then ++if test x$enable_weston_launch = xyes -a x$use_pam = xyes; then + WESTON_SEARCH_LIBS([PAM], [pam], [pam_open_session], [have_pam=yes], [have_pam=no]) + if test x$have_pam == xno; then +- AC_ERROR([weston-launch requires pam]) ++ AC_ERROR([PAM support is explicitly requested, but libpam couldn't be found]) + fi ++ AC_DEFINE([HAVE_PAM], [1], [Define if PAM is available]) + fi + + AM_CONDITIONAL(HAVE_PANGO, test "x$have_pango" = "xyes") +@@ -673,6 +677,7 @@ AC_MSG_RESULT([ + Enable developer documentation ${enable_devdocs} + + weston-launch utility ${enable_weston_launch} ++ PAM support ${use_pam} + systemd-login support ${have_systemd_login} + systemd notify support ${enable_systemd_notify} + +diff --git a/src/weston-launch.c b/src/weston-launch.c +index b8b2ba0..a865061 100644 +--- a/src/weston-launch.c ++++ b/src/weston-launch.c +@@ -51,7 +51,9 @@ + + #include <pwd.h> + #include <grp.h> ++#ifdef HAVE_PAM + #include <security/pam_appl.h> ++#endif + + #ifdef HAVE_SYSTEMD_LOGIN + #include <systemd/sd-login.h> +@@ -93,8 +95,10 @@ drmSetMaster(int drm_fd) + #endif + + struct weston_launch { ++#ifdef HAVE_PAM + struct pam_conv pc; + pam_handle_t *ph; ++#endif + int tty; + int ttynr; + int sock[2]; +@@ -181,6 +185,7 @@ weston_launch_allowed(struct weston_launch *wl) + return false; + } + ++#ifdef HAVE_PAM + static int + pam_conversation_fn(int msg_count, + const struct pam_message **messages, +@@ -221,6 +226,7 @@ setup_pam(struct weston_launch *wl) + + return 0; + } ++#endif + + static int + setup_launcher_socket(struct weston_launch *wl) +@@ -414,6 +420,7 @@ quit(struct weston_launch *wl, int status) + close(wl->signalfd); + close(wl->sock[0]); + ++#ifdef HAVE_PAM + if (wl->new_user) { + err = pam_close_session(wl->ph, 0); + if (err) +@@ -421,6 +428,7 @@ quit(struct weston_launch *wl, int status) + err, pam_strerror(wl->ph, err)); + pam_end(wl->ph, err); + } ++#endif + + if (ioctl(wl->tty, KDSKBMUTE, 0) && + ioctl(wl->tty, KDSKBMODE, wl->kb_mode)) +@@ -600,6 +608,7 @@ setup_session(struct weston_launch *wl) + setenv("HOME", wl->pw->pw_dir, 1); + setenv("SHELL", wl->pw->pw_shell, 1); + ++#ifdef HAVE_PAM + env = pam_getenvlist(wl->ph); + if (env) { + for (i = 0; env[i]; ++i) { +@@ -608,6 +617,7 @@ setup_session(struct weston_launch *wl) + } + free(env); + } ++#endif + } + + static void +@@ -665,7 +675,9 @@ static void + help(const char *name) + { + fprintf(stderr, "Usage: %s [args...] [-- [weston args..]]\n", name); ++#ifdef HAVE_PAM + fprintf(stderr, " -u, --user Start session as specified username\n"); ++#endif + fprintf(stderr, " -t, --tty Start session on alternative tty\n"); + fprintf(stderr, " -v, --verbose Be verbose\n"); + fprintf(stderr, " -h, --help Display this help message\n"); +@@ -678,7 +690,9 @@ main(int argc, char *argv[]) + int i, c; + char *tty = NULL; + struct option opts[] = { ++#ifdef HAVE_PAM + { "user", required_argument, NULL, 'u' }, ++#endif + { "tty", required_argument, NULL, 't' }, + { "verbose", no_argument, NULL, 'v' }, + { "help", no_argument, NULL, 'h' }, +@@ -690,9 +704,13 @@ main(int argc, char *argv[]) + while ((c = getopt_long(argc, argv, "u:t::vh", opts, &i)) != -1) { + switch (c) { + case 'u': ++#ifdef HAVE_PAM + wl.new_user = optarg; + if (getuid() != 0) + error(1, 0, "Permission denied. -u allowed for root only"); ++#else ++ error(1, 0, "-u is unsupported in this weston-launch build"); ++#endif + break; + case 't': + tty = optarg; +@@ -730,8 +748,10 @@ main(int argc, char *argv[]) + if (setup_tty(&wl, tty) < 0) + exit(EXIT_FAILURE); + ++#ifdef HAVE_PAM + if (wl.new_user && setup_pam(&wl) < 0) + exit(EXIT_FAILURE); ++#endif + + if (setup_launcher_socket(&wl) < 0) + exit(EXIT_FAILURE); +-- +2.1.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch deleted file mode 100644 index a40eaf186..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/explicit-enable-disable-systemd.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 8e1efcd40b3bad81c83744e2e120d70c2b567ef2 Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico@cadete.eu> -Date: Mon, 28 Sep 2015 00:30:10 +0200 -Subject: configure.ac: add explicit enable/disable for systemd-login support - -Otherwise, auto-enable depending on whether the system has the necessary -libraries. - -[Updated help text as per pq suggestion -- bwh] - -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> -Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> -Tested-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> - -Upstream-Status: Backport -Backported from Weston git: -http://cgit.freedesktop.org/wayland/weston/commit/?id=8e1efc - -Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> - -diff --git a/configure.ac b/configure.ac -index a9cd429..67e80d0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,18 +380,30 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - --PKG_CHECK_MODULES(SYSTEMD_LOGIN, -- [libsystemd >= 209], -- [have_systemd_login_209=yes;have_systemd_login=yes], -- [have_systemd_login_209=no;have_systemd_login=no]) -- --# Older versions of systemd package systemd-login separately. Fall back on that --AS_IF([test x$have_systemd_login != xyes],[ -- PKG_CHECK_MODULES(SYSTEMD_LOGIN, -- [libsystemd-login >= 198], -- [have_systemd_login=yes], -- [have_systemd_login=no]) -- ]) -+AC_ARG_ENABLE(systemd-login, -+ AS_HELP_STRING([--enable-systemd-login], -+ [Enable logind support]),, -+ enable_systemd_login=auto) -+if test x$enable_systemd_login != xno; then -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd >= 209], -+ [have_systemd_login_209=yes;have_systemd_login=yes], -+ [have_systemd_login_209=no;have_systemd_login=no]) -+ -+ # Older versions of systemd package systemd-login separately. Fall back on that -+ AS_IF([test x$have_systemd_login != xyes],[ -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd-login >= 198], -+ [have_systemd_login=yes], -+ [have_systemd_login=no]) -+ ]) -+else -+ have_systemd_login=no -+fi -+ -+if test "x$have_systemd_login" = "xno" -a "x$enable_systemd_login" = "xyes"; then -+ AC_MSG_ERROR([systemd-login support explicitly enabled, but can't find libsystemd>=209 or libsystemd-login]) -+fi - - AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) --- -cgit v0.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch deleted file mode 100644 index 2d28d5689..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/libsystemd.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 5eb025a867b42f8bc7bc73279eac8de58e51a13e Mon Sep 17 00:00:00 2001 -From: Frederico Cadete <frederico@cadete.eu> -Date: Mon, 28 Sep 2015 00:30:09 +0200 -Subject: configure.ac: add support for new versions of systemd - -Starting from systemd version 209, a single libsystemd.pc is provided. -For previous versions, fall back on libsystemd-login.pc. - -Signed-off-by: Frederico Cadete <frederico@cadete.eu> -Reviewed-by: Bryce Harrington <bryce@osg.samsung.com> -Reviewed-by: Derek Foreman <derekf@osg.samsung.com> - -Upstream-Status: Backport -Backported from Weston git: -http://cgit.freedesktop.org/wayland/weston/commit/?id=5eb025 - -Signed-off-by: Joshua Lock <joshua.lock@collabora.co.uk> - -diff --git a/configure.ac b/configure.ac -index 045291c..a9cd429 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -380,14 +380,23 @@ AC_ARG_ENABLE(resize-optimization, - AS_IF([test "x$enable_resize_optimization" = "xyes"], - [AC_DEFINE([USE_RESIZE_POOL], [1], [Use resize memory pool as a performance optimization])]) - --PKG_CHECK_MODULES(SYSTEMD_LOGIN, [libsystemd-login >= 198], -- [have_systemd_login=yes], [have_systemd_login=no]) -+PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd >= 209], -+ [have_systemd_login_209=yes;have_systemd_login=yes], -+ [have_systemd_login_209=no;have_systemd_login=no]) -+ -+# Older versions of systemd package systemd-login separately. Fall back on that -+AS_IF([test x$have_systemd_login != xyes],[ -+ PKG_CHECK_MODULES(SYSTEMD_LOGIN, -+ [libsystemd-login >= 198], -+ [have_systemd_login=yes], -+ [have_systemd_login=no]) -+ ]) -+ - AS_IF([test "x$have_systemd_login" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN], [1], [Have systemd-login])]) - AM_CONDITIONAL(HAVE_SYSTEMD_LOGIN, test "x$have_systemd_login" = "xyes") - --PKG_CHECK_MODULES(SYSTEMD_LOGIN_209, [libsystemd-login >= 209], -- [have_systemd_login_209=yes], [have_systemd_login_209=no]) - AS_IF([test "x$have_systemd_login_209" = "xyes"], - [AC_DEFINE([HAVE_SYSTEMD_LOGIN_209], [1], [Have systemd-login >= 209])]) - --- -cgit v0.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch deleted file mode 100644 index 35e6d6ff5..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-lcms-explicitly-configurable.patch +++ /dev/null @@ -1,43 +0,0 @@ -weston-1.5.0/configure.ac: make lcms explicitly configurable - -The lcms package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if lcms -dependencies are missing, autoconf throws a fatal error. Follow -upstream style to make it more likely to be merged. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -491,12 +491,24 @@ AC_ARG_ENABLE(demo-clients-install, - enable_demo_clients_install=no) - AM_CONDITIONAL(INSTALL_DEMO_CLIENTS, [test "x$enable_demo_clients_install" = "xyes"]) - --PKG_CHECK_MODULES(LCMS, lcms2, -- [have_lcms=yes], [have_lcms=no]) --if test "x$have_lcms" = xyes; then -- AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+AC_ARG_ENABLE(lcms, -+ AS_HELP_STRING([--disable-lcms], -+ [Disable lcms support]),, -+ enable_lcms=auto) -+AM_CONDITIONAL(HAVE_LCMS, [test "x$enable_lcms" = xyes]) -+if test "x$enable_lcms" != "xno"; then -+ PKG_CHECK_MODULES(LCMS, -+ lcms2, -+ [have_lcms=yes], -+ [have_lcms=no]) -+ if test "x$have_lcms" = "xno" -a "x$enable_lcms" = "xyes"; then -+ AC_MSG_ERROR([lcms support explicitly requested, but lcms couldn't be found]) -+ fi -+ if test "x$have_lcms" = "xyes"; then -+ enable_lcms=yes -+ AC_DEFINE(HAVE_LCMS, 1, [Have lcms support]) -+ fi - fi --AM_CONDITIONAL(HAVE_LCMS, [test "x$have_lcms" = xyes]) - - AC_PATH_PROG([wayland_scanner], [wayland-scanner]) - if test x$wayland_scanner = x; then diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch deleted file mode 100644 index ad07d4fc2..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-libwebp-explicitly-configurable.patch +++ /dev/null @@ -1,37 +0,0 @@ - -The libwebp package is outside of openembedded-core, so make it -explicitly configurable. Make it deterministic, so that if libwebp -dependencies are missing, autoconf throws a fatal error. - -Upstream-Status: Pending - -Index: weston-1.5.0/configure.ac -=================================================================== ---- weston-1.5.0.orig/configure.ac -+++ weston-1.5.0/configure.ac -@@ -268,9 +268,22 @@ fi - - PKG_CHECK_MODULES(PIXMAN, [pixman-1]) - PKG_CHECK_MODULES(PNG, [libpng]) --PKG_CHECK_MODULES(WEBP, [libwebp], [have_webp=yes], [have_webp=no]) --AS_IF([test "x$have_webp" = "xyes"], -- [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+AC_ARG_ENABLE(webp, -+ AS_HELP_STRING([--disable-webp], -+ [Disable libwebp support]),, -+ enable_webp=auto) -+AM_CONDITIONAL(HAVE_WEBP, [test "x$enable_webp" = xyes]) -+AS_IF([test "x$enable_webp" != "xno"], -+ PKG_CHECK_MODULES(WEBP, -+ [libwebp], -+ [have_webp=yes], -+ [have_webp=no]) -+ AS_IF([test "x$have_webp" = "xno" -a "x$enable_webp" = "xyes"], -+ AC_MSG_ERROR([libwebp support explicitly request, but lipwebp could not be found])) -+ AS_IF([test "x$have_webp" = "xyes"], -+ [enable_webp=yes] -+ [AC_DEFINE([HAVE_WEBP], [1], [Have webp])]) -+) - - AC_ARG_ENABLE(vaapi-recorder, [ --enable-vaapi-recorder],, - enable_vaapi_recorder=auto) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch new file mode 100644 index 000000000..0c408a43d --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/make-weston-launch-exit-for-unrecognized-option.patch @@ -0,0 +1,33 @@ +From e8b615250f700f7854b423aaaf0a0aeea92c05a9 Mon Sep 17 00:00:00 2001 +From: Tom Hochstein <tom.hochstein@nxp.com> +Date: Sat, 7 May 2016 08:51:58 -0300 +Subject: [PATCH] weston-launch: Handle invalid command line options +Organization: O.S. Systems Software LTDA. + +Exit the program if an unrecognized command line option is found. + +Upstream-Status: Submitted + +Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +--- + + src/weston-launch.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/weston-launch.c b/src/weston-launch.c +index b8dfb17..9987d8e 100644 +--- a/src/weston-launch.c ++++ b/src/weston-launch.c +@@ -703,6 +703,8 @@ main(int argc, char *argv[]) + case 'h': + help("weston-launch"); + exit(EXIT_FAILURE); ++ default: ++ exit(EXIT_FAILURE); + } + } + +-- +2.8.2 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/xwayland.weston-start b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/xwayland.weston-start new file mode 100644 index 000000000..b483c97cf --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/xwayland.weston-start @@ -0,0 +1,7 @@ +#!/bin/sh + +if type Xwayland >/dev/null 2>/dev/null; then + mkdir -p /tmp/.X11-unix + + add_weston_argument "--modules=xwayland.so" +fi diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_1.9.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_1.11.0.bb index 16a788d2a..3ad309dab 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_1.9.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_1.11.0.bb @@ -5,32 +5,32 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ file://src/compositor.c;endline=23;md5=1d535fed266cf39f6d8c0647f52ac331" -SRC_URI = "http://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ +SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ - file://make-lcms-explicitly-configurable.patch \ - file://make-libwebp-explicitly-configurable.patch \ file://0001-make-error-portable.patch \ - file://libsystemd.patch \ - file://explicit-enable-disable-systemd.patch \ + file://0001-configure.ac-Fix-wayland-protocols-path.patch \ + file://0001-shared-include-stdint.h-for-int32_t.patch \ + file://xwayland.weston-start \ + file://make-weston-launch-exit-for-unrecognized-option.patch \ + file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ " -SRC_URI[md5sum] = "66bbba12f546570b4d97f676bc79a28e" -SRC_URI[sha256sum] = "9c1b03f3184fa0b0dfdf67e215048085156e1a2ca344af6613fed36794ac48cf" +SRC_URI[md5sum] = "bc6f90a2039163804aecfa663b69c4c2" +SRC_URI[sha256sum] = "05e086e9f186a06843b9f7a5e1abf19347b1a6e4be26d7e74927abc17b6b7125" inherit autotools pkgconfig useradd distro_features_check # depends on virtual/egl REQUIRED_DISTRO_FEATURES = "opengl" DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0 jpeg" -DEPENDS += "wayland libinput virtual/egl pango wayland-native" +DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" EXTRA_OECONF = "--enable-setuid-install \ - --enable-simple-clients \ - --enable-clients \ - --enable-demo-clients-install \ --disable-rpi-compositor \ --disable-rdp-compositor \ + WAYLAND_PROTOCOLS_SYSROOT_DIR=${STAGING_DIR}/${MACHINE} \ " +EXTRA_OECONF[vardepsexclude] = "MACHINE" EXTRA_OECONF_append_qemux86 = "\ WESTON_NATIVE_BACKEND=fbdev-backend.so \ @@ -40,9 +40,10 @@ EXTRA_OECONF_append_qemux86-64 = "\ " PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms fbdev wayland egl', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'launch', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'pam', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', '', d)} \ - " + clients launch" # # Compositor choices # @@ -57,7 +58,7 @@ PACKAGECONFIG[headless] = "--enable-headless-compositor,--disable-headless-compo # Weston on framebuffer PACKAGECONFIG[fbdev] = "--enable-fbdev-compositor,--disable-fbdev-compositor,udev mtdev" # weston-launch -PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,libpam drm" +PACKAGECONFIG[launch] = "--enable-weston-launch,--disable-weston-launch,drm" # VA-API desktop recorder PACKAGECONFIG[vaapi] = "--enable-vaapi-recorder,--disable-vaapi-recorder,libva" # Weston with EGL support @@ -67,15 +68,19 @@ PACKAGECONFIG[cairo-glesv2] = "--with-cairo-glesv2,--with-cairo=image,cairo" # Weston with lcms support PACKAGECONFIG[lcms] = "--enable-lcms,--disable-lcms,lcms" # Weston with webp support -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" +PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" # Weston with unwinding support PACKAGECONFIG[libunwind] = "--enable-libunwind,--disable-libunwind,libunwind" # Weston with systemd-login support PACKAGECONFIG[systemd] = "--enable-systemd-login,--disable-systemd-login,systemd dbus" -# Weston with Xwayland support -PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland,libxcb libxcursor cairo" +# Weston with Xwayland support (requires X11 and Wayland) +PACKAGECONFIG[xwayland] = "--enable-xwayland,--disable-xwayland" # colord CMS support PACKAGECONFIG[colord] = "--enable-colord,--disable-colord,colord" +# Clients support +PACKAGECONFIG[clients] = "--enable-clients --enable-simple-clients --enable-demo-clients-install,--disable-clients --disable-simple-clients" +# Weston with PAM support +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them @@ -88,16 +93,25 @@ do_install_append() { install -d ${D}${datadir}/icons/hicolor/48x48/apps install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi + fi + + if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then + install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland + fi } +PACKAGE_BEFORE_PN += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)}" PACKAGES += "${PN}-examples" FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" FILES_${PN}-examples = "${bindir}/*" +FILES_${PN}-xwayland = "${libdir}/${BPN}/xwayland.so" +RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" + RDEPENDS_${PN} += "xkeyboard-config" RRECOMMENDS_${PN} = "liberation-fonts" +RRECOMMENDS_${PN}-dev += "wayland-protocols" USERADD_PACKAGES = "${PN}" GROUPADD_PARAM_${PN} = "--system weston-launch" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common/Xserver.in b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common/Xserver.in deleted file mode 100644 index b8eed7610..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common/Xserver.in +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh -# - -XSERVER=/usr/bin/Xorg - -. /etc/profile - -ARGS=" -br -pn @BLANK_ARGS@" - -DISPLAY=':0' - -exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh index 91594b9e3..6bd40b2fc 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common/etc/X11/Xsession.d/13xdgbasedirs.sh @@ -7,7 +7,7 @@ # In the ideal case where SystemD is booting and userspace is initiated by a # SystemD user session this will have been set already, so don't overwrite it. -if [ -z "$XGD_RUNTIME_DIR" ]; then - XDG_RUNTIME_DIR="/tmp" - export XDG_RUNTIME_DIR +if [ -z "$XDG_RUNTIME_DIR" ]; then + XDG_RUNTIME_DIR="/tmp" + export XDG_RUNTIME_DIR fi diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb index 6d7c347c0..ab9a939ce 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/x11-common_0.1.bb @@ -9,22 +9,14 @@ inherit distro_features_check REQUIRED_DISTRO_FEATURES = "x11" SRC_URI = "file://etc \ - file://Xserver.in \ file://gplv2-license.patch" S = "${WORKDIR}" -PACKAGECONFIG ??= "blank" -# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG -PACKAGECONFIG[blank] = "" - do_install() { cp -R ${S}/etc ${D}${sysconfdir} - sed -e 's/@BLANK_ARGS@/${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}/' \ - ${S}/Xserver.in > ${D}${sysconfdir}/X11/Xserver - chmod -R 755 ${D}${sysconfdir} } -RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xtscal xinit formfactor" +RDEPENDS_${PN} = "dbus-x11 xmodmap xdpyinfo xinput-calibrator formfactor" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb index b68d40e1b..a6d0d5eee 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init.bb @@ -5,10 +5,10 @@ SECTION = "x11" PR = "r31" SRC_URI = "file://xserver-nodm \ - file://Xusername \ + file://Xserver \ file://gplv2-license.patch \ - file://xserver-nodm.service \ - file://xserver-nodm.conf \ + file://xserver-nodm.service.in \ + file://xserver-nodm.conf.in \ " S = "${WORKDIR}" @@ -16,35 +16,44 @@ S = "${WORKDIR}" # Since we refer to ROOTLESS_X which is normally enabled per-machine PACKAGE_ARCH = "${MACHINE_ARCH}" -inherit update-rc.d systemd +inherit update-rc.d systemd distro_features_check + +REQUIRED_DISTRO_FEATURES = "x11" + +PACKAGECONFIG ??= "blank" +# dpms and screen saver will be on only if 'blank' is in PACKAGECONFIG +PACKAGECONFIG[blank] = "" do_install() { - install -d ${D}${sysconfdir}/init.d - install xserver-nodm ${D}${sysconfdir}/init.d + install -d ${D}${sysconfdir}/default + install xserver-nodm.conf.in ${D}${sysconfdir}/default/xserver-nodm + install -d ${D}${sysconfdir}/xserver-nodm + install Xserver ${D}${sysconfdir}/xserver-nodm/Xserver + + BLANK_ARGS="${@bb.utils.contains('PACKAGECONFIG', 'blank', '', '-s 0 -dpms', d)}" + if [ "${ROOTLESS_X}" = "1" ] ; then + XUSER_HOME="/home/xuser" + XUSER="xuser" + else + XUSER_HOME=${ROOT_HOME} + XUSER="root" + fi + sed -i "s:@HOME@:${XUSER_HOME}:; s:@USER@:${XUSER}:; s:@BLANK_ARGS@:${BLANK_ARGS}:" \ + ${D}${sysconfdir}/default/xserver-nodm if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -d ${D}${sysconfdir}/default - install xserver-nodm.conf ${D}${sysconfdir}/default/xserver-nodm install -d ${D}${systemd_unitdir}/system - install -m 0644 ${WORKDIR}/xserver-nodm.service ${D}${systemd_unitdir}/system - if [ "${ROOTLESS_X}" = "1" ] ; then - sed -i 's!^HOME=.*!HOME=/home/xuser!' ${D}${sysconfdir}/default/xserver-nodm - sed -i 's!^User=.*!User=xuser!' ${D}${systemd_unitdir}/system/xserver-nodm.service - else - sed -i 's!^HOME=.*!HOME=${ROOT_HOME}!' ${D}${sysconfdir}/default/xserver-nodm - sed -i '/^User=/d' ${D}${systemd_unitdir}/system/xserver-nodm.service - fi + install -m 0644 ${WORKDIR}/xserver-nodm.service.in ${D}${systemd_unitdir}/system/xserver-nodm.service + sed -i "s:@USER@:${XUSER}:" ${D}${systemd_unitdir}/system/xserver-nodm.service fi if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then - if [ "${ROOTLESS_X}" = "1" ] ; then - install -d ${D}${sysconfdir}/X11 - install Xusername ${D}${sysconfdir}/X11 - fi + install -d ${D}${sysconfdir}/init.d + install xserver-nodm ${D}${sysconfdir}/init.d fi } -RDEPENDS_${PN} = "${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" +RDEPENDS_${PN} = "xinit ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver new file mode 100644 index 000000000..0edbfbfc2 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xserver @@ -0,0 +1,25 @@ +#!/bin/sh + +# This script is only needed to make sure /etc/X11/xserver-common +# can affect XSERVER, ARGS & DPI: otherwise systemd could just use +# /etc/default/xserver-nodm as EnvironmentFile and sysvinit could just +# source the same file + +. /etc/profile + +# load default values for XSERVER, ARGS, DISPLAY... +. /etc/default/xserver-nodm + +# Allow xserver-common to override ARGS, XSERVER, DPI +if [ -e /etc/X11/xserver-common ] ; then + . /etc/X11/xserver-common + if [ ! -e $XSERVER ] ; then + XSERVER=$(which $XSERVER) + fi +fi + +if [ -n "$DPI" ] ; then + ARGS="$ARGS -dpi $DPI" +fi + +exec xinit /etc/X11/Xsession -- $XSERVER $DISPLAY $ARGS $* diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername deleted file mode 100644 index 7060e5ec1..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/Xusername +++ /dev/null @@ -1 +0,0 @@ -xuser diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm index bfa0a8d6c..6c548551b 100755 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm @@ -26,10 +26,11 @@ done case "$1" in start) . /etc/profile - username=root + + #default for USER + . /etc/default/xserver-nodm echo "Starting Xserver" - if [ -f /etc/X11/Xusername ]; then - username=`cat /etc/X11/Xusername` + if [ "$USER" != "root" ]; then # setting for rootless X chmod o+w /var/log chmod g+r /dev/tty[0-3] @@ -38,8 +39,9 @@ case "$1" in chmod o+rw /dev/hidraw* fi fi + # Using su rather than sudo as latest 1.8.1 cause failure [YOCTO #1211] - su -l -c '/etc/X11/Xserver&' $username + su -l -c '/etc/xserver-nodm/Xserver &' $USER # Wait for the desktop to say its finished loading # before loading the rest of the system # dbus-wait org.matchbox_project.desktop Loaded diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf deleted file mode 100644 index 3c0582a87..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf +++ /dev/null @@ -1 +0,0 @@ -HOME=/home/root diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in new file mode 100644 index 000000000..757c23d95 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.conf.in @@ -0,0 +1,7 @@ +# common environment file for sysvinit and systemd + +XSERVER=/usr/bin/Xorg +DISPLAY=:0 +ARGS=" -br -pn @BLANK_ARGS@ " +HOME=@HOME@ +USER=@USER@ diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in index 62d979f1d..324a26f54 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in @@ -2,9 +2,9 @@ Description=Xserver startup without a display manager [Service] -User=root EnvironmentFile=/etc/default/xserver-nodm -ExecStart=/etc/X11/Xserver +User=@USER@ +ExecStart=/etc/xserver-nodm/Xserver [Install] Alias=display-manager.service diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput new file mode 100644 index 000000000..a816d6d10 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/pointercal-xinput/qemuall/pointercal.xinput @@ -0,0 +1,2 @@ +# Dummy pointercal.xinput file to prevent xinput_calibrator +# from running on qemu startup diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch index 9351331be..9dc94ae49 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/add-geometry-input-when-calibrating.patch @@ -1,33 +1,34 @@ -Upstream-Status: Inappropriate [no longer maintained] - -From 93abf28d602da637376b78de8c88b7ab5cf13b4f Mon Sep 17 00:00:00 2001 -From: Jonathan David <jonathan.david@ni.com> -Date: Mon, 30 Nov 2015 12:12:20 -0600 +From 1cb83759632bb218559c4d0d65ff79f868c03dc5 Mon Sep 17 00:00:00 2001 +From: "Maxin B. John" <maxin.john@intel.com> +Date: Tue, 9 Aug 2016 17:03:31 +0300 Subject: [PATCH] add geometry input when calibrating Send monitor geometry to xinput_calibrator when running the script +Update: + Remove bashism + +Upstream-Status: Inappropriate [no longer maintained] Signed-off-by: Jonathan David <jonathan.david@ni.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> --- - scripts/xinput_calibrator_pointercal.sh | 5 ++++- - 1 file changed, 4 insertions(+), 1 deletion(-) + scripts/xinput_calibrator_pointercal.sh | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/xinput_calibrator_pointercal.sh b/scripts/xinput_calibrator_pointercal.sh -index 0ada7da..6a3aded 100755 +index fccb197..fea7c2f 100755 --- a/scripts/xinput_calibrator_pointercal.sh +++ b/scripts/xinput_calibrator_pointercal.sh -@@ -37,7 +37,10 @@ done - - [ "$USER" != "root" ] && CALFILE=$USER_CALFILE +@@ -24,7 +24,8 @@ if [ -e $CALFILE ] ; then + fi + fi -CALDATA=`$BINARY --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` -+read RESOLUTION <<< $(xrandr | awk -F '[[:space:]+]' '/ connected/ \ -+ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }') -+ ++RESOLUTION=$(xrandr | awk -F '[[:space:]+]' '/ connected/ { if ($3 != "primary") print $3; if ($3 == "primary") print $4 }') +CALDATA=`$BINARY --geometry $RESOLUTION --output-type xinput -v | tee $LOGFILE | grep ' xinput set' | sed 's/^ //g; s/$/;/g'` if [ ! -z "$CALDATA" ] ; then echo $CALDATA > $CALFILE echo "Calibration data stored in $CALFILE (log in $LOGFILE)" -- -1.9.1 +2.4.0 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index ac5b70cba..57c3a7a9a 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -34,5 +34,5 @@ do_install_append() { } FILES_${PN} += "${sysconfdir}/xdg/autostart" -RDEPENDS_${PN} = "xinput formfactor" +RDEPENDS_${PN} = "xinput formfactor xrandr" RRECOMMENDS_${PN} = "pointercal-xinput" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb index b173f4fe8..59b332373 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xauth_1.0.9.bb @@ -10,3 +10,6 @@ PE = "1" SRC_URI[md5sum] = "7d6003f32838d5b688e2c8a131083271" SRC_URI[sha256sum] = "56ce1523eb48b1f8a4f4244fe1c3d8e6af1a3b7d4b0e6063582421b0b68dc28f" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb index 825737f39..f23d258e0 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb @@ -15,3 +15,6 @@ PE = "1" SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516" SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.5.0.bb index 41bd42069..ea6897948 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.4.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xrandr_1.5.0.bb @@ -11,5 +11,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fe1608bdb33cf8c62a4438f7d34679b3" DEPENDS += "libxrandr libxrender" PE = "1" -SRC_URI[md5sum] = "441fdb98d2abc6051108b7075d948fc7" -SRC_URI[sha256sum] = "7154ac3486b86923692f2d6cdb2991a2ee72bc32af2c4379a6f1c068f204be1b" +SRC_URI[md5sum] = "ebffac98021b8f1dc71da0c1918e9b57" +SRC_URI[sha256sum] = "c1cfd4e1d4d708c031d60801e527abc9b6d34b85f2ffa2cadd21f75ff38151cd" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.3.bb index cf77ad209..f81c3ec64 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-evdev_2.10.3.bb @@ -16,5 +16,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fefe33b1cf0cacba0e72e3b0fa0f0e16" DEPENDS += "mtdev libevdev" -SRC_URI[md5sum] = "96d89d9406a02f5e36bdaa4edd9a243a" -SRC_URI[sha256sum] = "af9c2b47f5b272ae56b45da6bd84610fc9a3d80a4b32c8215842a39d862de017" +SRC_URI[md5sum] = "aa3363ce5061d0c4d1e7f7019b99716d" +SRC_URI[sha256sum] = "5aa21ba4be8df927e5676a99c7f4f0343abc089f5451b7e73e39536f29b332a2" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.19.0.bb index 0252baff1..5e5c4710a 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.16.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.19.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0" DEPENDS += "libinput" -SRC_URI[md5sum] = "2c8cb520f88da7bafaceebc0b34ea1d4" -SRC_URI[sha256sum] = "fdade531e91e79acf6dce8ac55fa4f65abe3f1358c5d3d777ae48dbc74b76f49" +SRC_URI[md5sum] = "52c38b1369764243bfcf6ead1e4c6d32" +SRC_URI[sha256sum] = "6c5d30dc7c8b8ae34261340e1dc9cbb8ef435078e084b8ef507527a8a21af477" FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb index 8615b48da..92a1b25eb 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-vmmouse_13.1.0.bb @@ -23,4 +23,4 @@ do_install_append () { EXTRA_OECONF = "--with-udev-rules-dir=${nonarch_base_libdir}/udev/rules.d" -FILES_${PN} += "${nonarch_base_libdir}/udev/rules.d/ ${datadir}/X11/xorg.conf.d" +FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch deleted file mode 100644 index 35762192f..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-gen8-Fix-the-YUV-RGB-shader.patch +++ /dev/null @@ -1,65 +0,0 @@ -From c43617b739e358064396912c7a7a8028ca91d201 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Ville=20Syrj=C3=A4l=C3=A4?= <ville.syrjala@linux.intel.com> -Date: Thu, 16 Apr 2015 20:40:39 +0300 -Subject: [PATCH] gen8: Fix the YUV->RGB shader -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Use the correct register (Yn_01) with first half of the -Y samples instead of using the register (Yn_23) with the -second half twice when computing the green channel. - -Also use the Yn_01 register name instead of Yn for the red -channel as well, just for a bit of extra consistency. - -Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=89807 -Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com> -Tested-by: Chris Wilson <chris@chris-wilson.co.uk> - -Upstream-Status: Backport -Signed-off-by: Saul Wold <sgw@linux.intel.com> - ---- - src/render_program/exa_wm_yuv_rgb.g8a | 4 ++-- - src/render_program/exa_wm_yuv_rgb.g8b | 2 +- - 2 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/render_program/exa_wm_yuv_rgb.g8a b/src/render_program/exa_wm_yuv_rgb.g8a -index 7def093..34973ba 100644 ---- a/src/render_program/exa_wm_yuv_rgb.g8a -+++ b/src/render_program/exa_wm_yuv_rgb.g8a -@@ -76,7 +76,7 @@ add (16) Cbn<1>F Cb<8,8,1>F -0.501961F { compr align1 }; - /* - * R = Y + Cr * 1.596 - */ --mov (8) acc0<1>F Yn<8,8,1>F { compr align1 }; -+mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 }; - mac.sat(8) src_sample_r_01<1>F Crn_01<8,8,1>F 1.596F { compr align1 }; - - mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 }; -@@ -84,7 +84,7 @@ mac.sat(8) src_sample_r_23<1>F Crn_23<8,8,1>F 1.596F { compr align1 }; - /* - * G = Crn * -0.813 + Cbn * -0.392 + Y - */ --mov (8) acc0<1>F Yn_23<8,8,1>F { compr align1 }; -+mov (8) acc0<1>F Yn_01<8,8,1>F { compr align1 }; - mac (8) acc0<1>F Crn_01<8,8,1>F -0.813F { compr align1 }; - mac.sat(8) src_sample_g_01<1>F Cbn_01<8,8,1>F -0.392F { compr align1 }; - -diff --git a/src/render_program/exa_wm_yuv_rgb.g8b b/src/render_program/exa_wm_yuv_rgb.g8b -index 4494953..2cd6fc4 100644 ---- a/src/render_program/exa_wm_yuv_rgb.g8b -+++ b/src/render_program/exa_wm_yuv_rgb.g8b -@@ -6,7 +6,7 @@ - { 0x80600048, 0x21c03ae8, 0x3e8d02c0, 0x3fcc49ba }, - { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, - { 0x80600048, 0x21e03ae8, 0x3e8d02e0, 0x3fcc49ba }, -- { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, -+ { 0x00600001, 0x24003ae0, 0x008d0300, 0x00000000 }, - { 0x00600048, 0x24003ae0, 0x3e8d02c0, 0xbf5020c5 }, - { 0x80600048, 0x22003ae8, 0x3e8d0340, 0xbec8b439 }, - { 0x00600001, 0x24003ae0, 0x008d0320, 0x00000000 }, --- -2.5.0 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch deleted file mode 100644 index 29924bb90..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 2c5063938cc809f624e56efd4673041fa8141e81 Mon Sep 17 00:00:00 2001 -From: Martin Peres <martin.peres@linux.intel.com> -Date: Thu, 9 Jul 2015 11:26:38 +0300 -Subject: [PATCH] uxa: fix the call to PixmapSyncDirtyHelper, broken by - xserver's 90db5ed - -[ickle: switch to HAS_DIRTYTRACKING_ROTATION as suggested by Dave Airlie] -Signed-off-by: Martin Peres <martin.peres@linux.intel.com> - -Upstream-Status: Backport -Signed-off-by: Saul Wold <sgw@linux.intel.com> ---- - src/compat-api.h | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/compat-api.h b/src/compat-api.h -index aa93bee..293e9d7 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -247,3 +247,7 @@ static inline void FreePixmap(PixmapPtr pixmap) - #endif - - #endif -+ -+#if HAS_DIRTYTRACKING_ROTATION -+#define PixmapSyncDirtyHelper(d, dd) PixmapSyncDirtyHelper(d) -+#endif --- -2.5.0 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch index dda508dcf..3dddd334b 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/disable-x11-dri3.patch @@ -12,6 +12,6 @@ diff --git a/configure.ac b/configure.ac index bd654f3..78a0e0d 100644 --- a/configure.ac +++ b/configure.ac -@@ -251 +251 @@ fi --PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) -+#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-present x11-xcb xshmfence x11 xrender xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) +@@ -279 +279 @@ fi +-PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) ++#PKG_CHECK_MODULES(X11_DRI3, [xcb-dri3 xcb-sync xcb-xfixes xcb-present x11-xcb xshmfence x11 xcomposite xdamage xrender xrandr xxf86vm xext libdrm], [x11_dri3="yes"], [x11_dri3="no"]) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch deleted file mode 100644 index 589d52e0f..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/sna-Protect-against-ABI-breakage-in-recent-versions-.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 7fe2b2948652443ff43d907855bd7a051d54d309 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Thu, 19 Mar 2015 23:14:17 +0000 -Subject: [PATCH] sna: Protect against ABI breakage in recent versions of - libdrm - -commit 7fe2b2948652443ff43d907855bd7a051d54d309 upstream. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> -Upstream-Status: Backport -Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> - -diff --git a/src/sna/kgem.c b/src/sna/kgem.c -index 11f0828f2bbc..6f16cbac87f2 100644 ---- a/src/sna/kgem.c -+++ b/src/sna/kgem.c -@@ -182,6 +182,15 @@ struct local_i915_gem_caching { - #define LOCAL_IOCTL_I915_GEM_SET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_SET_CACHING, struct local_i915_gem_caching) - #define LOCAL_IOCTL_I915_GEM_GET_CACHING DRM_IOW(DRM_COMMAND_BASE + LOCAL_I915_GEM_GET_CACHING, struct local_i915_gem_caching) - -+struct local_i915_gem_mmap { -+ uint32_t handle; -+ uint32_t pad; -+ uint64_t offset; -+ uint64_t size; -+ uint64_t addr_ptr; -+}; -+#define LOCAL_IOCTL_I915_GEM_MMAP DRM_IOWR(DRM_COMMAND_BASE + DRM_I915_GEM_MMAP, struct local_i915_gem_mmap) -+ - struct local_i915_gem_mmap2 { - uint32_t handle; - uint32_t pad; -@@ -514,15 +523,15 @@ retry_wc: - - static void *__kgem_bo_map__cpu(struct kgem *kgem, struct kgem_bo *bo) - { -- struct drm_i915_gem_mmap mmap_arg; -+ struct local_i915_gem_mmap arg; - int err; - - retry: -- VG_CLEAR(mmap_arg); -- mmap_arg.handle = bo->handle; -- mmap_arg.offset = 0; -- mmap_arg.size = bytes(bo); -- if ((err = do_ioctl(kgem->fd, DRM_IOCTL_I915_GEM_MMAP, &mmap_arg))) { -+ VG_CLEAR(arg); -+ arg.handle = bo->handle; -+ arg.offset = 0; -+ arg.size = bytes(bo); -+ if ((err = do_ioctl(kgem->fd, LOCAL_IOCTL_I915_GEM_MMAP, &arg))) { - assert(err != EINVAL); - - if (__kgem_throttle_retire(kgem, 0)) -@@ -536,10 +545,10 @@ retry: - return NULL; - } - -- VG(VALGRIND_MAKE_MEM_DEFINED(mmap_arg.addr_ptr, bytes(bo))); -+ VG(VALGRIND_MAKE_MEM_DEFINED(arg.addr_ptr, bytes(bo))); - - DBG(("%s: caching CPU vma for %d\n", __FUNCTION__, bo->handle)); -- return bo->map__cpu = (void *)(uintptr_t)mmap_arg.addr_ptr; -+ return bo->map__cpu = (void *)(uintptr_t)arg.addr_ptr; - } - - static int gem_write(int fd, uint32_t handle, --- -2.4.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch deleted file mode 100644 index 0e675ee9f..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/udev-fstat.patch +++ /dev/null @@ -1,59 +0,0 @@ -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 12af8a575d1518d40416f83195049157c3a062a5 Mon Sep 17 00:00:00 2001 -From: Chris Wilson <chris@chris-wilson.co.uk> -Date: Tue, 24 Feb 2015 15:25:40 +0000 -Subject: sna: udev integration depends on fstat and sys/stat.h - -src/sna/sna_driver.c: In function 'sna_handle_uevents': -src/sna/sna_driver.c:759:2: error: implicit declaration of function 'fstat' [-Werror=implicit-function-declaration] - -Also take the opportunity to include udev support in the configure -summary. - -Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk> - -diff --git a/configure.ac b/configure.ac -index 7476e2b..de3a4b3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -197,11 +197,15 @@ AC_ARG_ENABLE(udev, - - if test "x$UDEV" != "xno"; then - PKG_CHECK_MODULES(UDEV, [libudev], [udev="yes"], [udev="no"]) -+ AC_CHECK_HEADERS([sys/stat.h], [], [udev="no"]) - if test "x$UDEV" = "xyes" -a "x$udev" != "xyes"; then - AC_MSG_ERROR([udev support requested but not found (libudev)]) - fi - if test "x$udev" = "xyes"; then - AC_DEFINE(HAVE_UDEV,1,[Enable udev-based monitor hotplug detection]) -+ udev_msg=" yes" -+ else -+ udev_msg=" no" - fi - fi - -@@ -911,6 +915,7 @@ echo " Support for Kernel Mode Setting? $KMS" - echo " Support for legacy User Mode Setting (for i810)? $UMS" - echo " Support for Direct Rendering Infrastructure:$dri_msg" - echo " Support for Xv motion compensation (XvMC and libXvMC):$xvmc_msg" -+echo " Support for display hotplug notifications (udev):$udev_msg" - echo " Build additional tools and utilities?$tools_msg" - if test -n "$xp_msg"; then - echo " Experimental support:$xp_msg" -diff --git a/src/sna/sna_driver.c b/src/sna/sna_driver.c -index 8c0d0b5..bc20ef0 100644 ---- a/src/sna/sna_driver.c -+++ b/src/sna/sna_driver.c -@@ -740,6 +740,8 @@ sna_wakeup_handler(WAKEUPHANDLER_ARGS_DECL) - } - - #if HAVE_UDEV -+#include <sys/stat.h> -+ - static void - sna_handle_uevents(int fd, void *closure) - { --- -cgit v0.10.2 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index d75b44f17..06cc730f4 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_2.99.917.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb @@ -9,12 +9,13 @@ Infrastructure (DRI)." LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" -SRC_URI += "file://disable-x11-dri3.patch \ - file://always_include_xorg_server.h.patch \ - file://sna-Protect-against-ABI-breakage-in-recent-versions-.patch \ - file://udev-fstat.patch \ - file://0001-uxa-fix-the-call-to-PixmapSyncDirtyHelper-broken-by-.patch \ - file://0001-gen8-Fix-the-YUV-RGB-shader.patch \ +SRCREV = "8f33f80100096f7790c7b819ce37a3ed8ce8b5fa" +PV = "2.99.917+git${SRCPV}" +S = "${WORKDIR}/git" + +SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ + file://disable-x11-dri3.patch \ + file://always_include_xorg_server.h.patch \ " SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb index 90846d818..36766f2f4 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/encodings_1.0.4.bb @@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9da93f2daf2d5572faa2bfaf0dbd9e76" PE = "1" PR = "${INC_PR}.1" -DEPENDS = "mkfontscale-native font-util-native" +DEPENDS = "mkfontscale-native mkfontdir-native font-util-native" RDEPENDS_${PN} = "" SRC_URI += "file://nocompiler.patch" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb index 228512498..34646ff99 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb @@ -19,7 +19,4 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "23756dab809f9ec5011bb27fb2c3c7d6" SRC_URI[sha256sum] = "aa7ebdb0715106dd255082f2310dbaa2cd7e225957c2a77d719720c7cc92b921" -SYSROOT_PREPROCESS_FUNCS += "fontutil_sysroot_preprocess" -fontutil_sysroot_preprocess () { - sysroot_stage_dir ${D}${datadir}/fonts/ ${SYSROOT_DESTDIR}${datadir}/fonts/ -} +SYSROOT_DIRS_BLACKLIST_remove = "${datadir}/fonts" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb index 5049b7ee0..b361ad6dd 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb @@ -23,5 +23,6 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" -PACKAGECONFIG ??= "" +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" PACKAGECONFIG[arc4] = "ac_cv_lib_bsd_arc4random_buf=yes,ac_cv_lib_bsd_arc4random_buf=no,libbsd" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb index 192513636..da4ed9251 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb @@ -26,3 +26,6 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch new file mode 100644 index 000000000..899238635 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/Fix-inconsistent-use-of-tabs-vs.-space.patch @@ -0,0 +1,62 @@ +From 8740a288ca468433141341347aa115b9544891d3 Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <wiz@NetBSD.org> +Date: Thu, 19 May 2016 17:31:18 +0200 +Subject: [PATCH] Fix inconsistent use of tabs vs. space. + +Needed for at least python-3.5.x. + +Signed-off-by: Thomas Klausner <wiz@NetBSD.org> +Signed-off-by: Uli Schlachter <psychon@znc.in> + +Upstream-Status: Backport + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + src/c_client.py | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) + +diff --git a/src/c_client.py b/src/c_client.py +index 57de3fb..043338d 100644 +--- a/src/c_client.py ++++ b/src/c_client.py +@@ -1364,7 +1364,7 @@ def _c_serialize(context, self): + _c(' unsigned int xcb_align_to = 0;') + if self.is_switch: + _c(' unsigned int xcb_padding_offset = %d;', +- self.get_align_offset() ) ++ self.get_align_offset() ) + prefix = [('_aux', '->', self)] + aux_ptr = 'xcb_out' + +@@ -1390,7 +1390,7 @@ def _c_serialize(context, self): + _c(' unsigned int xcb_align_to = 0;') + if self.is_switch: + _c(' unsigned int xcb_padding_offset = %d;', +- self.get_align_offset() ) ++ self.get_align_offset() ) + + elif 'sizeof' == context: + param_names = [p[2] for p in params] +@@ -1930,14 +1930,14 @@ def _c_accessors_list(self, field): + # from the request size and divide that by the member size + return '(((R->length * 4) - sizeof('+ self.c_type + '))/'+'sizeof('+field.type.member.c_wiretype+'))' + else: +- # use the accessor to get the start of the list, then +- # compute the length of it by subtracting it from ++ # use the accessor to get the start of the list, then ++ # compute the length of it by subtracting it from + # the adress of the first byte after the end of the + # request +- after_end_of_request = '(((char*)R) + R->length * 4)' +- start_of_list = '%s(R)' % (field.c_accessor_name) ++ after_end_of_request = '(((char*)R) + R->length * 4)' ++ start_of_list = '%s(R)' % (field.c_accessor_name) + bytesize_of_list = '%s - (char*)(%s)' % (after_end_of_request, start_of_list) +- return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) ++ return '(%s) / sizeof(%s)' % (bytesize_of_list, field.type.member.c_wiretype) + else: + raise Exception( + "lengthless lists with varsized members are not supported. Fieldname '%s'" +-- +2.9.0 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb index 0856c190a..a38bdea5d 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.11.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb_1.12.bb @@ -13,9 +13,10 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ file://xcbincludedir.patch \ file://disable-check.patch \ file://gcc-mips-pr68302-mips-workaround.patch \ + file://Fix-inconsistent-use-of-tabs-vs.-space.patch \ " -SRC_URI[md5sum] = "f97a65e6158775de518ac391935634c2" -SRC_URI[sha256sum] = "b720fd6c7d200e5371affdb3f049cc8f88cff9aed942ff1b824d95eedbf69d30" +SRC_URI[md5sum] = "28e552bd78bc1050b6b26ca1db0e5bb6" +SRC_URI[sha256sum] = "4adfb1b7c67e99bc9c2ccb110b2f175686576d2f792c8a71b9c8b19014057b5b" BBCLASSEXTEND = "native nativesdk" @@ -31,6 +32,8 @@ inherit autotools pkgconfig distro_features_check REQUIRED_DISTRO_FEATURES = "x11" REQUIRED_DISTRO_FEATURES_class-native = "" +export PYTHON = "python3" + python populate_packages_prepend () { do_split_packages(d, '${libdir}', '^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) } diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb index a8e4f24b6..17629047b 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb @@ -12,7 +12,7 @@ LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=8902e6643f7bcd7793b23dcd5d8031a4" DEPENDS += "libxrender libxfixes" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" PE = "1" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb index efa8b65ac..063e531c0 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_1.3.3.bb @@ -13,7 +13,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=879ce266785414bd1cbc3bc2f4d9d7c8" -DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" +DEPENDS += "xproto virtual/libx11 xextproto" PROVIDES = "xext" PE = "1" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_git.bb deleted file mode 100644 index b799186ef..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxext_git.bb +++ /dev/null @@ -1,24 +0,0 @@ -require xorg-lib-common.inc - -SUMMARY = "XExt: X Extension library" - -DESCRIPTION = "libXext provides an X Window System client interface to \ -several extensions to the X protocol. The supported protocol extensions \ -are DOUBLE-BUFFER, DPMS, Extended-Visual-Information, LBX, MIT_SHM, \ -MIT_SUNDRY-NONSTANDARD, Multi-Buffering, SECURITY, SHAPE, SYNC, TOG-CUP, \ -XC-APPGROUP, XC-MISC, XTEST. libXext also provides a small set of \ -utility functions to aid authors of client APIs for X protocol \ -extensions." - -DEPENDS += "xproto virtual/libx11 xextproto libxau libxdmcp" -PROVIDES = "xext" -SRCREV = "d1f3bc77a48c8e42771579e3fdf3370b35d3209d" -PE = "1" -PV = "1.0.99.1+gitr${SRCPV}" - -XORG_PN = "libXext" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/${XORG_PN}" -S = "${WORKDIR}/git/" - -BBCLASSEXTEND = "nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.2.bb index 6e2740c9a..f078aed19 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfixes_5.0.2.bb @@ -18,5 +18,5 @@ XORG_PN = "libXfixes" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "b985b85f8b9386c85ddcfe1073906b4d" -SRC_URI[sha256sum] = "63bec085084fa3caaee5180490dd871f1eb2020ba9e9b39a30f93693ffc34767" +SRC_URI[md5sum] = "544d73df94e638ba7b64147be416e576" +SRC_URI[sha256sum] = "9bd20edfec084a1bed481d48dd4815dee88139fffad091418cdda081129a9aea" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb index 1b6e33c71..e01f3311f 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.1.bb @@ -20,3 +20,6 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "96f76ba94b4c909230bac1e2dcd551c4" SRC_URI[sha256sum] = "b70898527c73f9758f551bbab612af611b8a0962202829568d94f3edf4d86098" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb index 027c8043d..bb03f44e2 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxinerama_1.1.3.bb @@ -18,3 +18,5 @@ XORG_PN = "libXinerama" SRC_URI[md5sum] = "9336dc46ae3bf5f81c247f7131461efd" SRC_URI[sha256sum] = "7a45699f1773095a3f821e491cbd5e10c887c5a5fce5d8d3fced15c2ff7698e2" + +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.6.1.bb index de22a8197..fc08109c8 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.5.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.6.1.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=09457b156e3155972abebcaaaa0cb434" +LIC_FILES_CHKSUM = "file://LICENSE;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] = "2e1faeafcc609c30af3a561a91e84158" -SRC_URI[sha256sum] = "90bd7824742b9a6f52a6cf80e2cadd6f5349cf600a358d08260772615b89d19c" +SRC_URI[md5sum] = "67a8f322b5fa32352272e811bb90dd73" +SRC_URI[sha256sum] = "5b0887b080b42169096a61106661f8d35bae783f8b6c58f97ebcd3af83ea8760" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb index 003baec6e..d5935ff34 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxmu_1.1.2.bb @@ -30,3 +30,6 @@ BBCLASSEXTEND = "native" SRC_URI[md5sum] = "41d92ab627dfa06568076043f3e089e4" SRC_URI[sha256sum] = "756edc7c383254eef8b4e1b733c3bf1dc061b523c9f9833ac7058378b8349d0b" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'ipv6', 'ipv6', '', d)}" +PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb index 9fde04061..44cb2e0eb 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxrender_0.9.9.bb @@ -11,7 +11,7 @@ require xorg-lib-common.inc LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=d8bc71986d3b9b3639f6dfd6fac8f196" -DEPENDS += "virtual/libx11 renderproto xproto xdmcp" +DEPENDS += "virtual/libx11 renderproto xproto" PE = "1" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch index ce6c756df..ffc2c15d7 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxt/libxt_fix_for_x32.patch @@ -3,7 +3,7 @@ Upstream-Status: Pending This fixes compilation with x32 toolchain. Received this patch from H.J. Lu <hjl.tools@gmail.com> -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 +Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 --- libXt-1.1.1/include/X11/Xtos.h.x32 2011-02-08 07:56:40.000000000 -0800 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch new file mode 100644 index 000000000..782c1db02 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch @@ -0,0 +1,33 @@ +From 0ccd906b904d21536d5ab41c6196760e3e5d72cb Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 17 May 2016 17:30:00 -0700 +Subject: [PATCH] test/utils: Check for FE_INVALID definition before use + +Some architectures e.g. nios2 do not support all exceptions + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Submitted + + test/utils.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/test/utils.c b/test/utils.c +index f8e42a5..fe32b1e 100644 +--- a/test/utils.c ++++ b/test/utils.c +@@ -978,9 +978,11 @@ enable_invalid_exceptions (void) + { + #ifdef HAVE_FENV_H + #ifdef HAVE_FEENABLEEXCEPT ++#ifdef FE_INVALID + feenableexcept (FE_INVALID); + #endif + #endif ++#endif + } + + void * +-- +2.8.2 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch deleted file mode 100644 index 6b7c1e62a..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch +++ /dev/null @@ -1,65 +0,0 @@ -From fcd5eb9bd0e8674a6f4987a8fce7dc1ba8f9320c Mon Sep 17 00:00:00 2001 -From: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Date: Thu, 17 Sep 2015 03:08:36 +0200 -Subject: [PATCH] [v3] test: add a check for FE_DIVBYZERO - -Some architectures, such as Microblaze and Nios2, currently do not -implement FE_DIVBYZERO, even though they have <fenv.h> and -feenableexcept(). This commit adds a configure.ac check to verify -whether FE_DIVBYZERO is defined or not, and if not, disables the -problematic code in test/utils.c. - -Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com> -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Backport [commit 4297e9058] ---- -Changes v1 -> v2: - - * Use the ac_cv_have_decl_FE_DIVBYZERO variable, which is - automatically set by AC_CHECK_DECL, to decide whether or not - HAVE_FEDIVBYZERO should be defined. - -Changes v2 -> v3: - - * Use action-if-yes of AC_CHECK_DECL as suggested in - http://lists.freedesktop.org/archives/pixman/2014-February/003176.html ---- - configure.ac | 5 +++++ - test/utils.c | 2 ++ - 2 files changed, 7 insertions(+) - -diff --git a/configure.ac b/configure.ac -index f93cc30..424bfd3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -891,6 +891,11 @@ if test x$have_feenableexcept = xyes; then - AC_DEFINE(HAVE_FEENABLEEXCEPT, 1, [Whether we have feenableexcept()]) - fi - -+AC_CHECK_DECL([FE_DIVBYZERO], -+ [AC_DEFINE(HAVE_FEDIVBYZERO, 1, [Whether we have FE_DIVBYZERO])], -+ [], -+ [[#include <fenv.h>]]) -+ - AC_CHECK_FUNC(gettimeofday, have_gettimeofday=yes, have_gettimeofday=no) - AC_CHECK_HEADER(sys/time.h, have_sys_time_h=yes, have_sys_time_h=no) - if test x$have_gettimeofday = xyes && test x$have_sys_time_h = xyes; then -diff --git a/test/utils.c b/test/utils.c -index 222d4d5..8657966 100644 ---- a/test/utils.c -+++ b/test/utils.c -@@ -966,9 +966,11 @@ enable_divbyzero_exceptions (void) - { - #ifdef HAVE_FENV_H - #ifdef HAVE_FEENABLEEXCEPT -+#ifdef HAVE_FEDIVBYZERO - feenableexcept (FE_DIVBYZERO); -+#endif - #endif - #endif - } - - void --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch deleted file mode 100644 index 14a5fd209..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman/mips-export-revert.patch +++ /dev/null @@ -1,22 +0,0 @@ -Revert a commit in pixman 0.32.6 which breaks compliation on MIPS machines with -errors such as: - -pixman-0.32.6/pixman/pixman-mips-dspr2-asm.S:4267: -Error: invalid operands `mflo $14,$ac3' - -Upstream-Status: Pending -Signed-off-by: Ross Burton <ross.burton@intel.com> - ---- b/pixman/pixman-mips-dspr2-asm.h -+++ a/pixman/pixman-mips-dspr2-asm.h -@@ -72,10 +72,7 @@ - #define LEAF_MIPS32R2(symbol) \ - .globl symbol; \ - .align 2; \ --#ifdef __ELF__ -- .hidden symbol; \ - .type symbol, @function; \ --#endif - .ent symbol, 0; \ - symbol: .frame sp, 0, ra; \ - .set push; \ diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb index 553ce369b..c4ca621a8 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.32.8.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb @@ -31,12 +31,11 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk" SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ - file://mips-export-revert.patch \ file://asm_include.patch \ - file://0001-v3-test-add-a-check-for-FE_DIVBYZERO.patch \ + file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \ " -SRC_URI[md5sum] = "18d6b62abdb7bc0f8e6b0ddf48986b2c" -SRC_URI[sha256sum] = "5c63dbb3523fc4d86ed4186677815918a941b7cb390d5eec4f55cb5d66b59fb1" +SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59" +SRC_URI[sha256sum] = "39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0" REQUIRED_DISTRO_FEATURES = "" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.bb index 16a1f4f31..79fcbd897 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.16.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.18.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] = "bf6aa31195584cfce01b2194c3e5ea26" -SRC_URI[sha256sum] = "1e8a1f212c96b7f71ca0b05da361cac1816d27baae1d8e03e7b53049b58d1d58" +SRC_URI[md5sum] = "c28cf45616bfec276879360bc36c6b27" +SRC_URI[sha256sum] = "c41d917d6c8a59feb7ccbda51c40a6ada824fdd1e9684b52dd48c9530617ddd0" SECTION = "x11/libs" DEPENDS = "intltool-native virtual/gettext util-macros libxslt-native" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_git.bb deleted file mode 100644 index 9074f48d4..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/dri2proto_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "DRI2: Direct Rendering Infrastructure 2 headers" - -DESCRIPTION = "This package provides the wire protocol for the Direct \ -Rendering Ifnrastructure 2. DIR is required for may hardware \ -accelerated OpenGL drivers." - -SRCREV = "66c56ab10d917e3f47f93178d7eac6430970d3c4" -PV = "1.99.3+git${SRCPV}" -PR = "r2" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/dri2proto" - -LIC_FILES_CHKSUM="file://COPYING;md5=2e396fa91834f8786032cad2da5638f3" - -S = "${WORKDIR}/git" - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb index 7e8e0c155..eb5e66bd6 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_2.3.2.bb @@ -16,5 +16,7 @@ inherit gettext BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "6caebead4b779ba031727f66a7ffa358" -SRC_URI[sha256sum] = "5a47ee62053a6acef3a83f506312494be1461068d0b9269d818839703b95c1d1" +SRC_URI[md5sum] = "b290a463af7def483e6e190de460f31a" +SRC_URI[sha256sum] = "893a6af55733262058a27b38eeb1edc733669f01d404e8581b167f03c03ef31d" + +EXTRA_OECONF += "--without-asciidoc" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_git.bb deleted file mode 100644 index 6520f3bb0..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/inputproto_git.bb +++ /dev/null @@ -1,19 +0,0 @@ -require xorg-proto-common.inc - -SUMMARY = "XI: X Input extension headers" - -DESCRIPTION = "This package provides the wire protocol for the X Input \ -extension. The extension supports input devices other then the core X \ -keyboard and pointer." - -PR = "r1" -PE = "1" -SRCREV = "7203036522ba9d4b224d282d6afc2d0b947711ee" -PV = "1.9.99.12+git${SRCPV}" - -SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/inputproto" -S = "${WORKDIR}/git" - -inherit gettext - -BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb index 53aa7593b..6f97a2653 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/videoproto_2.3.3.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=ce3472a119a864085fa4155cb0979a7b" PE = "1" -SRC_URI[md5sum] = "e658641595327d3990eab70fdb55ca8b" -SRC_URI[sha256sum] = "8dae168cb820fcd32f564879afb3f24d27c176300d9af66819a18265539bd4b6" +SRC_URI[md5sum] = "fe86de8ea3eb53b5a8f52956c5cd3174" +SRC_URI[sha256sum] = "c7803889fd08e6fcaf7b68cc394fb038b2325d1f315e571a6954577e07cca702" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch new file mode 100644 index 000000000..89ec66618 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0001-Make-whitespace-use-consistent.patch @@ -0,0 +1,215 @@ +From ea7a3ac6c658164690e0febb55f4467cb9e0bcac Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <wiz@NetBSD.org> +Date: Thu, 19 May 2016 17:30:04 +0200 +Subject: [PATCH 1/2] Make whitespace use consistent. + +At least python-3.5.x complains about this forcefully. + +Signed-off-by: Thomas Klausner <wiz@NetBSD.org> +Signed-off-by: Uli Schlachter <psychon@znc.in> + +Upstream-Status: Backport + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + xcbgen/align.py | 96 ++++++++++++++++++++++++++++----------------------------- + 1 file changed, 48 insertions(+), 48 deletions(-) + +diff --git a/xcbgen/align.py b/xcbgen/align.py +index 5e31838..d4c12ee 100644 +--- a/xcbgen/align.py ++++ b/xcbgen/align.py +@@ -16,12 +16,12 @@ class Alignment(object): + return self.align == other.align and self.offset == other.offset + + def __str__(self): +- return "(align=%d, offset=%d)" % (self.align, self.offset) ++ return "(align=%d, offset=%d)" % (self.align, self.offset) + + @staticmethod + def for_primitive_type(size): +- # compute the required start_alignment based on the size of the type +- if size % 8 == 0: ++ # compute the required start_alignment based on the size of the type ++ if size % 8 == 0: + # do 8-byte primitives require 8-byte alignment in X11? + return Alignment(8,0) + elif size % 4 == 0: +@@ -33,7 +33,7 @@ class Alignment(object): + + + def align_after_fixed_size(self, size): +- new_offset = (self.offset + size) % self.align ++ new_offset = (self.offset + size) % self.align + return Alignment(self.align, new_offset) + + +@@ -41,7 +41,7 @@ class Alignment(object): + ''' + Assuming the given external_align, checks whether + self is fulfilled for all cases. +- Returns True if yes, False otherwise. ++ Returns True if yes, False otherwise. + ''' + if self.align == 1 and self.offset == 0: + # alignment 1 with offset 0 is always fulfilled +@@ -55,9 +55,9 @@ class Alignment(object): + # the external align guarantees less alignment -> not guaranteed + return False + +- if external_align.align % self.align != 0: ++ if external_align.align % self.align != 0: + # the external align cannot be divided by our align +- # -> not guaranteed ++ # -> not guaranteed + # (this can only happen if there are alignments that are not + # a power of 2, which is highly discouraged. But better be + # safe and check for it) +@@ -72,7 +72,7 @@ class Alignment(object): + + def combine_with(self, other): + # returns the alignment that is guaranteed when +- # both, self or other, can happen ++ # both, self or other, can happen + new_align = gcd(self.align, other.align) + new_offset_candidate1 = self.offset % new_align + new_offset_candidate2 = other.offset % new_align +@@ -83,8 +83,8 @@ class Alignment(object): + new_align = gcd(new_align, offset_diff) + new_offset_candidate1 = self.offset % new_align + new_offset_candidate2 = other.offset % new_align +- assert new_offset_candidate1 == new_offset_candidate2 +- new_offset = new_offset_candidate1 ++ assert new_offset_candidate1 == new_offset_candidate2 ++ new_offset = new_offset_candidate1 + # return the result + return Alignment(new_align, new_offset) + +@@ -92,44 +92,44 @@ class Alignment(object): + class AlignmentLog(object): + + def __init__(self): +- self.ok_list = [] +- self.fail_list = [] +- self.verbosity = 1 ++ self.ok_list = [] ++ self.fail_list = [] ++ self.verbosity = 1 + + def __str__(self): +- result = "" ++ result = "" + +- # output the OK-list +- for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list: +- stacksize = len(callstack) ++ # output the OK-list ++ for (align_before, field_name, type_obj, callstack, align_after) in self.ok_list: ++ stacksize = len(callstack) + indent = ' ' * stacksize +- if self.ok_callstack_is_relevant(callstack): ++ if self.ok_callstack_is_relevant(callstack): + if field_name is None or field_name == "": +- result += (" %sok: %s:\n\t%sbefore: %s, after: %s\n" +- % (indent, str(type_obj), indent, str(align_before), str(align_after))) +- else: +- result += (" %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n" +- % (indent, str(field_name), str(type_obj), +- indent, str(align_before), str(align_after))) ++ result += (" %sok: %s:\n\t%sbefore: %s, after: %s\n" ++ % (indent, str(type_obj), indent, str(align_before), str(align_after))) ++ else: ++ result += (" %sok: field \"%s\" in %s:\n\t%sbefore: %s, after: %s\n" ++ % (indent, str(field_name), str(type_obj), ++ indent, str(align_before), str(align_after))) + if self.verbosity >= 1: +- result += self.callstack_to_str(indent, callstack) ++ result += self.callstack_to_str(indent, callstack) + +- # output the fail-list +- for (align_before, field_name, type_obj, callstack, reason) in self.fail_list: +- stacksize = len(callstack) ++ # output the fail-list ++ for (align_before, field_name, type_obj, callstack, reason) in self.fail_list: ++ stacksize = len(callstack) + indent = ' ' * stacksize +- if field_name is None or field_name == "": +- result += (" %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n" +- % (indent, str(align_before), indent, str(type_obj), indent, reason)) +- else: +- result += (" %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n" +- % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason)) ++ if field_name is None or field_name == "": ++ result += (" %sfail: align %s is incompatible with\n\t%s%s\n\t%sReason: %s\n" ++ % (indent, str(align_before), indent, str(type_obj), indent, reason)) ++ else: ++ result += (" %sfail: align %s is incompatible with\n\t%sfield \"%s\" in %s\n\t%sReason: %s\n" ++ % (indent, str(align_before), indent, str(field_name), str(type_obj), indent, reason)) + + if self.verbosity >= 1: +- result += self.callstack_to_str(indent, callstack) ++ result += self.callstack_to_str(indent, callstack) + + +- return result ++ return result + + + def callstack_to_str(self, indent, callstack): +@@ -137,41 +137,41 @@ class AlignmentLog(object): + for stack_elem in callstack: + result += "\t %s%s\n" % (indent, str(stack_elem)) + result += "\t%s]\n" % indent +- return result ++ return result + + + def ok_callstack_is_relevant(self, ok_callstack): + # determine whether an ok callstack is relevant for logging +- if self.verbosity >= 2: +- return True ++ if self.verbosity >= 2: ++ return True + + # empty callstacks are always relevant +- if len(ok_callstack) == 0: ++ if len(ok_callstack) == 0: + return True + +- # check whether the ok_callstack is a subset or equal to a fail_callstack ++ # check whether the ok_callstack is a subset or equal to a fail_callstack + for (align_before, field_name, type_obj, fail_callstack, reason) in self.fail_list: + if len(ok_callstack) <= len(fail_callstack): + zipped = zip(ok_callstack, fail_callstack[:len(ok_callstack)]) +- is_subset = all([i == j for i, j in zipped]) +- if is_subset: ++ is_subset = all([i == j for i, j in zipped]) ++ if is_subset: + return True + + return False + + + def ok(self, align_before, field_name, type_obj, callstack, align_after): +- self.ok_list.append((align_before, field_name, type_obj, callstack, align_after)) ++ self.ok_list.append((align_before, field_name, type_obj, callstack, align_after)) + + def fail(self, align_before, field_name, type_obj, callstack, reason): +- self.fail_list.append((align_before, field_name, type_obj, callstack, reason)) ++ self.fail_list.append((align_before, field_name, type_obj, callstack, reason)) + + def append(self, other): +- self.ok_list.extend(other.ok_list) +- self.fail_list.extend(other.fail_list) ++ self.ok_list.extend(other.ok_list) ++ self.fail_list.extend(other.fail_list) + + def ok_count(self): +- return len(self.ok_list) ++ return len(self.ok_list) + + + +-- +2.9.0 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch new file mode 100644 index 000000000..542acb82b --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/0002-print-is-a-function-and-needs-parentheses.patch @@ -0,0 +1,75 @@ +From bea5e1c85bdc0950913790364e18228f20395a3d Mon Sep 17 00:00:00 2001 +From: Thomas Klausner <wiz@NetBSD.org> +Date: Thu, 19 May 2016 17:30:05 +0200 +Subject: [PATCH 2/2] print() is a function and needs parentheses. + +Fixes build with python-3.x. + +Signed-off-by: Thomas Klausner <wiz@NetBSD.org> +Signed-off-by: Uli Schlachter <psychon@znc.in> + +Upstream-Status: Backport + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + xcbgen/xtypes.py | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) + +diff --git a/xcbgen/xtypes.py b/xcbgen/xtypes.py +index c3b5758..b83b119 100644 +--- a/xcbgen/xtypes.py ++++ b/xcbgen/xtypes.py +@@ -501,7 +501,7 @@ class ComplexType(Type): + int(required_start_align_element.get('align', "4"), 0), + int(required_start_align_element.get('offset', "0"), 0)) + if verbose_align_log: +- print "Explicit start-align for %s: %s\n" % (self, self.required_start_align) ++ print ("Explicit start-align for %s: %s\n" % (self, self.required_start_align)) + + def resolve(self, module): + if self.resolved: +@@ -592,7 +592,7 @@ class ComplexType(Type): + if verbose_align_log: + print ("calc_required_start_align: %s has start-align %s" + % (str(self), str(self.required_start_align))) +- print "Details:\n" + str(log) ++ print ("Details:\n" + str(log)) + if self.required_start_align.offset != 0: + print (("WARNING: %s\n\thas start-align with non-zero offset: %s" + + "\n\tsuggest to add explicit definition with:" +@@ -619,12 +619,12 @@ class ComplexType(Type): + for offset in range(0,align): + align_candidate = Alignment(align, offset) + if verbose_align_log: +- print "trying %s for %s" % (str(align_candidate), str(self)) ++ print ("trying %s for %s" % (str(align_candidate), str(self))) + my_log = AlignmentLog() + if self.is_possible_start_align(align_candidate, callstack, my_log): + log.append(my_log) + if verbose_align_log: +- print "found start-align %s for %s" % (str(align_candidate), str(self)) ++ print ("found start-align %s for %s" % (str(align_candidate), str(self))) + return align_candidate + else: + my_ok_count = my_log.ok_count() +@@ -641,7 +641,7 @@ class ComplexType(Type): + # none of the candidates applies + # this type has illegal internal aligns for all possible start_aligns + if verbose_align_log: +- print "didn't find start-align for %s" % str(self) ++ print ("didn't find start-align for %s" % str(self)) + log.append(best_log) + return None + +@@ -900,7 +900,7 @@ class SwitchType(ComplexType): + # aux function for unchecked_get_alignment_after + def get_align_for_selected_case_field(self, case_field, start_align, callstack, log): + if verbose_align_log: +- print "get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field)) ++ print ("get_align_for_selected_case_field: %s, case_field = %s" % (str(self), str(case_field))) + total_align = start_align + for field in self.bitcases: + my_callstack = callstack[:] +-- +2.9.0 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch index f808e1963..09b6088db 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch @@ -20,7 +20,7 @@ index d140bfe..c7b68da 100644 -AM_PATH_PYTHON([2.5]) +pythondir="${libdir}/xcb-proto" +AC_SUBST(pythondir) -+PYTHON="python" ++PYTHON="python3" +AC_SUBST(PYTHON) xcbincludedir='${datadir}/xcb' diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb deleted file mode 100644 index 5bc5a112e..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.11.bb +++ /dev/null @@ -1,9 +0,0 @@ -include xcb-proto.inc - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ - file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" - - -SRC_URI[md5sum] = "6bf2797445dc6d43e9e4707c082eff9c" -SRC_URI[sha256sum] = "b4aceee6502a0ce45fc39b33c541a2df4715d00b72e660ebe8c5bb444771e32e" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb index 8703d6391..bc04bc48e 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb @@ -7,10 +7,17 @@ HOMEPAGE = "http://xcb.freedesktop.org" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=XCB" SECTION = "x11/libs" -LICENSE = "MIT-X" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ + file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ - file://no-python-native.patch" + file://no-python-native.patch \ + file://0001-Make-whitespace-use-consistent.patch \ + file://0002-print-is-a-function-and-needs-parentheses.patch \ + " +SRC_URI[md5sum] = "14e60919f859560f28426a685a555962" +SRC_URI[sha256sum] = "5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c480a4906" inherit autotools pkgconfig @@ -24,3 +31,10 @@ RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" + +do_install_append() { + # Makefile's do_install creates .pyc files for python3, now also create + # them for python2 so that they will be recorded by manifest, and can be + # cleaned correctly. + python -m py_compile ${D}${libdir}/xcb-proto/xcbgen/*.py +} diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb deleted file mode 100644 index 2ea4d0421..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_git.bb +++ /dev/null @@ -1,9 +0,0 @@ -DEFAULT_PREFERENCE = "-1" - -include xcb-proto.inc -SRCREV = "d81ca233e98be8fa59e8c90d262c0516944c5a66" -PV = "1.2+gitr${SRCPV}" -PR = "r4" - -SRC_URI = "git://anongit.freedesktop.org/git/xcb/proto" -S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb index d00774ece..dde7e9db7 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xineramaproto_1.2.1.bb @@ -15,3 +15,5 @@ PE = "1" SRC_URI[md5sum] = "9959fe0bfb22a0e7260433b8d199590a" SRC_URI[sha256sum] = "977574bb3dc192ecd9c55f59f991ec1dff340be3e31392c95deff423da52485b" + +BBCLASSEXTEND = "native nativesdk" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch index 540ad27d4..8a5ff58b9 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch @@ -8,7 +8,7 @@ __LP64__ before defining LONG64 without checking __amd64__/amd64. This fixes compilation with x32 toolchain. Received this patch from H.J. Lu <hjl.tools@gmail.com> -Signed-Off-By: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 +Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 --- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 +++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.29.bb index 7427a7d53..412b6a277 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.28.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto_7.0.29.bb @@ -15,6 +15,5 @@ SRC_URI += "file://xproto_fix_for_x32.patch" EXTRA_OECONF_append = " --enable-specs=no" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "3ce2f230c5d8fa929f326ad1f0fa40a8" -SRC_URI[sha256sum] = "29e85568d1f68ceef8a2c081dad9bc0e5500a53cfffde24b564dc43d46ddf6ca" - +SRC_URI[md5sum] = "eeeae1f47d43a33ef0d5c56727410326" +SRC_URI[sha256sum] = "6c1a477092ca73233902b8d5f33012635c4b0208f17e7833cc7efe5c93ba9f8a" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf index 7ceb6fd63..72e4fbf59 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config/10-preload-modules.conf @@ -3,7 +3,7 @@ Section "Module" Load "fb" Load "shadow" Load "shadowfb" + Load "int10" Load "vbe" Load "vgahw" EndSection - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index f4c5469b5..29503b1a5 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -69,7 +69,7 @@ PACKAGES =+ "${PN}-sdl \ xf86-video-modesetting" SUMMARY_xf86-video-modesetting = "X.Org X server -- modesetting display driver" -INSANE_SKIP_xf86-video-modesetting = "xorg-driver-abi" +INSANE_SKIP_${MLPREFIX}xf86-video-modesetting = "xorg-driver-abi" XSERVER_RRECOMMENDS = "xkeyboard-config rgb xserver-xf86-config xkbcomp" RRECOMMENDS_${PN} += "${XSERVER_RRECOMMENDS}" @@ -131,6 +131,7 @@ PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" # DRI3 requires xshmfence to also be enabled PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" +PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy,libegl" 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" @@ -167,9 +168,10 @@ python populate_packages_prepend() { } p = subprocess.Popen(args="pkg-config --variable=%s xorg-server" % abis[name], shell=True, env=newenv, stdout=subprocess.PIPE) - output = p.communicate()[0] + stdout, stderr = p.communicate() + output = stdout.decode("utf-8").split(".")[0] mlprefix = d.getVar('MLPREFIX', True) or '' - return "%sxorg-abi-%s-%s" % (mlprefix, name, output.split(".")[0]) + return "%sxorg-abi-%s-%s" % (mlprefix, name, output) pn = d.getVar("PN", True) d.appendVar("RPROVIDES_" + pn, " " + get_abi("input")) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch deleted file mode 100644 index cd3099952..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 0c2153d468229f56e6fef71d2f002e0cae14aa55 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Mon, 16 Nov 2015 16:18:40 +0200 -Subject: [PATCH] configure.ac: Use libsystemd in REQUIRED_LIBS check - -REQUIRED_LIBS needs to be set to the correct systemd library, -otherwise the later check will either fail or use the wrong -pc file. - -Upstream-Status: Submitted [xorg-devel@lists.x.org] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 13 ++++++++++--- - 1 file changed, 10 insertions(+), 3 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 96c0242..f63eca1 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -837,9 +837,16 @@ AC_ARG_WITH([systemd-daemon], - [support systemd socket activation (default: auto)]), - [WITH_SYSTEMD_DAEMON=$withval], [WITH_SYSTEMD_DAEMON=auto]) - PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd-daemon], -- [HAVE_SYSTEMD_DAEMON=yes], -+ [REQUIRED_SYSTEMD_DAEMON=libsystemd-daemon], - [PKG_CHECK_MODULES([SYSTEMD_DAEMON], [libsystemd], -- [HAVE_SYSTEMD_DAEMON=yes], [HAVE_SYSTEMD_DAEMON=no])]) -+ [REQUIRED_SYSTEMD_DAEMON=libsystemd], -+ [REQUIRED_SYSTEMD_DAEMON=])]) -+if test "x$REQUIRED_SYSTEMD_DAEMON" = x; then -+ HAVE_SYSTEMD_DAEMON=no -+else -+ HAVE_SYSTEMD_DAEMON=yes -+fi -+ - if test "x$WITH_SYSTEMD_DAEMON" = xauto; then - WITH_SYSTEMD_DAEMON="$HAVE_SYSTEMD_DAEMON" - fi -@@ -848,7 +855,7 @@ if test "x$WITH_SYSTEMD_DAEMON" = xyes; then - AC_MSG_ERROR([systemd support requested but no library has been found]) - fi - AC_DEFINE(HAVE_SYSTEMD_DAEMON, 1, [Define to 1 if libsystemd-daemon is available]) -- REQUIRED_LIBS="$REQUIRED_LIBS libsystemd-daemon" -+ REQUIRED_LIBS="$REQUIRED_LIBS $REQUIRED_SYSTEMD_DAEMON" - fi - AM_CONDITIONAL([HAVE_SYSTEMD_DAEMON], [test "x$HAVE_SYSTEMD_DAEMON" = "xyes"]) - --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch deleted file mode 100644 index 5f186cb84..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/modesetting_libdrm_requirements.patch +++ /dev/null @@ -1,30 +0,0 @@ -From bf23db42a4e5943129501223a47b48884cdeb62f Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Wed, 27 Jan 2016 11:50:13 -0500 -Subject: modesetting: Require sufficiently new libdrm - -Bugzilla: https://bugs.freedesktop.org/93883 -Signed-off-by: Adam Jackson <ajax@redhat.com> -Reviewed-by: Alex Deucher <alexander.deucher@amd.com> -Reviewed-by: Julien Cristau <jcristau@debian.org> - -Upstream-Status: Backport -Signed-off-by: Johannes Pointner <johannes.pointner@gmail.com> - -diff --git a/configure.ac b/configure.ac -index ac3bb64..312fc69 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2035,8 +2035,7 @@ if test "x$XORG" = xyes; then - - if test "x$DRM" = xyes; then - dnl 2.4.46 is required for cursor hotspot support. -- PKG_CHECK_EXISTS(libdrm >= 2.4.46) -- XORG_DRIVER_MODESETTING=yes -+ PKG_CHECK_EXISTS(libdrm >= 2.4.46, XORG_DRIVER_MODESETTING=yes, XORG_DRIVER_MODESETTING=no) - fi - - AC_SUBST([XORG_LIBS]) --- -cgit v0.10.2 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bb index eb79b4046..670056579 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.18.4.bb @@ -1,11 +1,8 @@ require xserver-xorg.inc -SRC_URI += "file://configure.ac-Use-libsystemd-in-REQUIRED_LIBS-check.patch \ - file://musl-arm-inb-outb.patch \ - file://modesetting_libdrm_requirements.patch \ - " -SRC_URI[md5sum] = "3c1c1057d3ad27380d8dd87ffcc182cd" -SRC_URI[sha256sum] = "195670819695d9cedd8dde95fbe069be0d0f488a77797a2d409f9f702daf312e" +SRC_URI += "file://musl-arm-inb-outb.patch" +SRC_URI[md5sum] = "d4842dfe3bd9a9d062f2fa1df9104a46" +SRC_URI[sha256sum] = "278459b2c31d61a15655d95a72fb79930c480a6bb8cf9226e48a07df8b1d31c8" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh b/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh deleted file mode 100644 index fa43617bd..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/30xTs_Calibrate.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh - -. /etc/formfactor/config - -if [ "$HAVE_TOUCHSCREEN" = "1" ]; then - n=1 - while [ ! -z $TSLIB_TSDEVICE ] && [ ! -f /etc/pointercal ] && [ $n -le 5 ] - do - /usr/bin/xtscal - sleep 1 - n=$(($n+1)) - done -fi diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/change-cross.patch b/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/change-cross.patch deleted file mode 100644 index 1da771786..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/change-cross.patch +++ /dev/null @@ -1,18 +0,0 @@ -Upstream-Status: Pending - ---- tmp/main.c.orig 2007-01-02 15:39:54.000000000 +0000 -+++ tmp/main.c 2007-01-02 15:39:54.000000000 +0000 -@@ -131,9 +131,10 @@ - { - XRenderFillRectangles (dpy, PictOpSrc, pict, &rect_color, rectangles, 2); - -- XFillArc (dpy, crosshair_w, crosshair_gc, (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, -- (CROSSHAIR_SIZE / 2) - (WIDTH / 2) - 1, -- WIDTH + 1, WIDTH + 1, 0, 360 * 64); -+ XFillRectangle (dpy, crosshair_w, crosshair_gc, -+ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), -+ (CROSSHAIR_SIZE / 2) - (WIDTH / 2), -+ WIDTH, WIDTH); - } - - void diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/cleanup.patch b/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/cleanup.patch deleted file mode 100644 index f7b0854c3..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/cleanup.patch +++ /dev/null @@ -1,621 +0,0 @@ ---- - Makefile.am | 9 -- - configure.ac | 3 - gpe-dist.am | 12 --- - h3600_ts.h | 216 ----------------------------------------------------------- - main.c | 210 ++------------------------------------------------------- - xtscal.in | 19 ----- - 6 files changed, 14 insertions(+), 455 deletions(-) - -Upstream-Status: Pending - -Index: xtscal-0.6.3/xtscal.in -=================================================================== ---- xtscal-0.6.3.orig/xtscal.in 2004-09-10 20:10:36.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,19 +0,0 @@ --#!/bin/sh -- --module_id() { -- # Get model name -- echo `grep "^Hardware" /proc/cpuinfo | sed -e "s/.*: *//" | tr a-z A-Z` --} -- --case `module_id` in -- "HP IPAQ H3100" | "HP IPAQ H3800" ) -- ARGS="-rotate 90" ;; -- "HP IPAQ H3600" | "HP IPAQ H3700" | "HP IPAQ H3900" | *COLLIE | *POODLE) -- ARGS="-rotate 270" ;; -- # H2200: works without rotation --esac -- --# the things we do for autoconf --prefix=@prefix@ --exec_prefix=@exec_prefix@ --exec @libexecdir@/xtscal.bin $ARGS $* -Index: xtscal-0.6.3/main.c -=================================================================== ---- xtscal-0.6.3.orig/main.c 2007-07-01 01:12:52.000000000 +0100 -+++ xtscal-0.6.3/main.c 2007-07-01 01:12:55.000000000 +0100 -@@ -22,12 +22,10 @@ - #include <X11/Xlib.h> - - #include <X11/extensions/Xrender.h> --#include <X11/extensions/Xrandr.h> - #include <X11/Xft/Xft.h> - #include <X11/extensions/xcalibrate.h> - #include <X11/keysym.h> - --#include "h3600_ts.h" - #include "calibrate.h" - - Display *dpy; -@@ -45,15 +43,11 @@ XftColor xftcol; - XftDraw *xftdraw; - XftFont *xftfont; - int screen_x, screen_y; --int ts_fd; - int samples; - Pixmap bg_pixmap; - int flag_debug; --int rotation = 0; - int error_base, event_base; - --int using_xcalibrate; -- - int moving; - - #define CROSSHAIR_SIZE 25 -@@ -63,7 +57,6 @@ int moving; - #define ENOUGH 5 - #define MAX_SAMPLES 40 - --#define RAW_DEVICE "/dev/h3600_tsraw" - #define FONTNAME "sans-10" - - struct point -@@ -287,12 +280,8 @@ sort_by_y (const void* a, const void *b) - void - set_calibration (calibration *cal) - { -- TS_CAL tc; -- int xtrans, ytrans, xscale, yscale, xyscale, yxscale; - calibration ocal = *cal; - -- if (using_xcalibrate) -- { - FILE *fp; - if (flag_debug) - printf ("constants are: %d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); -@@ -304,29 +293,6 @@ set_calibration (calibration *cal) - } - fprintf (fp, "%d %d %d %d %d %d %d\n", cal->a[1], cal->a[2], cal->a[0], cal->a[4], cal->a[5], cal->a[3], cal->a[6]); - fclose (fp); -- return; -- } -- -- xtrans = cal->a[0] / cal->a[6]; -- ytrans = cal->a[3] / cal->a[6]; -- xscale = cal->a[1] * 256 / cal->a[6]; -- yscale = cal->a[5] * 256 / cal->a[6]; -- xyscale = cal->a[2] * 256 / cal->a[6]; -- yxscale = cal->a[4] * 256 / cal->a[6]; -- -- tc.xtrans = xtrans; -- tc.ytrans = ytrans; -- tc.xscale = xscale; -- tc.yscale = yscale; -- tc.xyswap = 0; -- -- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); -- -- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_SET_CAL"); -- exit (1); -- } - } - - void -@@ -398,80 +364,13 @@ handle_ts_event (int x, int y, int press - } - - void --read_ts (void) --{ -- TS_EVENT ts_ev; -- int r; -- -- r = read (ts_fd, &ts_ev, sizeof (ts_ev)); -- if (r == sizeof (ts_ev)) -- handle_ts_event (ts_ev.x, ts_ev.y, ts_ev.pressure); --} -- --void --do_cal (char **args) --{ -- TS_CAL tc; -- -- tc.xscale = atoi (args[0]); -- tc.xtrans = atoi (args[1]); -- tc.yscale = atoi (args[2]); -- tc.ytrans = atoi (args[3]); -- tc.xyswap = atoi (args[4]); -- -- if (flag_debug) -- fprintf (stderr, "setting: %d %d %d %d %d\n", -- tc.xtrans, tc.ytrans, tc.xscale, tc.yscale, tc.xyswap); -- -- if (ioctl (ts_fd, TS_SET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_SET_CAL"); -- exit (1); -- } -- -- exit (0); --} -- --void --show_cal (void) --{ -- TS_CAL tc; -- -- if (ioctl (ts_fd, TS_GET_CAL, (void *)&tc) != 0) -- { -- perror ("TS_GET_CAL"); -- exit (1); -- } -- -- printf ("%d %d %d %d %d\n", tc.xscale, tc.xtrans, tc.yscale, tc.ytrans, tc.xyswap); --} -- --void - usage (const char *name) - { -- fprintf (stderr, "usage: %s -view\n", name); -- fprintf (stderr, " %s [-rotate <0 | 90 | 180 | 270>]\n", name); -- fprintf (stderr, " %s -cal <xs> <xt> <ys> <yt> <xyswap>\n", name); -- -+ fprintf (stderr, "usage: %s [-debug]\n", name); - exit (1); - } - - int --xrr_supported (void) --{ -- int xrr_event_base, xrr_error_base; -- int xrr_major, xrr_minor; -- -- if (XRRQueryExtension (dpy, &xrr_event_base, &xrr_error_base) == False -- || XRRQueryVersion (dpy, &xrr_major, &xrr_minor) == 0 -- || xrr_major != 1 -- || xrr_minor < 1) -- return 0; -- -- return 1; --} -- --int - main (int argc, char *argv[]) - { - XSetWindowAttributes attributes; -@@ -480,31 +379,11 @@ main (int argc, char *argv[]) - int max_fd; - GC bg_gc; - int i; -- int have_xrandr; - - for (i = 1; i < argc; i++) - { -- if (!strcmp (argv[i], "-view")) -- { -- show_cal (); -- exit (0); -- } -- else if (!strcmp (argv[i], "-debug")) -+ if (!strcmp (argv[i], "-debug")) - flag_debug = 1; -- else if (!strcmp (argv[i], "-cal")) -- { -- if (argc > (i + 5)) -- do_cal (argv + i + 1); -- else -- usage (argv[0]); -- } -- else if (!strcmp (argv[i], "-rotate")) -- { -- if (argc > (i + 1)) -- rotation = atoi (argv[++i]); -- else -- usage (argv[0]); -- } - else - usage (argv[0]); - } -@@ -531,48 +410,11 @@ main (int argc, char *argv[]) - fprintf (stderr, "failed to set raw mode: error %d\n", r); - exit (1); - } -- -- using_xcalibrate = 1; -- } -- -- have_xrandr = xrr_supported (); -- if (have_xrandr) -- { -- XRRScreenConfiguration *rr_screen; -- Rotation current_rotation; -- -- if (flag_debug) -- fprintf (stderr, "XRANDR is supported\n"); -- -- rr_screen = XRRGetScreenInfo (dpy, RootWindow (dpy, screen)); -- -- XRRRotations (dpy, screen, ¤t_rotation); -- -- XRRFreeScreenConfigInfo (rr_screen); -- -- if (flag_debug) -- fprintf (stderr, "Current RANDR rotation is %d\n", current_rotation); -- -- switch (current_rotation) -- { -- case RR_Rotate_270: -- rotation += 90; -- case RR_Rotate_180: -- rotation += 90; -- case RR_Rotate_90: -- rotation += 90; -- rotation %= 360; -- case RR_Rotate_0: -- break; -- default: -- fprintf (stderr, "Unknown RANDR rotation: %d\n", current_rotation); -- break; -- } - } - else - { -- if (flag_debug) -- fprintf (stderr, "XRANDR not supported\n"); -+ perror ("XCALIBRATE extension missing"); -+ exit (1); - } - - attributes.override_redirect = flag_debug ? False : True; -@@ -666,45 +508,17 @@ main (int argc, char *argv[]) - - for (i = 0; i < NR_POINTS; i++) - { -- switch (rotation) -- { -- case 0: -- cal.xfb[i] = cal.xscr[i]; -- cal.yfb[i] = cal.yscr[i]; -- break; -- case 90: -- cal.xfb[i] = cal.yscr[i]; -- cal.yfb[i] = screen_x - cal.xscr[i]; -- break; -- case 180: -- cal.xfb[i] = screen_x - cal.xscr[i]; -- cal.yfb[i] = screen_y - cal.yscr[i]; -- break; -- case 270: -- cal.xfb[i] = screen_y - cal.yscr[i]; -- cal.yfb[i] = cal.xscr[i]; -- break; -- } -+ cal.xfb[i] = cal.xscr[i]; -+ cal.yfb[i] = cal.yscr[i]; -+ XCalibrateScreenToCoord (dpy, &cal.xfb[i], &cal.yfb[i]); - - if (flag_debug) -- printf ("rotation %d: (%d,%d) -> (%d,%d)\n", rotation, -+ printf ("rotation conversion: (%d,%d) -> (%d,%d)\n", - cal.xscr[i], cal.yscr[i], cal.xfb[i], cal.yfb[i]); - } - - next_event (); - -- if (!using_xcalibrate) -- { -- ts_fd = open (RAW_DEVICE, O_RDONLY); -- if (ts_fd < 0) -- { -- perror (RAW_DEVICE); -- exit (1); -- } -- } -- -- max_fd = (xfd > ts_fd) ? xfd : ts_fd; -- - for (;;) - { - fd_set fds; -@@ -713,12 +527,8 @@ main (int argc, char *argv[]) - - FD_ZERO (&fds); - FD_SET (xfd, &fds); -- if (ts_fd != -1) -- FD_SET (ts_fd, &fds); - -- select (max_fd + 1, &fds, NULL, NULL, NULL); -- -- if (ts_fd != -1 && FD_ISSET (ts_fd, &fds)) -- read_ts (); -+ select (xfd + 1, &fds, NULL, NULL, NULL); - } - } -+ -Index: xtscal-0.6.3/configure.ac -=================================================================== ---- xtscal-0.6.3.orig/configure.ac 2004-09-10 20:11:12.000000000 +0100 -+++ xtscal-0.6.3/configure.ac 2007-07-01 01:12:55.000000000 +0100 -@@ -9,8 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - # Checks for programs. - AC_PROG_CC - --PKG_CHECK_MODULES(XTSCAL, x11 xft xext xrandr xcalibrate) -+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) - - AC_CONFIG_FILES([Makefile]) --AC_CONFIG_FILES([xtscal]) - AC_OUTPUT -Index: xtscal-0.6.3/gpe-dist.am -=================================================================== ---- xtscal-0.6.3.orig/gpe-dist.am 2004-06-02 23:07:13.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,12 +0,0 @@ --CVSTAG := $(shell echo $(PACKAGE)-$(VERSION) | tr [a-z.] [A-Z_]) -- --dist-upload: dist -- scp $(PACKAGE)-$(VERSION).tar.bz2 $(USER)@handhelds.org:/home/ftp/pub/projects/gpe/source/ -- --tag: -- cvs tag $(CVSTAG) -- --retag: -- cvs tag -F $(CVSTAG) -- --source: tag dist-upload -Index: xtscal-0.6.3/h3600_ts.h -=================================================================== ---- xtscal-0.6.3.orig/h3600_ts.h 2003-07-05 17:27:10.000000000 +0100 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,216 +0,0 @@ --/* --* --* Driver for the H3600 Touch Screen and other Atmel controlled devices. --* --* Copyright 2000 Compaq Computer Corporation. --* --* Use consistent with the GNU GPL is permitted, --* provided that this copyright notice is --* preserved in its entirety in all copies and derived works. --* --* COMPAQ COMPUTER CORPORATION MAKES NO WARRANTIES, EXPRESSED OR IMPLIED, --* AS TO THE USEFULNESS OR CORRECTNESS OF THIS CODE OR ITS --* FITNESS FOR ANY PARTICULAR PURPOSE. --* --* Author: Charles Flynn. --* --*/ -- -- --#ifndef __H3600_TS_H__ --#define __H3600_TS_H__ -- --#include <linux/ioctl.h> -- --enum h3600_ts_minor_devices { -- TS_MINOR = 0, -- TSRAW_MINOR = 1, -- KEY_MINOR = 2 --}; -- --typedef struct h3600_ts_calibration { -- int xscale; -- int xtrans; -- int yscale; -- int ytrans; -- int xyswap; --} TS_CAL; -- --typedef struct h3600_ts_event { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --} TS_EVENT; -- --/* Deprecated - do not use */ --typedef struct h3600_ts_return { -- unsigned short pressure; -- unsigned short x; -- unsigned short y; -- unsigned short pad; --} TS_RET; -- --enum power_button_mode { -- PBM_SUSPEND = 0, -- PBM_GENERATE_KEYPRESS = 1 --}; -- -- --/* ++++++++++++++ +++++++++++++++++++++++++++++++++++++ */ -- --typedef struct therm_dev { -- short data; --} THERM_DEV; -- --#define H3600_BATT_CHEM_ALKALINE 0x01 --#define H3600_BATT_CHEM_NICD 0x02 --#define H3600_BATT_CHEM_NIMH 0x03 --#define H3600_BATT_CHEM_LION 0x04 --#define H3600_BATT_CHEM_LIPOLY 0x05 --#define H3600_BATT_CHEM_NOT_INSTALLED 0x06 --#define H3600_BATT_CHEM_UNKNOWN 0xff -- --/* These should match the apm_bios.h definitions */ --#define H3600_AC_STATUS_AC_OFFLINE 0x00 --#define H3600_AC_STATUS_AC_ONLINE 0x01 --#define H3600_AC_STATUS_AC_BACKUP 0x02 /* What does this mean? */ --#define H3600_AC_STATUS_AC_UNKNOWN 0xff -- --/* These bitfields are rarely "or'd" together */ --#define H3600_BATT_STATUS_HIGH 0x01 --#define H3600_BATT_STATUS_LOW 0x02 --#define H3600_BATT_STATUS_CRITICAL 0x04 --#define H3600_BATT_STATUS_CHARGING 0x08 --#define H3600_BATT_STATUS_CHARGE_MAIN 0x10 --#define H3600_BATT_STATUS_DEAD 0x20 /* Battery will not charge */ --#define H3600_BATT_NOT_INSTALLED 0x20 /* For expansion pack batteries */ --#define H3600_BATT_STATUS_FULL 0x40 /* Battery fully charged (and connected to AC) */ --#define H3600_BATT_STATUS_NOBATT 0x80 --#define H3600_BATT_STATUS_UNKNOWN 0xff -- --struct battery_data { -- unsigned char chemistry; -- unsigned char status; -- unsigned short voltage; /* Voltage for battery #0; unknown for battery #1 */ -- unsigned short percentage; /* Percentage of full charge */ -- unsigned short life; /* Life remaining in minutes */ --}; -- --struct h3600_battery { -- unsigned char ac_status; -- unsigned char battery_count; /* How many batteries we have */ -- struct battery_data battery[2]; --}; -- --/* -------- EEPROM and SPI Interfaces ---------------*/ -- --#define EEPROM_RD_BUFSIZ 6 /* EEPROM reads are 16 bits */ --#define EEPROM_WR_BUFSIZ 5 /* Allow room for 8bit 'addr' field in buffer*/ --#define SPI_RD_BUFSIZ 16 /* SPI reads are 8 bits */ --#define SPI_WR_BUFSIZ 7 -- --/* The EEPROM is where internal programs are stored on the Amtel. -- You probably don't want to read or write these values */ -- --typedef struct h3600_eeprom_read_request { -- unsigned char addr; /* 8bit Address Offset 0-255 */ -- unsigned char len; /* Number of 16bit words to read 0-128 */ -- unsigned short buff[EEPROM_RD_BUFSIZ]; --} EEPROM_READ; -- --typedef struct h3600_eeprom_write_request { -- unsigned char len; /* used only to compute the number of bytes to send */ -- unsigned char addr; /* 0-128 */ -- unsigned short buff[EEPROM_WR_BUFSIZ]; --} EEPROM_WRITE; -- --/* The SPI bus connects to EEPROMs located on sleeves plugged into -- the iPAQ. You may want to read these values */ -- --typedef struct h3600_spi_read_request { -- unsigned short addr; /* 16bit Address Offset 0-128 */ -- unsigned char len; /* Number of bytes to read */ -- unsigned char buff[SPI_RD_BUFSIZ]; --} SPI_READ; -- --#define SPI_READ_STATUS_BYTE 0xffff /* Use this address to read the status byte */ -- --typedef struct h3600_spi_write_request { -- unsigned short len; /* used only to compute the number of bytes to send */ -- unsigned short addr; /* this 16bit address accesses a single byte */ -- unsigned char buff[SPI_WR_BUFSIZ]; --} SPI_WRITE; -- -- --/* -------- end of EEPROM and SPI Interfaces ---------------*/ -- --/* User space structures for IOCTL calls */ -- --typedef struct h3600_ts_version { -- unsigned char host_version[8]; /* ascii "x.yy" */ -- unsigned char pack_version[8]; /* ascii "x.yy" */ -- unsigned char boot_type; /* TODO ?? */ --} VER_RET; -- --typedef struct h3600_ts_led { -- unsigned char OffOnBlink; /* 0=off 1=on 2=Blink */ -- unsigned char TotalTime; /* Units of 5 seconds */ -- unsigned char OnTime; /* units of 100m/s */ -- unsigned char OffTime; /* units of 100m/s */ --} LED_IN; -- --enum flite_mode { -- FLITE_MODE1 = 1, -- FLITE_AUTO_MODE = 1, /* for reference only */ -- FLITE_MANUAL_MODE = 2, /* Use this normally? */ -- FLITE_GET_LIGHT_SENSOR = 3 /* Returns light reading in "brightness" field */ --}; --enum flite_pwr { -- FLITE_PWR_OFF = 0, -- FLITE_PWR_ON = 1 --}; -- --typedef struct h3600_ts_flite { -- unsigned char mode; -- unsigned char pwr; -- unsigned char brightness; --} FLITE_IN; -- --/*************************** Updated "universal" structures *******************/ -- --/* Sets backlight for both H3100 and H3600 models - technically "frontlight" for H3600 */ --struct h3600_ts_backlight { -- enum flite_pwr power; /* 0 = off, 1 = on */ -- unsigned char brightness; /* 0 - 255 */ --}; -- --struct h3600_ts_contrast { /* Only useful on H3100 model */ -- unsigned char contrast; /* 0 - 255 */ --}; -- --/* IOCTL cmds user or kernel space */ -- --/* Use 'f' as magic number */ --#define IOC_H3600_TS_MAGIC 'f' -- --/* TODO: Some of these IOWR values are just plain wrong */ --#define GET_VERSION _IOR(IOC_H3600_TS_MAGIC, 1, struct h3600_ts_version ) --#define READ_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 2, struct h3600_eeprom_read_request) --#define WRITE_EEPROM _IOWR(IOC_H3600_TS_MAGIC, 3, struct h3600_eeprom_write_request) --#define GET_THERMAL _IOR(IOC_H3600_TS_MAGIC, 4, struct therm_dev) --#define LED_ON _IOW(IOC_H3600_TS_MAGIC, 5, struct h3600_ts_led) --#define GET_BATTERY_STATUS _IOR(IOC_H3600_TS_MAGIC, 6, struct h3600_battery) --#define FLITE_ON _IOW(IOC_H3600_TS_MAGIC, 7, struct h3600_ts_flite) --#define READ_SPI _IOWR(IOC_H3600_TS_MAGIC, 8, struct h3600_spi_read_request) --#define WRITE_SPI _IOWR(IOC_H3600_TS_MAGIC, 9, struct h3600_spi_write_request) --#define TS_GET_CAL _IOR(IOC_H3600_TS_MAGIC, 10, struct h3600_ts_calibration) --#define TS_SET_CAL _IOW(IOC_H3600_TS_MAGIC, 11, struct h3600_ts_calibration) -- --/* New IOCTL interfaces - defined to be more user friendly */ --#define TS_GET_BACKLIGHT _IOR(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) --#define TS_SET_BACKLIGHT _IOW(IOC_H3600_TS_MAGIC, 20, struct h3600_ts_backlight) --#define TS_GET_CONTRAST _IOR(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) --#define TS_SET_CONTRAST _IOW(IOC_H3600_TS_MAGIC, 21, struct h3600_ts_contrast) -- --#endif -Index: xtscal-0.6.3/Makefile.am -=================================================================== ---- xtscal-0.6.3.orig/Makefile.am 2004-06-02 23:07:13.000000000 +0100 -+++ xtscal-0.6.3/Makefile.am 2007-07-02 12:51:02.000000000 +0100 -@@ -1,11 +1,8 @@ --libexec_PROGRAMS = xtscal.bin --bin_SCRIPTS = xtscal -+bin_PROGRAMS = xtscal - --xtscal_bin_SOURCES = main.c calibrate.c calibrate.h h3600_ts.h -+xtscal_SOURCES = main.c calibrate.c calibrate.h - --xtscal_bin_LDADD = @XTSCAL_LIBS@ -+xtscal_LDADD = @XTSCAL_LIBS@ - - INCLUDES = @XTSCAL_CFLAGS@ -DNR_POINTS=5 - --include gpe-dist.am -- diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch b/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch deleted file mode 100644 index 3e4533f78..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal/dso_linking_change_build_fix.patch +++ /dev/null @@ -1,27 +0,0 @@ -after gcc linking has changed, all the libraries must be explicitely specified -This patch avoids this linking error: - -| ccache i586-poky-linux-gcc -march=i586 --sysroot=/disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux -fexpensive-optimizations -fomit-frame-pointer -frename-registers -O2 -ggdb -feliminate-unused-debug-types -Wl,-O1 -Wl,--hash-style=gnu -Wl,--as-needed -o xtscal main.o calibrate.o -lX11 -lXft -lXext -lXcalibrate^M -| /disk0/pokybuild/build1/tmp/sysroots/x86_64-linux/usr/libexec/i586-poky-linux/gcc/i586-poky-linux/4.5.1/ld: ^?: invalid DSO for symbol `XRenderChangePicture' definition^M -| /disk0/pokybuild/build1/tmp/sysroots/i586-poky-linux/usr/lib/libXrender.so.1: could not read symbols: Bad value^M -| collect2: ld returned 1 exit status^M -| make: *** [xtscal] Error 1 - -Nitin A Kamble <nitin.a.kamble@intel.com> -Date: 2011/01/11 - -Upstream-Status: Pending - -Index: xtscal-0.6.3/configure.ac -=================================================================== ---- xtscal-0.6.3.orig/configure.ac -+++ xtscal-0.6.3/configure.ac -@@ -9,7 +9,7 @@ AM_INIT_AUTOMAKE([foreign dist-bzip2]) - # Checks for programs. - AC_PROG_CC - --PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate) -+PKG_CHECK_MODULES(XTSCAL, x11 xft xext xcalibrate xrender) - - AC_CONFIG_FILES([Makefile]) - AC_OUTPUT diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb deleted file mode 100644 index 4bfddf06b..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xtscal/xtscal_0.6.3.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "Touchscreen calibration utility" - -DESCRIPTION = "Basic touchscreen calibration utility" - -HOMEPAGE = "http://gpe.linuxtogo.org" -BUGTRACKER = "http://bugs.linuxtogo.org" -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ - file://main.c;endline=10;md5=8721bcb08ae9f24e5fe4c82941873c87" - -SECTION = "x11/base" - -DEPENDS = "virtual/libx11 libxft libxcalibrate" - -PR = "r13" - -SRC_URI = "${GPE_MIRROR}/xtscal-${PV}.tar.bz2 \ - file://change-cross.patch \ - file://cleanup.patch \ - file://dso_linking_change_build_fix.patch \ - file://30xTs_Calibrate.sh" - -SRC_URI[md5sum] = "9bcab80b474d5454477d1ca166a68c34" -SRC_URI[sha256sum] = "27b9dc2203de9b1706ca39fa6ca80ecab8807909ec901c4a345b8e41178800a1" - -inherit autotools pkgconfig distro_features_check -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -do_install_append() { - install -d ${D}${sysconfdir}/X11/Xsession.d/ - install -m 0755 ${WORKDIR}/30xTs_Calibrate.sh ${D}${sysconfdir}/X11/Xsession.d/ -} |