diff options
Diffstat (limited to 'poky/meta/recipes-graphics')
95 files changed, 1039 insertions, 1110 deletions
diff --git a/poky/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch b/poky/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch deleted file mode 100644 index 7d02ab947..000000000 --- a/poky/meta/recipes-graphics/cairo/cairo/0001-cairo-Fix-CVE-2017-9814.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 042421e9e3d266ad0bb7805132041ef51ad3234d Mon Sep 17 00:00:00 2001 -From: Adrian Johnson <ajohnson@redneon.com> -Date: Wed, 16 Aug 2017 22:52:35 -0400 -Subject: [PATCH] cairo: Fix CVE-2017-9814 - -The bug happens because in some scenarios the variable size can -have a value of 0 at line 1288. And malloc(0) is not returning -NULL as some people could expect: - - https://stackoverflow.com/questions/1073157/zero-size-malloc - -malloc(0) returns the smallest chunk possible. So the line 1290 -with the return is not execute. And the execution continues with -an invalid map. - -Since the size is 0 the variable map is not initialized correctly -at load_trutype_table. So, later when the variable map is accessed -previous values from a freed chunk are used. This could allows an -attacker to control the variable map. - -This patch have not merge in upstream now. - -Upstream-Status: Backport [https://bugs.freedesktop.org/show_bug.cgi?id=101547] -CVE: CVE-2017-9814 -Signed-off-by: Dengke Du <dengke.du@windriver.com> ---- - src/cairo-truetype-subset.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/cairo-truetype-subset.c b/src/cairo-truetype-subset.c -index e3449a0..f77d11c 100644 ---- a/src/cairo-truetype-subset.c -+++ b/src/cairo-truetype-subset.c -@@ -1285,7 +1285,7 @@ _cairo_truetype_reverse_cmap (cairo_scaled_font_t *scaled_font, - return CAIRO_INT_STATUS_UNSUPPORTED; - - size = be16_to_cpu (map->length); -- map = malloc (size); -+ map = _cairo_malloc (size); - if (unlikely (map == NULL)) - return _cairo_error (CAIRO_STATUS_NO_MEMORY); - --- -2.8.1 - diff --git a/poky/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch b/poky/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch new file mode 100644 index 000000000..4252a5663 --- /dev/null +++ b/poky/meta/recipes-graphics/cairo/cairo/CVE-2018-19876.patch @@ -0,0 +1,34 @@ +CVE: CVE-2018-19876 +Upstream-Status: Backport +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 90e85c2493fdfa3551f202ff10282463f1e36645 Mon Sep 17 00:00:00 2001 +From: Carlos Garcia Campos <cgarcia@igalia.com> +Date: Mon, 19 Nov 2018 12:33:07 +0100 +Subject: [PATCH] ft: Use FT_Done_MM_Var instead of free when available in + cairo_ft_apply_variations + +Fixes a crash when using freetype >= 2.9 +--- + src/cairo-ft-font.c | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/cairo-ft-font.c b/src/cairo-ft-font.c +index 325dd61b4..981973f78 100644 +--- a/src/cairo-ft-font.c ++++ b/src/cairo-ft-font.c +@@ -2393,7 +2393,11 @@ skip: + done: + free (coords); + free (current_coords); ++#if HAVE_FT_DONE_MM_VAR ++ FT_Done_MM_Var (face->glyph->library, ft_mm_var); ++#else + free (ft_mm_var); ++#endif + } + } + +-- +2.11.0 + diff --git a/poky/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch b/poky/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch new file mode 100644 index 000000000..5232cf70c --- /dev/null +++ b/poky/meta/recipes-graphics/cairo/cairo/CVE-2019-6461.patch @@ -0,0 +1,19 @@ +There is a potential infinite-loop in function _arc_error_normalized(). + +CVE: CVE-2019-6461 +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/src/cairo-arc.c b/src/cairo-arc.c +index 390397bae..f9249dbeb 100644 +--- a/src/cairo-arc.c ++++ b/src/cairo-arc.c +@@ -99,7 +99,7 @@ _arc_max_angle_for_tolerance_normalized (double tolerance) + do { + angle = M_PI / i++; + error = _arc_error_normalized (angle); +- } while (error > tolerance); ++ } while (error > tolerance && error > __DBL_EPSILON__); + + return angle; + } diff --git a/poky/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch b/poky/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch new file mode 100644 index 000000000..4e4598c5b --- /dev/null +++ b/poky/meta/recipes-graphics/cairo/cairo/CVE-2019-6462.patch @@ -0,0 +1,20 @@ +There is an assertion in function _cairo_arc_in_direction(). + +CVE: CVE-2019-6462 +Upstream-Status: Pending +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/src/cairo-arc.c b/src/cairo-arc.c +index 390397bae..1bde774a4 100644 +--- a/src/cairo-arc.c ++++ b/src/cairo-arc.c +@@ -186,7 +186,8 @@ _cairo_arc_in_direction (cairo_t *cr, + if (cairo_status (cr)) + return; + +- assert (angle_max >= angle_min); ++ if (angle_max < angle_min) ++ return; + + if (angle_max - angle_min > 2 * M_PI * MAX_FULL_CIRCLES) { + angle_max = fmod (angle_max - angle_min, 2 * M_PI); diff --git a/poky/meta/recipes-graphics/cairo/cairo_1.14.12.bb b/poky/meta/recipes-graphics/cairo/cairo_1.16.0.bb index 18b947948..c2628ae0c 100644 --- a/poky/meta/recipes-graphics/cairo/cairo_1.14.12.bb +++ b/poky/meta/recipes-graphics/cairo/cairo_1.16.0.bb @@ -24,11 +24,13 @@ DEPENDS = "fontconfig glib-2.0 libpng pixman zlib" SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ file://cairo-get_bitmap_surface-bsc1036789-CVE-2017-7475.diff \ - file://0001-cairo-Fix-CVE-2017-9814.patch \ + file://CVE-2018-19876.patch \ + file://CVE-2019-6461.patch \ + file://CVE-2019-6462.patch \ " -SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165" -SRC_URI[sha256sum] = "8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16" +SRC_URI[md5sum] = "f19e0353828269c22bd72e271243a552" +SRC_URI[sha256sum] = "5e7b29b3f113ef870d1e3ecf8adf21f923396401604bda16d44be45e66052331" inherit autotools pkgconfig upstream-version-is-even gtk-doc multilib_script @@ -81,7 +83,8 @@ DESCRIPTION_cairo-perf-utils = "The Cairo library performance utilities" FILES_${PN} = "${libdir}/libcairo.so.*" FILES_${PN}-gobject = "${libdir}/libcairo-gobject.so.*" FILES_${PN}-script-interpreter = "${libdir}/libcairo-script-interpreter.so.*" -FILES_${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so.*" -FILES_${PN}-dev += "${libdir}/cairo/*.so" +FILES_${PN}-perf-utils = "${bindir}/cairo-trace* ${libdir}/cairo/*.la ${libdir}/cairo/libcairo-trace.so" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" + +UPSTREAM_CHECK_REGEX = "cairo-(?P<pver>\d+(\.\d+)+).tar.xz" diff --git a/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.26.bb b/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.bb index 8a0dda542..35382453c 100644 --- a/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.26.bb +++ b/poky/meta/recipes-graphics/clutter/clutter-gst-3.0_3.0.27.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] = "7809ca6ce9d1a3490597fd4a7375c389" -SRC_URI[archive.sha256sum] = "d8618a6d9accec0f2a8574c5e1220051f8505fb82b20336c26bdbd482aa6cb3a" +SRC_URI[archive.md5sum] = "2bf9d7ca146c9d71e86c45cd00e9a28e" +SRC_URI[archive.sha256sum] = "fe69bd6c659d24ab30da3f091eb91cd1970026d431179b0724f13791e8ad9f9d" diff --git a/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc index 05c4e5f5c..4e82f5660 100644 --- a/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc +++ b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0.inc @@ -2,7 +2,9 @@ SUMMARY = "Library for embedding a Clutter canvas in a GTK+ application" HOMEPAGE = "http://www.clutter-project.org/" LICENSE = "LGPLv2+" -inherit clutter distro_features_check upstream-version-is-even gobject-introspection +CLUTTERBASEBUILDCLASS = "meson" +inherit clutter distro_features_check upstream-version-is-even gobject-introspection gtk-doc + # depends on clutter-1.0 which depends on cogl-1.0 REQUIRED_DISTRO_FEATURES ?= "opengl" # depends on gtk+3 @@ -10,6 +12,20 @@ ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" DEPENDS = "clutter-1.0 gtk+3" PACKAGES =+ "${PN}-examples" -AUTOTOOLS_AUXDIR = "${S}/build" + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Denable_gi=true" +GI_DISABLE_FLAG = "-Denable_gi=false" + +EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " + diff --git a/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch new file mode 100644 index 000000000..e21c6fd90 --- /dev/null +++ b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0/0001-Add-a-config-variable-for-enabling-disabling-introsp.patch @@ -0,0 +1,37 @@ +From 7233883c6bd4e80c0e91b29b5c76fe798023e9fe Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Mon, 11 Feb 2019 16:41:13 +0100 +Subject: [PATCH] Add a config variable for enabling/disabling introspection + +Upstream-Status: Pending +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + clutter-gtk/meson.build | 2 +- + meson_options.txt | 4 ++++ + 2 files changed, 5 insertions(+), 1 deletion(-) + +diff --git a/clutter-gtk/meson.build b/clutter-gtk/meson.build +index 5d6847d..5d934b6 100644 +--- a/clutter-gtk/meson.build ++++ b/clutter-gtk/meson.build +@@ -49,7 +49,7 @@ clutter_gtk_dep = declare_dependency(link_with: clutter_gtk, + dependencies: [ mathlib_dep, clutter_dep, gtk_dep ], + include_directories: include_directories('.')) + +-if not meson.is_cross_build() ++if get_option('enable_gi') + gnome.generate_gir(clutter_gtk, + sources: clutter_gtk_headers + clutter_gtk_sources, + namespace: 'GtkClutter', +diff --git a/meson_options.txt b/meson_options.txt +index aaf59f1..b7e51c3 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -2,3 +2,7 @@ option('enable_docs', + type: 'boolean', + value: false, + description: 'Enable generating the API reference (depends on GTK-Doc)') ++option('enable_gi', ++ type: 'boolean', ++ value: false, ++ description: 'Enable gobject introspection') diff --git a/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb index f0300c716..53948c894 100644 --- a/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb +++ b/poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb @@ -2,5 +2,6 @@ require clutter-gtk-1.0.inc LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" +SRC_URI += " file://0001-Add-a-config-variable-for-enabling-disabling-introsp.patch" SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" diff --git a/poky/meta/recipes-graphics/drm/libdrm_2.4.94.bb b/poky/meta/recipes-graphics/drm/libdrm_2.4.97.bb index d6542921f..bbe9a33ba 100644 --- a/poky/meta/recipes-graphics/drm/libdrm_2.4.94.bb +++ b/poky/meta/recipes-graphics/drm/libdrm_2.4.97.bb @@ -12,8 +12,8 @@ DEPENDS = "libpthread-stubs" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ file://musl-ioctl.patch" -SRC_URI[md5sum] = "e9803233838007047f39eb385c70d9e0" -SRC_URI[sha256sum] = "b73c59b0a3760502c428ba81de49cd4807657d26be5e697eba3a87dd021d16be" +SRC_URI[md5sum] = "acef22d0c62c89692348c2dd5591393e" +SRC_URI[sha256sum] = "77d0ccda3e10d6593398edb70b1566bfe1a23a39bd3da98ace2147692eadd123" inherit meson pkgconfig manpages diff --git a/poky/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb b/poky/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb new file mode 100644 index 000000000..87a131aa7 --- /dev/null +++ b/poky/meta/recipes-graphics/eglinfo/eglinfo-wayland_1.0.0.bb @@ -0,0 +1,13 @@ +EGLINFO_PLATFORM ?= "wayland" +EGLINFO_BINARY_NAME ?= "eglinfo-wayland" + +require eglinfo.inc + +DEPENDS += "wayland" + +inherit distro_features_check + +# depends on wayland +REQUIRED_DISTRO_FEATURES += "wayland" + +SUMMARY += "(Wayland version)" diff --git a/poky/meta/recipes-graphics/eglinfo/eglinfo.inc b/poky/meta/recipes-graphics/eglinfo/eglinfo.inc index 07ad07220..6dcb0c5a1 100644 --- a/poky/meta/recipes-graphics/eglinfo/eglinfo.inc +++ b/poky/meta/recipes-graphics/eglinfo/eglinfo.inc @@ -11,7 +11,7 @@ SRC_URI = "git://github.com/dv1/eglinfo.git;branch=master \ file://0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch \ file://0001-Check-for-libegl-using-pkg-config.patch \ " -SRCREV = "4b317648ec6cf39556a9e5d8078f605bc0edd5de" +SRCREV = "223817ee37988042db7873cfb5b2e899dfe35c10" CVE_PRODUCT = "eglinfo" diff --git a/poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch b/poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch index ca9f55c18..61327eb36 100644 --- a/poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch +++ b/poky/meta/recipes-graphics/eglinfo/files/0001-Add-STAGING_INCDIR-to-searchpath-for-egl-headers.patch @@ -1,4 +1,4 @@ -From 94b1e6daf7d70550b0e32fbb269fcf6887948d3f Mon Sep 17 00:00:00 2001 +From 99a5784d33ad5e0e6fa00338d2732cbccad7661c Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 13 Jan 2016 16:08:22 -0800 Subject: [PATCH] Add STAGING_INCDIR to searchpath for egl headers @@ -14,10 +14,10 @@ Upstream-Status: Submitted 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/wscript b/wscript -index fcbb55b..cece8bf 100644 +index 195e247..0f6ec53 100644 --- a/wscript +++ b/wscript -@@ -163,9 +163,10 @@ def configure_raspberrypi_device(conf, platform): +@@ -177,9 +177,10 @@ def configure_raspberrypi_device(conf, platform): conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') import os sysroot = conf.options.sysroot + conf.options.prefix @@ -30,5 +30,4 @@ index fcbb55b..cece8bf 100644 conf.env['WITH_APIS'] = [] if check_gles2(conf): -- -2.7.0 - +2.19.1 diff --git a/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch b/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch index 0289ac228..572c8014c 100644 --- a/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch +++ b/poky/meta/recipes-graphics/eglinfo/files/0001-Check-for-libegl-using-pkg-config.patch @@ -1,22 +1,25 @@ -From 58d51d941d3f4dfa38be18282d3e285d76d9020d Mon Sep 17 00:00:00 2001 +From 17f5d2f574236f8c3459f9efadef2f0f6220a4dd Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Mon, 13 Aug 2018 15:46:53 -0700 Subject: [PATCH] Check for libegl using pkg-config Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +[Roman: patch has been rebased to 223817ee3798 ("Add Wayland support") + trivial merge conflicts resolved] +Signed-off-by: Roman Stratiienko <roman.stratiienko@globallogic.com> --- - wscript | 1 + - 1 file changed, 1 insertion(+) + wscript | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) -Index: git/wscript -=================================================================== ---- git.orig/wscript -+++ git/wscript -@@ -160,14 +160,9 @@ def configure_raspberrypi_device(conf, p - conf.env['PLATFORM_USELIBS'] += ["X11"] - elif platform == "fb": - conf.env['PLATFORM_SOURCE'] = ['src/platform_fb_raspberrypi.cpp'] +diff --git a/wscript b/wscript +index 0f6ec53..401f62e 100644 +--- a/wscript ++++ b/wscript +@@ -174,14 +174,9 @@ def configure_raspberrypi_device(conf, platform): + else: + conf.fatal('Unsupported Raspberry Pi platform "%s"' % platform) + return - conf.check_cxx(mandatory = 1, lib = ['GLESv2', 'EGL', 'bcm_host'], uselib_store = 'EGL') + conf.check_cfg(package='egl', args='--libs --cflags') import os @@ -29,3 +32,5 @@ Index: git/wscript conf.env['WITH_APIS'] = [] if check_gles2(conf): conf.env['WITH_APIS'] += ['GLES1', 'GLES2'] +-- +2.19.1 diff --git a/poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch b/poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch new file mode 100644 index 000000000..d9bce212f --- /dev/null +++ b/poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch @@ -0,0 +1,33 @@ +From ab9522177a8396a51812fdbebb6387df451a8499 Mon Sep 17 00:00:00 2001 +From: Robert Yang <liezhi.yang@windriver.com> +Date: Mon, 24 Dec 2018 11:03:58 +0800 +Subject: [PATCH] src/fccache.c: Fix define for HAVE_POSIX_FADVISE + +Otherwise, there would be build errors in the following 2 cases: +* define HAVE_POSIX_FADVISE +Or: +* undef HAVE_POSIX_FADVISE + +Upstream-Status: Backport [https://gitlab.freedesktop.org/fontconfig/fontconfig/commit/586e35450e9ca7c1dc647ceb9d75ac8ed08c5c16] + +Signed-off-by: Robert Yang <liezhi.yang@windriver.com> +--- + fccache.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/fccache.c b/src/fccache.c +index 6f3c68a..85cc4b4 100644 +--- a/src/fccache.c ++++ b/src/fccache.c +@@ -700,7 +700,7 @@ FcDirCacheMapFd (FcConfig *config, int fd, struct stat *fd_stat, struct stat *di + { + #if defined(HAVE_MMAP) || defined(__CYGWIN__) + cache = mmap (0, fd_stat->st_size, PROT_READ, MAP_SHARED, fd, 0); +-#if (HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) ++#if defined(HAVE_POSIX_FADVISE) && defined(POSIX_FADV_WILLNEED) + posix_fadvise (fd, 0, fd_stat->st_size, POSIX_FADV_WILLNEED); + #endif + if (cache == MAP_FAILED) +-- +2.7.4 + diff --git a/poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb b/poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb index cec524755..8fa739de2 100644 --- a/poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb +++ b/poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb @@ -23,6 +23,7 @@ DEPENDS = "expat freetype zlib gperf-native" SRC_URI = "http://fontconfig.org/release/fontconfig-${PV}.tar.gz \ file://revert-static-pkgconfig.patch \ file://0001-src-fcxml.c-avoid-double-free-of-filename.patch \ + file://0001-src-fccache.c-Fix-define-for-HAVE_POSIX_FADVISE.patch \ " SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb" @@ -41,6 +42,12 @@ do_install_append_class-target() { ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache } +do_install_append_class-nativesdk() { + # duplicate fc-cache for postinstall script + mkdir -p ${D}${libexecdir} + ln ${D}${bindir}/fc-cache ${D}${libexecdir}/${MLPREFIX}fc-cache +} + PACKAGES =+ "fontconfig-utils" FILES_${PN} =+ "${datadir}/xml/*" FILES_fontconfig-utils = "${bindir}/* ${libexecdir}/*" @@ -61,4 +68,4 @@ FONTCONFIG_FONT_DIRS ?= "no" EXTRA_OECONF = " --disable-docs --with-default-fonts=${datadir}/fonts --with-cache-dir=${FONTCONFIG_CACHE_DIR} --with-add-fonts=${FONTCONFIG_FONT_DIRS}" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch b/poky/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch new file mode 100644 index 000000000..64f3e2fd9 --- /dev/null +++ b/poky/meta/recipes-graphics/glew/glew/0001-Fixed-compilation-with-current-mesa-versions.patch @@ -0,0 +1,73 @@ +From 7f65a36866f4e24dd1446fe1c9d21424f28bcabd Mon Sep 17 00:00:00 2001 +From: Deve <deveee@gmail.com> +Date: Wed, 14 Nov 2018 21:07:29 +0100 +Subject: [PATCH] Fixed compilation with current mesa versions. + +As you can see in +https://cgit.freedesktop.org/mesa/mesa/tree/include/GL/glext.h +now the file uses __gl_glext_h_ instead of __glext_h_ +It's precisely caused by commit f7d42ee7d319256608ad60778f6787c140badada + +Backoprt notes: + +* The original patch adjusts auto/src/glew_head.h only +* include/GL/glew.h is not part of git repo and gets created on tarball + creation + +=> patch include/GL/glew.h either to cause the desired fix + +Upstream-Status: Backport [1] + +[1] https://github.com/nigels-com/glew/commit/7f65a36866f4e24dd1446fe1c9d21424f28bcabd + +Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> +--- + auto/src/glew_head.h | 3 ++- + include/GL/glew.h | 3 ++- + 2 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/auto/src/glew_head.h b/auto/src/glew_head.h +index c19cefb..8f313d9 100644 +--- a/auto/src/glew_head.h ++++ b/auto/src/glew_head.h +@@ -14,7 +14,7 @@ + #if defined(__REGAL_H__) + #error Regal.h included before glew.h + #endif +-#if defined(__glext_h_) || defined(__GLEXT_H_) ++#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) + #error glext.h included before glew.h + #endif + #if defined(__gl_ATI_h_) +@@ -30,6 +30,7 @@ + #define __X_GL_H + #define __glext_h_ + #define __GLEXT_H_ ++#define __gl_glext_h_ + #define __gl_ATI_h_ + + #if defined(_WIN32) +diff --git a/include/GL/glew.h b/include/GL/glew.h +index b5b6987..a9f9e4b 100644 +--- a/include/GL/glew.h ++++ b/include/GL/glew.h +@@ -93,7 +93,7 @@ + #if defined(__REGAL_H__) + #error Regal.h included before glew.h + #endif +-#if defined(__glext_h_) || defined(__GLEXT_H_) ++#if defined(__glext_h_) || defined(__GLEXT_H_) || defined(__gl_glext_h_) + #error glext.h included before glew.h + #endif + #if defined(__gl_ATI_h_) +@@ -109,6 +109,7 @@ + #define __X_GL_H + #define __glext_h_ + #define __GLEXT_H_ ++#define __gl_glext_h_ + #define __gl_ATI_h_ + + #if defined(_WIN32) +-- +2.20.1 + diff --git a/poky/meta/recipes-graphics/glew/glew_2.1.0.bb b/poky/meta/recipes-graphics/glew/glew_2.1.0.bb index be725e053..18e6909aa 100644 --- a/poky/meta/recipes-graphics/glew/glew_2.1.0.bb +++ b/poky/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -6,7 +6,8 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ - file://no-strip.patch" + file://no-strip.patch \ + file://0001-Fixed-compilation-with-current-mesa-versions.patch" SRC_URI[md5sum] = "b2ab12331033ddfaa50dc39345343980" SRC_URI[sha256sum] = "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb index b904d9353..4b292d8ea 100644 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.8.8.bb +++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.3.1.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=e021dd6dda6ff1e6b1044002fc662b9b \ DEPENDS = "glib-2.0 cairo fontconfig freetype" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" -SRC_URI[md5sum] = "81dbce82d6471ec2b2a627ce02d03e5d" -SRC_URI[sha256sum] = "a8e5c86e4d99e1cc9865ec1b8e9b05b98e413c2a885cd11f8e9bb9502dd3e3a9" +SRC_URI[md5sum] = "531de9df7c8a5405dd9c6a873fcee8c2" +SRC_URI[sha256sum] = "f205699d5b91374008d6f8e36c59e419ae2d9a7bb8c5d9f34041b9a5abcae468" inherit autotools pkgconfig lib_package gtk-doc @@ -27,12 +27,6 @@ EXTRA_OECONF = " \ --without-graphite2 \ " -do_configure_prepend() { - # This is ancient and can get used instead of the patched one we ship, - # so delete it. In 1.8.9 this should be removed upstream. - rm -f ${S}/m4/pkg.m4 -} - PACKAGES =+ "${PN}-icu ${PN}-icu-dev" LEAD_SONAME = "libharfbuzz.so" @@ -43,4 +37,4 @@ FILES_${PN}-icu-dev = "${libdir}/libharfbuzz-icu.la \ ${libdir}/pkgconfig/harfbuzz-icu.pc \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch b/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch index 44c2c768b..82fffe1e6 100644 --- a/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch +++ b/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-package_qa-error.patch @@ -1,4 +1,4 @@ -From 0a24f03a67425a7b58b3fd40d965c0c9801ae7a1 Mon Sep 17 00:00:00 2001 +From 5cf847b5bef8dc3f9f89bd09dd5af4e6603f393c Mon Sep 17 00:00:00 2001 From: Changqing Li <changqing.li@windriver.com> Date: Mon, 27 Aug 2018 16:10:55 +0800 Subject: [PATCH] libjpeg-turbo: fix package_qa error @@ -10,23 +10,23 @@ usr/bin/cjpeg contains probably-redundant RPATH /usr/lib Upstream-Status: Inappropriate[oe-specific] Signed-off-by: Changqing Li <changqing.li@windriver.com> +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> --- - CMakeLists.txt | 2 -- - 1 file changed, 2 deletions(-) + CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index 1719522..682cef1 100644 +index 2bc3458..ea3041e 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -109,8 +109,6 @@ endif() +@@ -189,10 +189,6 @@ endif() + report_option(ENABLE_SHARED "Shared libraries") + report_option(ENABLE_STATIC "Static libraries") - include(cmakescripts/GNUInstallDirs.cmake) - --set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) +-if(ENABLE_SHARED) +- set(CMAKE_INSTALL_RPATH ${CMAKE_INSTALL_FULL_LIBDIR}) +-endif() - - macro(report_directory var) - if(CMAKE_INSTALL_${var} STREQUAL CMAKE_INSTALL_FULL_${var}) - message(STATUS "CMAKE_INSTALL_${var} = ${CMAKE_INSTALL_${var}}") --- -2.7.4 - + if(WITH_12BIT) + set(WITH_ARITH_DEC 0) + set(WITH_ARITH_ENC 0) diff --git a/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch b/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch deleted file mode 100644 index 16767ebb6..000000000 --- a/poky/meta/recipes-graphics/jpeg/files/0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch +++ /dev/null @@ -1,119 +0,0 @@ -From d301019d0f23d12b9666d3d88b0859067a4ade77 Mon Sep 17 00:00:00 2001 -From: Changqing Li <changqing.li@windriver.com> -Date: Thu, 30 Aug 2018 15:08:23 +0800 -Subject: [PATCH] libjpeg-turbo: fix wrongly defined define HAVE_STDLIB_H - -when change build system from autotools to cmake, below -part is replace wrongly: - -"#undef HAVE_STDLIB_H" -should be change to "#cmakedefine HAVE_STDLIB_H 1" -not "#cmakedefine HAVE_STDLIB_H" - -otherwise, even if stdlib.h is found, output file -of configure_file() will define like: #define HAVE_STDLIB_H -but we need it as #define HAVE_STDLIB_H 1, since for -different defination of HAVE_STDLIB_H will cause below error: -error: "HAVE_STDLIB_H" redefined [-Werror] - -Upstream-Status: Submitted[https://github.com/libjpeg-turbo/libjpeg-turbo/pull/275] - -Signed-off-by: Changqing Li <changqing.li@windriver.com> ---- - jconfig.h.in | 28 ++++++++++++++-------------- - jconfigint.h.in | 4 ++-- - 2 files changed, 16 insertions(+), 16 deletions(-) - -diff --git a/jconfig.h.in b/jconfig.h.in -index 2842754..18a69a4 100644 ---- a/jconfig.h.in -+++ b/jconfig.h.in -@@ -10,16 +10,16 @@ - #define LIBJPEG_TURBO_VERSION_NUMBER @LIBJPEG_TURBO_VERSION_NUMBER@ - - /* Support arithmetic encoding */ --#cmakedefine C_ARITH_CODING_SUPPORTED -+#cmakedefine C_ARITH_CODING_SUPPORTED 1 - - /* Support arithmetic decoding */ --#cmakedefine D_ARITH_CODING_SUPPORTED -+#cmakedefine D_ARITH_CODING_SUPPORTED 1 - - /* Support in-memory source/destination managers */ --#cmakedefine MEM_SRCDST_SUPPORTED -+#cmakedefine MEM_SRCDST_SUPPORTED 1 - - /* Use accelerated SIMD routines. */ --#cmakedefine WITH_SIMD -+#cmakedefine WITH_SIMD 1 - - /* - * Define BITS_IN_JSAMPLE as either -@@ -33,37 +33,37 @@ - #define BITS_IN_JSAMPLE @BITS_IN_JSAMPLE@ /* use 8 or 12 */ - - /* Define to 1 if you have the <locale.h> header file. */ --#cmakedefine HAVE_LOCALE_H -+#cmakedefine HAVE_LOCALE_H 1 - - /* Define to 1 if you have the <stddef.h> header file. */ --#cmakedefine HAVE_STDDEF_H -+#cmakedefine HAVE_STDDEF_H 1 - - /* Define to 1 if you have the <stdlib.h> header file. */ --#cmakedefine HAVE_STDLIB_H -+#cmakedefine HAVE_STDLIB_H 1 - - /* Define if you need to include <sys/types.h> to get size_t. */ --#cmakedefine NEED_SYS_TYPES_H -+#cmakedefine NEED_SYS_TYPES_H 1 - - /* Define if you have BSD-like bzero and bcopy in <strings.h> rather than - memset/memcpy in <string.h>. */ --#cmakedefine NEED_BSD_STRINGS -+#cmakedefine NEED_BSD_STRINGS 1 - - /* Define to 1 if the system has the type `unsigned char'. */ --#cmakedefine HAVE_UNSIGNED_CHAR -+#cmakedefine HAVE_UNSIGNED_CHAR 1 - - /* Define to 1 if the system has the type `unsigned short'. */ --#cmakedefine HAVE_UNSIGNED_SHORT -+#cmakedefine HAVE_UNSIGNED_SHORT 1 - - /* Compiler does not support pointers to undefined structures. */ --#cmakedefine INCOMPLETE_TYPES_BROKEN -+#cmakedefine INCOMPLETE_TYPES_BROKEN 1 - - /* Define if your (broken) compiler shifts signed values as if they were - unsigned. */ --#cmakedefine RIGHT_SHIFT_IS_UNSIGNED -+#cmakedefine RIGHT_SHIFT_IS_UNSIGNED 1 - - /* Define to 1 if type `char' is unsigned and you are not using gcc. */ - #ifndef __CHAR_UNSIGNED__ -- #cmakedefine __CHAR_UNSIGNED__ -+ #cmakedefine __CHAR_UNSIGNED__ 1 - #endif - - /* Define to empty if `const' does not conform to ANSI C. */ -diff --git a/jconfigint.h.in b/jconfigint.h.in -index 55df053..6c898ac 100644 ---- a/jconfigint.h.in -+++ b/jconfigint.h.in -@@ -17,10 +17,10 @@ - #define SIZEOF_SIZE_T @SIZE_T@ - - /* Define if your compiler has __builtin_ctzl() and sizeof(unsigned long) == sizeof(size_t). */ --#cmakedefine HAVE_BUILTIN_CTZL -+#cmakedefine HAVE_BUILTIN_CTZL 1 - - /* Define to 1 if you have the <intrin.h> header file. */ --#cmakedefine HAVE_INTRIN_H -+#cmakedefine HAVE_INTRIN_H 1 - - #if defined(_MSC_VER) && defined(HAVE_INTRIN_H) - #if (SIZEOF_SIZE_T == 8) --- -2.7.4 - diff --git a/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb index 282bf95e8..e1df754b7 100644 --- a/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.0.bb +++ b/poky/meta/recipes-graphics/jpeg/libjpeg-turbo_2.0.2.bb @@ -12,10 +12,10 @@ DEPENDS_append_x86_class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ file://0001-libjpeg-turbo-fix-package_qa-error.patch \ - file://0001-libjpeg-turbo-fix-wrongly-defined-define-HAVE_STDLIB.patch" + " -SRC_URI[md5sum] = "b12a3fcf1d078db38410f27718a91b83" -SRC_URI[sha256sum] = "778876105d0d316203c928fd2a0374c8c01f755d0a00b12a1c8934aeccff8868" +SRC_URI[md5sum] = "79f76fbfb0c6109631332762d10e16d2" +SRC_URI[sha256sum] = "acb8599fe5399af114287ee5907aea4456f8f2c1cc96d26c28aebfdf5ee82fed" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" @@ -31,6 +31,7 @@ inherit cmake pkgconfig # Add nasm-native dependency consistently for all build arches is hard EXTRA_OECMAKE_append_class-native = " -DWITH_SIMD=False" +EXTRA_OECMAKE_append_class-nativesdk = " -DWITH_SIMD=False" # Work around missing x32 ABI support EXTRA_OECMAKE_append_class-target = " ${@bb.utils.contains("TUNE_FEATURES", "mx32", "-DWITH_SIMD=False", "", d)}" @@ -53,4 +54,4 @@ FILES_jpeg-tools = "${bindir}/*" DESCRIPTION_libturbojpeg = "A SIMD-accelerated JPEG codec which provides only TurboJPEG APIs" FILES_libturbojpeg = "${libdir}/libturbojpeg.so.*" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/kmscube/kmscube_git.bb b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb index 46aeeb017..b2dd6b30b 100644 --- a/poky/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -2,17 +2,20 @@ DESCRIPTION = "Demo application to showcase 3D graphics using kms and gbm" HOMEPAGE = "https://cgit.freedesktop.org/mesa/kmscube/" LICENSE = "MIT" SECTION = "graphics" -DEPENDS = "virtual/libgles2 virtual/egl libdrm gstreamer1.0 gstreamer1.0-plugins-base" +DEPENDS = "virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "9dcce71e603616ee7a54707e932f962cdf8fb20a" +SRCREV = "d8da3dcfdfe33ee525cf562e928a5266ac69843c" SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git \ file://detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch" UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" -inherit autotools pkgconfig distro_features_check +inherit meson pkgconfig distro_features_check REQUIRED_DISTRO_FEATURES = "opengl" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[gstreamer] = "-Dgstreamer=enabled,-Dgstreamer=disabled,gstreamer1.0 gstreamer1.0-plugins-base" diff --git a/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb index 106721226..dd706a960 100644 --- a/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.2.bb +++ b/poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.3.bb @@ -7,16 +7,32 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ " -SRC_URI[md5sum] = "4a6b9e581da229dee74c2263c84b1eca" -SRC_URI[sha256sum] = "a9562386519eb3fd7f03209f279f697a8cba520d3c155d6e253c3e138beca7d8" +SRC_URI[md5sum] = "e2845de8d2782b2d31c01ae8d7cd4cbb" +SRC_URI[sha256sum] = "002958c5528321edd53440235d3c44e71b5b1e09b9177e8daf677450b6c4433d" UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" inherit meson pkgconfig distro_features_check REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES_class-native = "" +REQUIRED_DISTRO_FEATURES_class-nativesdk = "" PACKAGECONFIG[egl] = "-Degl=yes, -Degl=no, virtual/egl" PACKAGECONFIG[x11] = "-Dglx=yes, -Dglx=no, virtual/libx11 virtual/libgl" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)} egl" EXTRA_OEMESON += "-Dtests=false" + +PACKAGECONFIG_class-native = "egl" +PACKAGECONFIG_class-nativesdk = "egl" + +BBCLASSEXTEND = "native nativesdk" + +# This will ensure that dlopen will attempt only GL libraries provided by host +do_install_append_class-native() { + chrpath --delete ${D}${libdir}/*.so +} + +do_install_append_class-nativesdk() { + chrpath --delete ${D}${libdir}/*.so +} diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch b/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch deleted file mode 100644 index 9b32b3788..000000000 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2/0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch +++ /dev/null @@ -1,141 +0,0 @@ -From c215ba1d52a3d4ef03af3ab1a5baa1863f812aed Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Fri, 24 Aug 2018 23:10:25 +0200 -Subject: [PATCH] GLES2: Get sin/cos out of vertex shader -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The only place angle is activated and causes effect is RenderCopyEx. All other -methods which use vertex shader, leave angle disabled and cause useless sin/cos -calculation in shader. - -To get around shader's interface is changed to a vector that contains results -of sin and cos. To behave properly when disabled, cos value is set with offset --1.0 making 0.0 default when deactivated. - -As nice side effect it simplifies GLES2_UpdateVertexBuffer: All attributes are -vectors now. - -Additional background: - -* On RaspberryPi it gives a performace win for operations. Tested with - [1] numbers go down for 5-10% (not easy to estimate due to huge variation). -* SDL_RenderCopyEx was tested with [2] -* It works around left rotated display caused by low accuracy sin implemetation - in RaspberryPi/VC4 [3] - -Upstream-Status: Accepted [4] - -[1] https://github.com/schnitzeltony/sdl2box -[2] https://github.com/schnitzeltony/sdl2rendercopyex -[3] https://github.com/anholt/mesa/issues/110 -[4] https://hg.libsdl.org/SDL/rev/e5a666405750 - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - src/render/opengles2/SDL_render_gles2.c | 17 ++++++++++++----- - src/render/opengles2/SDL_shaders_gles2.c | 14 +++++++++----- - 2 files changed, 21 insertions(+), 10 deletions(-) - -diff --git a/src/render/opengles2/SDL_render_gles2.c b/src/render/opengles2/SDL_render_gles2.c -index 14671f7c8..7c54a7333 100644 ---- a/src/render/opengles2/SDL_render_gles2.c -+++ b/src/render/opengles2/SDL_render_gles2.c -@@ -1530,7 +1530,7 @@ GLES2_UpdateVertexBuffer(SDL_Renderer *renderer, GLES2_Attribute attr, - GLES2_DriverContext *data = (GLES2_DriverContext *)renderer->driverdata; - - #if !SDL_GLES2_USE_VBOS -- data->glVertexAttribPointer(attr, attr == GLES2_ATTRIBUTE_ANGLE ? 1 : 2, GL_FLOAT, GL_FALSE, 0, vertexData); -+ data->glVertexAttribPointer(attr, 2, GL_FLOAT, GL_FALSE, 0, vertexData); - #else - if (!data->vertex_buffers[attr]) { - data->glGenBuffers(1, &data->vertex_buffers[attr]); -@@ -1545,7 +1545,7 @@ GLES2_UpdateVertexBuffer(SDL_Renderer *renderer, GLES2_Attribute attr, - data->glBufferSubData(GL_ARRAY_BUFFER, 0, dataSizeInBytes, vertexData); - } - -- data->glVertexAttribPointer(attr, attr == GLES2_ATTRIBUTE_ANGLE ? 1 : 2, GL_FLOAT, GL_FALSE, 0, 0); -+ data->glVertexAttribPointer(attr, 2, GL_FLOAT, GL_FALSE, 0, 0); - #endif - - return 0; -@@ -1853,6 +1853,8 @@ GLES2_RenderCopy(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *s - return GL_CheckError("", renderer); - } - -+#define PI 3.14159265f -+ - static int - GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect *srcrect, - const SDL_FRect *dstrect, const double angle, const SDL_FPoint *center, const SDL_RendererFlip flip) -@@ -1861,8 +1863,9 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect - GLfloat vertices[8]; - GLfloat texCoords[8]; - GLfloat translate[8]; -- GLfloat fAngle[4]; -+ GLfloat fAngle[8]; - GLfloat tmp; -+ float radian_angle; - - GLES2_ActivateRenderer(renderer); - -@@ -1872,7 +1875,11 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect - - data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_CENTER); - data->glEnableVertexAttribArray(GLES2_ATTRIBUTE_ANGLE); -- fAngle[0] = fAngle[1] = fAngle[2] = fAngle[3] = (GLfloat)(360.0f - angle); -+ -+ radian_angle = PI * (360.0f - angle) / 180.f; -+ fAngle[0] = fAngle[2] = fAngle[4] = fAngle[6] = (GLfloat)sin(radian_angle); -+ /* render expects cos value - 1 (see GLES2_VertexSrc_Default_) */ -+ fAngle[1] = fAngle[3] = fAngle[5] = fAngle[7] = (GLfloat)cos(radian_angle) - 1.0f; - /* Calculate the center of rotation */ - translate[0] = translate[2] = translate[4] = translate[6] = (center->x + dstrect->x); - translate[1] = translate[3] = translate[5] = translate[7] = (center->y + dstrect->y); -@@ -1901,7 +1908,7 @@ GLES2_RenderCopyEx(SDL_Renderer *renderer, SDL_Texture *texture, const SDL_Rect - data->glVertexAttribPointer(GLES2_ATTRIBUTE_CENTER, 2, GL_FLOAT, GL_FALSE, 0, translate); - data->glVertexAttribPointer(GLES2_ATTRIBUTE_POSITION, 2, GL_FLOAT, GL_FALSE, 0, vertices);*/ - -- GLES2_UpdateVertexBuffer(renderer, GLES2_ATTRIBUTE_ANGLE, fAngle, 4 * sizeof(GLfloat)); -+ GLES2_UpdateVertexBuffer(renderer, GLES2_ATTRIBUTE_ANGLE, fAngle, 8 * sizeof(GLfloat)); - GLES2_UpdateVertexBuffer(renderer, GLES2_ATTRIBUTE_CENTER, translate, 8 * sizeof(GLfloat)); - GLES2_UpdateVertexBuffer(renderer, GLES2_ATTRIBUTE_POSITION, vertices, 8 * sizeof(GLfloat)); - -diff --git a/src/render/opengles2/SDL_shaders_gles2.c b/src/render/opengles2/SDL_shaders_gles2.c -index b0bcdff25..f428a4945 100644 ---- a/src/render/opengles2/SDL_shaders_gles2.c -+++ b/src/render/opengles2/SDL_shaders_gles2.c -@@ -30,20 +30,24 @@ - /************************************************************************************************* - * Vertex/fragment shader source * - *************************************************************************************************/ -- -+/* Notes on a_angle: -+ * It is a vector containing sin and cos for rotation matrix -+ * To get correct rotation for most cases when a_angle is disabled cos -+ value is decremented by 1.0 to get proper output with 0.0 which is -+ default value -+*/ - static const Uint8 GLES2_VertexSrc_Default_[] = " \ - uniform mat4 u_projection; \ - attribute vec2 a_position; \ - attribute vec2 a_texCoord; \ -- attribute float a_angle; \ -+ attribute vec2 a_angle; \ - attribute vec2 a_center; \ - varying vec2 v_texCoord; \ - \ - void main() \ - { \ -- float angle = radians(a_angle); \ -- float c = cos(angle); \ -- float s = sin(angle); \ -+ float s = a_angle[0]; \ -+ float c = a_angle[1] + 1.0; \ - mat2 rotationMatrix = mat2(c, -s, s, c); \ - vec2 position = rotationMatrix * (a_position - a_center) + a_center; \ - v_texCoord = a_texCoord; \ --- -2.14.4 - diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb index 812a9abf3..c741cfb24 100644 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb +++ b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.9.bb @@ -14,13 +14,12 @@ PROVIDES = "virtual/libsdl2" SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ file://more-gen-depends.patch \ - file://0001-GLES2-Get-sin-cos-out-of-vertex-shader.patch \ " S = "${WORKDIR}/SDL2-${PV}" -SRC_URI[md5sum] = "3800d705cef742c6a634f202c37f263f" -SRC_URI[sha256sum] = "edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec" +SRC_URI[md5sum] = "f2ecfba915c54f7200f504d8b48a5dfe" +SRC_URI[sha256sum] = "255186dc676ecd0c1dbf10ec8a2cc5d6869b5079d8a38194c2aecdff54b324b1" inherit autotools lib_package binconfig pkgconfig @@ -47,6 +46,8 @@ PACKAGECONFIG ??= " \ PACKAGECONFIG[alsa] = "--enable-alsa --disable-alsatest,--disable-alsa,alsa-lib," PACKAGECONFIG[directfb] = "--enable-video-directfb,--disable-video-directfb,directfb" PACKAGECONFIG[gles2] = "--enable-video-opengles,--disable-video-opengles,virtual/libgles2" +PACKAGECONFIG[jack] = "--enable-jack,--disable-jack,jack" +PACKAGECONFIG[kmsdrm] = "--enable-video-kmsdrm,--disable-video-kmsdrm,libdrm virtual/libgbm" PACKAGECONFIG[opengl] = "--enable-video-opengl,--disable-video-opengl,virtual/libgl" PACKAGECONFIG[pulseaudio] = "--enable-pulseaudio,--disable-pulseaudio,pulseaudio" PACKAGECONFIG[tslib] = "--enable-input-tslib,--disable-input-tslib,tslib" diff --git a/poky/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch b/poky/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch new file mode 100644 index 000000000..01fb71913 --- /dev/null +++ b/poky/meta/recipes-graphics/libva/libva-utils/0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch @@ -0,0 +1,35 @@ +From 8fc14e4bc81885b80c3072e549c2e6f59533d7ef Mon Sep 17 00:00:00 2001 +From: Anuj Mittal <anuj.mittal@intel.com> +Date: Fri, 8 Feb 2019 11:45:55 +0800 +Subject: [PATCH] Build sfcsample only when X11 backend is enabled + +See: https://github.com/intel/libva-utils/pull/149, and +https://github.com/intel/libva-utils/issues/150 + +Upstream-Status: Submitted + +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> +--- + Makefile.am | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/Makefile.am b/Makefile.am +index d28175a..e294e25 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -24,10 +24,11 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} + + AUTOMAKE_OPTIONS = foreign + +-SUBDIRS = common decode encode vainfo videoprocess vendor/intel vendor/intel/sfcsample ++SUBDIRS = common decode encode vainfo videoprocess vendor/intel + + if USE_X11 + SUBDIRS += putsurface ++SUBDIRS += vendor/intel/sfcsample + else + if USE_WAYLAND + SUBDIRS += putsurface +-- +2.17.1 + diff --git a/poky/meta/recipes-graphics/libva/libva-utils_2.2.0.bb b/poky/meta/recipes-graphics/libva/libva-utils_2.4.0.bb index e35085cb9..7b764314b 100644 --- a/poky/meta/recipes-graphics/libva/libva-utils_2.2.0.bb +++ b/poky/meta/recipes-graphics/libva/libva-utils_2.4.0.bb @@ -14,9 +14,12 @@ SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" -SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "93b58aa5b14c16f4bace8a45dc255ec9" -SRC_URI[sha256sum] = "ed7a6ed1fab657df4e83ea11f90310efcf31c27828f32d65351a28ca3c404dc0" +SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2 \ + file://0001-Build-sfcsample-only-when-X11-backend-is-enabled.patch \ + " + +SRC_URI[md5sum] = "f5374c4c32ce136e50aea0267887aed5" +SRC_URI[sha256sum] = "5b7d1954b40fcb2c0544be20125c71a0852049715ab85a3e8aba60434a40c6b3" UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" diff --git a/poky/meta/recipes-graphics/libva/libva_2.2.0.bb b/poky/meta/recipes-graphics/libva/libva_2.4.0.bb index 11e57e0eb..ffa1ab8f7 100644 --- a/poky/meta/recipes-graphics/libva/libva_2.2.0.bb +++ b/poky/meta/recipes-graphics/libva/libva_2.4.0.bb @@ -19,8 +19,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" -SRC_URI[md5sum] = "92d04ad1700136dc75b1e5f47516e704" -SRC_URI[sha256sum] = "6f6ca04c785544d30d315ef130a6aeb9435b75f934d7fbe0e4e9ba6084ce4ef2" +SRC_URI[md5sum] = "cfc69c2a5f526dd1858e098fb8eebfa6" +SRC_URI[sha256sum] = "99263056c21593a26f2ece812aee6fe60142b49e6cd46cb33c8dddf18fc19391" UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" diff --git a/poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb b/poky/meta/recipes-graphics/menu-cache/menu-cache_1.1.0.bb index 71540cf1d..ddbbd9406 100644 --- a/poky/meta/recipes-graphics/menu-cache/menu-cache_1.0.2.bb +++ b/poky/meta/recipes-graphics/menu-cache/menu-cache_1.1.0.bb @@ -10,9 +10,9 @@ DEPENDS = "glib-2.0 libfm-extra" SRC_URI = "${SOURCEFORGE_MIRROR}/lxde/menu-cache-${PV}.tar.xz" -SRC_URI[md5sum] = "8dde7a3f5bd9798d0129d1979a5d7640" -SRC_URI[sha256sum] = "6f83edf2de34f83e701dcb52145d755250a5677580cd413476cc4d7f2d2012d5" +SRC_URI[md5sum] = "99999a0bca48b980105208760c8fd893" +SRC_URI[sha256sum] = "ed02eb459dcb398f69b9fa5bf4dd813020405afc84331115469cdf7be9273ec7" -UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.0/" +UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/lxde/files/menu-cache/1.1/" inherit autotools gettext pkgconfig gtk-doc diff --git a/poky/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch b/poky/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch index a50d2a2ba..d065e2285 100644 --- a/poky/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch +++ b/poky/meta/recipes-graphics/mesa/files/0001-Simplify-wayland-scanner-lookup.patch @@ -1,7 +1,7 @@ -From 7e8e0f8a8ac2425e19a2f340c9e3da9345f25940 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Tue, 15 Nov 2016 15:20:49 +0200 -Subject: [PATCH 1/6] Simplify wayland-scanner lookup +From e53837ad7b01364f34a533b95f4817c1795789de Mon Sep 17 00:00:00 2001 +From: Fabio Berton <fabio.berton@ossystems.com.br> +Date: Wed, 20 Feb 2019 16:17:00 -0300 +Subject: [PATCH 1/4] Simplify wayland-scanner lookup Organization: O.S. Systems Software LTDA. Don't use pkg-config to lookup the path of a binary that's in the path. @@ -12,21 +12,26 @@ PKG_CONFIG_SYSROOT_DIR. Upstream-Status: Pending Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> --- configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/configure.ac b/configure.ac -index 14f1af2b2f..916d0bd207 100644 +index 1ef68fe68e6..1816a4cd475 100644 --- a/configure.ac +++ b/configure.ac -@@ -1825,12 +1825,7 @@ for plat in $platforms; do - PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) +@@ -1854,16 +1854,11 @@ for plat in $platforms; do + fi WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner`, - WAYLAND_SCANNER='') + PKG_CHECK_EXISTS([wayland-scanner >= 1.15], + AC_SUBST(SCANNER_ARG, 'private-code'), + AC_SUBST(SCANNER_ARG, 'code')) + - if test "x$WAYLAND_SCANNER" = x; then - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) - fi @@ -35,5 +40,5 @@ index 14f1af2b2f..916d0bd207 100644 if test "x$WAYLAND_SCANNER" = "x:"; then AC_MSG_ERROR([wayland-scanner is needed to compile the wayland platform]) -- -2.18.0 +2.21.0 diff --git a/poky/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch b/poky/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch index ffb3bf7a6..aaeb0f11b 100644 --- a/poky/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch +++ b/poky/meta/recipes-graphics/mesa/files/0002-winsys-svga-drm-Include-sys-types.h.patch @@ -1,7 +1,7 @@ -From 7792f228991744a0396b8bf811e281dca86165d3 Mon Sep 17 00:00:00 2001 +From f212b6bed4bf265aec069c21cdc4b7c2d9cb32df Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Wed, 16 Aug 2017 18:58:20 -0700 -Subject: [PATCH 2/6] winsys/svga/drm: Include sys/types.h +Subject: [PATCH 2/4] winsys/svga/drm: Include sys/types.h Organization: O.S. Systems Software LTDA. vmw_screen.h uses dev_t which is defines in sys/types.h @@ -13,12 +13,13 @@ system headers Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Backport [7dfdfbf8c37e52e7b9b09f7d1d434edad3ebc864] Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> --- src/gallium/winsys/svga/drm/vmw_screen.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/gallium/winsys/svga/drm/vmw_screen.h b/src/gallium/winsys/svga/drm/vmw_screen.h -index f21cabb51f..4c972fdaa9 100644 +index a87c087d9c5..cb34fec48e7 100644 --- a/src/gallium/winsys/svga/drm/vmw_screen.h +++ b/src/gallium/winsys/svga/drm/vmw_screen.h @@ -41,6 +41,7 @@ @@ -30,5 +31,5 @@ index f21cabb51f..4c972fdaa9 100644 #define VMW_GMR_POOL_SIZE (16*1024*1024) #define VMW_QUERY_POOL_SIZE (8192) -- -2.18.0 +2.21.0 diff --git a/poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch b/poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch index 5e735ca10..96edc2172 100644 --- a/poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch +++ b/poky/meta/recipes-graphics/mesa/files/0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch @@ -1,7 +1,7 @@ -From 8b42fb47138f91d9378439ab716bac7701e4e326 Mon Sep 17 00:00:00 2001 +From ce7b9ff6517fda089f296b2af2c1c49604872514 Mon Sep 17 00:00:00 2001 From: Otavio Salvador <otavio@ossystems.com.br> Date: Tue, 5 Jun 2018 11:11:10 -0300 -Subject: [PATCH 3/6] Properly get LLVM version when using LLVM Git releases +Subject: [PATCH 3/4] Properly get LLVM version when using LLVM Git releases Organization: O.S. Systems Software LTDA. $ llvm-config-host --version @@ -13,15 +13,16 @@ doing Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> --- configure.ac | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac -index 916d0bd207..dd172f1ebe 100644 +index 1816a4cd475..13fed9daf59 100644 --- a/configure.ac +++ b/configure.ac -@@ -1090,7 +1090,7 @@ strip_unwanted_llvm_flags() { +@@ -1124,7 +1124,7 @@ strip_unwanted_llvm_flags() { llvm_set_environment_variables() { if test "x$LLVM_CONFIG" != xno; then @@ -30,7 +31,7 @@ index 916d0bd207..dd172f1ebe 100644 LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` LLVM_LIBDIR=`$LLVM_CONFIG --libdir` -@@ -2808,7 +2808,7 @@ detect_old_buggy_llvm() { +@@ -2870,7 +2870,7 @@ detect_old_buggy_llvm() { dnl ourselves. dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, @@ -40,5 +41,5 @@ index 916d0bd207..dd172f1ebe 100644 if test "x$llvm_have_one_so" = xyes; then -- -2.18.0 +2.21.0 diff --git a/poky/meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch b/poky/meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch deleted file mode 100644 index 8953c4a18..000000000 --- a/poky/meta/recipes-graphics/mesa/files/0004-Use-Python-3-to-execute-the-scripts.patch +++ /dev/null @@ -1,32 +0,0 @@ -From ebe6077a1d74e56b28249f71e8760295fa846ed2 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Fri, 29 Dec 2017 10:27:59 -0200 -Subject: [PATCH 4/6] Use Python 3 to execute the scripts -Organization: O.S. Systems Software LTDA. - -The MESA build system uses Python 2 but as OE-Core has moved away from -it, we change it to use Python 3 instead. - -Upstream-Status: Inappropriate [ configuration ] - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index dd172f1ebe..40cac36ac2 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -122,7 +122,7 @@ AM_PROG_CC_C_O - AC_PROG_NM - AM_PROG_AS - AX_CHECK_GNU_MAKE --AC_CHECK_PROGS([PYTHON2], [python2.7 python2 python]) -+AC_CHECK_PROGS([PYTHON2], [python3.5 python3 python]) - AC_PROG_SED - AC_PROG_MKDIR_P - --- -2.18.0 - diff --git a/poky/meta/recipes-graphics/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch b/poky/meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch index 0212922c5..45bcd466a 100644 --- a/poky/meta/recipes-graphics/mesa/files/0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch +++ b/poky/meta/recipes-graphics/mesa/files/0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch @@ -1,7 +1,7 @@ -From 754ccf89a732fc3da6e9bc62ebd6b28686ff3d26 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Wed, 29 Aug 2018 22:10:30 -0300 -Subject: [PATCH 6/6] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR +From 5489e1d22e18740a1924628c5c97096d48dcfbf8 Mon Sep 17 00:00:00 2001 +From: Fabio Berton <fabio.berton@ossystems.com.br> +Date: Fri, 15 Feb 2019 10:57:06 -0200 +Subject: [PATCH 4/4] use PKG_CHECK_VAR for defining WAYLAND_PROTOCOLS_DATADIR Organization: O.S. Systems Software LTDA. This allows to override the wayland-protocols pkgdatadir with the @@ -11,27 +11,28 @@ pkgconfig would return an absolute path in /usr/share/wayland-protocols for the pkgdatadir value, which is not suitable for cross-compiling. -Signed-off-by: Khem Raj <raj.khem@gmail.com> Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> --- configure.ac | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configure.ac b/configure.ac -index 40cac36ac2..728bbdcbc4 100644 +index 13fed9daf59..6cff8afb7cf 100644 --- a/configure.ac +++ b/configure.ac -@@ -1823,7 +1823,7 @@ for plat in $platforms; do - PKG_CHECK_MODULES([WAYLAND_CLIENT], [wayland-client >= $WAYLAND_REQUIRED]) - PKG_CHECK_MODULES([WAYLAND_SERVER], [wayland-server >= $WAYLAND_REQUIRED]) - PKG_CHECK_MODULES([WAYLAND_PROTOCOLS], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED]) +@@ -1852,7 +1852,7 @@ for plat in $platforms; do + if test "x$enable_egl" = xyes; then + PKG_CHECK_MODULES([WAYLAND_EGL], [wayland-egl-backend >= $WAYLAND_EGL_BACKEND_REQUIRED]) + fi - WAYLAND_PROTOCOLS_DATADIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` + PKG_CHECK_VAR([WAYLAND_PROTOCOLS_DATADIR], [wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], pkgdatadir) - AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner], [:]) - + PKG_CHECK_EXISTS([wayland-scanner >= 1.15], + AC_SUBST(SCANNER_ARG, 'private-code'), -- -2.18.0 +2.21.0 diff --git a/poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch b/poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch deleted file mode 100644 index d40e7b585..000000000 --- a/poky/meta/recipes-graphics/mesa/files/0005-dri-i965-Add-missing-time.h-include.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 9e0368af471af3a36e0eb526453f892598120065 Mon Sep 17 00:00:00 2001 -From: Otavio Salvador <otavio@ossystems.com.br> -Date: Wed, 6 Jun 2018 09:50:35 -0300 -Subject: [PATCH 5/6] dri: i965: Add missing time.h include -Organization: O.S. Systems Software LTDA. - -This fixes a build error when using musl: - -,---- -| In file included from .../src/mesa/drivers/dri/i965/intel_upload.c:33:0: -| .../src/mesa/drivers/dri/i965/brw_bufmgr.h:132:4: error: unknown type name 'time_t' -| time_t free_time; -| ^~~~~~ -`---- - -Upstream-Status: Backport [3c288da5eec81ee58b85927df18d9194ead8f5c2] -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - src/mesa/drivers/dri/i965/brw_bufmgr.h | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/src/mesa/drivers/dri/i965/brw_bufmgr.h b/src/mesa/drivers/dri/i965/brw_bufmgr.h -index 68f5e0c2c8..5b60a23763 100644 ---- a/src/mesa/drivers/dri/i965/brw_bufmgr.h -+++ b/src/mesa/drivers/dri/i965/brw_bufmgr.h -@@ -37,6 +37,7 @@ - #include <stdbool.h> - #include <stdint.h> - #include <stdio.h> -+#include <time.h> - #include "util/u_atomic.h" - #include "util/list.h" - --- -2.18.0 - diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb index 73267eb4f..d4b1c1c45 100644 --- a/poky/meta/recipes-graphics/mesa/mesa-gl_18.1.9.bb +++ b/poky/meta/recipes-graphics/mesa/mesa-gl_19.0.1.bb @@ -7,3 +7,4 @@ PROVIDES = "virtual/libgl virtual/mesa" S = "${WORKDIR}/mesa-${PV}" PACKAGECONFIG ??= "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" +PACKAGECONFIG_class-target = "opengl dri ${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index f47f1aa20..ece74974b 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -26,7 +26,9 @@ PROVIDES = " \ inherit autotools pkgconfig python3native gettext distro_features_check -ANY_OF_DISTRO_FEATURES = "opengl vulkan" +BBCLASSEXTEND = "native nativesdk" + +ANY_OF_DISTRO_FEATURES_class-target = "opengl vulkan" PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)} \ ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'drm', '', d)} \ @@ -40,26 +42,31 @@ EXTRA_OECONF = "--enable-shared-glapi \ --enable-glx-read-only-text \ PYTHON2=python2 \ --with-llvm-prefix=${STAGING_LIBDIR}/llvm${MESA_LLVM_RELEASE} \ - --with-platforms='${PLATFORMS}'" + --with-platforms='${PLATFORMS}' \ + --enable-autotools \ +" -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri', '', d)} \ +PACKAGECONFIG_class-target ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri gallium', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ " +PACKAGECONFIG_class-native ?= "gbm dri egl opengl" +PACKAGECONFIG_class-nativesdk ?= "gbm dri egl opengl" # "gbm" requires "dri", "opengl" PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm" -X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes" +X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" # "x11" requires "opengl" PACKAGECONFIG[x11] = "--enable-glx-tls,--disable-glx,${X11_DEPS}" PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc" PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" -DRIDRIVERS = "swrast" -DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" -DRIDRIVERS_append_x86-64 = ",radeon,r200,nouveau,i965,i915" +DRIDRIVERS_class-native = "swrast" +DRIDRIVERS_class-nativesdk = "swrast" +DRIDRIVERS_append_x86_class-target = ",radeon,r200,nouveau,i965,i915" +DRIDRIVERS_append_x86-64_class-target = ",radeon,r200,nouveau,i965,i915" # "dri" requires "opengl" PACKAGECONFIG[dri] = "--enable-dri --with-dri-drivers=${DRIDRIVERS}, --disable-dri, xorgproto libdrm" PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence" @@ -67,8 +74,8 @@ PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, xorgproto libxshmfence" # Vulkan drivers need dri3 enabled # radeon could be enabled as well but requires gallium-llvm with llvm >= 3.9 VULKAN_DRIVERS = "" -VULKAN_DRIVERS_append_x86 = ",intel" -VULKAN_DRIVERS_append_x86-64 = ",intel" +VULKAN_DRIVERS_append_x86_class-target = ",intel" +VULKAN_DRIVERS_append_x86-64_class-target = ",intel" PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers, python3-mako-native" PACKAGECONFIG[opengl] = "--enable-opengl, --disable-opengl" @@ -85,17 +92,21 @@ PACKAGECONFIG[imx] = "" GALLIUMDRIVERS = "swrast" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}" -GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" -PACKAGECONFIG[r600] = "" + +# radeonsi requires LLVM +GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" GALLIUMDRIVERS_LLVM33_ENABLED = "${@oe.utils.version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, d)}" GALLIUMDRIVERS_LLVM = "r300,svga,nouveau${@',${GALLIUMDRIVERS_LLVM33}' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" -GALLIUMDRIVERS_append_x86 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" -GALLIUMDRIVERS_append_x86-64 = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" -GALLIUMDRIVERS_append_x86 = ",virgl" -GALLIUMDRIVERS_append_x86-64 = ",virgl" + +PACKAGECONFIG[r600] = "" + +GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',${GALLIUMDRIVERS_LLVM}', '', d)}" +GALLIUMDRIVERS_append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}" +GALLIUMDRIVERS_append = ",virgl" + # keep --with-gallium-drivers separate, because when only one of gallium versions is enabled, other 2 were adding --without-gallium-drivers -PACKAGECONFIG[gallium] = "--enable-texture-float --with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" -MESA_LLVM_RELEASE ?= "6.0" +PACKAGECONFIG[gallium] = "--with-gallium-drivers=${GALLIUMDRIVERS}, --without-gallium-drivers" +MESA_LLVM_RELEASE ?= "8.0.0" PACKAGECONFIG[gallium-llvm] = "--enable-llvm --enable-llvm-shared-libs, --disable-llvm, llvm${MESA_LLVM_RELEASE} llvm-native \ ${@'elfutils' if ${GALLIUMDRIVERS_LLVM33_ENABLED} else ''}" export WANT_LLVM_RELEASE = "${MESA_LLVM_RELEASE}" @@ -141,6 +152,7 @@ do_install_append () { rm -f ${D}${libdir}/gallium-pipe/*.la rm -f ${D}${libdir}/gbm/*.la + # it was packaged in libdricore9.1.3-1 and preventing upgrades when debian.bbclass was used chrpath --delete ${D}${libdir}/dri/*_dri.so || true # libwayland-egl has been moved to wayland 1.15+ @@ -192,7 +204,7 @@ python mesa_populate_packages() { 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) + m = re.match(r'^(.*)_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) @@ -200,15 +212,14 @@ python mesa_populate_packages() { d.appendVar("RREPLACES_%s" % lib_name, pkg_name) pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe") - do_split_packages(d, pipe_drivers_root, '^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') + do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') } PACKAGESPLITFUNCS_prepend = "mesa_populate_packages " PACKAGES_DYNAMIC += "^mesa-driver-.*" -FILES_${PN} = "" -FILES_mesa-megadriver = "${libdir}/dri/* ${sysconfdir}" +FILES_mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d/00-mesa-defaults.conf" FILES_mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${datadir}/vulkan" FILES_libegl-mesa = "${libdir}/libEGL.so.*" FILES_libgbm = "${libdir}/libgbm.so.*" @@ -231,3 +242,8 @@ FILES_libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir} FILES_libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ ${libdir}/pkgconfig/xatracker.pc" + +# Fix upgrade path from mesa to mesa-megadriver +RREPLACES_mesa-megadriver = "mesa" +RCONFLICTS_mesa-megadriver = "mesa" +RPROVIDES_mesa-megadriver = "mesa" diff --git a/poky/meta/recipes-graphics/mesa/mesa_18.1.9.bb b/poky/meta/recipes-graphics/mesa/mesa_19.0.1.bb index 86d6a6bf3..d90be8a07 100644 --- a/poky/meta/recipes-graphics/mesa/mesa_18.1.9.bb +++ b/poky/meta/recipes-graphics/mesa/mesa_19.0.1.bb @@ -4,13 +4,11 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-Simplify-wayland-scanner-lookup.patch \ file://0002-winsys-svga-drm-Include-sys-types.h.patch \ file://0003-Properly-get-LLVM-version-when-using-LLVM-Git-releas.patch \ - file://0004-Use-Python-3-to-execute-the-scripts.patch \ - file://0005-dri-i965-Add-missing-time.h-include.patch \ - file://0006-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ + file://0004-use-PKG_CHECK_VAR-for-defining-WAYLAND_PROTOCOLS_DAT.patch \ " -SRC_URI[md5sum] = "2f8d2098ab478bc3907e42130577b54a" -SRC_URI[sha256sum] = "55f5778d58a710a63d6635f000535768faf7db9e8144dc0f4fd1989f936c1a83" +SRC_URI[md5sum] = "19636bb3da35c21f43040d31e575d5ce" +SRC_URI[sha256sum] = "6884163c0ea9e4c98378ab8fecd72fe7b5f437713a14471beda378df247999d4" #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/poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch b/poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch deleted file mode 100644 index 6784a105a..000000000 --- a/poky/meta/recipes-graphics/pango/pango/0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch +++ /dev/null @@ -1,147 +0,0 @@ -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/poky/meta/recipes-graphics/pango/pango/insensitive-diff.patch b/poky/meta/recipes-graphics/pango/pango/insensitive-diff.patch new file mode 100644 index 000000000..faaa96133 --- /dev/null +++ b/poky/meta/recipes-graphics/pango/pango/insensitive-diff.patch @@ -0,0 +1,28 @@ +Do case-insensitive diffs as the test is sensitive as to whether 0x0 is printed +as (null) or (NULL). + +Upstream-Status: Submitted [https://gitlab.gnome.org/GNOME/pango/merge_requests/44] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/tests/markup-parse.c b/tests/markup-parse.c +index 633f3e89..36d2c776 100644 +--- a/tests/markup-parse.c ++++ b/tests/markup-parse.c +@@ -217,7 +217,7 @@ diff_with_file (const char *file1, + GString *string, + GError **error) + { +- const char *command[] = { "diff", "-u", file1, NULL, NULL }; ++ const char *command[] = { "diff", "-u", "-i", file1, NULL, NULL }; + char *diff, *tmpfile; + int fd; + +@@ -237,7 +237,7 @@ diff_with_file (const char *file1, + goto done; + } + close (fd); +- command[3] = tmpfile; ++ command[4] = tmpfile; + + /* run diff command */ + g_spawn_sync (NULL, (char **)command, NULL, G_SPAWN_SEARCH_PATH, NULL, NULL, &diff, NULL, NULL, error); diff --git a/poky/meta/recipes-graphics/pango/pango_1.42.4.bb b/poky/meta/recipes-graphics/pango/pango_1.42.4.bb index 22fe3af15..d3357f82d 100644 --- a/poky/meta/recipes-graphics/pango/pango_1.42.4.bb +++ b/poky/meta/recipes-graphics/pango/pango_1.42.4.bb @@ -11,29 +11,38 @@ LICENSE = "LGPLv2.0+" LIC_FILES_CHKSUM = "file://COPYING;md5=3bf50002aefd002f49e7bb854063f7e7" +GNOMEBASEBUILDCLASS = "meson" + inherit gnomebase gtk-doc ptest-gnome upstream-version-is-even gobject-introspection SRC_URI += "file://run-ptest \ - file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ -" + file://insensitive-diff.patch" + SRC_URI[archive.md5sum] = "deb171a31a3ad76342d5195a1b5bbc7c" SRC_URI[archive.sha256sum] = "1d2b74cd63e8bd41961f2f8d952355aa0f9be6002b52c8aa7699d9f5da597c9d" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" +PACKAGECONFIG[x11] = ",,virtual/libx11 libxft" + +GTKDOC_ENABLE_FLAG = "-Denable_docs=true" +GTKDOC_DISABLE_FLAG = "-Denable_docs=false" + +GI_ENABLE_FLAG = "-Dgir=true" +GI_DISABLE_FLAG = "-Dgir=false" + +EXTRA_OEMESON_append_class-nativesdk = " ${GI_DISABLE_FLAG}" + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '${GI_ENABLE_FLAG}', \ + '${GI_DISABLE_FLAG}', d)} " + +EXTRA_OEMESON_append_class-target = " ${@bb.utils.contains('GTKDOC_ENABLED', 'True', '${GTKDOC_ENABLE_FLAG}', \ + '${GTKDOC_DISABLE_FLAG}', d)} " LEAD_SONAME = "libpango-1.0*" LIBV = "1.8.0" -# This binary needs to be compiled for the host architecture. This isn't pretty! -do_compile_prepend_class-target () { - if ${@bb.utils.contains('PTEST_ENABLED', '1', '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 -} - FILES_${PN} = "${bindir}/* ${libdir}/libpango*${SOLIBS}" FILES_${PN}-dev += "${libdir}/pango/${LIBV}/modules/*.la" @@ -42,4 +51,11 @@ RDEPENDS_${PN}-ptest += "liberation-fonts cantarell-fonts" RPROVIDES_${PN} += "pango-modules pango-module-indic-lang \ pango-module-basic-fc pango-module-arabic-lang" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" + +do_install_append () { + if [ "${PTEST_ENABLED}" != "1" ]; then + rm -rf ${D}${libexecdir}/installed-tests ${D}${datadir}/installed-tests + rmdir --ignore-fail-on-non-empty ${D}${libexecdir} ${D}${datadir} + fi +} diff --git a/poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch b/poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch index f851a92ce..57eda2e20 100644 --- a/poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch +++ b/poky/meta/recipes-graphics/piglit/piglit/0001-tests-Use-FE_UPWARD-only-if-its-defined-in-fenv.h.patch @@ -1,54 +1,75 @@ -From 0fc2c2932699cfd68be96c820fddfdd79b48b788 Mon Sep 17 00:00:00 2001 +Upstream-Status: Submitted [mailing list] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From 0e0a2a69261031d55d52b6045990e8982ea12912 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 +Subject: [PATCH] tests: only run rounding tests if FE_UPWARD is present -Fixes errors like +On ARM, musl does not define FE_* when the architecture does not have VFP (which +is the right interpretation). -tests/general/roundmode-pixelstore.c:82:19: error: 'FE_UPWARD' undeclared (first use in this function) - ret = fesetround(FE_UPWARD); - ^~~~~~~~~ +As these tests depend on calling fesetround(), skip the test if FE_UPWARD isn't +available. -Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Ross Burton <ross.burton@intel.com> --- -Upstream-Status: Pending - - tests/general/roundmode-getintegerv.c | 2 ++ - tests/general/roundmode-pixelstore.c | 2 ++ - 2 files changed, 4 insertions(+) + tests/general/roundmode-getintegerv.c | 12 ++++++++---- + tests/general/roundmode-pixelstore.c | 12 ++++++++---- + 2 files changed, 16 insertions(+), 8 deletions(-) diff --git a/tests/general/roundmode-getintegerv.c b/tests/general/roundmode-getintegerv.c -index 28ecfaf..5c27579 100644 +index 28ecfaf55..aa99044a1 100644 --- a/tests/general/roundmode-getintegerv.c +++ b/tests/general/roundmode-getintegerv.c -@@ -81,7 +81,9 @@ piglit_init(int argc, char **argv) +@@ -79,13 +79,17 @@ test(float val, int expect) + void + piglit_init(int argc, char **argv) { - int ret; +- int ret; bool pass = true; +- ret = fesetround(FE_UPWARD); +- if (ret != 0) { +- printf("Couldn't set rounding mode\n"); ++ +#ifdef FE_UPWARD - ret = fesetround(FE_UPWARD); -+#endif - if (ret != 0) { - printf("Couldn't set rounding mode\n"); ++ if (fesetround(FE_UPWARD) != 0) { ++ printf("Setting rounding mode failed\n"); piglit_report_result(PIGLIT_SKIP); + } ++#else ++ printf("Cannot set rounding mode\n"); ++ piglit_report_result(PIGLIT_SKIP); ++#endif + + pass = test(2.2, 2) && pass; + pass = test(2.8, 3) && pass; diff --git a/tests/general/roundmode-pixelstore.c b/tests/general/roundmode-pixelstore.c -index 9284f43..3fcb396 100644 +index 8a029b257..57ec11c09 100644 --- a/tests/general/roundmode-pixelstore.c +++ b/tests/general/roundmode-pixelstore.c -@@ -79,7 +79,9 @@ piglit_init(int argc, char **argv) +@@ -79,13 +79,17 @@ test(float val, int expect) + void + piglit_init(int argc, char **argv) { - int ret; +- int ret; bool pass = true; +- ret = fesetround(FE_UPWARD); +- if (ret != 0) { +- printf("Couldn't set rounding mode\n"); ++ +#ifdef FE_UPWARD - ret = fesetround(FE_UPWARD); -+#endif - if (ret != 0) { - printf("Couldn't set rounding mode\n"); ++ if (fesetround(FE_UPWARD) != 0) { ++ printf("Setting rounding mode failed\n"); piglit_report_result(PIGLIT_SKIP); + } ++#else ++ printf("Cannot set rounding mode\n"); ++ piglit_report_result(PIGLIT_SKIP); ++#endif + + pass = test(2.2, 2) && pass; + pass = test(2.8, 3) && pass; -- -1.8.3.1 +2.11.0 diff --git a/poky/meta/recipes-graphics/piglit/piglit/format-fix.patch b/poky/meta/recipes-graphics/piglit/piglit/format-fix.patch new file mode 100644 index 000000000..73d539fef --- /dev/null +++ b/poky/meta/recipes-graphics/piglit/piglit/format-fix.patch @@ -0,0 +1,69 @@ +Upstream-Status: Submitted [mailing list] +Signed-off-by: Ross Burton <ross.burton@intel.com> + +From f0c6981322807e179e39ce67aeebd42cf7a54d36 Mon Sep 17 00:00:00 2001 +From: Ross Burton <ross.burton@intel.com> +Date: Wed, 21 Nov 2018 12:44:36 +0000 +Subject: [PATCH] arb_texture_view: fix security format warnings + +If built with -Werror=format-security then Piglit fails to build: + +/tests/spec/arb_texture_view/rendering-layers-image.c:150:8: +error: format not a string literal and no format arguments [-Werror=format-security] + (desc)); \ + ^~~~~~ + +In this case test->uniform_type is being turned into a string using snprintf() +and then passed to piglit_report_subtest_result() which takes a format string, +but GCC can't verify the format. + +As _subtest_report() takes a format string, we can just remove the snprintf() +and let it construct the label. + +Also as X is used once and doesn't make the code clearer, just inline it. + +Signed-off-by: Ross Burton <ross.burton@intel.com> +--- + tests/spec/arb_texture_view/rendering-layers-image.c | 19 ++++++------------- + 1 file changed, 6 insertions(+), 13 deletions(-) + +diff --git a/tests/spec/arb_texture_view/rendering-layers-image.c b/tests/spec/arb_texture_view/rendering-layers-image.c +index 415b01657..86148075b 100644 +--- a/tests/spec/arb_texture_view/rendering-layers-image.c ++++ b/tests/spec/arb_texture_view/rendering-layers-image.c +@@ -142,26 +142,19 @@ test_render_layers(const struct test_info *test) + return pass; + } + +-#define X(f, desc) \ +- do { \ +- const bool subtest_pass = (f); \ +- piglit_report_subtest_result(subtest_pass \ +- ? PIGLIT_PASS : PIGLIT_FAIL, \ +- (desc)); \ +- pass = pass && subtest_pass; \ +- } while (0) +- + enum piglit_result + piglit_display(void) + { + bool pass = true; + for (int test_idx = 0; test_idx < ARRAY_SIZE(tests); test_idx++) { + const struct test_info *test = &tests[test_idx]; +- char test_name[128]; +- snprintf(test_name, sizeof(test_name), "layers rendering of %s", test->uniform_type); +- X(test_render_layers(test), test_name); ++ ++ const bool subtest_pass = test_render_layers(test); ++ ++ piglit_report_subtest_result(subtest_pass ? PIGLIT_PASS : PIGLIT_FAIL, ++ "layers rendering of %s", test->uniform_type); ++ pass = pass && subtest_pass; + } +-#undef X + pass = piglit_check_gl_error(GL_NO_ERROR) && pass; + return pass ? PIGLIT_PASS : PIGLIT_FAIL; + } +-- +2.11.0 + diff --git a/poky/meta/recipes-graphics/piglit/piglit_git.bb b/poky/meta/recipes-graphics/piglit/piglit_git.bb index 1f7c6f960..59d134801 100644 --- a/poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -6,11 +6,12 @@ SRC_URI = "git://anongit.freedesktop.org/piglit \ 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-use-proper-WAYLAND_INCLUDE_DIRS-variable.patch \ + file://format-fix.patch \ " UPSTREAM_CHECK_COMMITS = "1" -# From 2018-08-13 -SRCREV = "57859e15dc8ba4034348b04d0b72f213b74d6347" +# From 2018-10-26 +SRCREV = "b9066c7717af1d169a616c9e61706b99ff8515b5" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" @@ -51,3 +52,6 @@ RDEPENDS_${PN} = "waffle waffle-bin python3 python3-mako python3-json \ " INSANE_SKIP_${PN} += "dev-so already-stripped" + +# Can't be built with ccache +CCACHE_DISABLE = "1" diff --git a/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb b/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb index 412da4872..f5df9efa3 100644 --- a/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb +++ b/poky/meta/recipes-graphics/ttf-fonts/liberation-fonts_2.00.1.bb @@ -37,3 +37,5 @@ do_install () { PACKAGES = "${PN}" FILES_${PN} += "${sysconfdir} ${datadir}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch new file mode 100644 index 000000000..aa8d81484 --- /dev/null +++ b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-Makefile.am-explicitly-link-with-libdrm.patch @@ -0,0 +1,31 @@ +From d61f7073b8ce159d21811b291c22b273b040c330 Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Tue, 12 Feb 2019 12:04:52 +0100 +Subject: [PATCH] Makefile.am: explicitly link with libdrm + +Otherwise, a failure happens with gold linker: + +../src/.libs/libvirglrenderer.so: error: undefined reference to 'drmPrimeHandleToFD' + +https://errors.yoctoproject.org/Errors/Details/222046/ + +Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/153] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/Makefile.am | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/Makefile.am b/src/Makefile.am +index 9a0a44e..9b668c8 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,5 +1,6 @@ + SUBDIRS := gallium/auxiliary + AM_LDFLAGS = -lm \ ++ $(LIBDRM_LIBS) \ + $(GBM_LIBS) \ + $(EPOXY_LIBS) \ + $(X11_LIBS) \ +-- +2.17.1 + diff --git a/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch new file mode 100644 index 000000000..2b4ffa932 --- /dev/null +++ b/poky/meta/recipes-graphics/virglrenderer/virglrenderer/0001-vtest-add-missing-includes.patch @@ -0,0 +1,38 @@ +From 05c5c5f43fbffb3317bd9da27d414890d2ef493c Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Fri, 18 Jan 2019 13:47:23 +0100 +Subject: [PATCH] vtest: add missing includes + +This fixes build failures with musl C library + +Upstream-Status: Accepted [https://gitlab.freedesktop.org/virgl/virglrenderer/merge_requests/125] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + vtest/util.c | 1 + + vtest/vtest_server.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/vtest/util.c b/vtest/util.c +index 0d3c78f..c605253 100644 +--- a/vtest/util.c ++++ b/vtest/util.c +@@ -26,6 +26,7 @@ + #include <stdio.h> + #include <string.h> + #include <unistd.h> ++#include <sys/select.h> + + int vtest_wait_for_fd_read(int fd) + { +diff --git a/vtest/vtest_server.c b/vtest/vtest_server.c +index bc6c95f..010721f 100644 +--- a/vtest/vtest_server.c ++++ b/vtest/vtest_server.c +@@ -31,6 +31,7 @@ + #include <netinet/in.h> + #include <sys/un.h> + #include <fcntl.h> ++#include <string.h> + + #include "util.h" + #include "vtest.h" diff --git a/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb b/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb new file mode 100644 index 000000000..225a0b8b0 --- /dev/null +++ b/poky/meta/recipes-graphics/virglrenderer/virglrenderer_0.7.0.bb @@ -0,0 +1,22 @@ +SUMMARY = "VirGL virtual OpenGL renderer" +HOMEPAGE = "https://virgil3d.github.io/" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" + +DEPENDS = "libdrm mesa libepoxy" +SRCREV = "402c228861c9893f64cffbbcb4cb23044b8c721c" +SRC_URI = "git://anongit.freedesktop.org/virglrenderer \ + file://0001-vtest-add-missing-includes.patch \ + file://0001-Makefile.am-explicitly-link-with-libdrm.patch \ + " + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig distro_features_check + +BBCLASSEXTEND = "native nativesdk" + +REQUIRED_DISTRO_FEATURES = "opengl" +REQUIRED_DISTRO_FEATURES_class-native = "" +REQUIRED_DISTRO_FEATURES_class-nativesdk = "" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb index 5496f5396..02e4330cf 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan_1.1.73.0.bb @@ -4,13 +4,13 @@ that provides efficient access to modern GPUs. These packages \ provide only the common vendor-agnostic library loader, headers and \ the vulkaninfo utility." HOMEPAGE = "https://www.khronos.org/vulkan/" -BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers" +BUGTRACKER = "https://github.com/KhronosGroup/Vulkan-Loader" SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \ file://loader/loader.c;endline=25;md5=151b392f46568aaedb4ad22b246237ec" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.1.73 \ +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;nobranch=1 \ file://demos-Don-t-build-tri-or-cube.patch \ " SRCREV = "5998d6f444a85e6381b7a089ebf3f9e86482a31d" @@ -35,3 +35,6 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU RRECOMMENDS_${PN} = "mesa-vulkan-drivers" INSANE_SKIP_${PN}-dev += "dev-elf" + +# Can't be built with ccache +CCACHE_DISABLE = "1" diff --git a/poky/meta/recipes-graphics/wayland/libinput_1.11.3.bb b/poky/meta/recipes-graphics/wayland/libinput_1.12.6.bb index 12e2091c0..46366b751 100644 --- a/poky/meta/recipes-graphics/wayland/libinput_1.11.3.bb +++ b/poky/meta/recipes-graphics/wayland/libinput_1.12.6.bb @@ -9,8 +9,8 @@ DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ " -SRC_URI[md5sum] = "df6e877f11de4a9793511e9abfe7ef01" -SRC_URI[sha256sum] = "f31191d96e425b4f16319842279d65946d9d983dcd3d9e466ae1206aa10ecb06" +SRC_URI[md5sum] = "8cf10cc0fdfab865b105dd28283fa0fd" +SRC_URI[sha256sum] = "12b4023a3fc683d3d8127db573bdf925a2ef366615042f69c87e57c32a50f45d" UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" inherit meson pkgconfig lib_package diff --git a/poky/meta/recipes-graphics/wayland/wayland-protocols_1.16.bb b/poky/meta/recipes-graphics/wayland/wayland-protocols_1.17.bb index fc4b71117..ca8f06c55 100644 --- a/poky/meta/recipes-graphics/wayland/wayland-protocols_1.16.bb +++ b/poky/meta/recipes-graphics/wayland/wayland-protocols_1.17.bb @@ -11,8 +11,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ " -SRC_URI[md5sum] = "e0b523ff162e30bab46be1d65d527683" -SRC_URI[sha256sum] = "6b1485951fdcd36a960c870c46f28b03a3e5121fb46246916333ed07f78c98c5" +SRC_URI[md5sum] = "55ddd5fdb02b73b9de9559aaec267315" +SRC_URI[sha256sum] = "df1319cf9705643aea9fd16f9056f4e5b2471bd10c0cc3713d4a4cdc23d6812f" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" diff --git a/poky/meta/recipes-graphics/wayland/wayland_1.16.0.bb b/poky/meta/recipes-graphics/wayland/wayland_1.17.0.bb index 112ee1a25..d34bb3974 100644 --- a/poky/meta/recipes-graphics/wayland/wayland_1.16.0.bb +++ b/poky/meta/recipes-graphics/wayland/wayland_1.17.0.bb @@ -15,8 +15,8 @@ DEPENDS = "expat libxml2 libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://fixpathinpcfiles.patch \ " -SRC_URI[md5sum] = "0c215e53de71d6fb26f7102cdc6432d3" -SRC_URI[sha256sum] = "4e72c2b56109ccfb6610d776e465f4ca0af2280c9c2f7d5cc23f0ed2548752f5" +SRC_URI[md5sum] = "d91f970aea11fd549eae023d06f91af3" +SRC_URI[sha256sum] = "72aa11b8ac6e22f4777302c9251e8fec7655dc22f9d94ee676c6b276f95f91a4" UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" diff --git a/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch b/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch new file mode 100644 index 000000000..37617600d --- /dev/null +++ b/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator/0001-calibrator.hh-Include-string-to-get-std-string.patch @@ -0,0 +1,28 @@ +From 79bc507b48d4acd3dec8a85ab6b341b872d44a05 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 22:40:24 -0800 +Subject: [PATCH] calibrator.hh: Include <string> to get std::string + +Found with libc++ + +Upstream-Status: Submitted [https://github.com/tias/xinput_calibrator/pull/76] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/calibrator.hh | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/calibrator.hh b/src/calibrator.hh +index a6f9504..e75bcef 100644 +--- a/src/calibrator.hh ++++ b/src/calibrator.hh +@@ -29,6 +29,7 @@ + #include <X11/Xlib.h> + #include <stdio.h> + #include <vector> ++#include <string> + + // XXX: we currently don't handle lines that are longer than this + #define MAX_LINE_LEN 1024 +-- +2.20.1 + diff --git a/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb b/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb index 68e62ea6d..9873d3f33 100644 --- a/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb +++ b/poky/meta/recipes-graphics/xinput-calibrator/xinput-calibrator_git.bb @@ -14,7 +14,9 @@ REQUIRED_DISTRO_FEATURES = "x11" SRCREV = "03dadf55109bd43d3380f040debe9f82f66f2f35" SRC_URI = "git://github.com/tias/xinput_calibrator.git \ file://30xinput_calibrate.sh \ - file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch" + file://Allow-xinput_calibrator_pointercal.sh-to-be-run-as-n.patch \ + file://0001-calibrator.hh-Include-string-to-get-std-string.patch \ + " S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch b/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch index 6130959f8..53c0ac2e6 100644 --- a/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch +++ b/poky/meta/recipes-graphics/xorg-app/xev/diet-x11.patch @@ -4,79 +4,106 @@ Upstream-Status: Inappropriate [disable feature] xev.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) -Index: xev-1.2.0/xev.c +Index: xev-1.2.3/xev.c =================================================================== ---- xev-1.2.0.orig/xev.c -+++ xev-1.2.0/xev.c -@@ -116,7 +116,7 @@ do_KeyPress (XEvent *eventp) - nbytes = XLookupString (e, str, 256, &ks, NULL); +--- xev-1.2.3.orig/xev.c ++++ xev-1.2.3/xev.c +@@ -125,17 +125,6 @@ do_KeyPress(XEvent *eventp) + nbytes = XLookupString(e, str, 256, &ks, NULL); /* not supposed to call XmbLookupString on a key release event */ - if (e->type == KeyPress && xic) { -+ /*if (e->type == KeyPress && xic) { - do { - nmbbytes = XmbLookupString (xic, e, buf, bsize - 1, &ks, &status); - buf[nmbbytes] = '\0'; -@@ -126,7 +126,7 @@ do_KeyPress (XEvent *eventp) - buf = realloc (buf, bsize); - } - } while (status == XBufferOverflow); +- do { +- nmbbytes = XmbLookupString(xic, e, buf, bsize - 1, &ks, &status); +- buf[nmbbytes] = '\0'; +- +- if (status == XBufferOverflow) { +- bsize = nmbbytes + 1; +- buf = realloc(buf, bsize); +- } +- } while (status == XBufferOverflow); - } -+ }*/ if (ks == NoSymbol) - ksname = "NoSymbol"; -@@ -156,7 +156,7 @@ do_KeyPress (XEvent *eventp) + ksname = "NoSymbol"; +@@ -168,16 +157,6 @@ do_KeyPress(XEvent *eventp) } /* not supposed to call XmbLookupString on a key release event */ - if (e->type == KeyPress && xic) { -+ /*if (e->type == KeyPress && xic) { - printf (" XmbLookupString gives %d bytes: ", nmbbytes); - if (nmbbytes > 0) { - dump (buf, nmbbytes); -@@ -164,7 +164,7 @@ do_KeyPress (XEvent *eventp) - } else { - printf ("\n"); +- printf(" XmbLookupString gives %d bytes: ", nmbbytes); +- if (nmbbytes > 0) { +- dump(buf, nmbbytes); +- printf(" \"%s\"\n", buf); +- } +- else { +- printf("\n"); +- } +- } + + printf(" XFilterEvent returns: %s\n", + XFilterEvent(eventp, e->window) ? "True" : "False"); +@@ -1141,7 +1120,7 @@ parse_event_mask(const char *s, long eve + if (s) + return True; } - } -+ } */ ++ } - printf (" XFilterEvent returns: %s\n", - XFilterEvent (eventp, e->window) ? "True" : "False"); -@@ -1015,7 +1015,7 @@ main (int argc, char **argv) - fprintf (stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); + if (s != NULL) + fprintf(stderr, "%s: unrecognized event mask '%s'\n", ProgramName, s); +@@ -1288,37 +1267,6 @@ main(int argc, char **argv) + fprintf(stderr, "%s: XSetLocaleModifiers failed\n", ProgramName); } -- xim = XOpenIM (dpy, NULL, NULL, NULL); -+ /*xim = XOpenIM (dpy, NULL, NULL, NULL); - if (xim == NULL) { - fprintf (stderr, "%s: XOpenIM failed\n", ProgramName); - } -@@ -1042,7 +1042,7 @@ main (int argc, char **argv) - } - XFree (xim_styles); - } +- xim = XOpenIM(dpy, NULL, NULL, NULL); +- if (xim == NULL) { +- fprintf(stderr, "%s: XOpenIM failed\n", ProgramName); - } -+ }*/ - - screen = DefaultScreen (dpy); +- +- if (xim) { +- imvalret = XGetIMValues(xim, XNQueryInputStyle, &xim_styles, NULL); +- if (imvalret != NULL || xim_styles == NULL) { +- fprintf(stderr, "%s: input method doesn't support any styles\n", +- ProgramName); +- } +- +- if (xim_styles) { +- xim_style = 0; +- for (i = 0; i < xim_styles->count_styles; i++) { +- if (xim_styles->supported_styles[i] == +- (XIMPreeditNothing | XIMStatusNothing)) { +- xim_style = xim_styles->supported_styles[i]; +- break; +- } +- } +- +- if (xim_style == 0) { +- fprintf(stderr, +- "%s: input method doesn't support the style we support\n", +- ProgramName); +- } +- XFree(xim_styles); +- } +- } +- + screen = DefaultScreen(dpy); -@@ -1109,7 +1109,7 @@ main (int argc, char **argv) - printf ("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); + attr.event_mask = event_masks[EVENT_MASK_INDEX_CORE]; +@@ -1373,16 +1321,6 @@ main(int argc, char **argv) + printf("Outer window is 0x%lx, inner window is 0x%lx\n", w, subw); } - if (xim && xim_style) { -+ /*if (xim && xim_style) { - xic = XCreateIC (xim, - XNInputStyle, xim_style, - XNClientWindow, w, -@@ -1119,7 +1119,7 @@ main (int argc, char **argv) - if (xic == NULL) { - fprintf (stderr, "XCreateIC failed\n"); - } +- xic = XCreateIC(xim, +- XNInputStyle, xim_style, +- XNClientWindow, w, XNFocusWindow, w, NULL); +- +- if (xic == NULL) { +- fprintf(stderr, "XCreateIC failed\n"); +- } - } -+ }*/ - - have_rr = XRRQueryExtension (dpy, &rr_event_base, &rr_error_base); +- + have_rr = XRRQueryExtension(dpy, &rr_event_base, &rr_error_base); if (have_rr) { + int rr_major, rr_minor; diff --git a/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb b/poky/meta/recipes-graphics/xorg-app/xev_1.2.3.bb index 0705b7f7f..6a69e747a 100644 --- a/poky/meta/recipes-graphics/xorg-app/xev_1.2.2.bb +++ b/poky/meta/recipes-graphics/xorg-app/xev_1.2.3.bb @@ -14,5 +14,5 @@ DEPENDS += "libxrandr xorgproto" SRC_URI += "file://diet-x11.patch" -SRC_URI[md5sum] = "249bdde90f01c0d861af52dc8fec379e" -SRC_URI[sha256sum] = "d94ae62a6c1af56c2961d71f5782076ac4116f0fa4e401420ac7e0db33dc314f" +SRC_URI[md5sum] = "eec82a5d4b599736f0fa637e96136746" +SRC_URI[sha256sum] = "66bc4f1cfa1946d62612737815c34164e4ce40fcebd2c9e1d7e7a1117ad3ad09" diff --git a/poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb b/poky/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb index 77490f548..26bec3f0d 100644 --- a/poky/meta/recipes-graphics/xorg-app/xhost_1.0.7.bb +++ b/poky/meta/recipes-graphics/xorg-app/xhost_1.0.8.bb @@ -13,8 +13,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=8fbed71dddf48541818cef8079124199" DEPENDS += "libxmu libxau" PE = "1" -SRC_URI[md5sum] = "f5d490738b148cb7f2fe760f40f92516" -SRC_URI[sha256sum] = "93e619ee15471f576cfb30c663e18f5bc70aca577a63d2c2c03f006a7837c29a" +SRC_URI[md5sum] = "a48c72954ae6665e0616f6653636da8c" +SRC_URI[sha256sum] = "a2dc3c579e13674947395ef8ccc1b3763f89012a216c2cc6277096489aadc396" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb b/poky/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb index dc2a06b58..5626ebbd5 100644 --- a/poky/meta/recipes-graphics/xorg-app/xinit_1.4.0.bb +++ b/poky/meta/recipes-graphics/xorg-app/xinit_1.4.1.bb @@ -12,8 +12,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=18f01e7b39807bebe2b8df101a039b68" PE = "1" -SRC_URI[md5sum] = "2da154b2f80ca9637b1a17b13af0880c" -SRC_URI[sha256sum] = "230835eef2f5978a1e1344928168119373f6df1d0a32c09515e545721ee582ef" +SRC_URI[md5sum] = "6d506ab2efc17a08e87778654e099d37" +SRC_URI[sha256sum] = "de9b8f617b68a70f6caf87da01fcf0ebd2b75690cdcba9c921d0ef54fa54abb9" EXTRA_OECONF = "ac_cv_path_MCOOKIE=${bindir}/mcookie" diff --git a/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb b/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb index 2deac6a05..7dedb03a2 100644 --- a/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.9.bb +++ b/poky/meta/recipes-graphics/xorg-app/xmodmap_1.0.10.bb @@ -12,6 +12,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=272c17e96370e1e74773fa22d9989621" PE = "1" - -SRC_URI[md5sum] = "723f02d3a5f98450554556205f0a9497" -SRC_URI[sha256sum] = "b7b0e5cc5f10d0fb6d2d6ea4f00c77e8ac0e847cc5a73be94cd86139ac4ac478" +SRC_URI[md5sum] = "51f1d30a525e9903280ffeea2744b1f6" +SRC_URI[sha256sum] = "473f0941d7439d501bb895ff358832b936ec34c749b9704c37a15e11c318487c" diff --git a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb index ca58d4751..3280813ef 100644 --- a/poky/meta/recipes-graphics/xorg-app/xprop_1.2.3.bb +++ b/poky/meta/recipes-graphics/xorg-app/xprop_1.2.4.bb @@ -14,5 +14,5 @@ DEPENDS += "libxmu" PE = "1" -SRC_URI[md5sum] = "4becb3ddc4674d741487189e4ce3d0b6" -SRC_URI[sha256sum] = "d22afb28c86d85fff10a50156a7d0fa930c80ae865d70b26d805fd28a17a521b" +SRC_URI[md5sum] = "cc369c28383a5d7144e7197ee7d30bfa" +SRC_URI[sha256sum] = "8c77fb096e46c60032b7e2bde9492c3ffcc18734f50b395085a5f10bfd3cf753" diff --git a/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb b/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb index 2965ef7f8..a913ae11f 100644 --- a/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.3.bb +++ b/poky/meta/recipes-graphics/xorg-app/xvinfo_1.1.4.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b664101ad7a1dc758a4c4109bf978e68" DEPENDS += " libxv" PE = "1" -SRC_URI[md5sum] = "558360176b718dee3c39bc0648c0d10c" -SRC_URI[sha256sum] = "9fba8b68daf53863e66d5004fa9c703fcecf69db4d151ea2d3d885d621e6e5eb" +SRC_URI[md5sum] = "b13afec137b9b331814a9824ab03ec80" +SRC_URI[sha256sum] = "0353220d6606077ba42363db65f50410759f9815352f77adc799e2adfa76e73f" diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.28.0.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.28.2.bb index 5853b5b5c..19123e06c 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.28.0.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.28.2.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0" DEPENDS += "libinput" -SRC_URI[md5sum] = "2d7519ac0e39d4c88f3be32e81a637aa" -SRC_URI[sha256sum] = "21994d065fc26e85d1c3fc87d8479b9c22699ed5a0119df98fbe0000e84630a1" +SRC_URI[md5sum] = "b7548bc1d7e82d189205794ff86307af" +SRC_URI[sha256sum] = "b8b346962c6b62b8069928c29c0db83b6f544863bf2fc6830f324de841de2820" FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch deleted file mode 100644 index 06ef10501..000000000 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch +++ /dev/null @@ -1,116 +0,0 @@ -From 96d4e8e7b8a699f0ef77fa7b210d4de5f1c703d0 Mon Sep 17 00:00:00 2001 -From: Liwei Song <liwei.song@windriver.com> -Date: Wed, 22 Nov 2017 08:59:03 +0000 -Subject: [PATCH] Add Coffeelake PCI IDs for S Skus - -Add the Coffeelake PCI IDs based on the following kernel patches: - -commit b056f8f3d6b900e8afd19f312719160346d263b4 -Author: Anusha Srivatsa <anusha.srivatsa@intel.com> -Date: Thu Jun 8 16:41:05 2017 -0700 - - drm/i915/cfl: Add Coffee Lake PCI IDs for S Skus. - -Upstream-Status: Submitted [https://patchwork.kernel.org/patch/10139905] - -Signed-off-by: Liwei Song <liwei.song@windriver.com> ---- - src/i915_pciids.h | 7 +++++++ - src/intel_module.c | 13 +++++++++++++ - src/sna/gen9_render.c | 12 ++++++++++++ - 3 files changed, 32 insertions(+) - -diff --git a/src/i915_pciids.h b/src/i915_pciids.h -index 0370f830c541..11ccfa9c047a 100644 ---- a/src/i915_pciids.h -+++ b/src/i915_pciids.h -@@ -340,4 +340,11 @@ - INTEL_VGA_DEVICE(0x3184, info), \ - INTEL_VGA_DEVICE(0x3185, info) - -+#define INTEL_CFL_S_IDS(info) \ -+ INTEL_VGA_DEVICE(0x3E90, info), /* SRV GT1 */ \ -+ INTEL_VGA_DEVICE(0x3E93, info), /* SRV GT1 */ \ -+ INTEL_VGA_DEVICE(0x3E91, info), /* SRV GT2 */ \ -+ INTEL_VGA_DEVICE(0x3E92, info), /* SRV GT2 */ \ -+ INTEL_VGA_DEVICE(0x3E96, info) /* SRV GT2 */ -+ - #endif /* _I915_PCIIDS_H */ -diff --git a/src/intel_module.c b/src/intel_module.c -index 6b04857e2853..4827a67255f0 100644 ---- a/src/intel_module.c -+++ b/src/intel_module.c -@@ -138,6 +138,10 @@ static const struct intel_device_info intel_geminilake_info = { - .gen = 0113, - }; - -+static const struct intel_device_info intel_coffeelake_info = { -+ .gen = 0114, -+}; -+ - static const SymTabRec intel_chipsets[] = { - {PCI_CHIP_I810, "i810"}, - {PCI_CHIP_I810_DC100, "i810-dc100"}, -@@ -303,6 +307,13 @@ static const SymTabRec intel_chipsets[] = { - {0x5916, "HD Graphics 620"}, - {0x591E, "HD Graphics 615"}, - -+ /*Coffeelake*/ -+ {0x3E90, "HD Graphics"}, -+ {0x3E93, "HD Graphics"}, -+ {0x3E91, "HD Graphics"}, -+ {0x3E92, "HD Graphics"}, -+ {0x3E96, "HD Graphics"}, -+ - /* When adding new identifiers, also update: - * 1. intel_identify() - * 2. man/intel.man -@@ -368,6 +379,8 @@ static const struct pci_id_match intel_device_match[] = { - - INTEL_GLK_IDS(&intel_geminilake_info), - -+ INTEL_CFL_S_IDS(&intel_coffeelake_info), -+ - INTEL_VGA_DEVICE(PCI_MATCH_ANY, &intel_generic_info), - #endif - -diff --git a/src/sna/gen9_render.c b/src/sna/gen9_render.c -index e5f12c723956..7f49052c5ec1 100644 ---- a/src/sna/gen9_render.c -+++ b/src/sna/gen9_render.c -@@ -245,6 +245,11 @@ static const struct gt_info glk_gt_info = { - .urb = { .max_vs_entries = 320 }, - }; - -+static const struct gt_info cfl_gt_info = { -+ .name = "Coffeelake (gen9)", -+ .urb = { .max_vs_entries = 960 }, -+}; -+ - static bool is_skl(struct sna *sna) - { - return sna->kgem.gen == 0110; -@@ -265,6 +270,11 @@ static bool is_glk(struct sna *sna) - return sna->kgem.gen == 0113; - } - -+static bool is_cfl(struct sna *sna) -+{ -+ return sna->kgem.gen == 0114; -+} -+ - - static inline bool too_large(int width, int height) - { -@@ -4040,6 +4050,8 @@ static bool gen9_render_setup(struct sna *sna) - state->info = &kbl_gt_info; - if (is_glk(sna)) - state->info = &glk_gt_info; -+ if (is_cfl(sna)) -+ state->info = &cfl_gt_info; - - sna_static_stream_init(&general); - --- -2.13.3 - diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch new file mode 100644 index 000000000..52916f8b4 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/01_Fix-build-on-i686.patch @@ -0,0 +1,55 @@ +From a414d4e24461da1cb4cef8ee910bc57bab360ceb Mon Sep 17 00:00:00 2001 +From: Adam Jackson <ajax@redhat.com> +Date: Tue, 6 Mar 2018 12:07:46 -0500 +Subject: [PATCH] Fix build on i686 + +Presumably this only matters for i686 because amd64 implies sse2, but: + +BUILDSTDERR: In file included from gen4_vertex.c:34: +BUILDSTDERR: gen4_vertex.c: In function 'emit_vertex': +BUILDSTDERR: sna_render_inline.h:40:26: error: inlining failed in call to always_inline 'vertex_emit_2s': target specific option mismatch +BUILDSTDERR: static force_inline void vertex_emit_2s(struct sna *sna, int16_t x, int16_t y) +BUILDSTDERR: ^~~~~~~~~~~~~~ +BUILDSTDERR: gen4_vertex.c:308:25: note: called from here +BUILDSTDERR: #define OUT_VERTEX(x,y) vertex_emit_2s(sna, x,y) /* XXX assert(!too_large(x, y)); */ +BUILDSTDERR: ^~~~~~~~~~~~~~~~~~~~~~~~ +BUILDSTDERR: gen4_vertex.c:360:2: note: in expansion of macro 'OUT_VERTEX' +BUILDSTDERR: OUT_VERTEX(dstX, dstY); +BUILDSTDERR: ^~~~~~~~~~ + +The bug here appears to be that emit_vertex() is declared 'sse2' but +vertex_emit_2s is merely always_inline. gcc8 decides that since you said +always_inline you need to have explicitly cloned it for every +permutation of targets. Merely saying inline seems to do the job of +cloning vertex_emit_2s as much as necessary. + +So to reiterate: if you say always-inline, it won't, but if you just say +maybe inline, it will. Thanks gcc, that's helpful. + +- ajax + +Patch taken from Fedora. + +Upstream-Status: Pending +Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> + +--- + src/sna/compiler.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/sna/compiler.h b/src/sna/compiler.h +index 3c176a16..bc447c7a 100644 +--- a/src/sna/compiler.h ++++ b/src/sna/compiler.h +@@ -32,7 +32,7 @@ + #define likely(expr) (__builtin_expect (!!(expr), 1)) + #define unlikely(expr) (__builtin_expect (!!(expr), 0)) + #define noinline __attribute__((noinline)) +-#define force_inline inline __attribute__((always_inline)) ++#define force_inline inline + #define fastcall __attribute__((regparm(3))) + #define must_check __attribute__((warn_unused_result)) + #define constant __attribute__((const)) +-- +2.16.2 + diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch deleted file mode 100644 index ada9eb5e5..000000000 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/glibc.patch +++ /dev/null @@ -1,25 +0,0 @@ -Add a missing include needed for glibc 2.28 to avoid: - -| ../../git/tools/backlight_helper.c: In function 'main': -| ../../git/tools/backlight_helper.c:54:34: error: implicit declaration of function 'major' [-Werror=implicit-function-declaration] -| if (fd < 0 || fstat(fd, &st) || major(st.st_dev)) -| ^~~~~ -| ../../git/tools/backlight_helper.c:54:34: warning: nested extern declaration of 'major' [-Wnested-externs] -| cc1: some warnings being treated as errors -| Makefile:666: recipe for target 'backlight_helper.o' failed - -Upstream-Status: Pending -RP 2018/8/12 - -Index: git/tools/backlight_helper.c -=================================================================== ---- git.orig/tools/backlight_helper.c -+++ git/tools/backlight_helper.c -@@ -8,6 +8,7 @@ - - #include <sys/types.h> - #include <sys/stat.h> -+#include <sys/sysmacros.h> - - #if MAJOR_IN_MKDEV - #include <sys/mkdev.h> diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index 655fd4dc6..bf9009bda 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb @@ -9,20 +9,20 @@ Infrastructure (DRI)." LIC_FILES_CHKSUM = "file://COPYING;md5=8730ad58d11c7bbad9a7066d69f7808e" -SRCREV = "e4fe79cf0d9a05ee3f3a027148ef0aeb2b1b34e1" +SRCREV = "33ee0c3b21ea279e08d0863fcb2e874f0974b00e" PV = "2.99.917+git${SRCPV}" S = "${WORKDIR}/git" SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ - file://0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch \ - file://glibc.patch \ " +SRC_URI_append_qemux86 = "file://01_Fix-build-on-i686.patch" + UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" DEPENDS += "virtual/libx11 drm libpciaccess pixman" -PACKAGECONFIG ??= "xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 dri3', '', d)}" +PACKAGECONFIG ??= "sna xvmc uxa udev ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri dri2 dri3', '', d)}" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri" PACKAGECONFIG[dri1] = "--enable-dri1,--disable-dri1" diff --git a/poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb b/poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb index 34646ff99..1289c1686 100644 --- a/poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb +++ b/poky/meta/recipes-graphics/xorg-font/font-util_1.3.1.bb @@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5df208ec65eb84ce5bb8d82d8f3b9675 \ DEPENDS = "encodings util-macros" DEPENDS_class-native = "util-macros-native" RDEPENDS_${PN} = "mkfontdir mkfontscale encodings" -RDEPENDS_${PN}_class-native = "mkfontdir-native mkfontscale-native" +RDEPENDS_${PN}_class-native = "" BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb b/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.4.bb index 34d5fc448..1fc74b199 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libfontenc_1.1.4.bb @@ -11,7 +11,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=96254c20ab81c63e65b26f0dbcd4a1c1" DEPENDS += "zlib xorgproto font-util" PE = "1" -BBCLASSEXTEND = "native" +SRC_URI[md5sum] = "6447db6a689fb530c218f0f8328c3abc" +SRC_URI[sha256sum] = "2cfcce810ddd48f2e5dc658d28c1808e86dcf303eaff16728b9aa3dbc0092079" -SRC_URI[md5sum] = "0920924c3a9ebc1265517bdd2f9fde50" -SRC_URI[sha256sum] = "70588930e6fc9542ff38e0884778fbc6e6febf21adbab92fd8f524fe60aefd21" +BBCLASSEXTEND = "native" diff --git a/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb b/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb index 999434ee5..c1b19138f 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libice_1.0.9.bb @@ -18,7 +18,7 @@ PE = "1" XORG_PN = "libICE" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" SRC_URI[md5sum] = "addfb1e897ca8079531669c7c7711726" SRC_URI[sha256sum] = "8f7032f2c1c64352b5423f6b48a8ebdc339cc63064af34d66a6c9aa79759e202" diff --git a/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb b/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.3.bb index fdc693be1..49df690f0 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.2.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libsm_1.2.3.bb @@ -22,10 +22,10 @@ PE = "1" XORG_PN = "libSM" -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "499a7773c65aba513609fe651853c5f3" -SRC_URI[sha256sum] = "0baca8c9f5d934450a70896c4ad38d06475521255ca63b717a6510fdb6e287bd" +SRC_URI[md5sum] = "87c7fad1c1813517979184c8ccd76628" +SRC_URI[sha256sum] = "2d264499dcb05f56438dee12a1b4b71d76736ce7ba7aa6efbf15ebb113769cbb" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.6.bb b/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb index a4ba4e54e..9c773a09d 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.6.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11-diet_1.6.7.bb @@ -11,9 +11,6 @@ SRC_URI += "file://X18NCMSstubs.patch \ RPROVIDES_${PN}-dev = "libx11-dev" RPROVIDES_${PN}-locale = "libx11-locale" -SRC_URI[md5sum] = "6b0f83e851b3b469dd660f3a95ac3e42" -SRC_URI[sha256sum] = "65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f" - EXTRA_OECONF += "--disable-xlocale" PACKAGECONFIG ??= "" diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11.inc b/poky/meta/recipes-graphics/xorg-lib/libx11.inc index 36c950ad3..ea2ebfb8b 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/poky/meta/recipes-graphics/xorg-lib/libx11.inc @@ -10,6 +10,9 @@ FILESEXTRAPATHS =. "${FILE_DIRNAME}/libx11:" PE = "1" +SRC_URI[md5sum] = "034fdd6cc5393974d88aec6f5bc96162" +SRC_URI[sha256sum] = "910e9e30efba4ad3672ca277741c2728aebffa7bc526f04dcfa74df2e52a1348" + PROVIDES = "virtual/libx11" XORG_PN = "libX11" diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch b/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch index 897882b8d..2a723b7e4 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch +++ b/poky/meta/recipes-graphics/xorg-lib/libx11/Fix-hanging-issue-in-_XReply.patch @@ -17,19 +17,19 @@ https://patchwork.freedesktop.org/patch/171458/ Signed-off-by: Tatu Frisk <tatu.frisk@ge.com> Signed-off-by: Jose Alarcon <jose.alarcon@ge.com> + +[Refreshed for 1.6.7 update] +Signed-off-by: Armin Kuster <akuster808@gmail.com> + --- src/xcb_io.c | 19 +++++++------------ 1 file changed, 7 insertions(+), 12 deletions(-) -diff --git a/src/xcb_io.c b/src/xcb_io.c -index 5987329..c64eb04 100644 ---- a/src/xcb_io.c -+++ b/src/xcb_io.c -@@ -609,22 +609,17 @@ Status _XReply(Display *dpy, xReply *rep, int extra, Bool discard) - * letting anyone else process this sequence number, we - * need to process any events that should have come - * earlier. */ -- +Index: libX11-1.6.7/src/xcb_io.c +=================================================================== +--- libX11-1.6.7.orig/src/xcb_io.c ++++ libX11-1.6.7/src/xcb_io.c +@@ -620,18 +620,14 @@ Status _XReply(Display *dpy, xReply *rep if(dpy->xcb->event_owner == XlibOwnsEventQueue) { xcb_generic_reply_t *event; @@ -42,6 +42,9 @@ index 5987329..c64eb04 100644 - while(dpy->xcb->event_waiter) - { /* need braces around ConditionWait */ - ConditionWait(dpy, dpy->xcb->event_notify); +- } +- while((event = poll_for_event(dpy, True))) +- handle_response(dpy, event, True); + + /* Assume event queue is empty if another thread is blocking + * waiting for event. */ @@ -49,12 +52,7 @@ index 5987329..c64eb04 100644 + { + while((event = poll_for_response(dpy))) + handle_response(dpy, event, True); - } -- while((event = poll_for_event(dpy))) -- handle_response(dpy, event, True); ++ } } req->reply_waiter = 0; --- -2.10.1 - diff --git a/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb b/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb index 0fee1a908..6141f571c 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.6.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libx11_1.6.7.bb @@ -1,14 +1,13 @@ require libx11.inc -inherit gettext - -BBCLASSEXTEND = "native nativesdk" SRC_URI += "file://disable_tests.patch \ file://Fix-hanging-issue-in-_XReply.patch \ " + +inherit gettext + do_configure_append () { sed -i -e "/X11_CFLAGS/d" ${B}/src/util/Makefile } -SRC_URI[md5sum] = "6b0f83e851b3b469dd660f3a95ac3e42" -SRC_URI[sha256sum] = "65fe181d40ec77f45417710c6a67431814ab252d21c2e85c75dd1ed568af414f" +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb b/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb index 8c52475b8..dcfc66652 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.8.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxau_1.0.9.bb @@ -20,5 +20,5 @@ XORG_PN = "libXau" BBCLASSEXTEND = "native nativesdk" -SRC_URI[md5sum] = "685f8abbffa6d145c0f930f00703b21b" -SRC_URI[sha256sum] = "fdd477320aeb5cdd67272838722d6b7d544887dfe7de46e1e7cc0c27c2bea4f2" +SRC_URI[md5sum] = "c5f16288f2da9f071b29111d68797480" +SRC_URI[sha256sum] = "ccf8cbf0dbf676faa2ea0a6d64bcc3b6746064722b606c8c52917ed00dcb73ec" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb b/poky/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb index a8e0307e1..84303e624 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxcb_1.13.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxcb_1.13.1.bb @@ -15,8 +15,8 @@ SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.bz2 \ file://gcc-mips-pr68302-mips-workaround.patch \ " -SRC_URI[md5sum] = "c2b6cf928afa16b0047c974e7aaa783f" -SRC_URI[sha256sum] = "188c8752193c50ff2dbe89db4554c63df2e26a2e47b0fa415a70918b5b851daa" +SRC_URI[md5sum] = "f33cdfc67346f7217a9326c0d8679975" +SRC_URI[sha256sum] = "a89fb7af7a11f43d2ce84a844a4b38df688c092bf4b67683aef179cdf2a647c4" BBCLASSEXTEND = "native nativesdk" @@ -35,5 +35,5 @@ 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) + do_split_packages(d, '${libdir}', r'^libxcb-(.*)\.so\..*$', 'libxcb-%s', 'XCB library module for %s', allow_links=True) } diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.5.bb index 73e294840..3ef3ddb81 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxcomposite_0.4.5.bb @@ -16,7 +16,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=3f2907aad541f6f226fbc58cc1b3cdf1" DEPENDS += " xorgproto virtual/libx11 libxfixes libxext" PROVIDES = "xcomposite" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" PE = "1" @@ -24,5 +24,5 @@ XORG_PN = "libXcomposite" SRC_URI += " file://change-include-order.patch" -SRC_URI[md5sum] = "f7a218dcbf6f0848599c6c36fc65c51a" -SRC_URI[sha256sum] = "ede250cd207d8bee4a338265c3007d7a68d5aca791b6ac41af18e9a2aeb34178" +SRC_URI[md5sum] = "3fa0841ea89024719b20cd702a9b54e0" +SRC_URI[sha256sum] = "b3218a2c15bab8035d16810df5b8251ffc7132ff3aa70651a1fba0bfe9634e8f" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb b/poky/meta/recipes-graphics/xorg-lib/libxcursor_1.2.0.bb index dc9af233e..2df7a3a4f 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxcursor_1.2.0.bb @@ -12,11 +12,12 @@ LICENSE = "MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=8902e6643f7bcd7793b23dcd5d8031a4" DEPENDS += "libxrender libxfixes" -BBCLASSEXTEND = "native nativesdk" PE = "1" XORG_PN = "libXcursor" -SRC_URI[md5sum] = "58fe3514e1e7135cf364101e714d1a14" -SRC_URI[sha256sum] = "294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b" +SRC_URI[md5sum] = "9b9be0e289130fb820aedf67705fc549" +SRC_URI[sha256sum] = "3ad3e9f8251094af6fe8cb4afcf63e28df504d46bfa5a5529db74a505d628782" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb b/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.5.bb index 6d6ffadf2..b201124d8 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.4.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxdamage_1.1.5.bb @@ -18,11 +18,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=9fe101f30dd24134cf43146863241868" DEPENDS += "virtual/libx11 xorgproto libxfixes" PROVIDES = "xdamage" -BBCLASSEXTEND = "native" PE = "1" XORG_PN = "libXdamage" -SRC_URI[md5sum] = "0cf292de2a9fa2e9a939aefde68fd34f" -SRC_URI[sha256sum] = "7c3fe7c657e83547f4822bfde30a90d84524efb56365448768409b77f05355ad" +SRC_URI[md5sum] = "e3f554267a7a04b042dc1f6352bd6d99" +SRC_URI[sha256sum] = "b734068643cac3b5f3d2c8279dd366b5bf28c7219d9e9d8717e1383995e0ea45" + +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb index b4547819f..4565ae262 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxft_2.3.2.bb @@ -25,7 +25,7 @@ SRC_URI[sha256sum] = "f5a3c824761df351ca91827ac221090943ef28b248573486050de89f4b XORG_PN = "libXft" -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" python () { if d.getVar('DEBIAN_NAMES'): diff --git a/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb index 08381d9c4..ab49cdba3 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.9.bb @@ -20,3 +20,5 @@ XORG_PN = "libXi" SRC_URI[md5sum] = "1f0f2719c020655a60aee334ddd26d67" SRC_URI[sha256sum] = "c2e6b8ff84f9448386c1b5510a5cf5a16d788f76db018194dacdc200180faf45" +BBCLASSEXTEND = "native nativesdk" + diff --git a/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.2.bb b/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb index 8cf508b0b..8fcae12ce 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.2.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.4.bb @@ -9,8 +9,8 @@ DEPENDS = "util-macros flex-native bison-native" SRC_URI = "http://xkbcommon.org/download/${BPN}-${PV}.tar.xz" -SRC_URI[md5sum] = "5f7f8533f907ebcfb1cf8dceb9501264" -SRC_URI[sha256sum] = "7ab8c4b3403d89d01898066b72cb6069bddeb5af94905a65368f671a026ed58c" +SRC_URI[md5sum] = "3c4409058dfd203f641a563358e0187d" +SRC_URI[sha256sum] = "60ddcff932b7fd352752d51a5c4f04f3d0403230a584df9a2e0d5ed87c486c8b" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb b/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb index 13a1b919e..57b202cae 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxpm_3.5.12.bb @@ -12,7 +12,7 @@ protocol." LICENSE = "BSD" LIC_FILES_CHKSUM = "file://COPYING;md5=51f4270b012ecd4ab1a164f5f4ed6cf7" -DEPENDS += "libxext libsm libxt" +DEPENDS += "libxext libsm libxt gettext-native" PE = "1" XORG_PN = "libXpm" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb b/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb index f8d94a2f5..23d9db41c 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxt_1.1.5.bb @@ -27,7 +27,7 @@ SRC_URI += "file://libxt_fix_for_x32.patch \ file://0001-libXt-util-don-t-link-makestrs-with-target-cflags.patch \ " -BBCLASSEXTEND = "native" +BBCLASSEXTEND = "native nativesdk" EXTRA_OECONF += "--disable-xkb" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb b/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb index 266bd1ca5..7837f69d3 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxtst_1.2.3.bb @@ -19,3 +19,4 @@ XORG_PN = "libXtst" SRC_URI[md5sum] = "ef8c2c1d16a00bd95b9fdcef63b8a2ca" SRC_URI[sha256sum] = "4655498a1b8e844e3d6f21f3b2c4e2b571effb5fd83199d428a6ba7ea4bf5204" +BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch b/poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch deleted file mode 100644 index b52a5707d..000000000 --- a/poky/meta/recipes-graphics/xorg-lib/pixman/asm_include.patch +++ /dev/null @@ -1,29 +0,0 @@ -Fixes errors like - -Assembler messages: -Fatal error: can't create .libs/pixman-mips-dspr2-asm.o: No such file or directory - -it works with glibc because it uses gcc fixed-headers but thats not right. - -We move the include under C block - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending -Index: pixman-0.32.6/pixman/pixman-private.h -=================================================================== ---- pixman-0.32.6.orig/pixman/pixman-private.h -+++ pixman-0.32.6/pixman/pixman-private.h -@@ -1,4 +1,3 @@ --#include <float.h> - - #ifndef PIXMAN_PRIVATE_H - #define PIXMAN_PRIVATE_H -@@ -17,6 +16,8 @@ - - #ifndef __ASSEMBLER__ - -+#include <float.h> -+ - #ifndef PACKAGE - # error config.h must be included before pixman-private.h - #endif diff --git a/poky/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb b/poky/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb index c290fa461..49c3d6234 100644 --- a/poky/meta/recipes-graphics/xorg-lib/pixman_0.34.0.bb +++ b/poky/meta/recipes-graphics/xorg-lib/pixman_0.38.0.bb @@ -31,11 +31,10 @@ EXTRA_OECONF_class-nativesdk = "--disable-gtk" SRC_URI += "\ file://0001-ARM-qemu-related-workarounds-in-cpu-features-detecti.patch \ - file://asm_include.patch \ file://0001-test-utils-Check-for-FE_INVALID-definition-before-us.patch \ " -SRC_URI[md5sum] = "002a4fcb644ddfcb4b0e4191576a0d59" -SRC_URI[sha256sum] = "39ba3438f3d17c464b0cb8be006dacbca0ab5aee97ebde69fec7ecdbf85794a0" +SRC_URI[md5sum] = "04ecad28edcc14e7eb5f7ed6df29c7a0" +SRC_URI[sha256sum] = "b768e3f7895ddebdc0f07478729d9cec4fe0a9d2201f828c900d67b0e5b436a8" REQUIRED_DISTRO_FEATURES = "" diff --git a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.24.bb b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.26.bb index 7d0e608e7..5c2328845 100644 --- a/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.24.bb +++ b/poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.26.bb @@ -14,8 +14,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "74c4bdf52382127cb5802c3f2ab441e0" -SRC_URI[sha256sum] = "91b18580f46b4e4ea913707f6c8d68ab5286879c3a6591462f3b9e760d3ac4d7" +SRC_URI[md5sum] = "e2e980629bfeb9f40a7d44488b18ba12" +SRC_URI[sha256sum] = "393718c7460cd06c4e8cb819d943ca54812ea476f32714c4d8975c77031a038e" SECTION = "x11/libs" DEPENDS = "intltool-native util-macros libxslt-native" diff --git a/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb b/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb index d5037868d..746709092 100644 --- a/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb +++ b/poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.13.bb @@ -12,40 +12,18 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.bz2" - SRC_URI[md5sum] = "abe9aa4886138150bbc04ae4f29b90e3" SRC_URI[sha256sum] = "7b98721e669be80284e9bbfeab02d2d0d54cd11172b72271e47a2fe875e2bde1" -inherit autotools pkgconfig - -# Force the use of Python 3 and a specific library path so we don't need to -# depend on python3-native -CACHED_CONFIGUREVARS += "PYTHON=python3 am_cv_python_pythondir=${libdir}/xcb-proto" +inherit autotools pkgconfig python3native PACKAGES += "python-xcbgen" FILES_${PN} = "" FILES_${PN}-dev += "${datadir}/xcb/*.xml ${datadir}/xcb/*.xsd" -FILES_python-xcbgen = "${libdir}/xcb-proto" +FILES_python-xcbgen = "${PYTHON_SITEPACKAGES_DIR}" RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" - -# Need to do this dance because we're forcing the use of host Python above and -# if xcb-proto is built with Py3.5 and then re-used from sstate on a host with -# Py3.6 the second build will write new cache files into the sysroot which won't -# be listed in the manifest so won't be deleted, resulting in an error on -# rebuilds. Solve this by deleting the entire cache directory when this package -# is removed from the sysroot. -SSTATEPOSTINSTFUNCS += "xcb_sstate_postinst" -xcb_sstate_postinst() { - if [ "${BB_CURRENTTASK}" = "populate_sysroot" -o "${BB_CURRENTTASK}" = "populate_sysroot_setscene" ] - then - cat <<EOF >${SSTATE_INST_POSTRM} -#!/bin/sh -rm -rf ${libdir}/xcb-proto/xcbgen/__pycache__ -EOF - fi -} diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 489a42850..615ad6d9b 100644 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -18,6 +18,8 @@ INC_PR = "r8" XORG_PN = "xorg-server" SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +CVE_PRODUCT = "xorg-server" + S = "${WORKDIR}/${XORG_PN}-${PV}" inherit autotools pkgconfig diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch new file mode 100644 index 000000000..c0c242814 --- /dev/null +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-test-xtest-Initialize-array-with-braces.patch @@ -0,0 +1,36 @@ +From 8a382c015cd3c69fcfc146ef03dcbf30c77ff207 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 1 Mar 2019 09:47:57 -0800 +Subject: [PATCH] test/xtest: Initialize array with braces + +Fixes an error when extra warnings are enabled, this is caught with clang + +test/xtest.c:64:23: error: suggest braces around initialization of subobject [-Werror,-Wmissing-braces] + WindowRec root = {0}; + ^ + {} +1 error generated. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + test/xtest.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/test/xtest.c b/test/xtest.c +index fc5e433..d7e6620 100644 +--- a/test/xtest.c ++++ b/test/xtest.c +@@ -61,7 +61,7 @@ xtest_init_devices(void) + { + ScreenRec screen = {0}; + ClientRec server_client = {0}; +- WindowRec root = {0}; ++ WindowRec root = {{0}}; + WindowOptRec optional = {0}; + + /* random stuff that needs initialization */ +-- +2.21.0 + diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2018-14665.patch b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2018-14665.patch deleted file mode 100644 index 7f6235b43..000000000 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2018-14665.patch +++ /dev/null @@ -1,62 +0,0 @@ -Incorrect command-line parameter validation in the Xorg X server can lead to -privilege elevation and/or arbitrary files overwrite, when the X server is -running with elevated privileges (ie when Xorg is installed with the setuid bit -set and started by a non-root user). The -modulepath argument can be used to -specify an insecure path to modules that are going to be loaded in the X server, -allowing to execute unprivileged code in the privileged process. The -logfile -argument can be used to overwrite arbitrary files in the file system, due to -incorrect checks in the parsing of the option. - -CVE: CVE-2018-14665 -Upstream-Status: Backport -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From 50c0cf885a6e91c0ea71fb49fa8f1b7c86fe330e Mon Sep 17 00:00:00 2001 -From: Matthieu Herrb <matthieu@herrb.eu> -Date: Tue, 23 Oct 2018 21:29:08 +0200 -Subject: [PATCH] Disable -logfile and -modulepath when running with elevated - privileges - -Could cause privilege elevation and/or arbitrary files overwrite, when -the X server is running with elevated privileges (ie when Xorg is -installed with the setuid bit set and started by a non-root user). - -CVE-2018-14665 - -Issue reported by Narendra Shinde and Red Hat. - -Signed-off-by: Matthieu Herrb <matthieu@herrb.eu> -Reviewed-by: Alan Coopersmith <alan.coopersmith@oracle.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Reviewed-by: Adam Jackson <ajax@redhat.com> ---- - hw/xfree86/common/xf86Init.c | 8 ++++++-- - 1 file changed, 6 insertions(+), 2 deletions(-) - -diff --git a/hw/xfree86/common/xf86Init.c b/hw/xfree86/common/xf86Init.c -index 6c25eda73..0f57efa86 100644 ---- a/hw/xfree86/common/xf86Init.c -+++ b/hw/xfree86/common/xf86Init.c -@@ -935,14 +935,18 @@ ddxProcessArgument(int argc, char **argv, int i) - /* First the options that are not allowed with elevated privileges */ - if (!strcmp(argv[i], "-modulepath")) { - CHECK_FOR_REQUIRED_ARGUMENT(); -- xf86CheckPrivs(argv[i], argv[i + 1]); -+ if (xf86PrivsElevated()) -+ FatalError("\nInvalid argument -modulepath " -+ "with elevated privileges\n"); - xf86ModulePath = argv[i + 1]; - xf86ModPathFrom = X_CMDLINE; - return 2; - } - if (!strcmp(argv[i], "-logfile")) { - CHECK_FOR_REQUIRED_ARGUMENT(); -- xf86CheckPrivs(argv[i], argv[i + 1]); -+ if (xf86PrivsElevated()) -+ FatalError("\nInvalid argument -logfile " -+ "with elevated privileges\n"); - xf86LogFile = argv[i + 1]; - xf86LogFileFrom = X_CMDLINE; - return 2; --- -2.18.1 diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb index 9fd2e8d87..ad99d6bec 100644 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.1.bb +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.4.bb @@ -3,10 +3,10 @@ require xserver-xorg.inc SRC_URI += "file://musl-arm-inb-outb.patch \ file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ file://pkgconfig.patch \ - file://CVE-2018-14665.patch \ + file://0001-test-xtest-Initialize-array-with-braces.patch \ " -SRC_URI[md5sum] = "e525846d1d0af5732ba835f2e2ec066d" -SRC_URI[sha256sum] = "59c99fe86fe75b8164c6567bfc6e982aecc2e4a51e6fbac1b842d5d00549e918" +SRC_URI[md5sum] = "c4841cc24b79420205d082fe82e0a650" +SRC_URI[sha256sum] = "fe0fd493ebe93bfc56bede382fa204458ff5f636ea54d413a5d1bd58e19166ee" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb deleted file mode 100644 index 1d275a004..000000000 --- a/poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Simple XVideo test application" -LICENSE = "GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552 \ - file://src/test-xvideo.c;beginline=1;endline=20;md5=6ae3b4c3c2ff9e51dbbc35bb237afa00" -DEPENDS = "libxv" - -SRCREV = "7d38b881e99eb74169d292b40f7164e461a65092" -PV = "0.1+git${SRCPV}" - -SRC_URI = "git://git.yoctoproject.org/test-xvideo" -UPSTREAM_CHECK_COMMITS = "1" - -S = "${WORKDIR}/git" - -inherit autotools distro_features_check - -# The libxv requires x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11" |
