diff options
Diffstat (limited to 'poky/meta/recipes-graphics')
-rw-r--r-- | poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb | 5 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/drm/libdrm_2.4.107.bb (renamed from poky/meta/recipes-graphics/drm/libdrm_2.4.106.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/glslang/glslang_11.5.0.bb (renamed from poky/meta/recipes-graphics/glslang/glslang_11.4.0.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch | 44 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb (renamed from poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb) | 11 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libva/libva-initial_2.12.0.bb (renamed from poky/meta/recipes-graphics/libva/libva-initial_2.11.0.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libva/libva-utils_2.12.0.bb (renamed from poky/meta/recipes-graphics/libva/libva-utils_2.11.1.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libva/libva.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/libva/libva_2.12.0.bb (renamed from poky/meta/recipes-graphics/libva/libva_2.11.0.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb (renamed from poky/meta/recipes-graphics/mesa/libglu_9.0.1.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/mesa/mesa-gl_21.1.5.bb (renamed from poky/meta/recipes-graphics/mesa/mesa-gl_21.1.3.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/mesa/mesa.inc | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/mesa/mesa_21.1.5.bb (renamed from poky/meta/recipes-graphics/mesa/mesa_21.1.3.bb) | 0 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/pango/pango_1.48.7.bb (renamed from poky/meta/recipes-graphics/pango/pango_1.48.5.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/shaderc/shaderc_2021.1.bb (renamed from poky/meta/recipes-graphics/shaderc/shaderc_2021.0.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/spir/spirv-tools_2021.2.bb (renamed from poky/meta/recipes-graphics/spir/spirv-tools_2021.1.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.182.0.bb (renamed from poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.176.0.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb (renamed from poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.176.0.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.182.0.bb (renamed from poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.176.0.bb) | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb (renamed from poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.0.1.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-lib/libxi_1.7.99.2.bb (renamed from poky/meta/recipes-graphics/xorg-lib/libxi_1.7.10.bb) | 3 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc | 4 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb (renamed from poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb) | 2 | ||||
-rw-r--r-- | poky/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb (renamed from poky/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb) | 20 |
26 files changed, 48 insertions, 73 deletions
diff --git a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb index 8dc4ceb39..b0ce56127 100644 --- a/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb +++ b/poky/meta/recipes-graphics/cantarell-fonts/cantarell-fonts_0.301.bb @@ -20,3 +20,8 @@ HASHEQUIV_HASH_VERSION .= ".2" EXTRA_OEMESON += "-Duseprebuilt=true -Dbuildappstream=false" FILES_${PN} = "${datadir}/fonts ${datadir}/fontconfig" + +# This isn't a GNOME-style version do gnome_verdir fails. Just return the +# version as that is how the directory is structured. +def gnome_verdir(v): + return v diff --git a/poky/meta/recipes-graphics/drm/libdrm_2.4.106.bb b/poky/meta/recipes-graphics/drm/libdrm_2.4.107.bb index 2f6348902..1dd07046f 100644 --- a/poky/meta/recipes-graphics/drm/libdrm_2.4.106.bb +++ b/poky/meta/recipes-graphics/drm/libdrm_2.4.107.bb @@ -13,7 +13,7 @@ DEPENDS = "libpthread-stubs" SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz \ " -SRC_URI[sha256sum] = "92d8ac54429b171e087e61c2894dc5399fe6a549b1fbba09fa6a3cb9d4e57bd4" +SRC_URI[sha256sum] = "c554cef03b033636a975543eab363cc19081cb464595d3da1ec129f87370f888" inherit meson pkgconfig manpages diff --git a/poky/meta/recipes-graphics/glslang/glslang_11.4.0.bb b/poky/meta/recipes-graphics/glslang/glslang_11.5.0.bb index fd4cf6d53..e3eaa2ac6 100644 --- a/poky/meta/recipes-graphics/glslang/glslang_11.4.0.bb +++ b/poky/meta/recipes-graphics/glslang/glslang_11.5.0.bb @@ -8,7 +8,7 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229" -SRCREV = "18eef33bd7a4bf5ad8c69f99cb72022608cf6e73" +SRCREV = "ae2a562936cc8504c9ef2757cceaff163147834f" SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \ file://0001-generate-glslang-pkg-config.patch" UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch b/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch deleted file mode 100644 index c1d4df42a..000000000 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz/0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch +++ /dev/null @@ -1,44 +0,0 @@ -From f96b2b653c605679b83a820b38f49a0a0f4baf42 Mon Sep 17 00:00:00 2001 -From: Andi-Bogdan Postelnicu <abpostelnicu@me.com> -Date: Wed, 2 Jun 2021 14:08:11 +0300 -Subject: [PATCH] Removed unused variable `supp_size` from - plan_subset_encoding(...). - -Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/243d056ff1c2af583ceb67e5dfbfaac51dc96e63] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/hb-subset-cff1.cc | 4 +--- - 1 file changed, 1 insertion(+), 3 deletions(-) - -diff --git a/src/hb-subset-cff1.cc b/src/hb-subset-cff1.cc -index df322f8..35dae7b 100644 ---- a/src/hb-subset-cff1.cc -+++ b/src/hb-subset-cff1.cc -@@ -402,7 +402,7 @@ struct cff_subset_plan { - void plan_subset_encoding (const OT::cff1::accelerator_subset_t &acc, hb_subset_plan_t *plan) - { - const Encoding *encoding = acc.encoding; -- unsigned int size0, size1, supp_size; -+ unsigned int size0, size1; - hb_codepoint_t code, last_code = CFF_UNDEF_CODE; - hb_vector_t<hb_codepoint_t> supp_codes; - -@@ -412,7 +412,6 @@ struct cff_subset_plan { - return; - } - -- supp_size = 0; - supp_codes.init (); - - subset_enc_num_codes = plan->num_output_glyphs () - 1; -@@ -448,7 +447,6 @@ struct cff_subset_plan { - code_pair_t pair = { supp_codes[i], sid }; - subset_enc_supp_codes.push (pair); - } -- supp_size += SuppEncoding::static_size * supp_codes.length; - } - } - supp_codes.fini (); --- -2.31.1 - diff --git a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb index 1a0e651f6..6da76ad0a 100644 --- a/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.1.bb +++ b/poky/meta/recipes-graphics/harfbuzz/harfbuzz_2.8.2.bb @@ -4,16 +4,15 @@ HOMEPAGE = "http://www.freedesktop.org/wiki/Software/HarfBuzz" BUGTRACKER = "https://bugs.freedesktop.org/enter_bug.cgi?product=HarfBuzz" SECTION = "libs" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=8f787620b7d3866d9552fd1924c07572 \ - file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc" +LIC_FILES_CHKSUM = "file://COPYING;md5=6ee0f16281694fb6aa689cca1e0fb3da \ + file://src/hb-ucd.cc;beginline=1;endline=15;md5=29d4dcb6410429195df67efe3382d8bc \ + " UPSTREAM_CHECK_URI = "https://github.com/${BPN}/${BPN}/releases" UPSTREAM_CHECK_REGEX = "harfbuzz-(?P<pver>\d+(\.\d+)+).tar" -SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz \ - file://0001-Removed-unused-variable-supp_size-from-plan_subset_e.patch \ - " -SRC_URI[sha256sum] = "4124f663ec4bf4e294d9cf230668370b4249a48ff34deaf0f06e8fc82d891300" +SRC_URI = "https://github.com/${BPN}/${BPN}/releases/download/${PV}/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "d58461395ce28b9dc03903254374dd70c38c8c28c5046db123c08f7ab9417be7" inherit meson pkgconfig lib_package gtk-doc gobject-introspection diff --git a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb index 54556abb2..3aac32159 100644 --- a/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb +++ b/poky/meta/recipes-graphics/libsdl2/libsdl2_2.0.14.bb @@ -76,6 +76,4 @@ do_configure_prepend() { export SYSROOT=$PKG_CONFIG_SYSROOT_DIR } -FILES_${PN}-dev += "${libdir}/cmake" - BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/libva/libva-initial_2.11.0.bb b/poky/meta/recipes-graphics/libva/libva-initial_2.12.0.bb index 5c6abeafe..5c6abeafe 100644 --- a/poky/meta/recipes-graphics/libva/libva-initial_2.11.0.bb +++ b/poky/meta/recipes-graphics/libva/libva-initial_2.12.0.bb diff --git a/poky/meta/recipes-graphics/libva/libva-utils_2.11.1.bb b/poky/meta/recipes-graphics/libva/libva-utils_2.12.0.bb index 096d80b68..096d80b68 100644 --- a/poky/meta/recipes-graphics/libva/libva-utils_2.11.1.bb +++ b/poky/meta/recipes-graphics/libva/libva-utils_2.12.0.bb diff --git a/poky/meta/recipes-graphics/libva/libva.inc b/poky/meta/recipes-graphics/libva/libva.inc index 43d916cd1..3d65ac501 100644 --- a/poky/meta/recipes-graphics/libva/libva.inc +++ b/poky/meta/recipes-graphics/libva/libva.inc @@ -18,7 +18,7 @@ LICENSE = "MIT" SRC_URI = "https://github.com/intel/libva/releases/download/${PV}/libva-${PV}.tar.bz2" LIC_FILES_CHKSUM = "file://COPYING;md5=2e48940f94acb0af582e5ef03537800f" -SRC_URI[sha256sum] = "6e361117038b571ad4741d38c9280db8c140b17e76e8c01fc7a4d608d3ed7d5d" +SRC_URI[sha256sum] = "d3f4873715077a8c969c9bfe4ba8455a133353176be0ffe0c41ffd4155c9a8c8" S = "${WORKDIR}/libva-${PV}" diff --git a/poky/meta/recipes-graphics/libva/libva_2.11.0.bb b/poky/meta/recipes-graphics/libva/libva_2.12.0.bb index 4d3fa5096..4d3fa5096 100644 --- a/poky/meta/recipes-graphics/libva/libva_2.11.0.bb +++ b/poky/meta/recipes-graphics/libva/libva_2.12.0.bb diff --git a/poky/meta/recipes-graphics/mesa/libglu_9.0.1.bb b/poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb index 703f131f7..ae18f8653 100644 --- a/poky/meta/recipes-graphics/mesa/libglu_9.0.1.bb +++ b/poky/meta/recipes-graphics/mesa/libglu_9.0.2.bb @@ -10,12 +10,10 @@ LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b35645 # Epoch as this used to be part of mesa PE = "2" -PR = "0" SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.gz" -SRC_URI[md5sum] = "5599a0e0a97335e10239d9165aced60d" -SRC_URI[sha256sum] = "f6f484cfcd51e489afe88031afdea1e173aa652697e4c19ddbcb8260579a10f7" +SRC_URI[sha256sum] = "24effdfb952453cc00e275e1c82ca9787506aba0282145fff054498e60e19a65" S = "${WORKDIR}/glu-${PV}" diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_21.1.3.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_21.1.5.bb index dff79f0be..dff79f0be 100644 --- a/poky/meta/recipes-graphics/mesa/mesa-gl_21.1.3.bb +++ b/poky/meta/recipes-graphics/mesa/mesa-gl_21.1.5.bb diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index b7e42a9d7..6a0df4fa2 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -21,7 +21,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-futex.h-Define-__NR_futex-if-it-does-not-exist.patch \ " -SRC_URI[sha256sum] = "cbe221282670875ffd762247b6a2c95dcee91d0a34c29802c75ef761fc891e69" +SRC_URI[sha256sum] = "022c7293074aeeced2278c872db4fa693147c70f8595b076cf3f1ef81520766d" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/mesa/mesa_21.1.3.bb b/poky/meta/recipes-graphics/mesa/mesa_21.1.5.bb index 28abc91a8..28abc91a8 100644 --- a/poky/meta/recipes-graphics/mesa/mesa_21.1.3.bb +++ b/poky/meta/recipes-graphics/mesa/mesa_21.1.5.bb diff --git a/poky/meta/recipes-graphics/pango/pango_1.48.5.bb b/poky/meta/recipes-graphics/pango/pango_1.48.7.bb index b29c3c2d9..963fd5d01 100644 --- a/poky/meta/recipes-graphics/pango/pango_1.48.5.bb +++ b/poky/meta/recipes-graphics/pango/pango_1.48.7.bb @@ -20,7 +20,7 @@ GIR_MESON_DISABLE_FLAG = "disabled" SRC_URI += "file://run-ptest" -SRC_URI[archive.sha256sum] = "501e74496173c02dcd024ded7fbb3f09efd37e2a488e248aa40799424dbb3b2a" +SRC_URI[archive.sha256sum] = "28a82f6a6cab60aa3b75a90f04197ead2d311fa8fe8b7bfdf8666e2781d506dc" DEPENDS = "glib-2.0 glib-2.0-native fontconfig freetype virtual/libiconv cairo harfbuzz fribidi" diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2021.0.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2021.1.bb index 3d59e0c38..e15b5794e 100644 --- a/poky/meta/recipes-graphics/shaderc/shaderc_2021.0.bb +++ b/poky/meta/recipes-graphics/shaderc/shaderc_2021.1.bb @@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" -SRCREV = "1a3e2aaab191f44644e899e29ab7bac50bebdeb8" +SRCREV = "031a8c9715df5d7c69dcc1ee9d53cbfa35c7b026" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ file://0001-cmake-disable-building-external-dependencies.patch \ file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_2021.1.bb b/poky/meta/recipes-graphics/spir/spirv-tools_2021.2.bb index 5795d93e5..6b5ad1ec0 100644 --- a/poky/meta/recipes-graphics/spir/spirv-tools_2021.1.bb +++ b/poky/meta/recipes-graphics/spir/spirv-tools_2021.2.bb @@ -7,7 +7,7 @@ SECTION = "graphics" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRCREV = "4b3707b788c84449a55f67257ae6aab3ca3552cb" +SRCREV = "e198c6a785d388db68eb9166b43ac5e5208fd5cc" SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git \ file://0001-fix-strncpy-bound-error.patch \ " diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.176.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.182.0.bb index cff654a06..736af7b9e 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.176.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-headers_1.2.182.0.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=master" -SRCREV = "074fa3055cfee530992bcbfa0fcb23106a82c1ab" +SRCREV = "37164a5726f7e6113810f9557903a117498421cf" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.176.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb index e241a2f15..ec09fd0f7 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.176.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-loader_1.2.182.0.bb @@ -11,7 +11,7 @@ LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git \ " -SRCREV = "eb6d6f95dff809d66e95b903105da6424e75862f" +SRCREV = "1896143df69d439b0933c1bb485f5a4587bdf2dc" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb index a177d9a39..972173ef5 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-samples_git.bb @@ -11,7 +11,7 @@ SRC_URI = "gitsm://github.com/KhronosGroup/Vulkan-Samples.git \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "04278ed5f0f9847ae6897509eb56d7b21b4e8cde" +SRCREV = "47c5237be21209afc945e43d03ae409fa80a0155" UPSTREAM_CHECK_GITTAGREGEX = "These are not the releases you're looking for" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.176.0.bb b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.182.0.bb index 10fa0fdb3..d0a298ecf 100644 --- a/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.176.0.bb +++ b/poky/meta/recipes-graphics/vulkan/vulkan-tools_1.2.182.0.bb @@ -6,8 +6,8 @@ SECTION = "libs" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" -SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.176" -SRCREV = "eb3d67bd17ee433e2b0a8e56a7249bd83908812e" +SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=sdk-1.2.182" +SRCREV = "9d3305731c3be8de05c9f223a79959d448506a37" S = "${WORKDIR}/git" diff --git a/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.0.1.bb b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb index 1777492ed..5688eb476 100644 --- a/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.0.1.bb +++ b/poky/meta/recipes-graphics/xorg-driver/xf86-input-libinput_1.1.0.bb @@ -6,6 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=a22925127bd3c827c384cedd23ed2309" DEPENDS += "libinput" -SRC_URI[sha256sum] = "fddec49c115591918475155bf16aaf23017d7f814cee7823a0c11f867aca245b" +SRC_URI[sha256sum] = "e11d2a41419124a6e9b148f1df181bf7819fc7398c8ee9a1b6390b0742c68d16" FILES_${PN} += "${datadir}/X11/xorg.conf.d" diff --git a/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.10.bb b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.99.2.bb index 5a08e0736..8afa9aa52 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.10.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxi_1.7.99.2.bb @@ -17,7 +17,6 @@ PE = "1" XORG_PN = "libXi" -SRC_URI[md5sum] = "62c4af0839072024b4b1c8cbe84216c7" -SRC_URI[sha256sum] = "36a30d8f6383a72e7ce060298b4b181fd298bc3a135c8e201b7ca847f5f81061" +SRC_URI[sha256sum] = "2ce90ebcb7fa0c3ed671924f1268b8f4c500fff62e1284699fc413e182a7896b" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc index da025171d..8b0cc2748 100644 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg.inc @@ -15,7 +15,9 @@ PROVIDES += "virtual/xserver" PE = "2" XORG_PN = "xorg-server" -SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.bz2" +SRC_URI = "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${PV}.tar.xz" + +UPSTREAM_CHECK_REGEX = "xorg-server-(?P<pver>\d+(\.(?!99)\d+)+)\.tar" CVE_PRODUCT = "xorg-server" diff --git a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb index 1eb2056b8..8f86bea87 100644 --- a/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.11.bb +++ b/poky/meta/recipes-graphics/xorg-xserver/xserver-xorg_1.20.12.bb @@ -8,7 +8,7 @@ SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.pat file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ file://0001-Fix-segfault-on-probing-a-non-PCI-platform-device-on.patch \ " -SRC_URI[sha256sum] = "914c796e3ffabe1af48071d40ccc85e92117c97a9082ed1df29e4d64e3c34c49" +SRC_URI[sha256sum] = "336dc093431d81ecc03fa36af771f1181334f2746b7de7796f3cc6a8fa9e8cac" # These extensions are now integrated into the server, so declare the migration # path for in-place upgrades. diff --git a/poky/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb b/poky/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb index 8b1c96fc4..794a7bd98 100644 --- a/poky/meta/recipes-graphics/xwayland/xwayland_21.1.1.bb +++ b/poky/meta/recipes-graphics/xwayland/xwayland_21.1.2.bb @@ -10,13 +10,31 @@ LICENSE = "MIT-X" LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "31f261ce51bbee76a6ca3ec02aa367ffa2b5efa2b98412df57ccefd7a19003ce" +SRC_URI[sha256sum] = "b81cbdd5ad60b8b7ad8c3ecc7ec2a28c9bf021448670735cebb501f08bebd18b" + +UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" inherit meson features_check REQUIRED_DISTRO_FEATURES = "x11 opengl" DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy" +OPENGL_PKGCONFIGS = "glx glamor dri3" +PACKAGECONFIG ??= "${XORG_CRYPTO} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ +" +PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" +PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" +PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" +PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" +PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" + +# Xorg requires a SHA1 implementation, pick one +XORG_CRYPTO ??= "openssl" +PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" +PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" +PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" + do_install_append() { # remove files not needed and clashing with xserver-xorg rm -rf ${D}/${libdir}/xorg/ |