diff options
| author | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-25 12:45:53 -0400 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2018-06-27 14:38:15 -0400 |
| commit | 316dfdd917bec6a218f431211d28bf8df6b6fb0f (patch) | |
| tree | 5541073f9851f44c2bd67b4959dc776ee3c3810f /import-layers/yocto-poky/meta/recipes-graphics | |
| parent | 36acd3e888044dea2ac0b2946f15616f968388c9 (diff) | |
| download | blackbird-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.tar.gz blackbird-openbmc-316dfdd917bec6a218f431211d28bf8df6b6fb0f.zip | |
Yocto 2.5
Move OpenBMC to Yocto 2.5(sumo)
Signed-off-by: Brad Bishop <bradleyb@fuzziesquirrel.com>
Change-Id: I5c5ad6904a16e14c1c397f0baf10c9d465594a78
Diffstat (limited to 'import-layers/yocto-poky/meta/recipes-graphics')
94 files changed, 848 insertions, 1001 deletions
diff --git a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.10.bb b/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.12.bb index fcdddc6d9..075ca1ed3 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.10.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/cairo/cairo_1.14.12.bb @@ -7,8 +7,8 @@ SRC_URI = "http://cairographics.org/releases/cairo-${PV}.tar.xz \ file://0001-cairo-Fix-CVE-2017-9814.patch \ " -SRC_URI[md5sum] = "146f5f4d0b4439fc3792fd3452b7b12a" -SRC_URI[sha256sum] = "7e87878658f2c9951a14fc64114d4958c0e65ac47530b8ac3078b2ce41b66a09" +SRC_URI[md5sum] = "9f0db9dbfca0966be8acd682e636d165" +SRC_URI[sha256sum] = "8c90f00c500b2299c0a323dd9beead2a00353752b2092ead558139bd67f7bf16" PACKAGES =+ "cairo-gobject cairo-script-interpreter cairo-perf-utils" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch index 3b6a70ef0..ce9ab3a24 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-1.0/install-examples.patch @@ -3,11 +3,11 @@ Install the examples to $libdir/clutter/. Signed-off-by: Ross Burton <ross.burton@intel.com> Upstream-Status: Inappropriate -diff --git a/examples/Makefile.am b/examples/Makefile.am -index 4b9b449..232cd19 100644 ---- a/examples/Makefile.am -+++ b/examples/Makefile.am -@@ -38,6 +38,7 @@ AM_CPPFLAGS = \ +Index: clutter-1.26.2/examples/Makefile.am +=================================================================== +--- clutter-1.26.2.orig/examples/Makefile.am ++++ clutter-1.26.2/examples/Makefile.am +@@ -33,7 +33,8 @@ AM_CPPFLAGS = \ -I$(top_srcdir)/clutter \ -I$(top_builddir)/clutter @@ -16,3 +16,4 @@ index 4b9b449..232cd19 100644 +example_PROGRAMS = $(all_examples) EXTRA_DIST = redhand.png + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc index 26ae91c48..4c877982b 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gst-3.0.inc @@ -15,7 +15,3 @@ PACKAGES =+ "${PN}-examples" FILES_${PN} += "${libdir}/gstreamer-1.0/lib*.so" FILES_${PN}-dev += "${libdir}/gstreamer-1.0/*.la" FILES_${PN}-examples = "${bindir}/video-player ${bindir}/video-sink" - -# Needs to be disable due to a dependency on gstreamer-plugins introspection files -EXTRA_OECONF_append_mips64 = " --disable-introspection " - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.2.bb deleted file mode 100644 index 78050df7d..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.2.bb +++ /dev/null @@ -1,6 +0,0 @@ -require clutter-gtk-1.0.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" - -SRC_URI[archive.md5sum] = "6698207ee6e3d5a1c0ffc0a23444e12f" -SRC_URI[archive.sha256sum] = "da27d486325490ad3f65d2abf9413aeb8b4a8f7b559e4b2f73567a5344a26b94" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb new file mode 100644 index 000000000..f0300c716 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/clutter/clutter-gtk-1.0_1.8.4.bb @@ -0,0 +1,6 @@ +require clutter-gtk-1.0.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=7fbc338309ac38fefcd64b04bb903e34" + +SRC_URI[archive.md5sum] = "b363ac9878e2337be887b8ee9e1da00e" +SRC_URI[archive.sha256sum] = "521493ec038973c77edcb8bc5eac23eed41645117894aaee7300b2487cb42b06" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch index bf526370b..40bebc0f5 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm/0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch @@ -12,11 +12,11 @@ Upstream-Status: Submitted [mailing list] configure.ac | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index e3048c7..918d21d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -137,6 +137,12 @@ AC_ARG_ENABLE(install-test-programs, +Index: libdrm-2.4.91/configure.ac +=================================================================== +--- libdrm-2.4.91.orig/configure.ac ++++ libdrm-2.4.91/configure.ac +@@ -163,6 +163,12 @@ AC_ARG_ENABLE(install-test-programs, [Install test programs (default: no)]), [INSTALL_TESTS=$enableval], [INSTALL_TESTS=no]) @@ -29,8 +29,8 @@ index e3048c7..918d21d 100644 dnl =========================================================================== dnl check compiler flags AC_DEFUN([LIBDRM_CC_TRY_FLAG], [ -@@ -372,7 +378,7 @@ if test "x$RADEON" = xyes; then - AC_DEFINE(HAVE_RADEON, 1, [Have radeon support]) +@@ -411,7 +417,7 @@ else + AC_DEFINE(HAVE_RADEON, 0) fi -if test "x$AMDGPU" != xno; then @@ -38,8 +38,8 @@ index e3048c7..918d21d 100644 # Detect cunit library PKG_CHECK_MODULES([CUNIT], [cunit >= 2.1], [have_cunit=yes], [have_cunit=no]) # If pkg-config does not find cunit, check it using AC_CHECK_LIB. We -@@ -399,7 +406,11 @@ if test "x$AMDGPU" = xyes; then - AC_DEFINE(HAVE_CUNIT, [test "x$have_cunit" != "xno"], [Enable CUNIT Have amdgpu support]) +@@ -436,7 +442,11 @@ if test "x$AMDGPU" = xyes; then + AC_DEFINE(HAVE_AMDGPU, 1, [Have amdgpu support]) if test "x$have_cunit" = "xno"; then - AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) @@ -49,8 +49,5 @@ index e3048c7..918d21d 100644 + AC_MSG_WARN([Could not find cunit library. Disabling amdgpu tests]) + fi fi - fi - --- -2.1.4 - + else + AC_DEFINE(HAVE_AMDGPU, 0) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.83.bb b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.91.bb index a5cb75c26..c49028588 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.83.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/drm/libdrm_2.4.91.bb @@ -16,8 +16,8 @@ SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.bz2 \ file://0001-configure.ac-Allow-explicit-enabling-of-cunit-tests.patch \ " -SRC_URI[md5sum] = "23800953ed7564988872e1e8c61fde31" -SRC_URI[sha256sum] = "03a52669da60ead62548a35bc430aafb6c2d8dd21ec9dba3a90f96eff5fe36d6" +SRC_URI[md5sum] = "23d87cda92700b710a37d9b8edaa9f54" +SRC_URI[sha256sum] = "634a0ed0cc1eff06f48674b1da81aafa661a9f001e7a4f43dde81076886dc800" inherit autotools pkgconfig manpages diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch b/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch new file mode 100644 index 000000000..3ca9fde96 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig/0001-src-fcxml.c-avoid-double-free-of-filename.patch @@ -0,0 +1,28 @@ +From a163c81ac430cdc292add200f3e6a0c048be4d7e Mon Sep 17 00:00:00 2001 +From: Alexander Kanavin <alex.kanavin@gmail.com> +Date: Wed, 11 Oct 2017 17:40:09 +0300 +Subject: [PATCH] src/fcxml.c: avoid double free() of filename + +It's also freed after bail1, so no need to do it here. + +Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=103221] +Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> +--- + src/fcxml.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/fcxml.c b/src/fcxml.c +index 19ce96a..edb6054 100644 +--- a/src/fcxml.c ++++ b/src/fcxml.c +@@ -3398,7 +3398,6 @@ FcConfigParseAndLoad (FcConfig *config, + + fd = FcOpen ((char *) filename, O_RDONLY); + if (fd == -1) { +- FcStrFree (filename); + goto bail1; + } + +-- +2.14.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb index a058b3598..d4cbce80b 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.4.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/fontconfig/fontconfig_2.12.6.bb @@ -22,9 +22,13 @@ 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 \ " -SRC_URI[md5sum] = "4fb01fc3f41760c41c69e37cc784b658" -SRC_URI[sha256sum] = "fd5a6a663f4c4a00e196523902626654dd0c4a78686cbc6e472f338e50fdf806" + +SRC_URI[md5sum] = "00e748c67fad11e7057a71ed385e8bdb" +SRC_URI[sha256sum] = "064b9ebf060c9e77011733ac9dc0e2ce92870b574cca2405e11f5353a683c334" + +UPSTREAM_CHECK_REGEX = "fontconfig-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" do_configure_prepend() { # work around https://bugs.freedesktop.org/show_bug.cgi?id=101280 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.8.bb b/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.9.bb index 8e88e84b1..da05916b3 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.8.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/freetype/freetype_2.9.bb @@ -9,17 +9,17 @@ SECTION = "libs" LICENSE = "FreeType | GPLv2+" LIC_FILES_CHKSUM = "file://docs/LICENSE.TXT;md5=4af6221506f202774ef74f64932878a1 \ - file://docs/FTL.TXT;md5=13b25413274c9b3b09b63e4028216ff4 \ + file://docs/FTL.TXT;md5=9f37b4e6afa3fef9dba8932b16bd3f97 \ file://docs/GPLv2.TXT;md5=8ef380476f642c20ebf40fecb0add2ec" SRC_URI = "${SOURCEFORGE_MIRROR}/freetype/freetype-${PV}.tar.bz2 \ file://use-right-libtool.patch" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/freetype/files/freetype2/" -UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" +UPSTREAM_CHECK_REGEX = "freetype-(?P<pver>\d+(\.\d+)+)" -SRC_URI[md5sum] = "2413ac3eaf508ada019c63959ea81a92" -SRC_URI[sha256sum] = "a3c603ed84c3c2495f9c9331fe6bba3bb0ee65e06ec331e0a0fb52158291b40b" +SRC_URI[md5sum] = "513c403c110016fdc7e537216a642b1d" +SRC_URI[sha256sum] = "e6ffba3c8cef93f557d1f767d7bc3dee860ac7a3aaff588a521e081bc36f4c8a" inherit autotools pkgconfig binconfig-disabled multilib_header diff --git a/import-layers/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb index 9e09cd268..69f217830 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/fstests/fstests_git.bb @@ -8,7 +8,7 @@ SRCREV = "e5939ff608b95cdd4d0ab0e1935781ab9a276ac0" PV = "0.1+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/${BPN}" -UPSTREAM_VERSION_UNKNOWN = "1" +UPSTREAM_CHECK_COMMITS = "1" LIC_FILES_CHKSUM = "file://test-pango-gdk.c;endline=24;md5=1ee74ec851ecda57eb7ac6cc180f7655" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_2.0.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_2.1.0.bb index f2ab75629..be725e053 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_2.0.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/glew/glew_2.1.0.bb @@ -8,8 +8,8 @@ LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2ac251558de685c6b9478d89be3149c2" SRC_URI = "${SOURCEFORGE_MIRROR}/project/glew/glew/${PV}/glew-${PV}.tgz \ file://no-strip.patch" -SRC_URI[md5sum] = "2a2cd7c98f13854d2fcddae0d2b20411" -SRC_URI[sha256sum] = "c572c30a4e64689c342ba1624130ac98936d7af90c3103f9ce12b8a0c5736764" +SRC_URI[md5sum] = "b2ab12331033ddfaa50dc39345343980" +SRC_URI[sha256sum] = "04de91e7e6763039bc11940095cd9c7f880baba82196a7765f727ac05a993c95" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/glew/files/glew" UPSTREAM_CHECK_REGEX = "/glew/(?P<pver>(\d+[\.\-_]*)+)/" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb b/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb index 4f5e5a378..0a9b02946 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.4.8.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/harfbuzz/harfbuzz_1.7.5.bb @@ -12,8 +12,8 @@ DEPENDS = "glib-2.0 cairo fontconfig freetype" SRC_URI = "http://www.freedesktop.org/software/harfbuzz/release/${BP}.tar.bz2" -SRC_URI[md5sum] = "d1aa446e1e65717311c15d9ac0cf31ee" -SRC_URI[sha256sum] = "ccec4930ff0bb2d0c40aee203075447954b64a8c2695202413cc5e428c907131" +SRC_URI[md5sum] = "1466ab51fc5aaa6af4065936939cec62" +SRC_URI[sha256sum] = "84574e1b1f65ca694cb8fb6905309665c0368af18a312357f8ff886ee2f29563" inherit autotools pkgconfig lib_package gtk-doc diff --git a/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb index 58646d35a..50a5ae085 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/jpeg/libjpeg-turbo_1.5.3.bb @@ -3,17 +3,17 @@ DESCRIPTION = "libjpeg-turbo is a derivative of libjpeg that uses SIMD instructi HOMEPAGE = "http://libjpeg-turbo.org/" LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=05bab7c7ad899d85bfba60da1a1271f2 \ +LIC_FILES_CHKSUM = "file://cdjpeg.h;endline=13;md5=8184bcc7c4ac7b9edc6a7bc00f231d0b \ file://jpeglib.h;endline=16;md5=f67d70e547a2662c079781c72f877f72 \ - file://djpeg.c;endline=11;md5=b90b6d2b4119f9e5807cd273f525d2af \ + file://djpeg.c;endline=11;md5=c59e19811c006cb38f82d6477134d314 \ " DEPENDS_append_x86-64_class-target = " nasm-native" DEPENDS_append_x86_class-target = " nasm-native" SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "6b4923e297a7eaa255f08511017a8818" -SRC_URI[sha256sum] = "9098943b270388727ae61de82adec73cf9f0dbb240b3bc8b172595ebf405b528" +SRC_URI[md5sum] = "7c82f0f6a3130ec06b8a4d0b321cbca3" +SRC_URI[sha256sum] = "b24890e2bb46e12e72a79f7e965f409f4e16466d00e1dd15d93d73ee6b592523" UPSTREAM_CHECK_URI = "http://sourceforge.net/projects/libjpeg-turbo/files/" UPSTREAM_CHECK_REGEX = "/libjpeg-turbo/files/(?P<pver>(\d+[\.\-_]*)+)/" @@ -40,6 +40,14 @@ EXTRA_OECONF_append_class-target = " ${@bb.utils.contains("MIPSPKGSFX_FPU", "-nf EXTRA_OECONF_append_class-target_powerpc = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" EXTRA_OECONF_append_class-target_powerpc64 = " ${@bb.utils.contains("TUNE_FEATURES", "altivec", "", "--without-simd", d)}" +def get_build_time(d): + if d.getVar('SOURCE_DATE_EPOCH') != None: + import datetime + return " --with-build-date="+ datetime.datetime.fromtimestamp(float(d.getVar('SOURCE_DATE_EPOCH'))).strftime("%Y%m%d") + return "" + +EXTRA_OECONF_append_class-target = "${@get_build_time(d)}" + PACKAGES =+ "jpeg-tools libturbojpeg" DESCRIPTION_jpeg-tools = "The jpeg-tools package includes client programs to access libjpeg functionality. These tools allow for the compression, decompression, transformation and display of JPEG files and benchmarking of the libjpeg library." diff --git a/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch b/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch new file mode 100644 index 000000000..3605446e4 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube/detect-gst_bo_map-_unmap-and-use-it-or-avoid-it.patch @@ -0,0 +1,116 @@ +From 761bf993ca55095f46380c0238583791c1797295 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Daniel=20D=C3=ADaz?= <daniel.diaz@linaro.org> +Date: Tue, 11 Jul 2017 14:50:37 -0500 +Subject: [PATCH kmscube] Detect gst_bo_map/_unmap and use it (or avoid it) +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Those functions are not available on libMali, thus breaking +builds and creating havoc. + +Removing the specific parts of the code that deal with +gbm_bo_map() and gbm_bo_unmap() renders the kmscube utility +a little less useful, but still valuable. + +Signed-off-by: Daniel Díaz <daniel.diaz@linaro.org> +Cc: Rob Clark <robdclark@gmail.com> +Reviewed-by: Eric Engestrom <eric.engestrom@imgtec.com> + +Upstream-Status: Submitted [https://lists.freedesktop.org/archives/mesa-dev/2017-July/163020.html] +--- + Makefile.am | 5 ++++- + configure.ac | 3 +++ + gst-decoder.c | 7 ++++++- + kmscube.c | 4 ++++ + 4 files changed, 17 insertions(+), 2 deletions(-) + +diff --git a/Makefile.am b/Makefile.am +index a36087d..ab4adbf 100644 +--- a/Makefile.am ++++ b/Makefile.am +@@ -43,7 +43,6 @@ kmscube_SOURCES = \ + common.c \ + common.h \ + cube-smooth.c \ +- cube-tex.c \ + drm-atomic.c \ + drm-common.c \ + drm-common.h \ +@@ -59,3 +58,7 @@ kmscube_LDADD += $(GST_LIBS) + kmscube_CFLAGS += $(GST_CFLAGS) + kmscube_SOURCES += cube-video.c gst-decoder.c + endif ++ ++if ENABLE_GBM_MAP ++kmscube_SOURCES += cube-tex.c ++endif +diff --git a/configure.ac b/configure.ac +index 8397f7b..c7f1f4d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -65,5 +65,8 @@ if test "x$enable_gbm_modifiers" = xyes; then + AC_DEFINE(HAVE_GBM_MODIFIERS, 1, [Define if you can use GBM properties.]) + fi + ++AC_CHECK_LIB([gbm], [gbm_bo_map], [HAVE_GBM_BO_MAP=yes], []) ++AM_CONDITIONAL(ENABLE_GBM_MAP, [test "x$HAVE_GBM_BO_MAP" = "xyes"]) ++ + AC_CONFIG_FILES([Makefile]) + AC_OUTPUT +diff --git a/gst-decoder.c b/gst-decoder.c +index 2d6d581..b84980e 100644 +--- a/gst-decoder.c ++++ b/gst-decoder.c +@@ -332,6 +332,7 @@ set_last_frame(struct decoder *dec, EGLImage frame, GstSample *samp) + dec->last_samp = samp; + } + ++#if HAVE_GBM_BO_MAP + // TODO this could probably be a helper re-used by cube-tex: + static int + buf_to_fd(const struct gbm *gbm, int size, void *ptr) +@@ -357,6 +358,7 @@ buf_to_fd(const struct gbm *gbm, int size, void *ptr) + + return fd; + } ++#endif + + static EGLImage + buffer_to_image(struct decoder *dec, GstBuffer *buf) +@@ -410,12 +412,15 @@ buffer_to_image(struct decoder *dec, GstBuffer *buf) + + if (is_dmabuf_mem) { + dmabuf_fd = dup(gst_dmabuf_memory_get_fd(mem)); +- } else { ++ } ++#if HAVE_GBM_BO_MAP ++ else { + GstMapInfo map_info; + gst_buffer_map(buf, &map_info, GST_MAP_READ); + dmabuf_fd = buf_to_fd(dec->gbm, map_info.size, map_info.data); + gst_buffer_unmap(buf, &map_info); + } ++#endif + + if (dmabuf_fd < 0) { + GST_ERROR("could not obtain DMABUF FD"); +diff --git a/kmscube.c b/kmscube.c +index 3a2c4dd..276dc55 100644 +--- a/kmscube.c ++++ b/kmscube.c +@@ -142,7 +142,11 @@ int main(int argc, char *argv[]) + else if (mode == VIDEO) + egl = init_cube_video(gbm, video); + else ++#if HAVE_GBM_BO_MAP + egl = init_cube_tex(gbm, mode); ++#else ++ printf("gbm_bo_map() support missing\n"); ++#endif + + if (!egl) { + printf("failed to initialize EGL\n"); +-- +2.7.4 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube_git.bb index cab68fffb..5b64ed643 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -7,8 +7,9 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm gstreamer1.0 gstreamer1.0-plugins LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" SRCREV = "0d8de4ce3a03f36af1817f9b0586d132ad2c5d2e" -SRC_URI = "git://anongit.freedesktop.org/mesa/kmscube;branch=master;protocol=git" -UPSTREAM_VERSION_UNKNOWN = "1" +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" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch deleted file mode 100644 index b9297257d..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/Add-fallback-definition-for-EGL-CAST.patch +++ /dev/null @@ -1,33 +0,0 @@ -Add fallback definition for EGL_CAST - -The EGL API update from d11104f introduced a dependency on the -EGL_CAST() macro, provided by an updated eglplatform.h. Given that we -don't provide eglplatform.h, add a fallback definition for if we're -building against Mesa 17.0.x or similar. - -https://bugs.gentoo.org/show_bug.cgi?id=623926 - -Upstream-Status: Backport [https://github.com/anholt/libepoxy/commit/ebe3a53db1c0bb34e1ca963b95d1f222115f93f8] - -Signed-off-by: Tom Hochstein <tom.hochstein@nxp.com> - -Index: libepoxy-1.4.3/src/gen_dispatch.py -=================================================================== ---- libepoxy-1.4.3.orig/src/gen_dispatch.py 2017-06-06 04:24:13.000000000 -0500 -+++ libepoxy-1.4.3/src/gen_dispatch.py 2017-11-06 12:45:43.594966473 -0600 -@@ -491,6 +491,15 @@ - self.outln('#include "epoxy/gl.h"') - if self.target == "egl": - self.outln('#include "EGL/eglplatform.h"') -+ # Account for older eglplatform.h, which doesn't define -+ # the EGL_CAST macro. -+ self.outln('#ifndef EGL_CAST') -+ self.outln('#if defined(__cplusplus)') -+ self.outln('#define EGL_CAST(type, value) (static_cast<type>(value))') -+ self.outln('#else') -+ self.outln('#define EGL_CAST(type, value) ((type) (value))') -+ self.outln('#endif') -+ self.outln('#endif') - else: - # Add some ridiculous inttypes.h redefinitions that are - # from khrplatform.h and not included in the XML. We diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch new file mode 100644 index 000000000..d2b6c1a25 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy/no-tests.patch @@ -0,0 +1,33 @@ +Add option to disable tests. + +Upstream-Status: Submitted (https://github.com/anholt/libepoxy/pull/158) +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/meson.build b/meson.build +index b2ebaef..9632c7a 100644 +--- a/meson.build ++++ b/meson.build +@@ -242,7 +242,10 @@ libepoxy_inc = [ + + subdir('include/epoxy') + subdir('src') +-subdir('test') ++ ++if get_option('tests') ++ subdir('test') ++endif + + if get_option('docs') + doxygen = find_program('doxygen', required: false) +diff --git a/meson_options.txt b/meson_options.txt +index b5d7c98..dc30e68 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -15,3 +15,7 @@ option('x11', + type: 'boolean', + value: true, + description: 'Enable X11 support (GLX or EGL-X11)') ++option('tests', ++ type: 'boolean', ++ value: true, ++ description: 'Build the test suite') diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb index 0172322b9..5ca0868c2 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.4.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/libepoxy/libepoxy_1.5.0.bb @@ -6,17 +6,18 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=58ef4c80d401e07bd9ee8b6b58cf464b" SRC_URI = "https://github.com/anholt/${BPN}/releases/download/${PV}/${BP}.tar.xz \ - file://Add-fallback-definition-for-EGL-CAST.patch" -SRC_URI[md5sum] = "af4c3ce0fb1143bdc4e43f85695a9bed" -SRC_URI[sha256sum] = "0b808a06c9685a62fca34b680abb8bc7fb2fda074478e329b063c1f872b826f6" + file://no-tests.patch \ + " +SRC_URI[md5sum] = "63fe3847789258254dcd7e3fdb9e7f5e" +SRC_URI[sha256sum] = "4c94995398a6ebf691600dda2e9685a0cac261414175c2adf4645cdfab42a5d5" UPSTREAM_CHECK_URI = "https://github.com/anholt/libepoxy/releases" -inherit autotools pkgconfig distro_features_check +inherit meson pkgconfig distro_features_check REQUIRED_DISTRO_FEATURES = "opengl" -DEPENDS = "util-macros" - -PACKAGECONFIG[egl] = "--enable-egl, --disable-egl, virtual/egl" -PACKAGECONFIG[x11] = "--enable-glx, --disable-glx, virtual/libx11" +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" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch deleted file mode 100644 index efc84188f..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b44808e43130dcd13b43e5b978b9b24aeb4c134c Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Thu, 20 Oct 2016 14:57:51 +0200 -Subject: [PATCH] prepend our sysroot path so that make finds our - wayland-protocol files -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.in | 4 +- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/configure.in b/configure.in -index 726ded3..3376600 100644 ---- a/configure.in -+++ b/configure.in -@@ -1206,7 +1206,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for - WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` - WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` - WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` -- WAYLAND_CORE_PROTOCOL_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-client` -- WAYLAND_PROTOCOLS_DIR=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` -+ WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client` -+ WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - video_wayland=yes - fi - fi --- -2.5.5 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch deleted file mode 100644 index 7837315f1..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/0002-Avoid-finding-build-host-s-wayland-scanner.patch +++ /dev/null @@ -1,31 +0,0 @@ -From ae879091cf65cb70293b375ec7e61ed12a96d8a7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Fri, 2 Dec 2016 09:39:25 +0100 -Subject: [PATCH] Avoid finding build host's wayland-scanner -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.in | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.in b/configure.in -index 3376600..2aa6ed4 100644 ---- a/configure.in -+++ b/configure.in -@@ -1204,7 +1204,7 @@ AC_HELP_STRING([--enable-video-wayland-qt-touch], [QtWayland server support for - if $PKG_CONFIG --exists wayland-client wayland-scanner wayland-protocols wayland-egl wayland-cursor egl xkbcommon ; then - WAYLAND_CFLAGS=`$PKG_CONFIG --cflags wayland-client wayland-egl wayland-cursor xkbcommon` - WAYLAND_LIBS=`$PKG_CONFIG --libs wayland-client wayland-egl wayland-cursor xkbcommon` -- WAYLAND_SCANNER=`$PKG_CONFIG --variable=wayland_scanner wayland-scanner` -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - WAYLAND_CORE_PROTOCOL_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-client` - WAYLAND_PROTOCOLS_DIR=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols` - video_wayland=yes --- -2.7.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch deleted file mode 100644 index 1520bcfb6..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/fix-build-failure-on-ppc.patch +++ /dev/null @@ -1,50 +0,0 @@ -Upstream-Status: Backport [https://hg.libsdl.org/SDL/rev/5184186d4366] - -Backport patch from upstream to fix build failures on ppc and ppc64. - -Signed-off-by: Kai Kang <kai.kang@windriver.com> ---- -# HG changeset patch -# User Sam Lantinga <slouken@libsdl.org> -# Date 1477159315 25200 -# Node ID 5184186d4366169617b434f5b71c618a7035cde4 -# Parent 71d4148e32de5088c4bc2f04c1e5ded647a2bf82 -Fixed bug 3466 - Can't build 2.0.5 on ppc64 - -/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c: In function 'calc_swizzle32': -/home/fedora/SDL2-2.0.5/src/video/SDL_blit_N.c:127:5: error: ISO C90 forbids mixed declarations and code [-Werror=declaration-after-statement] - const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, - ^ - -diff -r 71d4148e32de -r 5184186d4366 src/video/SDL_blit_N.c ---- a/src/video/SDL_blit_N.c Wed Oct 19 21:22:42 2016 -0700 -+++ b/src/video/SDL_blit_N.c Sat Oct 22 11:01:55 2016 -0700 -@@ -118,12 +118,6 @@ - 16, 8, 0, 24, - 0, NULL - }; -- if (!srcfmt) { -- srcfmt = &default_pixel_format; -- } -- if (!dstfmt) { -- dstfmt = &default_pixel_format; -- } - const vector unsigned char plus = VECUINT8_LITERAL(0x00, 0x00, 0x00, 0x00, - 0x04, 0x04, 0x04, 0x04, - 0x08, 0x08, 0x08, 0x08, -@@ -136,6 +130,14 @@ - Uint32 gmask = RESHIFT(srcfmt->Gshift) << (dstfmt->Gshift); - Uint32 bmask = RESHIFT(srcfmt->Bshift) << (dstfmt->Bshift); - Uint32 amask; -+ -+ if (!srcfmt) { -+ srcfmt = &default_pixel_format; -+ } -+ if (!dstfmt) { -+ dstfmt = &default_pixel_format; -+ } -+ - /* Use zero for alpha if either surface doesn't have alpha */ - if (dstfmt->Amask) { - amask = - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch deleted file mode 100644 index 60185b131..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2/linkage.patch +++ /dev/null @@ -1,46 +0,0 @@ -When building use the libtool intermediate .lo files instead of explicitly using -the .o files. Under libtool foo.lo is the libtool intermediate wrapper, foo.o is -a static build, and .libs/foo.o is a shared build. - -If static libraries have been disabled globally then libtool won't generate them -and explicit references to foo.o won't be satisfied. - -Upstream-Status: Pending -RP -2016/1/16 - - -Index: SDL2-2.0.4/configure.in -=================================================================== ---- SDL2-2.0.4.orig/configure.in -+++ SDL2-2.0.4/configure.in -@@ -3464,23 +3464,23 @@ done - - VERSION_OBJECTS=`echo $VERSION_SOURCES` - VERSION_DEPENDS=`echo $VERSION_SOURCES` --VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.o,g'` -+VERSION_OBJECTS=`echo "$VERSION_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.rc,$(objects)/\1.lo,g'` - VERSION_DEPENDS=`echo "$VERSION_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.rc,\\\\ --\\$(objects)/\\2.o: \\1/\\2.rc\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.rc\\\\ - \\$(WINDRES) \\$< \\$@,g"` - - SDLMAIN_OBJECTS=`echo $SDLMAIN_SOURCES` - SDLMAIN_DEPENDS=`echo $SDLMAIN_SOURCES` --SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` -+SDLMAIN_OBJECTS=`echo "$SDLMAIN_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - SDLMAIN_DEPENDS=`echo "$SDLMAIN_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.o: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` - - SDLTEST_OBJECTS=`echo $SDLTEST_SOURCES` - SDLTEST_DEPENDS=`echo $SDLTEST_SOURCES` --SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.o,g'` -+SDLTEST_OBJECTS=`echo "$SDLTEST_OBJECTS" | sed 's,[[^ ]]*/\([[^ ]]*\)\.c,$(objects)/\1.lo,g'` - SDLTEST_DEPENDS=`echo "$SDLTEST_DEPENDS" | sed "s,\\([[^ ]]*\\)/\\([[^ ]]*\\)\\.c,\\\\ --\\$(objects)/\\2.o: \\1/\\2.c\\\\ -+\\$(objects)/\\2.lo: \\1/\\2.c\\\\ - \\$(RUN_CMD_CC)\\$(LIBTOOL) --tag=CC --mode=compile \\$(CC) \\$(CFLAGS) \\$(EXTRA_CFLAGS) $DEPENDENCY_TRACKING_OPTIONS -c \\$< -o \\$@,g"` - - # Set runtime shared library paths as needed diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb index 12d3aaf6f..c0cf70d7f 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.5.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.8.bb @@ -8,7 +8,7 @@ BUGTRACKER = "http://bugzilla.libsdl.org/" SECTION = "libs" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=b2304ad7e91711027590d3f102a754b7" +LIC_FILES_CHKSUM = "file://COPYING.txt;md5=02ee26814dd044bd7838ae24e05b880f" PROVIDES = "virtual/libsdl2" @@ -16,16 +16,12 @@ DEPENDS_class-nativesdk = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'virtu SRC_URI = " \ http://www.libsdl.org/release/SDL2-${PV}.tar.gz \ - file://linkage.patch \ - file://0001-prepend-our-sysroot-path-so-that-make-finds-our-wayl.patch \ - file://0002-Avoid-finding-build-host-s-wayland-scanner.patch \ - file://fix-build-failure-on-ppc.patch \ " S = "${WORKDIR}/SDL2-${PV}" -SRC_URI[md5sum] = "d4055424d556b4a908aa76fad63abd3c" -SRC_URI[sha256sum] = "442038cf55965969f2ff06d976031813de643af9c9edc9e331bd761c242e8785" +SRC_URI[md5sum] = "3800d705cef742c6a634f202c37f263f" +SRC_URI[sha256sum] = "edc77c57308661d576e843344d8638e025a7818bff73f8fbfab09c3c5fd092ec" inherit autotools lib_package binconfig pkgconfig @@ -35,7 +31,7 @@ EXTRA_OECONF = "--disable-oss --disable-esd --disable-arts \ --enable-pthreads \ --enable-sdl-dlopen \ --disable-rpath \ - WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT}" + " # opengl packageconfig factored out to make it easy for distros # and BSP layers to pick either (desktop) opengl, gles2, or no GL diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libva/libva-utils_1.8.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/libva/libva-utils_2.1.0.bb index c082c18b5..a8018ea72 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/libva/libva-utils_1.8.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/libva/libva-utils_2.1.0.bb @@ -8,18 +8,17 @@ for video processing. It consists of a main library and driver-specific \ acceleration backends for each supported hardware vendor" HOMEPAGE = "https://01.org/linuxmedia/vaapi" -BUGTRACKER = "https://github.com/01org/libva-utils/issues" +BUGTRACKER = "https://github.com/intel/libva-utils/issues" SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=b148fc8adf19dc9aec17cf9cd29a9a5e" -SRC_URI = "git://github.com/01org/libva-utils.git;branch=v1.8-branch" -SRCREV = "011c709b98b52db3b10aeb361dfea9da43930364" -UPSTREAM_CHECK_URI = "https://github.com/01org/libva-utils/releases" -UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>(\d+(\.\d+)+))" +SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" +SRC_URI[md5sum] = "6649be70390606651cb636320bfd43c6" +SRC_URI[sha256sum] = "f6a7790c3dcc56537372c90a83036a3136194a8b397e84e97bf9cc9254fa2c51" -S = "${WORKDIR}/git" +UPSTREAM_CHECK_URI = "https://github.com/intel/libva-utils/releases" DEPENDS = "libva" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/libva/libva_1.8.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/libva/libva_2.1.0.bb index ceeda8428..d3cf6334c 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/libva/libva_1.8.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/libva/libva_2.1.0.bb @@ -11,19 +11,20 @@ manufacturers can also freely use this API for hardware accelerated \ video decoding." HOMEPAGE = "https://01.org/linuxmedia/vaapi" -BUGTRACKER = "https://github.com/01org/libva/issues" +BUGTRACKER = "https://github.com/intel/libva/issues" SECTION = "x11" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" -SRC_URI = "git://github.com/01org/libva.git;protocol=http;branch=v1.8-branch " -SRCREV = "457470987cc9df5976ce8c72ffd4bfbd9baaf0f9" -UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>(\d+(\.\d+)+))$" +SRC_URI = "https://github.com/intel/${BPN}/releases/download/${PV}/${BP}.tar.bz2" -S = "${WORKDIR}/git" +SRC_URI[md5sum] = "9d6e4f1d36c407566343e9dde5a972b8" +SRC_URI[sha256sum] = "f3fa953a11d3210c3a4ee79031abdbe0863d5ce13d9b3f93f315f1eec60a4b0f" -DEPENDS = "libdrm virtual/mesa virtual/libgles1 virtual/libgles2 virtual/egl" +UPSTREAM_CHECK_URI = "https://github.com/intel/libva/releases" + +DEPENDS = "libdrm virtual/mesa" inherit autotools pkgconfig distro_features_check @@ -35,17 +36,11 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,virtual/libx11 libxext libxfixes" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland-native wayland" -PACKAGES =+ "${PN}-x11 ${PN}-tpi ${PN}-glx ${PN}-egl ${PN}-wayland" +PACKAGES =+ "${PN}-x11 ${PN}-glx ${PN}-wayland" -RDEPENDS_${PN}-tpi =+ "${PN}" RDEPENDS_${PN}-x11 =+ "${PN}" RDEPENDS_${PN}-glx =+ "${PN}-x11" -RDEPENDS_${PN}-egl =+ "${PN}-x11" - -FILES_${PN}-dbg += "${libdir}/dri/.debug" FILES_${PN}-x11 =+ "${libdir}/libva-x11*${SOLIBS}" -FILES_${PN}-tpi =+ "${libdir}/libva-tpi*${SOLIBS}" FILES_${PN}-glx =+ "${libdir}/libva-glx*${SOLIBS}" -FILES_${PN}-egl =+ "${libdir}/libva-egl*${SOLIBS}" FILES_${PN}-wayland =+ "${libdir}/libva-wayland*${SOLIBS}" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch index bd1e86349..f908d4655 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch @@ -20,17 +20,18 @@ undefined reference to `XML_GetCurrentLineNumber' explictly add EXPAT_LIBS to intel's VULKAN_LIB_DEPS -Upstream-Status: Submitted [mesa-dev@lists.freedesktop.org] +Upstream-Status: Accepted +https://cgit.freedesktop.org/mesa/mesa/commit/?id=05fc62d89f59ce19a18bfd4e63a09624910d6caf Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> --- src/intel/Makefile.vulkan.am | 1 + 1 file changed, 1 insertion(+) -diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am -index 271b0a5..8fbe2c8 100644 ---- a/src/intel/Makefile.vulkan.am -+++ b/src/intel/Makefile.vulkan.am +Index: mesa-17.3.6/src/intel/Makefile.vulkan.am +=================================================================== +--- mesa-17.3.6.orig/src/intel/Makefile.vulkan.am ++++ mesa-17.3.6/src/intel/Makefile.vulkan.am @@ -144,6 +144,7 @@ VULKAN_LIB_DEPS = \ $(LIBDRM_LIBS) \ $(PTHREAD_LIBS) \ @@ -38,7 +39,4 @@ index 271b0a5..8fbe2c8 100644 + $(EXPAT_LIBS) \ -lm - if HAVE_PLATFORM_X11 --- -2.7.4 - + if HAVE_PLATFORM_ANDROID diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch index eb6ff4ff0..2444b2846 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-Use-wayland-scanner-in-the-path.patch @@ -14,12 +14,12 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> configure.ac | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) -diff --git a/configure.ac b/configure.ac -index 2c7e636fac..d2b2350739 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2174,12 +2174,7 @@ if test "x$with_platforms" != xauto; then - with_egl_platforms=$with_platforms +Index: mesa-17.3.6/configure.ac +=================================================================== +--- mesa-17.3.6.orig/configure.ac ++++ mesa-17.3.6/configure.ac +@@ -1694,12 +1694,7 @@ if test "x$with_platforms" = xauto; then + with_platforms=$with_egl_platforms fi -PKG_CHECK_MODULES([WAYLAND_SCANNER], [wayland-scanner], @@ -30,8 +30,5 @@ index 2c7e636fac..d2b2350739 100644 -fi +AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - # Do per-EGL platform setups and checks - egl_platforms=`IFS=', '; echo $with_egl_platforms` --- -2.13.0 - + PKG_CHECK_EXISTS([wayland-protocols >= $WAYLAND_PROTOCOLS_REQUIRED], [have_wayland_protocols=yes], [have_wayland_protocols=no]) + if test "x$have_wayland_protocols" = xyes; then diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch deleted file mode 100644 index b27a3bc8e..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 9861437e58fdd0de01193a102608d34e5952953f Mon Sep 17 00:00:00 2001 -From: Christoph Haag <haagch+mesadev@frickel.club> -Date: Thu, 20 Apr 2017 10:34:18 +0200 -Subject: [PATCH 1/2] ac: fix build after LLVM 5.0 SVN r300718 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -v2: previously getWithDereferenceableBytes() exists, but addAttr() doesn't take that type - -Signed-off-by: Christoph Haag <haagch+mesadev@frickel.club> -Reviewed-by: Nicolai Hähnle <nicolai.haehnle@amd.com> -Tested-and-reviewed-by: Mike Lothian <mike@fireburn.co.uk> ---- -Upstream-Status: Backport - - src/amd/common/ac_llvm_helper.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/amd/common/ac_llvm_helper.cpp b/src/amd/common/ac_llvm_helper.cpp -index d9ea4b1..11fa809 100644 ---- a/src/amd/common/ac_llvm_helper.cpp -+++ b/src/amd/common/ac_llvm_helper.cpp -@@ -44,9 +44,13 @@ typedef AttributeSet AttributeList; - void ac_add_attr_dereferenceable(LLVMValueRef val, uint64_t bytes) - { - llvm::Argument *A = llvm::unwrap<llvm::Argument>(val); -+#if HAVE_LLVM < 0x0500 - llvm::AttrBuilder B; - B.addDereferenceableAttr(bytes); - A->addAttr(llvm::AttributeList::get(A->getContext(), A->getArgNo() + 1, B)); -+#else -+ A->addAttr(llvm::Attribute::getWithDereferenceableBytes(A->getContext(), bytes)); -+#endif - } - - bool ac_is_sgpr_param(LLVMValueRef arg) --- -2.13.3 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch deleted file mode 100644 index 4753c49d2..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-configure.ac-Always-check-for-expat.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 1f7d752193f02d15d5923cee992e8f46d4c6df1b Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Mon, 28 Aug 2017 13:51:49 +0300 -Subject: [PATCH] configure.ac: Always check for expat - -expat was not checked if dri was not built leading to build failure -in vulkan driver: backport a fix (a combination of multiple commits -that should end up in 17.3). - -Upstream-Status: Backport -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 15 ++++++--------- - 1 file changed, 6 insertions(+), 9 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fd346c8aa2..662faecefa 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -1777,6 +1777,12 @@ if test "x$with_dri_drivers" = xno; then - with_dri_drivers='' - fi - -+# Check for expat -+PKG_CHECK_MODULES([EXPAT], [expat]) -+PKG_CHECK_MODULES([EXPAT], [expat],, -+ [PKG_CHECK_MODULES([EXPAT], [expat21])] -+) -+ - dnl If $with_dri_drivers is yes, drivers will be added through - dnl platform checks. Set DEFINES and LIB_DEPS - if test "x$enable_dri" = xyes; then -@@ -1810,15 +1816,6 @@ if test "x$enable_dri" = xyes; then - with_dri_drivers="i915 i965 nouveau r200 radeon swrast" - fi - -- # Check for expat -- PKG_CHECK_MODULES([EXPAT], [expat], [], -- # expat version 2.0 and earlier do not provide expat.pc -- [AC_CHECK_HEADER([expat.h],[], -- [AC_MSG_ERROR([Expat headers required for DRI not found])]) -- AC_CHECK_LIB([expat],[XML_ParserCreate],[], -- [AC_MSG_ERROR([Expat library required for DRI not found])]) -- EXPAT_LIBS="-lexpat"]) -- - # put all the necessary libs together - DRI_LIB_DEPS="$DRI_LIB_DEPS $SELINUX_LIBS $LIBDRM_LIBS $EXPAT_LIBS -lm $PTHREAD_LIBS $DLOPEN_LIBS" - fi --- -2.14.1 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch new file mode 100644 index 000000000..6aba7859e --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch @@ -0,0 +1,43 @@ +From 4cbecb61682a0ee426faaa03d824fc8fd7aef826 Mon Sep 17 00:00:00 2001 +From: Daniel Stone <daniels@collabora.com> +Date: Mon, 2 Apr 2018 13:20:34 +0100 +Subject: [PATCH] st/dri: Initialise modifier to INVALID for DRI2 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +When allocating a buffer for DRI2, set the modifier to INVALID to inform +the backend that we have no supplied modifiers and it should do its own +thing. The missed initialisation forced linear, even if the +implementation had made other decisions. + +This resulted in VC4 DRI2 clients failing with: + Modifier 0x0 vs. tiling (0x700000000000001) mismatch + +Signed-off-by: Daniel Stone <daniels@collabora.com> +Reported-by: Andreas Müller <schnitzeltony@gmail.com> +Reviewed-by: Eric Anholt <eric@anholt.net> +Fixes: 3f8513172ff6 ("gallium/winsys/drm: introduce modifier field to winsys_handle") + +Upstream-Status: Backport [1] + +[1] https://cgit.freedesktop.org/mesa/mesa/commit/?id=4cbecb61682a0ee426faaa03d824fc8fd7aef826 +--- + src/gallium/state_trackers/dri/dri2.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/src/gallium/state_trackers/dri/dri2.c b/src/gallium/state_trackers/dri/dri2.c +index 31d17d46c2..58a6757f03 100644 +--- a/src/gallium/state_trackers/dri/dri2.c ++++ b/src/gallium/state_trackers/dri/dri2.c +@@ -806,6 +806,7 @@ dri2_allocate_textures(struct dri_context *ctx, + whandle.handle = buf->name; + whandle.stride = buf->pitch; + whandle.offset = 0; ++ whandle.modifier = DRM_FORMAT_MOD_INVALID; + if (screen->can_share_buffer) + whandle.type = DRM_API_HANDLE_TYPE_SHARED; + else +-- +2.14.3 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch deleted file mode 100644 index ac8caec74..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch +++ /dev/null @@ -1,49 +0,0 @@ -From a02a0dfda2712d30ad62b8f0421ec7b8244ba2cb Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Michel=20D=C3=A4nzer?= <michel.daenzer@amd.com> -Date: Wed, 10 May 2017 17:26:07 +0900 -Subject: [PATCH 2/2] gallivm: Fix build against LLVM SVN >= r302589 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -deregisterEHFrames doesn't take any parameters anymore. - -Reviewed-by: Vedran Miletić <vedran@miletic.net> -Reviewed-by: Marek Olšák <marek.olsak@amd.com> ---- -Upstream-Status: Backport - - src/gallium/auxiliary/gallivm/lp_bld_misc.cpp | 12 +++++++++--- - 1 file changed, 9 insertions(+), 3 deletions(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -index 2a388cb..0e4a531 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -+++ b/src/gallium/auxiliary/gallivm/lp_bld_misc.cpp -@@ -342,14 +342,20 @@ class DelegatingJITMemoryManager : public BaseMemoryManager { - virtual void registerEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { - mgr()->registerEHFrames(Addr, LoadAddr, Size); - } -- virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { -- mgr()->deregisterEHFrames(Addr, LoadAddr, Size); -- } - #else - virtual void registerEHFrames(llvm::StringRef SectionData) { - mgr()->registerEHFrames(SectionData); - } - #endif -+#if HAVE_LLVM >= 0x0500 -+ virtual void deregisterEHFrames() { -+ mgr()->deregisterEHFrames(); -+ } -+#elif HAVE_LLVM >= 0x0304 -+ virtual void deregisterEHFrames(uint8_t *Addr, uint64_t LoadAddr, size_t Size) { -+ mgr()->deregisterEHFrames(Addr, LoadAddr, Size); -+ } -+#endif - virtual void *getPointerToNamedFunction(const std::string &Name, - bool AbortOnFailure=true) { - return mgr()->getPointerToNamedFunction(Name, AbortOnFailure); --- -2.13.3 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch new file mode 100644 index 000000000..0b4aabf97 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/Use-Python-3-to-execute-the-scripts.patch @@ -0,0 +1,32 @@ +From 18c3e684a8259a0644214f88c7ead7fa31573fd9 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] 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 b107f04c2e..055546142d 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -114,7 +114,7 @@ AC_PROG_CXX + AM_PROG_CC_C_O + 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.15.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/llvm-config-version.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/llvm-config-version.patch index aa33a1e91..fd79991aa 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/llvm-config-version.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/llvm-config-version.patch @@ -1,18 +1,24 @@ -When building llvm from git or svn it embeds the svn/git revision into internal version string +From: Otavio Salvador <otavio@ossystems.com.br> +Subject: [PATCH] Properly get LLVM version when using LLVM Git releases -$ /mnt/a/oe/build/tmp/work/corei7-64-bec-linux/mesa/2_17.1.5-r0/recipe-sysroot/usr/lib/llvm5.0/llvm-config-host --version +$ llvm-config-host --version 5.0.0git-9a5c333388c -We need to ignore everything after 5.0.0 which is what the cut cmd is doing +We need to ignore everything after 5.0.0 which is what the cut cmd is +doing Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> +--- + configure.ac | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) -Index: mesa-17.1.5/configure.ac -=================================================================== ---- mesa-17.1.5.orig/configure.ac -+++ mesa-17.1.5/configure.ac -@@ -967,7 +967,7 @@ strip_unwanted_llvm_flags() { +diff --git a/configure.ac b/configure.ac +index a02173f244..b107f04c2e 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -995,7 +995,7 @@ strip_unwanted_llvm_flags() { llvm_set_environment_variables() { if test "x$LLVM_CONFIG" != xno; then @@ -21,12 +27,15 @@ Index: mesa-17.1.5/configure.ac LLVM_CPPFLAGS=`strip_unwanted_llvm_flags "$LLVM_CONFIG --cppflags"` LLVM_INCLUDEDIR=`$LLVM_CONFIG --includedir` LLVM_LIBDIR=`$LLVM_CONFIG --libdir` -@@ -2560,7 +2560,7 @@ if test "x$enable_llvm" = xyes; then +@@ -2644,7 +2644,7 @@ detect_old_buggy_llvm() { + dnl ourselves. dnl (See https://llvm.org/bugs/show_bug.cgi?id=6823) - if test "x$enable_llvm_shared_libs" = xyes; then - dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, -- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` -+ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version|cut -c1-5` - AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) + dnl We can't use $LLVM_VERSION because it has 'svn' stripped out, +- LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version` ++ LLVM_SO_NAME=LLVM-`$LLVM_CONFIG --version | cut -c1-5` + AS_IF([test -f "$LLVM_LIBDIR/lib$LLVM_SO_NAME.$IMP_LIB_EXT"], [llvm_have_one_so=yes]) - if test "x$llvm_have_one_so" = xyes; then + if test "x$llvm_have_one_so" = xyes; then +-- +2.15.1 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch deleted file mode 100644 index 0280ee859..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/replace_glibc_check_with_linux.patch +++ /dev/null @@ -1,26 +0,0 @@ -endianness check is OS wide and not specific to libc - -Signed-off-by: Khem Raj <raj.khem@gmail.com> -Upstream-Status: Pending - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - src/util/u_endian.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/u_endian.h b/src/util/u_endian.h -index b9d563d..2d5eab9 100644 ---- a/src/util/u_endian.h -+++ b/src/util/u_endian.h -@@ -27,7 +27,7 @@ - #ifndef U_ENDIAN_H - #define U_ENDIAN_H - --#if defined(__GLIBC__) || defined(ANDROID) -+#if defined(__linux__) - #include <endian.h> - - #if __BYTE_ORDER == __LITTLE_ENDIAN --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch b/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch deleted file mode 100644 index 15ee5eeb1..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/files/vulkan-mkdir.patch +++ /dev/null @@ -1,37 +0,0 @@ -Upstream-Status: Submitted -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From c78979fd95a1c4f732f7e6edf0f32c524e5955b8 Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Wed, 12 Jul 2017 17:10:07 +0100 -Subject: [PATCH] src/intel/Makefile.vulkan.am: create target directories when - required - -In out-of-tree builds src/intel/vulkan won't exist, so always create it before -writing into it. - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - src/intel/Makefile.vulkan.am | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/intel/Makefile.vulkan.am b/src/intel/Makefile.vulkan.am -index 3857a5dc62..26e9cd410c 100644 ---- a/src/intel/Makefile.vulkan.am -+++ b/src/intel/Makefile.vulkan.am -@@ -44,11 +44,13 @@ EXTRA_DIST += \ - vulkan/TODO - - vulkan/dev_icd.json : vulkan/dev_icd.json.in -+ $(MKDIR_GEN) - $(AM_V_GEN) $(SED) \ - -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \ - < $(srcdir)/vulkan/dev_icd.json.in > $@ - - vulkan/intel_icd.@host_cpu@.json : vulkan/intel_icd.json.in -+ $(MKDIR_GEN) - $(AM_V_GEN) $(SED) \ - -e "s#@install_libdir@#${libdir}#" \ - < $(srcdir)/vulkan/intel_icd.json.in > $@ --- -2.11.0 diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb index 73267eb4f..73267eb4f 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_17.1.7.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa-gl_17.3.8.bb diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc index 4f31ed255..b501b7e72 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa.inc @@ -16,9 +16,15 @@ PE = "2" DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native" EXTRANATIVEPATH += "chrpath-native" -PROVIDES = "virtual/libgl virtual/libgles1 virtual/libgles2 virtual/egl virtual/mesa" +PROVIDES = " \ + ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ + ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ + virtual/mesa \ + " -inherit autotools pkgconfig gettext distro_features_check +inherit autotools pkgconfig python3native gettext distro_features_check ANY_OF_DISTRO_FEATURES = "opengl vulkan" @@ -34,7 +40,7 @@ EXTRA_OECONF = "--enable-shared-glapi \ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm dri', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11 dri3', '', d)} \ ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ " @@ -45,7 +51,7 @@ X11_DEPS = "xf86driproto glproto virtual/libx11 libxext libxxf86vm libxdamage li # "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" +PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" DRIDRIVERS = "swrast" DRIDRIVERS_append_x86 = ",radeon,r200,nouveau,i965,i915" @@ -59,7 +65,7 @@ PACKAGECONFIG[dri3] = "--enable-dri3, --disable-dri3, dri3proto presentproto lib VULKAN_DRIVERS = "" VULKAN_DRIVERS_append_x86 = ",intel" VULKAN_DRIVERS_append_x86-64 = ",intel" -PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers" +PACKAGECONFIG[vulkan] = "--with-vulkan-drivers=${VULKAN_DRIVERS}, --without-vulkan-drivers, python3-mako-native" PACKAGECONFIG[opengl] = "--enable-opengl, --disable-opengl" @@ -77,13 +83,13 @@ GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnav GALLIUMDRIVERS_append ="${@bb.utils.contains('PACKAGECONFIG', 'imx', ',imx', '', d)}" GALLIUMDRIVERS_LLVM33 = "${@bb.utils.contains('PACKAGECONFIG', 'r600', 'radeonsi,r600', '', d)}" PACKAGECONFIG[r600] = "" -GALLIUMDRIVERS_LLVM33_ENABLED = "${@base_version_less_or_equal('MESA_LLVM_RELEASE', '3.2', False, len('${GALLIUMDRIVERS_LLVM33}') > 0, 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)}" # 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 ?= "5.0" +MESA_LLVM_RELEASE ?= "6.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}" @@ -99,9 +105,6 @@ FULL_OPTIMIZATION_append = " -fno-omit-frame-pointer" CFLAGS_append_armv5 = " -DMISSING_64BIT_ATOMICS" -# Multiple virtual/gl providers being built breaks staging -EXCLUDE_FROM_WORLD = "1" - # Remove the mesa dependency on mesa-dev, as mesa is empty RDEPENDS_${PN}-dev = "" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_17.1.7.bb b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_17.3.8.bb index 39cfce992..2d3fd3ca3 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_17.1.7.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/mesa/mesa_17.3.8.bb @@ -1,20 +1,18 @@ require ${BPN}.inc SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://replace_glibc_check_with_linux.patch \ file://disable-asm-on-non-gcc.patch \ + file://Use-Python-3-to-execute-the-scripts.patch \ file://0001-Use-wayland-scanner-in-the-path.patch \ file://0002-hardware-gloat.patch \ - file://vulkan-mkdir.patch \ file://llvm-config-version.patch \ - file://0001-ac-fix-build-after-LLVM-5.0-SVN-r300718.patch \ - file://0002-gallivm-Fix-build-against-LLVM-SVN-r302589.patch \ file://0001-winsys-svga-drm-Include-sys-types.h.patch \ - file://0001-configure.ac-Always-check-for-expat.patch \ file://0001-Makefile.vulkan.am-explictly-add-lib-expat-to-intel-.patch \ + file://0001-st-dri-Initialise-modifier-to-INVALID-for-DRI2.patch \ " -SRC_URI[md5sum] = "e40bb428a263bd28cbf6478dae45b207" -SRC_URI[sha256sum] = "69f472a874b1122404fa0bd13e2d6bf87eb3b9ad9c21d2f39872a96d83d9e5f5" + +SRC_URI[md5sum] = "203d1a79156ab6926f2d253b377e9d9d" +SRC_URI[sha256sum] = "8f9d9bf281c48e4a8f5228816577263b4c655248dc7666e75034ab422951a6b1" #because we cannot rely on the fact that all apps will use pkgconfig, #make eglplatform.h independent of MESA_EGL_NO_X11_HEADER diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch index 812da21c5..9e1626e9a 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango/0001-Drop-introspection-macros-from-acinclude.m4.patch @@ -6,7 +6,7 @@ Subject: [PATCH] Drop introspection macros from acinclude.m4 They take precendence over our customized macros, and so introspection doesn't work correctly. -Upstream-Status: Pending [review on oe-core list] +Upstream-Status: Backport [upstream 5ccfe0] Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> --- acinclude.m4 | 96 ------------------------------------------------------------ @@ -118,4 +118,3 @@ index 8899c7c..48fd5d8 100644 -]) -- 2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.6.bb b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.14.bb index 31c3d2a65..3bd9c6471 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.6.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/pango/pango_1.40.14.bb @@ -17,16 +17,14 @@ SRC_URI += "file://run-ptest \ file://0001-Drop-introspection-macros-from-acinclude.m4.patch \ file://0001-Enforce-recreation-of-docs-pango.types-it-is-build-c.patch \ " -SRC_URI[archive.md5sum] = "507c6746fbf53fc9d48c577f1e265de3" -SRC_URI[archive.sha256sum] = "ca152b7383a1e9f7fd74ae96023dc6770dc5043414793bfe768ff06b6759e573" +SRC_URI[archive.md5sum] = "18d7eb8d52e7e445e733c109ddaa7b78" +SRC_URI[archive.sha256sum] = "90af1beaa7bf9e4c52db29ec251ec4fd0a8f2cc185d521ad1f88d01b3a6a17e3" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" PACKAGECONFIG[x11] = "--with-xft,--without-xft,virtual/libx11 libxft" -EXTRA_AUTORECONF = "" - EXTRA_OECONF = " \ --disable-debug \ " diff --git a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb index d274a8fbd..b936ad8a7 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -6,10 +6,10 @@ 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 \ " -UPSTREAM_VERSION_UNKNOWN = "1" +UPSTREAM_CHECK_COMMITS = "1" -# From 2017-07-03 -SRCREV = "c8f4fd9eeb298a2ef0855927f22634f794ef3eff" +# From 2018-02-26 +SRCREV = "4ce0887e2f7f848d2be2e435a2d0f3c80e44ea3b" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" @@ -40,14 +40,12 @@ do_configure_prepend() { fi } -do_install() { - oe_runmake -C ${B} 'DESTDIR=${D}' install/strip -} +OECMAKE_TARGET_INSTALL = "install/strip" RDEPENDS_${PN} = "waffle python3 python3-mako python3-json \ - python3-subprocess python3-misc python3-importlib \ + python3-misc \ python3-unixadmin python3-xml python3-multiprocessing \ - python3-six python3-shell python3-io python3-argparse \ + python3-six python3-shell python3-io \ python3-netserver mesa-demos bash \ " diff --git a/import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb b/import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb index b2e4cef39..70b32cf8f 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/ttf-fonts/ttf-bitstream-vera_1.10.bb @@ -13,26 +13,20 @@ inherit fontcache FONT_PACKAGES = "${PN}" -SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" - -do_install () { - install -d ${D}${prefix}/share/fonts/ttf/ - for i in *.ttf; do - install -m 644 $i ${D}${prefix}/share/fonts/ttf/${i} - done - - # fontconfig ships this too. not sure what to do about it. - #install -d ${D}${sysconfdir}/fonts - #install -m 644 local.conf ${D}${sysconfdir}/fonts/local.conf - +SRC_URI = "${GNOME_MIRROR}/ttf-bitstream-vera/1.10/ttf-bitstream-vera-${PV}.tar.bz2" +SRC_URI[md5sum] = "bb22bd5b4675f5dbe17c6963d8c00ed6" +SRC_URI[sha256sum] = "db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc" - install -d ${D}${prefix}/share/doc/${BPN}/ - for i in *.TXT; do - install -m 644 $i ${D}${prefix}/share/doc/${BPN}/$i - done -} +do_install () { + install -d ${D}${datadir}/fonts/ttf + for i in *.ttf; do + install -m 644 $i ${D}${datadir}/fonts/ttf + done -FILES_${PN} = "/etc ${datadir}/fonts" + install -d ${D}${docdir}/${BPN} + for i in *.TXT; do + install -m 644 $i ${D}${docdir}/${BPN} + done +} -SRC_URI[md5sum] = "bb22bd5b4675f5dbe17c6963d8c00ed6" -SRC_URI[sha256sum] = "db5b27df7bbb318036ebdb75acd3e98f1bd6eb6608fb70a67d478cd243d178dc" +FILES_${PN} = "${datadir}/fonts" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/assimp_4.0.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/vulkan/assimp_4.1.0.bb index 7a96a4f36..194cbe33c 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/assimp_4.0.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/vulkan/assimp_4.1.0.bb @@ -11,12 +11,10 @@ DEPENDS = "zlib" SRC_URI = "git://github.com/assimp/assimp.git" UPSTREAM_CHECK_GITTAGREGEX = "v(?P<pver>(\d+(\.\d+)+))" -SRCREV = "52c8d06f5d6498afd66df983da348a6b112f1314" +SRCREV = "80799bdbf90ce626475635815ee18537718a05b1" S = "${WORKDIR}/git" inherit cmake EXTRA_OECMAKE = "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF -DASSIMP_BUILD_TESTS=OFF -DASSIMP_LIB_INSTALL_DIR=${baselib}" - -FILES_${PN}-dev += "${libdir}/cmake/" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb index 0b8943508..5fc9c2dba 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan-demos_git.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/SaschaWillems/Vulkan.git \ file://0001-Don-t-build-demos-with-questionably-licensed-data.patch \ file://0001-Fix-build-on-x86.patch \ " -UPSTREAM_VERSION_UNKNOWN = "1" +UPSTREAM_CHECK_COMMITS = "1" SRCREV = "18df00c7b4677b0889486e16977857aa987947e2" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch b/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch index 3cf241d62..bcf84a5a3 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan/demos-Don-t-build-tri-or-cube.patch @@ -11,9 +11,11 @@ Date: Tue Feb 16 10:05:25 2016 -0500 Upstream-Status: Inappropriate [configuration] Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- a/demos/CMakeLists.txt -+++ b/demos/CMakeLists.txt -@@ -61,46 +61,6 @@ +Index: git/demos/CMakeLists.txt +=================================================================== +--- git.orig/demos/CMakeLists.txt ++++ git/demos/CMakeLists.txt +@@ -63,46 +63,6 @@ elseif(UNIX) else() endif() @@ -60,7 +62,7 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> if(WIN32) include_directories ( -@@ -114,43 +74,6 @@ +@@ -116,43 +76,6 @@ endif() add_executable(${API_LOWERCASE}info vulkaninfo.c) target_link_libraries(${API_LOWERCASE}info ${LIBRARIES}) @@ -103,4 +105,4 @@ Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -endif() if(UNIX) - install(TARGETS ${API_LOWERCASE}info DESTINATION ${CMAKE_INSTALL_BINDIR}) + if(INSTALL_LVL_FILES) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan_1.0.65.2.bb index 9de39bc09..1c8a89550 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan_1.0.51.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/vulkan/vulkan_1.0.65.2.bb @@ -10,10 +10,10 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=99c647ca3d4f6a4b9d8628f757aad156 \ file://loader/loader.c;endline=25;md5=a87cd5442291c23d1fce4eece4cfde9d" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.51 \ +SRC_URI = "git://github.com/KhronosGroup/Vulkan-LoaderAndValidationLayers.git;branch=sdk-1.0.65 \ file://demos-Don-t-build-tri-or-cube.patch \ -" -SRCREV = "8d021e4d5a9f91436f4462df1dafb222908e296d" + " +SRCREV = "73486a1a169d862d5210e2ad520d95319a2383fa" UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb index a5179db1d..43c3edc05 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/waffle/waffle_1.5.2.bb @@ -35,6 +35,3 @@ PACKAGECONFIG[gbm] = "-Dwaffle_has_gbm=1,-Dwaffle_has_gbm=0,virtual/${MLPREFIX}l # I say virtual/libgl, actually wants egl.pc PACKAGECONFIG[x11-egl] = "-Dwaffle_has_x11_egl=1,-Dwaffle_has_x11_egl=0,virtual/${MLPREFIX}libgl libxcb" - -FILES_${PN}-dev += "${datadir}/cmake/Modules/FindWaffle.cmake \ - ${libdir}/cmake/Waffle/" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch deleted file mode 100644 index 4667538c5..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput/0001-tools-Fix-race-in-autotools-install.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 5e8864c5b7a2e258eea041b0ef66dac7fcab9b7f Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 9 Aug 2017 09:47:14 +0300 -Subject: [PATCH] tools: Fix race in (autotools) install -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -exec/data distinction is done based on install dir so compat scripts -must be moved in exec hook. - -This should fix this occasional failure: -| install: cannot change permissions of -| ‘/usr/bin/libinput-debug-events.compat’: No such file or directory - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Submitted ---- - tools/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/tools/Makefile.am b/tools/Makefile.am -index 2c8660b..7ee8b90 100644 ---- a/tools/Makefile.am -+++ b/tools/Makefile.am -@@ -63,7 +63,7 @@ endif - - EXTRA_DIST = make-ptraccel-graphs.sh install-compat-scripts.sh $(bin_SCRIPTS) - --install-data-hook: -+install-exec-hook: - (cd $(DESTDIR)$(bindir) && mv libinput-list-devices.compat libinput-list-devices) - (cd $(DESTDIR)$(bindir) && mv libinput-debug-events.compat libinput-debug-events) - --- -2.13.3 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.8.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.9.4.bb index a21babeb0..67a49dfe0 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.8.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/libinput_1.9.4.bb @@ -8,22 +8,20 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2184aef38ff137ed33ce9a63b9d1eb8f" DEPENDS = "libevdev udev mtdev" SRC_URI = "http://www.freedesktop.org/software/${BPN}/${BP}.tar.xz \ - file://0001-tools-Fix-race-in-autotools-install.patch \ -" + " +SRC_URI[md5sum] = "8b43d07d1698fb207a0492fc67554d4f" +SRC_URI[sha256sum] = "0bcdbd4c4e3c2a2db322fbdf2ef3284f2e6d6fb7be3af80e6d8de7783f675190" -SRC_URI[md5sum] = "8247f0bb67052ffb272c50c3cb9c5998" -SRC_URI[sha256sum] = "e3590a9037e561a5791c8bd3b34bfd30fad5cacd8cbefc0d75fafe3a41d07147" - -inherit autotools pkgconfig lib_package +UPSTREAM_CHECK_REGEX = "libinput-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" +inherit meson pkgconfig lib_package PACKAGECONFIG ??= "" -PACKAGECONFIG[libunwind] = "--with-libunwind,--without-libunwind,libunwind" -PACKAGECONFIG[libwacom] = "--enable-libwacom,--disable-libwacom,libwacom" -PACKAGECONFIG[gui] = "--enable-debug-gui,--disable-debug-gui,cairo gtk+3" +PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" +PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" UDEVDIR = "`pkg-config --variable=udevdir udev`" -EXTRA_OECONF += "--with-udev-dir=${UDEVDIR} --disable-documentation --disable-tests" +EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} -Ddocumentation=false -Dtests=false" # package name changed in 1.8.1 upgrade: make sure package upgrades work RPROVIDES_${PN} = "libinput" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.13.bb index 4f9e9f32b..1ef1ee141 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.10.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland-protocols_1.13.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] = "84a7846c2b6a6a3e265fc9be36453e60" -SRC_URI[sha256sum] = "5719c51d7354864983171c5083e93a72ac99229e2b460c4bb10513de08839c0a" +SRC_URI[md5sum] = "29312149dafcd4a0e739ba94995a574d" +SRC_URI[sha256sum] = "0758bc8008d5332f431b2a84fea7de64d971ce270ed208206a098ff2ebc68f38" inherit allarch autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch new file mode 100644 index 000000000..ad3526d98 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland/fixpathinpcfiles.patch @@ -0,0 +1,32 @@ +Fix wayland-client and wayland-scanner pc files + +Upstream-Status: Pending + +Signed-off-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> + +Index: wayland-1.14.0/src/wayland-client.pc.in +=================================================================== +--- wayland-1.14.0.orig/src/wayland-client.pc.in ++++ wayland-1.14.0/src/wayland-client.pc.in +@@ -1,7 +1,7 @@ + prefix=@prefix@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ +-pkgdatadir=@datadir@/@PACKAGE@ ++pkgdatadir=${pc_sysrootdir}@datadir@/@PACKAGE@ + libdir=@libdir@ + includedir=@includedir@ + +Index: wayland-1.14.0/src/wayland-scanner.pc.in +=================================================================== +--- wayland-1.14.0.orig/src/wayland-scanner.pc.in ++++ wayland-1.14.0/src/wayland-scanner.pc.in +@@ -2,7 +2,7 @@ prefix=@prefix@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ + pkgdatadir=@datadir@/@PACKAGE@ +-wayland_scanner=@bindir@/wayland-scanner ++wayland_scanner=wayland-scanner + + Name: Wayland Scanner + Description: Wayland scanner diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.13.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.14.0.bb index b9396b6c7..1a9ff9807 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.13.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/wayland_1.14.0.bb @@ -13,9 +13,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ DEPENDS = "expat libxml2 libffi wayland-native" SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ + file://fixpathinpcfiles.patch \ " -SRC_URI[md5sum] = "cae152ed956da6de53f9727bc1c45039" -SRC_URI[sha256sum] = "69b052c031a61e89af7cc8780893d0da1e301492352aa449dee9345043e6fe51" +SRC_URI[md5sum] = "0235f6075c32c3be61cff94fa0b9f108" +SRC_URI[sha256sum] = "ed80cabc0961a759a42092e2c39aabfc1ec9a13c86c98bbe2b812f008da27ab8" inherit autotools pkgconfig diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch deleted file mode 100644 index 5f4d79c38..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-configure.ac-Fix-wayland-protocols-path.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1cfc1434a5d385a74de593ec7601674dba39e2fe Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 11 May 2016 16:16:30 +0300 -Subject: [PATCH] configure.ac: Fix wayland-protocols path - -The wayland-protocols directory is used during build: Fix the path -to point to sysroot specified in recipe. - -Normally PKG_CONFIG_SYSROOT_DIR could be used in configure.ac but that -breaks multilib weston as it would point to multilib sysroot when the -(allarch) wayland-protocols is actually in the machine sysroot. - -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> -Upstream-Status: Inappropriate [embedded specific] ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/configure.ac -+++ b/configure.ac -@@ -187,7 +187,7 @@ PKG_CHECK_MODULES(LIBINPUT_BACKEND, [lib - PKG_CHECK_MODULES(COMPOSITOR, [$COMPOSITOR_MODULES]) - - PKG_CHECK_MODULES(WAYLAND_PROTOCOLS, [wayland-protocols >= 1.7], -- [ac_wayland_protocols_pkgdatadir=`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) -+ [ac_wayland_protocols_pkgdatadir=${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`]) - AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, $ac_wayland_protocols_pkgdatadir) - - AC_ARG_ENABLE(wayland-compositor, [ --enable-wayland-compositor],, diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch index e2213aca6..0671a4504 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/0001-make-error-portable.patch @@ -16,9 +16,11 @@ Upstream-Status: Submitted 3 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 src/weston-error.h ---- a/configure.ac -+++ b/configure.ac -@@ -60,6 +60,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], +Index: weston-3.0.0/configure.ac +=================================================================== +--- weston-3.0.0.orig/configure.ac ++++ weston-3.0.0/configure.ac +@@ -103,6 +103,8 @@ AC_CHECK_DECL(CLOCK_MONOTONIC,[], [[#include <time.h>]]) AC_CHECK_HEADERS([execinfo.h]) @@ -26,9 +28,11 @@ Upstream-Status: Submitted + AC_CHECK_FUNCS([mkostemp strchrnul initgroups posix_fallocate]) - COMPOSITOR_MODULES="wayland-server >= $WAYLAND_PREREQ_VERSION pixman-1 >= 0.25.2" + # check for libdrm as a build-time dependency only +Index: weston-3.0.0/libweston/weston-error.h +=================================================================== --- /dev/null -+++ b/libweston/weston-error.h ++++ weston-3.0.0/libweston/weston-error.h @@ -0,0 +1,20 @@ +#ifndef _WESTON_ERROR_H +#define _WESTON_ERROR_H @@ -50,8 +54,10 @@ Upstream-Status: Submitted + +#endif + ---- a/libweston/weston-launch.c -+++ b/libweston/weston-launch.c +Index: weston-3.0.0/libweston/weston-launch.c +=================================================================== +--- weston-3.0.0.orig/libweston/weston-launch.c ++++ weston-3.0.0/libweston/weston-launch.c @@ -33,7 +33,6 @@ #include <poll.h> #include <errno.h> @@ -60,7 +66,7 @@ Upstream-Status: Submitted #include <getopt.h> #include <sys/types.h> -@@ -59,6 +58,7 @@ +@@ -60,6 +59,7 @@ #endif #include "weston-launch.h" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/fix-missing-header.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/fix-missing-header.patch new file mode 100644 index 000000000..55c0d4fd0 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/fix-missing-header.patch @@ -0,0 +1,30 @@ +On the musl C library, tests/timespec-text.c does not build, with the +following error: + + In file included from tests/timespec-test.c:36:0: + ./shared/timespec-util.h:41:21: warning: ‘struct timespec’ declared + inside parameter list will not be visible outside of this definition + or declaration + timespec_sub(struct timespec *r, + ^~~~~~~~ + [...] + +Indeed, struct timespec is defined in time.h, so we must include it. + +Upstream-Status: Backport [fa41bdfbc0b962fd73b89f01aab1a5370c9c28eb] + +Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> +Reviewed-by: Pekka Paalanen <pekka.paalanen@collabora.co.uk> + +Index: weston-3.0.0/shared/timespec-util.h +=================================================================== +--- weston-3.0.0.orig/shared/timespec-util.h ++++ weston-3.0.0/shared/timespec-util.h +@@ -28,6 +28,7 @@ + + #include <stdint.h> + #include <assert.h> ++#include <time.h> + + #define NSEC_PER_SEC 1000000000 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch new file mode 100644 index 000000000..b3e1d06f5 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston/weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch @@ -0,0 +1,55 @@ +Multi-plane sub-sampled textures have partial width/height, e.g. +YUV420/I420 has a full-size Y plane, followed by a half-width/height U +plane, and a half-width/height V plane. + +zwp_linux_dmabuf_v1 allows clients to pass an explicit pitch for each +plane, but for wl_shm this must be inferred. gl-renderer was correctly +accounting for the width and height when subsampling, but the pitch was +being taken as the pitch for the first plane. + +This does not match the requirements for GStreamer's waylandsink, in +particular, as well as other clients. Fix the SHM upload path to +correctly set the pitch for each plane, according to subsampling. + +Tested with: + $ gst-launch-1.0 videotestsrc ! waylandsink + +Upstream-Status: Backport [https://patchwork.freedesktop.org/patch/180767/] + +Signed-off-by: Daniel Stone <daniels@collabora.com> +Fixes: fdeefe42418 ("gl-renderer: add support of WL_SHM_FORMAT_YUV420") +Reported-by: Fabien Lahoudere <fabien.lahoudere@collabora.co.uk> +Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=103063 + +--- + libweston/gl-renderer.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/libweston/gl-renderer.c b/libweston/gl-renderer.c +index 244ce309..40bf0bb6 100644 +--- a/libweston/gl-renderer.c ++++ b/libweston/gl-renderer.c +@@ -1445,14 +1445,13 @@ gl_renderer_flush_damage(struct weston_surface *surface) + goto done; + } + +- glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch); +- + if (gs->needs_full_upload) { + glPixelStorei(GL_UNPACK_SKIP_PIXELS_EXT, 0); + glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, 0); + wl_shm_buffer_begin_access(buffer->shm_buffer); + for (j = 0; j < gs->num_textures; j++) { + glBindTexture(GL_TEXTURE_2D, gs->textures[j]); ++ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch / gs->hsub[j]); + glTexImage2D(GL_TEXTURE_2D, 0, + gs->gl_format[j], + gs->pitch / gs->hsub[j], +@@ -1477,6 +1476,7 @@ gl_renderer_flush_damage(struct weston_surface *surface) + glPixelStorei(GL_UNPACK_SKIP_ROWS_EXT, r.y1); + for (j = 0; j < gs->num_textures; j++) { + glBindTexture(GL_TEXTURE_2D, gs->textures[j]); ++ glPixelStorei(GL_UNPACK_ROW_LENGTH_EXT, gs->pitch / gs->hsub[j]); + glTexSubImage2D(GL_TEXTURE_2D, 0, + r.x1 / gs->hsub[j], + r.y1 / gs->vsub[j], diff --git a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_2.0.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_3.0.0.bb index 54b07bd6b..ad0cdc2b0 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_2.0.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/wayland/weston_3.0.0.bb @@ -9,12 +9,13 @@ SRC_URI = "https://wayland.freedesktop.org/releases/${BPN}-${PV}.tar.xz \ file://weston.png \ file://weston.desktop \ file://0001-make-error-portable.patch \ - file://0001-configure.ac-Fix-wayland-protocols-path.patch \ file://xwayland.weston-start \ file://0001-weston-launch-Provide-a-default-version-that-doesn-t.patch \ + file://weston-gl-renderer-Set-pitch-correctly-for-subsampled-textures.patch \ + file://fix-missing-header.patch \ " -SRC_URI[md5sum] = "15f38945942bf2a91fe2687145fb4c7d" -SRC_URI[sha256sum] = "b4e446ac27f118196f1609dab89bb3cb3e81652d981414ad860e733b355365d8" +SRC_URI[md5sum] = "9c42a4c51a1b9f35d040fa9d45ada36d" +SRC_URI[sha256sum] = "cde1d55e8dd70c3cbb3d1ec72f60e60000041579caa1d6a262bd9c35e93723a5" inherit autotools pkgconfig useradd distro_features_check # depends on virtual/egl @@ -25,7 +26,6 @@ DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" EXTRA_OECONF = "--enable-setuid-install \ --disable-rdp-compositor \ - WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \ " EXTRA_OECONF_append_qemux86 = "\ WESTON_NATIVE_BACKEND=fbdev-backend.so \ @@ -77,7 +77,7 @@ PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" do_install_append() { # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/libweston-2/*.la + rm -f ${D}/${libdir}/libweston-3/*.la # If X11, ship a desktop file to launch it if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then @@ -94,16 +94,16 @@ do_install_append() { } PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ - libweston-2 ${PN}-examples" + libweston-3 ${PN}-examples" FILES_${PN} = "${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so ${datadir}" -FILES_libweston-2 = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-2/*.so" -SUMMARY_libweston-2 = "Helper library for implementing 'wayland window managers'." +FILES_libweston-3 = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-3/*.so" +SUMMARY_libweston-3 = "Helper library for implementing 'wayland window managers'." FILES_${PN}-examples = "${bindir}/*" -FILES_${PN}-xwayland = "${libdir}/libweston-2/xwayland.so" +FILES_${PN}-xwayland = "${libdir}/libweston-3/xwayland.so" RDEPENDS_${PN}-xwayland += "xserver-xorg-xwayland" RDEPENDS_${PN} += "xkeyboard-config" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in index 324a26f54..87dc4f8fc 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init/xserver-nodm.service.in @@ -5,6 +5,7 @@ Description=Xserver startup without a display manager EnvironmentFile=/etc/default/xserver-nodm User=@USER@ ExecStart=/etc/xserver-nodm/Xserver +Restart=always [Install] Alias=display-manager.service diff --git a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index 345b58969..a77c56445 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb @@ -60,7 +60,7 @@ do_install() { fi } -RDEPENDS_${PN} = "xinit ${@base_conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" +RDEPENDS_${PN} = "xinit ${@oe.utils.conditional('ROOTLESS_X', '1', 'xuser-account', '', d)}" INITSCRIPT_NAME = "xserver-nodm" INITSCRIPT_PARAMS = "start 9 5 . stop 20 0 1 2 3 6 ." diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb index 733ebce74..a4ab7f6eb 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xcursor-transparent-theme/xcursor-transparent-theme_git.bb @@ -11,7 +11,7 @@ SRCREV = "23c8af5ba4a1b7efbaf0bbca59a65ff7e10a1a06" PV = "0.1.1+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/${BPN};branch=master" -UPSTREAM_VERSION_UNKNOWN = "1" +UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch index 97d13a30d..a97c7b72f 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-app/xset/disable-xkb.patch @@ -4,11 +4,11 @@ Upstream-Status: Pending Rebase for 1.2.1 by: Yu Ke <ke.yu@intel.com> -diff --git a/configure.ac b/configure.ac -index 81c3ae4..26601bf 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -52,11 +52,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, +Index: xset-1.2.3/configure.ac +=================================================================== +--- xset-1.2.3.orig/configure.ac ++++ xset-1.2.3/configure.ac +@@ -53,11 +53,15 @@ PKG_CHECK_MODULES(SET_XEXT, xext, AC_CHECK_HEADERS([X11/extensions/dpms.h X11/extensions/MITMisc.h],,,[#include <X11/Xlib.h>]) CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) @@ -22,5 +22,5 @@ index 81c3ae4..26601bf 100644 CPPFLAGS="$SAVE_CPPFLAGS"],[echo "not found"]) +fi - AC_ARG_WITH(xf86misc, AC_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), + AC_ARG_WITH(xf86misc, AS_HELP_STRING([--without-xf86misc],[Disable xf86misc support.]), [USE_XF86MISC="$withval"], [USE_XF86MISC="yes"]) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.25.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.26.0.bb index 7b3ea16c9..54c33d790 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.25.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_0.26.0.bb @@ -5,7 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5e6b20ea2ef94a998145f0ea3f788ee0" DEPENDS += "libinput" -SRC_URI[md5sum] = "14003139614b25cc76c9a4cad059df89" -SRC_URI[sha256sum] = "489f7d591c9ef08463d4966e61f7c6ea433f5fcbb9f5370fb621da639a84c7e0" +SRC_URI[md5sum] = "da47ef62eab1d0e922a8fa929ff81758" +SRC_URI[sha256sum] = "abca558fc2226f295691f1cf3412d4c0edeaa439f677ca25b5c9fab310d2387b" FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch new file mode 100644 index 000000000..06ef10501 --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel/0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch @@ -0,0 +1,116 @@ +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/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb index 138dfddcf..2623cb2f3 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-intel_git.bb @@ -16,6 +16,7 @@ S = "${WORKDIR}/git" SRC_URI = "git://anongit.freedesktop.org/xorg/driver/xf86-video-intel \ file://disable-x11-dri3.patch \ file://always_include_xorg_server.h.patch \ + file://0001-Add-Coffeelake-PCI-IDs-for-S-Skus.patch \ " SRC_URI[md5sum] = "fa196a66e52c0c624fe5d350af7a5e7b" @@ -37,7 +38,7 @@ PACKAGECONFIG[xvmc] = "--enable-xvmc,--disable-xvmc,libxvmc xcb-util" PACKAGECONFIG[tools] = "--enable-tools,--disable-tools,libxinerama libxrandr libxdamage libxfixes libxcursor libxtst libxext libxrender" # --enable-kms-only option is required by ROOTLESS_X -EXTRA_OECONF += '${@base_conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' +EXTRA_OECONF += '${@oe.utils.conditional( "ROOTLESS_X", "1", " --enable-kms-only", "", d )}' COMPATIBLE_HOST = '(i.86|x86_64).*-linux' diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb index e65239451..bef363609 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xf86-video-omap_0.4.5.bb @@ -36,6 +36,6 @@ do_compile_prepend_armv7a () { python () { if not bb.utils.contains ('DISTRO_FEATURES', 'opengl', True, False, d): - raise bb.parse.SkipPackage("'opengl' not in DISTRO_FEATURES") + raise bb.parse.SkipRecipe("'opengl' not in DISTRO_FEATURES") } diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc index fe42f11b6..bca0aade6 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-driver/xorg-driver-common.inc @@ -38,3 +38,5 @@ def _add_xorg_abi_depends(d, name): pn = d.getVar("PN") d.appendVar('RDEPENDS_' + pn, ' ' + abi) + +SECURITY_LDFLAGS = "${SECURITY_X_LDFLAGS}" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb index a3b682b09..a44a5c892 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.13.5.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpciaccess_0.14.bb @@ -9,8 +9,8 @@ SRC_URI += "\ file://0004-Don-t-include-sys-io.h-on-arm.patch \ " -SRC_URI[md5sum] = "d810ab17e24c1418dedf7207fb2841d4" -SRC_URI[sha256sum] = "752c54e9b3c311b4347cb50aea8566fa48eab274346ea8a06f7f15de3240b999" +SRC_URI[md5sum] = "8f436e151d5106a9cfaa71857a066d33" +SRC_URI[sha256sum] = "3df543e12afd41fea8eac817e48cbfde5aed8817b81670a4e9e493bb2f5bf2a4" LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=277aada5222b9a22fbf3471ff3687068" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb index a69984125..ffa1c859d 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libpthread-stubs_0.4.bb @@ -7,17 +7,11 @@ SECTION = "x11/libs" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6edc1fea03d959f0c2d743fe5ca746ad" -#DEPENDS = "xcb-proto xproto libxau libxslt-native" -# DEPENDS += "xsltproc-native gperf-native" - -ALLOW_EMPTY_${PN} = "1" - -SRC_URI = "http://xcb.freedesktop.org/dist/libpthread-stubs-${PV}.tar.bz2" - +SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.bz2" SRC_URI[md5sum] = "48c1544854a94db0e51499cc3afd797f" SRC_URI[sha256sum] = "e4d05911a3165d3b18321cc067fdd2f023f06436e391c6a28dff618a78d2e733" -inherit autotools pkgconfig +inherit autotools RDEPENDS_${PN}-dev = "" RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc index b04eafbdf..4af40ab8a 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libx11.inc @@ -35,7 +35,3 @@ PACKAGES =+ "${PN}-xcb" FILES_${PN} += "${datadir}/X11/XKeysymDB ${datadir}/X11/XErrorDB ${datadir}/X11/Xcms.txt" FILES_${PN}-xcb += "${libdir}/libX11-xcb.so.*" FILES_${PN}-locale += "${datadir}/X11/locale ${libdir}/X11/locale" - -# Multiple libx11 derivatives from from this file and are selected by virtual/libx11 -# A world build should only build the correct version, not all of them. -EXCLUDE_FROM_WORLD = "1" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb index 7c7fa3ddb..0fe65318b 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcalibrate_git.bb @@ -16,7 +16,7 @@ PV = "0.0+git${SRCPV}" SRC_URI = "git://anongit.freedesktop.org/git/xorg/lib/libXCalibrate \ file://fix-xcb.patch" -UPSTREAM_VERSION_UNKNOWN = "1" +UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch index 5641c0fe9..c0efbdc21 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcb/disable-check.patch @@ -9,17 +9,17 @@ Upstream-Status: Inappropriate Signed-off-by: Ross Burton <ross.burton@intel.com> -diff --git a/configure.ac b/configure.ac -index 6d7c9a5..22cceb9 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -21,7 +21,8 @@ AC_USE_SYSTEM_EXTENSIONS - - AM_PATH_PYTHON([2.6]) +Index: libxcb-1.12/configure.ac +=================================================================== +--- libxcb-1.12.orig/configure.ac ++++ libxcb-1.12/configure.ac +@@ -36,7 +36,8 @@ if test x"$HAVE_DOT" = xno; then + AC_MSG_WARN([dot not found - doxygen targets will be skipped]) + fi -PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) +dnl PKG_CHECK_MODULES(CHECK, [check >= 0.9.4], [HAVE_CHECK=yes], [HAVE_CHECK=no]) +HAVE_CHECK=no AM_CONDITIONAL(HAVE_CHECK, test x$HAVE_CHECK = xyes) - AC_CONFIG_HEADERS([src/config.h]) + XSLTPROC=no diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb index 17629047b..dc9af233e 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.14.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxcursor_1.1.15.bb @@ -18,5 +18,5 @@ PE = "1" XORG_PN = "libXcursor" -SRC_URI[md5sum] = "1e7c17afbbce83e2215917047c57d1b3" -SRC_URI[sha256sum] = "9bc6acb21ca14da51bda5bc912c8955bc6e5e433f0ab00c5e8bef842596c33df" +SRC_URI[md5sum] = "58fe3514e1e7135cf364101e714d1a14" +SRC_URI[sha256sum] = "294e670dd37cd23995e69aae626629d4a2dfe5708851bbc13d032401b7a3df6b" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb index 4bfb290ae..5f27a5582 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont2_2.0.3.bb @@ -15,8 +15,8 @@ XORG_PN = "libXfont2" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "0d9f6dd9c23bf4bcbfb00504b566baf5" -SRC_URI[sha256sum] = "e9fbbb475ddd171b3a6a54b989cbade1f6f874fc35d505ebc5be426bc6e4db7e" +SRC_URI[md5sum] = "b7ca87dfafeb5205b28a1e91ac3efe85" +SRC_URI[sha256sum] = "0e8ab7fd737ccdfe87e1f02b55f221f0bd4503a1c5f28be4ed6a54586bac9c4e" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb index b11dda57e..79f77fcea 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxfont_1.5.4.bb @@ -18,8 +18,8 @@ XORG_PN = "libXfont" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "254ee42bd178d18ebc7a73aacfde7f79" -SRC_URI[sha256sum] = "02945ea68da447102f3e6c2b896c1d2061fd115de99404facc2aca3ad7010d71" +SRC_URI[md5sum] = "16eaf156edd79b68038b6a7c44aa9e9b" +SRC_URI[sha256sum] = "1a7f7490774c87f2052d146d1e0e64518d32e6848184a18654e8d0bb57883242" PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'ipv6', d)}" PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.0.bb index 81df1dd8d..050d0b740 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.7.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxkbcommon_0.8.0.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] = "947ba609cb0239b9462127d5cf8908ee" -SRC_URI[sha256sum] = "ba59305d2e19e47c27ea065c2e0df96ebac6a3c6e97e28ae5620073b6084e68b" +SRC_URI[md5sum] = "7d0e4c4a137d0ac45bf6b328c84c3a81" +SRC_URI[sha256sum] = "e829265db04e0aebfb0591b6dc3377b64599558167846c3f5ee5c5e53641fe6d" UPSTREAM_CHECK_URI = "http://xkbcommon.org/" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb index 8c04c44f8..8c34e47b4 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.0.7.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxres_1.2.0.bb @@ -16,5 +16,5 @@ PE = "1" XORG_PN = "libXres" -SRC_URI[md5sum] = "45ef29206a6b58254c81bea28ec6c95f" -SRC_URI[sha256sum] = "26899054aa87f81b17becc68e8645b240f140464cf90c42616ebb263ec5fa0e5" +SRC_URI[md5sum] = "5d6d443d1abc8e1f6fc1c57fb27729bb" +SRC_URI[sha256sum] = "ff75c1643488e64a7cfbced27486f0f944801319c84c18d3bd3da6bf28c812d4" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch new file mode 100644 index 000000000..4cc9e05ab --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence/extensions.patch @@ -0,0 +1,17 @@ +With glibc 2.27 memfd_create is behind a _GNU_SOURCE guard, so call +AC_USE_SYSTEM_EXTENSIONS to get that defined. + +Upstream-Status: Submitted +Signed-off-by: Ross Burton <ross.burton@intel.com> + +diff --git a/configure.ac b/configure.ac +index 0c98875..ebf4dee 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -29,4 +29,6 @@ AC_CONFIG_SRCDIR([Makefile.am]) + AC_CONFIG_HEADERS([config.h]) + ++AC_USE_SYSTEM_EXTENSIONS ++ + # Initialize Automake + AM_INIT_AUTOMAKE([foreign dist-bzip2]) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb index ae34b1fe4..1df068d1b 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/libxshmfence_1.2.bb @@ -13,5 +13,7 @@ DEPENDS += "virtual/libx11" BBCLASSEXTEND = "native nativesdk" +SRC_URI += "file://extensions.patch" + SRC_URI[md5sum] = "66662e76899112c0f99e22f2fc775a7e" SRC_URI[sha256sum] = "d21b2d1fd78c1efbe1f2c16dae1cb23f8fd231dcf891465b8debe636a9054b0c" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.21.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb index 01a51adad..4fd894fd7 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.21.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-lib/xkeyboard-config_2.22.bb @@ -13,8 +13,9 @@ LICENSE = "MIT & MIT-style" LIC_FILES_CHKSUM = "file://COPYING;md5=0e7f21ca7db975c63467d2e7624a12f9" SRC_URI = "${XORG_MIRROR}/individual/data/xkeyboard-config/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "af9498e8954907d0a47f0f7b3d21e1ef" -SRC_URI[sha256sum] = "30c17049fae129fc14875656da9aa3099e3031d6ce0ee1d77aae190fd9edcec5" + +SRC_URI[md5sum] = "eb61fb3fd419e817df572b0c8d94a883" +SRC_URI[sha256sum] = "deaec9989fbc443358b43864437b7b6d39caff07890a4a8055105ce9fcaa59bd" SECTION = "x11/libs" DEPENDS = "intltool-native util-macros libxslt-native" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb index 3a989262c..eb4b4224c 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/calibrateproto_git.bb @@ -17,5 +17,5 @@ PR = "r2" SRC_URI = "git://anongit.freedesktop.org/git/xorg/proto/calibrateproto \ file://fix.patch;apply=yes" S = "${WORKDIR}/git" -UPSTREAM_VERSION_UNKNOWN = "1" +UPSTREAM_CHECK_COMMITS = "1" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch deleted file mode 100644 index 09b6088db..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto/no-python-native.patch +++ /dev/null @@ -1,27 +0,0 @@ -Upstream uses AM_PATH_PYTHON to find a python binary and ask it where to install -libraries. This means we either need to depend on python-native (large build -dependency, early in the build) or use the host python (pythondir reflects the -host and not the target, breaks builds). - -The third option is to just hardcode the path where the module goes, as most -callers of the code use pkg-config to find where it was installed anyway. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton <ross.burton@intel.com> - -diff --git a/configure.ac b/configure.ac -index d140bfe..c7b68da 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -14,7 +14,10 @@ if test "$XMLLINT" = "no"; then - AC_MSG_WARN([xmllint not found; unable to validate against schema.]) - fi - --AM_PATH_PYTHON([2.5]) -+pythondir="${libdir}/xcb-proto" -+AC_SUBST(pythondir) -+PYTHON="python3" -+AC_SUBST(PYTHON) - - xcbincludedir='${datadir}/xcb' - AC_SUBST(xcbincludedir) diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb index bc04bc48e..25a8373e0 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xcb-proto_1.12.bb @@ -11,8 +11,7 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7 \ file://src/dri2.xml;beginline=2;endline=28;md5=f8763b13ff432e8597e0d610cf598e65" -SRC_URI = "http://xcb.freedesktop.org/dist/xcb-proto-${PV}.tar.bz2 \ - file://no-python-native.patch \ +SRC_URI = "http://xcb.freedesktop.org/dist/${BP}.tar.bz2 \ file://0001-Make-whitespace-use-consistent.patch \ file://0002-print-is-a-function-and-needs-parentheses.patch \ " @@ -21,6 +20,10 @@ SRC_URI[sha256sum] = "5922aba4c664ab7899a29d92ea91a87aa4c1fc7eb5ee550325c3216c48 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" + PACKAGES += "python-xcbgen" FILES_${PN} = "" @@ -32,9 +35,19 @@ RRECOMMENDS_${PN}-dbg = "${PN}-dev (= ${EXTENDPKGV})" BBCLASSEXTEND = "native nativesdk" -do_install_append() { - # Makefile's do_install creates .pyc files for python3, now also create - # them for python2 so that they will be recorded by manifest, and can be - # cleaned correctly. - python -m py_compile ${D}${libdir}/xcb-proto/xcbgen/*.py +# 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/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch index 8a5ff58b9..4f9ed99c9 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-proto/xproto/xproto_fix_for_x32.patch @@ -10,13 +10,15 @@ This fixes compilation with x32 toolchain. Received this patch from H.J. Lu <hjl.tools@gmail.com> Signed-off-by: Nitin A Kamble <nitin.a.kamble@intel.com> 2011/12/1 ---- xproto-7.0.22/Xmd.h.x32 2009-07-11 04:19:50.000000000 -0700 -+++ xproto-7.0.22/Xmd.h 2011-11-30 17:14:19.290395893 -0800 +Index: xproto-7.0.31/Xmd.h +=================================================================== +--- xproto-7.0.31.orig/Xmd.h ++++ xproto-7.0.31/Xmd.h @@ -62,7 +62,6 @@ SOFTWARE. defined(__ia64__) || defined(ia64) || \ defined(__sparc64__) || \ defined(__s390x__) || \ - defined(__amd64__) || defined(amd64) || \ defined(__powerpc64__) - # define LONG64 /* 32/64-bit architecture */ - # endif + # if !defined(__ILP32__) /* amd64-x32 is 32bit */ + # define LONG64 /* 32/64-bit architecture */ diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb index 4c442bc71..5420b7d23 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb @@ -10,7 +10,6 @@ SRC_URI = "file://xorg.conf" S = "${WORKDIR}" CONFFILES_${PN} = "${sysconfdir}/X11/xorg.conf" -CONFFILES_${PN}_append_libc-musl = " ${sysconfdir}/X11/xorg.conf.d/10-preload-modules.conf" PACKAGE_ARCH = "${MACHINE_ARCH}" ALLOW_EMPTY_${PN} = "1" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index 863d80ce4..cf2286c65 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -117,7 +117,6 @@ EXTRA_OECONF += "--with-fop=no \ --sysconfdir=/etc/X11 \ --localstatedir=/var \ --with-xkb-output=/var/lib/xkb \ - WAYLAND_PROTOCOLS_SYSROOT_DIR=${RECIPE_SYSROOT} \ " OPENGL_PKGCONFIGS = "dri glx glamor dri3 xshmfence" @@ -133,7 +132,7 @@ PACKAGECONFIG[dri2] = "--enable-dri2,--disable-dri2,dri2proto" # DRI3 requires xshmfence to also be enabled PACKAGECONFIG[dri3] = "--enable-dri3,--disable-dri3,dri3proto" PACKAGECONFIG[glx] = "--enable-glx,--disable-glx,glproto virtual/libgl virtual/libx11" -PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy,libegl" +PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor,libepoxy virtual/libgbm,libegl" PACKAGECONFIG[unwind] = "--enable-libunwind,--disable-libunwind,libunwind" PACKAGECONFIG[xshmfence] = "--enable-xshmfence,--disable-xshmfence,libxshmfence" PACKAGECONFIG[xmlto] = "--with-xmlto, --without-xmlto, xmlto-native docbook-xml-dtd4-native docbook-xsl-stylesheets-native" diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch new file mode 100644 index 000000000..d05eec5bb --- /dev/null +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch @@ -0,0 +1,53 @@ +From d77cdc5e1eee26821ab98c947abea53fb7b18fe5 Mon Sep 17 00:00:00 2001 +From: California Sullivan <california.l.sullivan@intel.com> +Date: Fri, 16 Mar 2018 17:23:11 -0700 +Subject: [PATCH] xf86pciBus.c: use Intel ddx only for pre-gen4 hardware + +Use intel ddx only on pre-gen4 hw, newer ones will fall back to modesetting +Author: Timo Aaltonen <tjaalton@debian.org> + +Instead of defaulting to the Intel driver for all Intel hardware, only +default it for older hardware for which it has shown to be better for. + +Others fall through to the -modesetting default. + +Upstream-Status: Pending [Debian/Fedora patch +https://src.fedoraproject.org/rpms/xorg-x11-server/c/ee515e44b07e37689abf48cf2fffb41578f3bc1d] + +Signed-off-by: California Sullivan <california.l.sullivan@intel.com> +--- + hw/xfree86/common/xf86pciBus.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c +index e61ae0cd4..d70c99197 100644 +--- a/hw/xfree86/common/xf86pciBus.c ++++ b/hw/xfree86/common/xf86pciBus.c +@@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev, + case 0x0bef: + /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */ + break; +- default: ++ /* Default to intel only on pre-gen4 chips */ ++ case 0x3577: ++ case 0x2562: ++ case 0x3582: ++ case 0x358e: ++ case 0x2572: ++ case 0x2582: ++ case 0x258a: ++ case 0x2592: ++ case 0x2772: ++ case 0x27a2: ++ case 0x27ae: ++ case 0x29b2: ++ case 0x29c2: ++ case 0x29d2: ++ case 0xa001: ++ case 0xa011: + driverList[0] = "intel"; + break; + } +-- +2.14.3 + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch deleted file mode 100644 index eafd07a5f..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 963428f914c42270d3312d4f0c0840565521534e Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen <jussi.kukkonen@intel.com> -Date: Wed, 16 Nov 2016 00:41:51 +0200 -Subject: [PATCH 2/2] configure.ac: Fix wayland-scanner and protocols locations - -We want to use the wayland-scanner in path (native sysroot) -instead of using pkg-config which gives us target paths. - -The protocols paths on the other hand need to be prefixed with the -(allarch) sysroot because, again, pkg-config gives us target paths. - -Upstream-Status: Inappropriate [embedded specific] -Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> ---- - configure.ac | 6 ++---- - 1 file changed, 2 insertions(+), 4 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 58f1567..383a7df 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -2525,11 +2525,9 @@ if test "x$XWAYLAND" = xyes; then - AC_MSG_ERROR([Xwayland requires CLOCK_MONOTONIC support.]) - fi - -- WAYLAND_PREFIX=`$PKG_CONFIG --variable=prefix wayland-client` -- AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner],, -- [${WAYLAND_PREFIX}/bin$PATH_SEPARATOR$PATH]) -+ AC_PATH_PROG([WAYLAND_SCANNER], [wayland-scanner]) - -- AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, `$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) -+ AC_SUBST(WAYLAND_PROTOCOLS_DATADIR, ${WAYLAND_PROTOCOLS_SYSROOT_DIR}`$PKG_CONFIG --variable=pkgdatadir wayland-protocols`) - fi - - --- -2.1.4 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-1.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-1.patch deleted file mode 100644 index 23c804989..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-1.patch +++ /dev/null @@ -1,76 +0,0 @@ -From 215f894965df5fb0bb45b107d84524e700d2073c Mon Sep 17 00:00:00 2001 -From: Michal Srb <msrb@suse.com> -Date: Wed, 24 May 2017 15:54:40 +0300 -Subject: [PATCH] dix: Disallow GenericEvent in SendEvent request. - -The SendEvent request holds xEvent which is exactly 32 bytes long, no more, -no less. Both ProcSendEvent and SProcSendEvent verify that the received data -exactly match the request size. However nothing stops the client from passing -in event with xEvent::type = GenericEvent and any value of -xGenericEvent::length. - -In the case of ProcSendEvent, the event will be eventually passed to -WriteEventsToClient which will see that it is Generic event and copy the -arbitrary length from the receive buffer (and possibly past it) and send it to -the other client. This allows clients to copy unitialized heap memory out of X -server or to crash it. - -In case of SProcSendEvent, it will attempt to swap the incoming event by -calling a swapping function from the EventSwapVector array. The swapped event -is written to target buffer, which in this case is local xEvent variable. The -xEvent variable is 32 bytes long, but the swapping functions for GenericEvents -expect that the target buffer has size matching the size of the source -GenericEvent. This allows clients to cause stack buffer overflows. - -Signed-off-by: Michal Srb <msrb@suse.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -CVE: CVE-2017-10971 - -Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/xserver/commit/?id=215f894965df5fb0bb45b107d84524e700d2073c] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - dix/events.c | 6 ++++++ - dix/swapreq.c | 7 +++++++ - 2 files changed, 13 insertions(+) - -diff --git a/dix/events.c b/dix/events.c -index 3e3a01e..d3a33ea 100644 ---- a/dix/events.c -+++ b/dix/events.c -@@ -5366,6 +5366,12 @@ ProcSendEvent(ClientPtr client) - client->errorValue = stuff->event.u.u.type; - return BadValue; - } -+ /* Generic events can have variable size, but SendEvent request holds -+ exactly 32B of event data. */ -+ if (stuff->event.u.u.type == GenericEvent) { -+ client->errorValue = stuff->event.u.u.type; -+ return BadValue; -+ } - if (stuff->event.u.u.type == ClientMessage && - stuff->event.u.u.detail != 8 && - stuff->event.u.u.detail != 16 && stuff->event.u.u.detail != 32) { -diff --git a/dix/swapreq.c b/dix/swapreq.c -index 719e9b8..6785059 100644 ---- a/dix/swapreq.c -+++ b/dix/swapreq.c -@@ -292,6 +292,13 @@ SProcSendEvent(ClientPtr client) - swapl(&stuff->destination); - swapl(&stuff->eventMask); - -+ /* Generic events can have variable size, but SendEvent request holds -+ exactly 32B of event data. */ -+ if (stuff->event.u.u.type == GenericEvent) { -+ client->errorValue = stuff->event.u.u.type; -+ return BadValue; -+ } -+ - /* Swap event */ - proc = EventSwapVector[stuff->event.u.u.type & 0177]; - if (!proc || proc == NotImplemented) /* no swapping proc; invalid event type? */ --- -1.7.9.5 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-2.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-2.patch deleted file mode 100644 index 5c9887afa..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-2.patch +++ /dev/null @@ -1,55 +0,0 @@ -From 8caed4df36b1f802b4992edcfd282cbeeec35d9d Mon Sep 17 00:00:00 2001 -From: Michal Srb <msrb@suse.com> -Date: Wed, 24 May 2017 15:54:41 +0300 -Subject: [PATCH] Xi: Verify all events in ProcXSendExtensionEvent. - -The requirement is that events have type in range -EXTENSION_EVENT_BASE..lastEvent, but it was tested -only for first event of all. - -Signed-off-by: Michal Srb <msrb@suse.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -CVE: CVE-2017-10971 - -Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/xserver/commit/?id=8caed4df36b1f802b4992edcfd282cbeeec35d9d] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - Xi/sendexev.c | 12 +++++++----- - 1 file changed, 7 insertions(+), 5 deletions(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 1cf118a..5e63bfc 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -117,7 +117,7 @@ SProcXSendExtensionEvent(ClientPtr client) - int - ProcXSendExtensionEvent(ClientPtr client) - { -- int ret; -+ int ret, i; - DeviceIntPtr dev; - xEvent *first; - XEventClass *list; -@@ -141,10 +141,12 @@ ProcXSendExtensionEvent(ClientPtr client) - /* The client's event type must be one defined by an extension. */ - - first = ((xEvent *) &stuff[1]); -- if (!((EXTENSION_EVENT_BASE <= first->u.u.type) && -- (first->u.u.type < lastEvent))) { -- client->errorValue = first->u.u.type; -- return BadValue; -+ for (i = 0; i < stuff->num_events; i++) { -+ if (!((EXTENSION_EVENT_BASE <= first[i].u.u.type) && -+ (first[i].u.u.type < lastEvent))) { -+ client->errorValue = first[i].u.u.type; -+ return BadValue; -+ } - } - - list = (XEventClass *) (first + stuff->num_events); --- -1.7.9.5 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-3.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-3.patch deleted file mode 100644 index 54ba48102..000000000 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/CVE-2017-10971-3.patch +++ /dev/null @@ -1,50 +0,0 @@ -From ba336b24052122b136486961c82deac76bbde455 Mon Sep 17 00:00:00 2001 -From: Michal Srb <msrb@suse.com> -Date: Wed, 24 May 2017 15:54:42 +0300 -Subject: [PATCH] Xi: Do not try to swap GenericEvent. - -The SProcXSendExtensionEvent must not attempt to swap GenericEvent because -it is assuming that the event has fixed size and gives the swapping function -xEvent-sized buffer. - -A GenericEvent would be later rejected by ProcXSendExtensionEvent anyway. - -Signed-off-by: Michal Srb <msrb@suse.com> -Reviewed-by: Peter Hutterer <peter.hutterer@who-t.net> -Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net> - -CVE: CVE-2017-10971 - -Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/xserver/commit/?id=ba336b24052122b136486961c82deac76bbde455] - -Signed-off-by: Jackie Huang <jackie.huang@windriver.com> ---- - Xi/sendexev.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/Xi/sendexev.c b/Xi/sendexev.c -index 5e63bfc..5c2e0fc 100644 ---- a/Xi/sendexev.c -+++ b/Xi/sendexev.c -@@ -95,9 +95,17 @@ SProcXSendExtensionEvent(ClientPtr client) - - eventP = (xEvent *) &stuff[1]; - for (i = 0; i < stuff->num_events; i++, eventP++) { -+ if (eventP->u.u.type == GenericEvent) { -+ client->errorValue = eventP->u.u.type; -+ return BadValue; -+ } -+ - proc = EventSwapVector[eventP->u.u.type & 0177]; -- if (proc == NotImplemented) /* no swapping proc; invalid event type? */ -+ /* no swapping proc; invalid event type? */ -+ if (proc == NotImplemented) { -+ client->errorValue = eventP->u.u.type; - return BadValue; -+ } - (*proc) (eventP, &eventT); - *eventP = eventT; - } --- -1.7.9.5 - diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch index ec0eea6ca..c36e4e730 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg/macro_tweak.patch @@ -5,13 +5,13 @@ Upstream-Status: Pending Signed-off-by: Yu Ke <ke.yu@intel.com> -diff --git a/xorg-server.m4 b/xorg-server.m4 -index bdecf62..040fdb8 100644 ---- a/xorg-server.m4 -+++ b/xorg-server.m4 +Index: xorg-server-1.19.6/xorg-server.m4 +=================================================================== +--- xorg-server-1.19.6.orig/xorg-server.m4 ++++ xorg-server-1.19.6/xorg-server.m4 @@ -28,10 +28,12 @@ dnl - # Checks for the $1 define in xorg-server.h (from the sdk). If it - # is defined, then add $1 to $REQUIRED_MODULES. + # Checks for the MACRO define in xorg-server.h (from the sdk). If it + # is defined, then add the given PROTO to $REQUIRED_MODULES. +m4_pattern_allow(PKG_CONFIG_SYSROOT_DIR) + diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.3.bb b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb index 65ef6c683..c680cf9e8 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.3.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.19.6.bb @@ -2,15 +2,12 @@ require xserver-xorg.inc SRC_URI += "file://musl-arm-inb-outb.patch \ file://0001-configure.ac-Fix-check-for-CLOCK_MONOTONIC.patch \ - file://0002-configure.ac-Fix-wayland-scanner-and-protocols-locat.patch \ file://0003-modesetting-Fix-16-bit-depth-bpp-mode.patch \ file://0003-Remove-check-for-useSIGIO-option.patch \ - file://CVE-2017-10971-1.patch \ - file://CVE-2017-10971-2.patch \ - file://CVE-2017-10971-3.patch \ + file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ " -SRC_URI[md5sum] = "015d2fc4b9f2bfe7a626edb63a62c65e" -SRC_URI[sha256sum] = "677a8166e03474719238dfe396ce673c4234735464d6dadf2959b600d20e5a98" +SRC_URI[md5sum] = "3e47777ff034a331aed2322b078694a8" +SRC_URI[sha256sum] = "a732502f1db000cf36a376cd0c010ffdbf32ecdd7f1fa08ba7f5bdf9601cc197" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/import-layers/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb b/import-layers/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb index 2667dd899..1d275a004 100644 --- a/import-layers/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb +++ b/import-layers/yocto-poky/meta/recipes-graphics/xvideo-tests/xvideo-tests_git.bb @@ -8,7 +8,7 @@ SRCREV = "7d38b881e99eb74169d292b40f7164e461a65092" PV = "0.1+git${SRCPV}" SRC_URI = "git://git.yoctoproject.org/test-xvideo" -UPSTREAM_VERSION_UNKNOWN = "1" +UPSTREAM_CHECK_COMMITS = "1" S = "${WORKDIR}/git" |
