diff options
Diffstat (limited to 'meta/recipes-graphics')
34 files changed, 61 insertions, 95 deletions
diff --git a/meta/recipes-graphics/builder/builder_0.1.bb b/meta/recipes-graphics/builder/builder_0.1.bb index 52c9351f93..7719b783c2 100644 --- a/meta/recipes-graphics/builder/builder_0.1.bb +++ b/meta/recipes-graphics/builder/builder_0.1.bb | |||
@@ -7,7 +7,8 @@ LIC_FILES_CHKSUM = "file://builder_session.sh;endline=5;md5=84796c3c41785d86100f | |||
7 | SRC_URI = "file://builder_session.sh \ | 7 | SRC_URI = "file://builder_session.sh \ |
8 | " | 8 | " |
9 | 9 | ||
10 | S = "${WORKDIR}" | 10 | S = "${WORKDIR}/sources" |
11 | UNPACKDIR = "${S}" | ||
11 | 12 | ||
12 | RDEPENDS:${PN} = "mini-x-session" | 13 | RDEPENDS:${PN} = "mini-x-session" |
13 | 14 | ||
diff --git a/meta/recipes-graphics/glslang/glslang_1.3.280.0.bb b/meta/recipes-graphics/glslang/glslang_1.3.283.0.bb index 637082c719..b58bd1e956 100644 --- a/meta/recipes-graphics/glslang/glslang_1.3.280.0.bb +++ b/meta/recipes-graphics/glslang/glslang_1.3.283.0.bb | |||
@@ -8,14 +8,14 @@ HOMEPAGE = "https://www.khronos.org/opengles/sdk/tools/Reference-Compiler" | |||
8 | LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" | 8 | LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exception" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2a2b5acd7bc4844964cfda45fe807dc3" |
10 | 10 | ||
11 | SRCREV = "ee2f5d09eaf8f4e8d0d598bd2172fce290d4ca60" | 11 | SRCREV = "e8dd0b6903b34f1879520b444634c75ea2deedf5" |
12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ | 12 | SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https;branch=main \ |
13 | file://0001-generate-glslang-pkg-config.patch \ | 13 | file://0001-generate-glslang-pkg-config.patch \ |
14 | " | 14 | " |
15 | PE = "1" | 15 | PE = "1" |
16 | # These recipes need to be updated in lockstep with each other: | 16 | # These recipes need to be updated in lockstep with each other: |
17 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | 17 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools |
18 | # vulkan-validation-layers, vulkan-utility-libraries. | 18 | # vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. |
19 | # The tags versions should always be sdk-x.y.z, as this is what | 19 | # The tags versions should always be sdk-x.y.z, as this is what |
20 | # upstream considers a release. | 20 | # upstream considers a release. |
21 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 21 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/harfbuzz/harfbuzz_8.3.1.bb b/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb index fd4dcc2338..6b0eb12046 100644 --- a/meta/recipes-graphics/harfbuzz/harfbuzz_8.3.1.bb +++ b/meta/recipes-graphics/harfbuzz/harfbuzz_8.5.0.bb | |||
@@ -9,7 +9,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b98429b8e8e3c2a67cfef01e99e4893d \ | |||
9 | " | 9 | " |
10 | 10 | ||
11 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" | 11 | SRC_URI = "${GITHUB_BASE_URI}/download/${PV}/${BPN}-${PV}.tar.xz" |
12 | SRC_URI[sha256sum] = "f73e1eacd7e2ffae687bc3f056bb0c705b7a05aee86337686e09da8fc1c2030c" | 12 | SRC_URI[sha256sum] = "77e4f7f98f3d86bf8788b53e6832fb96279956e1c3961988ea3d4b7ca41ddc27" |
13 | 13 | ||
14 | DEPENDS += "glib-2.0-native" | 14 | DEPENDS += "glib-2.0-native" |
15 | 15 | ||
@@ -32,6 +32,9 @@ PACKAGES =+ "${PN}-icu ${PN}-icu-dev ${PN}-subset" | |||
32 | 32 | ||
33 | LEAD_SONAME = "libharfbuzz.so" | 33 | LEAD_SONAME = "libharfbuzz.so" |
34 | 34 | ||
35 | # Remove when https://github.com/harfbuzz/harfbuzz/issues/4671 is resolved | ||
36 | EXTRA_OEMESON += "-Dcpp_std=c++17" | ||
37 | |||
35 | do_install:append() { | 38 | do_install:append() { |
36 | # If no tools are installed due to PACKAGECONFIG then this directory might | 39 | # If no tools are installed due to PACKAGECONFIG then this directory might |
37 | # still be installed, so remove it to stop packaging warnings. | 40 | # still be installed, so remove it to stop packaging warnings. |
diff --git a/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb b/meta/recipes-graphics/libsdl2/libsdl2_2.30.3.bb index f9dacb288c..68cc2790e5 100644 --- a/meta/recipes-graphics/libsdl2/libsdl2_2.30.2.bb +++ b/meta/recipes-graphics/libsdl2/libsdl2_2.30.3.bb | |||
@@ -25,7 +25,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL2-${PV}.tar.gz" | |||
25 | 25 | ||
26 | S = "${WORKDIR}/SDL2-${PV}" | 26 | S = "${WORKDIR}/SDL2-${PV}" |
27 | 27 | ||
28 | SRC_URI[sha256sum] = "891d66ac8cae51361d3229e3336ebec1c407a8a2a063b61df14f5fdf3ab5ac31" | 28 | SRC_URI[sha256sum] = "820440072f8f5b50188c1dae104f2ad25984de268785be40c41a099a510f0aec" |
29 | 29 | ||
30 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even | 30 | inherit cmake lib_package binconfig-disabled pkgconfig upstream-version-is-even |
31 | 31 | ||
diff --git a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb index d1f0a67d84..8a4cfef631 100644 --- a/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb +++ b/meta/recipes-graphics/matchbox-session/matchbox-session_0.1.bb | |||
@@ -10,7 +10,9 @@ SECTION = "x11" | |||
10 | RCONFLICTS:${PN} = "matchbox-common" | 10 | RCONFLICTS:${PN} = "matchbox-common" |
11 | 11 | ||
12 | SRC_URI = "file://matchbox-session" | 12 | SRC_URI = "file://matchbox-session" |
13 | S = "${WORKDIR}" | 13 | |
14 | S = "${WORKDIR}/sources" | ||
15 | UNPACKDIR = "${S}" | ||
14 | 16 | ||
15 | 17 | ||
16 | inherit update-alternatives | 18 | inherit update-alternatives |
diff --git a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch deleted file mode 100644 index 7be7d81eeb..0000000000 --- a/meta/recipes-graphics/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ /dev/null | |||
@@ -1,42 +0,0 @@ | |||
1 | From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001 | ||
2 | From: Alistair Francis <alistair@alistair23.me> | ||
3 | Date: Thu, 14 Nov 2019 13:04:49 -0800 | ||
4 | Subject: [PATCH] meson.build: check for all linux host_os combinations | ||
5 | |||
6 | Make sure that we are also looking for our host_os combinations like | ||
7 | linux-musl etc. when assuming support for DRM/KMS. | ||
8 | |||
9 | Also delete a duplicate line. | ||
10 | |||
11 | Upstream-Status: Pending | ||
12 | |||
13 | Signed-off-by: Anuj Mittal <anuj.mittal@intel.com> | ||
14 | Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br> | ||
15 | Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> | ||
16 | Signed-off-by: Alistair Francis <alistair@alistair23.me> | ||
17 | --- | ||
18 | meson.build | 4 ++-- | ||
19 | 1 file changed, 2 insertions(+), 2 deletions(-) | ||
20 | |||
21 | diff --git a/meson.build b/meson.build | ||
22 | index 133fd9a..817861e 100644 | ||
23 | --- a/meson.build | ||
24 | +++ b/meson.build | ||
25 | @@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 | ||
26 | # Only build shared_glapi if at least one OpenGL API is enabled | ||
27 | with_shared_glapi = with_shared_glapi and with_any_opengl | ||
28 | |||
29 | -system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) | ||
30 | +system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') | ||
31 | |||
32 | gallium_drivers = get_option('gallium-drivers') | ||
33 | if gallium_drivers.contains('auto') | ||
34 | @@ -997,7 +997,7 @@ if cc.has_function('fmemopen') | ||
35 | endif | ||
36 | |||
37 | # TODO: this is very incomplete | ||
38 | -if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) | ||
39 | +if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') | ||
40 | pre_args += '-D_GNU_SOURCE' | ||
41 | elif host_machine.system() == 'sunos' | ||
42 | pre_args += '-D__EXTENSIONS__' | ||
diff --git a/meta/recipes-graphics/mesa/mesa-gl_24.0.5.bb b/meta/recipes-graphics/mesa/mesa-gl_24.0.7.bb index ca160f1bfc..ca160f1bfc 100644 --- a/meta/recipes-graphics/mesa/mesa-gl_24.0.5.bb +++ b/meta/recipes-graphics/mesa/mesa-gl_24.0.7.bb | |||
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc index 77e9c80fcb..2581ccb120 100644 --- a/meta/recipes-graphics/mesa/mesa.inc +++ b/meta/recipes-graphics/mesa/mesa.inc | |||
@@ -15,14 +15,13 @@ LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10 | |||
15 | PE = "2" | 15 | PE = "2" |
16 | 16 | ||
17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ | 17 | SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ |
18 | file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ | ||
19 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ | 18 | file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ |
20 | file://0001-drisw-fix-build-without-dri3.patch \ | 19 | file://0001-drisw-fix-build-without-dri3.patch \ |
21 | file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ | 20 | file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ |
22 | file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ | 21 | file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ |
23 | " | 22 | " |
24 | 23 | ||
25 | SRC_URI[sha256sum] = "38cc245ca8faa3c69da6d2687f8906377001f63365348a62cc6f7fafb1e8c018" | 24 | SRC_URI[sha256sum] = "7454425f1ed4a6f1b5b107e1672b30c88b22ea0efea000ae2c7d96db93f6c26a" |
26 | 25 | ||
27 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" | 26 | UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" |
28 | 27 | ||
diff --git a/meta/recipes-graphics/mesa/mesa_24.0.5.bb b/meta/recipes-graphics/mesa/mesa_24.0.7.bb index 96e8aa38d6..96e8aa38d6 100644 --- a/meta/recipes-graphics/mesa/mesa_24.0.5.bb +++ b/meta/recipes-graphics/mesa/mesa_24.0.7.bb | |||
diff --git a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb index ba81d0b17a..48d50c8f66 100644 --- a/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb +++ b/meta/recipes-graphics/mini-x-session/mini-x-session_0.1.bb | |||
@@ -11,7 +11,9 @@ SECTION = "x11" | |||
11 | RCONFLICTS:${PN} = "matchbox-common" | 11 | RCONFLICTS:${PN} = "matchbox-common" |
12 | 12 | ||
13 | SRC_URI = "file://mini-x-session" | 13 | SRC_URI = "file://mini-x-session" |
14 | S = "${WORKDIR}" | 14 | |
15 | S = "${WORKDIR}/sources" | ||
16 | UNPACKDIR = "${S}" | ||
15 | 17 | ||
16 | RDEPENDS:${PN} = "sudo" | 18 | RDEPENDS:${PN} = "sudo" |
17 | 19 | ||
diff --git a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb index d0794f8ee6..ee5173dc83 100644 --- a/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb +++ b/meta/recipes-graphics/pong-clock/pong-clock_1.0.bb | |||
@@ -10,7 +10,8 @@ SRC_URI = "file://pong-clock-no-flicker.c" | |||
10 | 10 | ||
11 | LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3" | 11 | LIC_FILES_CHKSUM = "file://pong-clock-no-flicker.c;beginline=1;endline=23;md5=dd248d50f73f746d1ee78586b0b2ebd3" |
12 | 12 | ||
13 | S = "${WORKDIR}" | 13 | S = "${WORKDIR}/sources" |
14 | UNPACKDIR = "${S}" | ||
14 | 15 | ||
15 | do_compile () { | 16 | do_compile () { |
16 | ${CC} ${CFLAGS} ${LDFLAGS} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp` | 17 | ${CC} ${CFLAGS} ${LDFLAGS} -o pong-clock pong-clock-no-flicker.c `pkg-config --cflags --libs x11 xau xdmcp` |
diff --git a/meta/recipes-graphics/shaderc/shaderc_2024.0.bb b/meta/recipes-graphics/shaderc/shaderc_2024.1.bb index 9975c608ac..1f0b12ef57 100644 --- a/meta/recipes-graphics/shaderc/shaderc_2024.0.bb +++ b/meta/recipes-graphics/shaderc/shaderc_2024.1.bb | |||
@@ -6,7 +6,7 @@ HOMEPAGE = "https://github.com/google/shaderc" | |||
6 | LICENSE = "Apache-2.0" | 6 | LICENSE = "Apache-2.0" |
7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" | 7 | LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" |
8 | 8 | ||
9 | SRCREV = "9f56ca620c07d6c4d119c65c1c1f3f1c584c9985" | 9 | SRCREV = "5d7736da11e626b49c5463aadb2afb228ad20276" |
10 | SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ | 10 | SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ |
11 | file://0001-cmake-disable-building-external-dependencies.patch \ | 11 | file://0001-cmake-disable-building-external-dependencies.patch \ |
12 | file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ | 12 | file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ |
diff --git a/meta/recipes-graphics/spir/spirv-headers_1.3.280.0.bb b/meta/recipes-graphics/spir/spirv-headers_1.3.283.0.bb index 26bfd9c4fa..5ec7e42b7c 100644 --- a/meta/recipes-graphics/spir/spirv-headers_1.3.280.0.bb +++ b/meta/recipes-graphics/spir/spirv-headers_1.3.283.0.bb | |||
@@ -4,12 +4,12 @@ HOMEPAGE = "https://www.khronos.org/registry/spir-v" | |||
4 | LICENSE = "MIT" | 4 | LICENSE = "MIT" |
5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741" | 5 | LIC_FILES_CHKSUM = "file://LICENSE;md5=d14ee3b13f42e9c9674acc5925c3d741" |
6 | 6 | ||
7 | SRCREV = "8b246ff75c6615ba4532fe4fde20f1be090c3764" | 7 | SRCREV = "4f7b471f1a66b6d06462cd4ba57628cc0cd087d7" |
8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" | 8 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Headers;protocol=https;branch=main" |
9 | PE = "1" | 9 | PE = "1" |
10 | # These recipes need to be updated in lockstep with each other: | 10 | # These recipes need to be updated in lockstep with each other: |
11 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | 11 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools |
12 | # vulkan-validation-layers, vulkan-utility-libraries. | 12 | # vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. |
13 | # The tags versions should always be sdk-x.y.z, as this is what | 13 | # The tags versions should always be sdk-x.y.z, as this is what |
14 | # upstream considers a release. | 14 | # upstream considers a release. |
15 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 15 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb b/meta/recipes-graphics/spir/spirv-tools_1.3.283.0.bb index d2b6acf946..292a17f00d 100644 --- a/meta/recipes-graphics/spir/spirv-tools_1.3.280.0.bb +++ b/meta/recipes-graphics/spir/spirv-tools_1.3.283.0.bb | |||
@@ -7,12 +7,12 @@ SECTION = "graphics" | |||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" |
9 | 9 | ||
10 | SRCREV = "04896c462d9f3f504c99a4698605b6524af813c1" | 10 | SRCREV = "dd4b663e13c07fea4fbb3f70c1c91c86731099f7" |
11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" | 11 | SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git;branch=main;protocol=https" |
12 | PE = "1" | 12 | PE = "1" |
13 | # These recipes need to be updated in lockstep with each other: | 13 | # These recipes need to be updated in lockstep with each other: |
14 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | 14 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools |
15 | # vulkan-validation-layers, vulkan-utility-libraries. | 15 | # vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. |
16 | # The tags versions should always be sdk-x.y.z, as this is what | 16 | # The tags versions should always be sdk-x.y.z, as this is what |
17 | # upstream considers a release. | 17 | # upstream considers a release. |
18 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 18 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.280.0.bb b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.283.0.bb index 371cc7304d..6423ef9df6 100644 --- a/meta/recipes-graphics/vulkan/vulkan-headers_1.3.280.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-headers_1.3.283.0.bb | |||
@@ -11,7 +11,7 @@ LICENSE = "Apache-2.0 & MIT" | |||
11 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=1bc355d8c4196f774c8b87ed1a8dd625" |
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Headers.git;branch=main;protocol=https" |
13 | 13 | ||
14 | SRCREV = "577baa05033cf1d9236b3d078ca4b3269ed87a2b" | 14 | SRCREV = "eaa319dade959cb61ed2229c8ea42e307cc8f8b3" |
15 | 15 | ||
16 | S = "${WORKDIR}/git" | 16 | S = "${WORKDIR}/git" |
17 | 17 | ||
@@ -22,7 +22,7 @@ RDEPENDS:${PN} += "python3-core" | |||
22 | 22 | ||
23 | # These recipes need to be updated in lockstep with each other: | 23 | # These recipes need to be updated in lockstep with each other: |
24 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools, | 24 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools, |
25 | # vulkan-validation-layers, vulkan-utility-libraries. | 25 | # vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. |
26 | # The tags versions should always be sdk-x.y.z, as this is what | 26 | # The tags versions should always be sdk-x.y.z, as this is what |
27 | # upstream considers a release. | 27 | # upstream considers a release. |
28 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 28 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.280.0.bb b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.283.0.bb index b738771801..6c3197e13f 100644 --- a/meta/recipes-graphics/vulkan/vulkan-loader_1.3.280.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-loader_1.3.283.0.bb | |||
@@ -9,8 +9,8 @@ SECTION = "libs" | |||
9 | 9 | ||
10 | LICENSE = "Apache-2.0" | 10 | LICENSE = "Apache-2.0" |
11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" | 11 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=7dbefed23242760aa3475ee42801c5ac" |
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.280;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Loader.git;branch=vulkan-sdk-1.3.283;protocol=https" |
13 | SRCREV = "61a9c50248e09f3a0e0be7ce6f8bb1663855f979" | 13 | SRCREV = "720be5198aad4696381d2e3eeadc131c9f56bdc6" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
@@ -37,7 +37,7 @@ RRECOMMENDS:${PN} = "mesa-vulkan-drivers" | |||
37 | 37 | ||
38 | # These recipes need to be updated in lockstep with each other: | 38 | # These recipes need to be updated in lockstep with each other: |
39 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools, | 39 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools, |
40 | # vulkan-validation-layers, vulkan-utility-libraries. | 40 | # vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. |
41 | # The tags versions should always be sdk-x.y.z, as this is what | 41 | # The tags versions should always be sdk-x.y.z, as this is what |
42 | # upstream considers a release. | 42 | # upstream considers a release. |
43 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 43 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.280.0.bb b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.283.0.bb index a7e4a67aaa..a76f60735f 100644 --- a/meta/recipes-graphics/vulkan/vulkan-tools_1.3.280.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-tools_1.3.283.0.bb | |||
@@ -6,8 +6,8 @@ SECTION = "libs" | |||
6 | 6 | ||
7 | LICENSE = "Apache-2.0" | 7 | LICENSE = "Apache-2.0" |
8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" | 8 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=3b83ef96387f14655fc854ddc3c6bd57" |
9 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=vulkan-sdk-1.3.280;protocol=https" | 9 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Tools.git;branch=vulkan-sdk-1.3.283;protocol=https" |
10 | SRCREV = "136976082d0b14dad8b9687982b2a80cc6e6a633" | 10 | SRCREV = "38321da9031f5909f1ca2dbafac8840ef6b2c144" |
11 | 11 | ||
12 | S = "${WORKDIR}/git" | 12 | S = "${WORKDIR}/git" |
13 | 13 | ||
@@ -31,7 +31,7 @@ PACKAGECONFIG[wayland] = "-DBUILD_WSI_WAYLAND_SUPPORT=ON, -DBUILD_WSI_WAYLAND_SU | |||
31 | 31 | ||
32 | # These recipes need to be updated in lockstep with each other: | 32 | # These recipes need to be updated in lockstep with each other: |
33 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools | 33 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, spirv-headers, spirv-tools |
34 | # vulkan-validation-layers, vulkan-utility-libraries. | 34 | # vulkan-validation-layers, vulkan-utility-libraries, vulkan-volk. |
35 | # The tags versions should always be sdk-x.y.z, as this is what | 35 | # The tags versions should always be sdk-x.y.z, as this is what |
36 | # upstream considers a release. | 36 | # upstream considers a release. |
37 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 37 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.280.0.bb b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.283.0.bb index 3ab31af96a..3274bea8fd 100644 --- a/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.280.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-utility-libraries_1.3.283.0.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "Apache-2.0" | |||
10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b" | 10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=4ca2d6799091aaa98a8520f1b793939b" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=main;protocol=https" | 12 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-Utility-Libraries.git;branch=main;protocol=https" |
13 | SRCREV = "a4140c5fd47dcf3a030726a60b293db61cfb54a3" | 13 | SRCREV = "ad7f699a7b2b5deb66eb3de19f24aa33597ed65b" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
@@ -27,7 +27,7 @@ inherit cmake features_check pkgconfig | |||
27 | # These recipes need to be updated in lockstep with each other: | 27 | # These recipes need to be updated in lockstep with each other: |
28 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, | 28 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, |
29 | # vulkan-validation-layers, spirv-headers, spirv-tools, | 29 | # vulkan-validation-layers, spirv-headers, spirv-tools, |
30 | # vulkan-utility-libraries. | 30 | # vulkan-utility-libraries, vulkan-volk. |
31 | # The tags versions should always be sdk-x.y.z, as this is what | 31 | # The tags versions should always be sdk-x.y.z, as this is what |
32 | # upstream considers a release. | 32 | # upstream considers a release. |
33 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 33 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.280.0.bb b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.283.0.bb index c488309c91..2f1efba856 100644 --- a/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.280.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-validation-layers_1.3.283.0.bb | |||
@@ -8,8 +8,8 @@ SECTION = "libs" | |||
8 | LICENSE = "Apache-2.0 & MIT" | 8 | LICENSE = "Apache-2.0 & MIT" |
9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" | 9 | LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=cd3c0bc366cd9b6a906e22f0bcb5910f" |
10 | 10 | ||
11 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.280;protocol=https" | 11 | SRC_URI = "git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;branch=vulkan-sdk-1.3.283;protocol=https" |
12 | SRCREV = "8506077b9a25a00684e8be24b779733ae1405a54" | 12 | SRCREV = "d5bed3e26b3d487e8d21f0cc39039351eac921a7" |
13 | 13 | ||
14 | S = "${WORKDIR}/git" | 14 | S = "${WORKDIR}/git" |
15 | 15 | ||
@@ -43,7 +43,7 @@ FILES_SOLIBSDEV = "" | |||
43 | # These recipes need to be updated in lockstep with each other: | 43 | # These recipes need to be updated in lockstep with each other: |
44 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, | 44 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, |
45 | # vulkan-validation-layers, spirv-headers, spirv-tools, | 45 | # vulkan-validation-layers, spirv-headers, spirv-tools, |
46 | # vulkan-utility-libraries. | 46 | # vulkan-utility-libraries, vulkan-volk. |
47 | # The tags versions should always be sdk-x.y.z, as this is what | 47 | # The tags versions should always be sdk-x.y.z, as this is what |
48 | # upstream considers a release. | 48 | # upstream considers a release. |
49 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 49 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/vulkan/vulkan-volk_1.3.280.0.bb b/meta/recipes-graphics/vulkan/vulkan-volk_1.3.283.0.bb index 2ef12fedf8..5485aa0b0d 100644 --- a/meta/recipes-graphics/vulkan/vulkan-volk_1.3.280.0.bb +++ b/meta/recipes-graphics/vulkan/vulkan-volk_1.3.283.0.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "MIT" | |||
10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=12e6af3a0e2a5e5dbf7796aa82b64626" | 10 | LIC_FILES_CHKSUM = "file://LICENSE.md;md5=12e6af3a0e2a5e5dbf7796aa82b64626" |
11 | 11 | ||
12 | SRC_URI = "git://github.com/zeux/volk.git;branch=master;protocol=https" | 12 | SRC_URI = "git://github.com/zeux/volk.git;branch=master;protocol=https" |
13 | SRCREV = "01986ac85fa2e5c70df09aeae9c907e27c5d50b2" | 13 | SRCREV = "3a8068a57417940cf2bf9d837a7bb60d015ca2f1" |
14 | 14 | ||
15 | S = "${WORKDIR}/git" | 15 | S = "${WORKDIR}/git" |
16 | 16 | ||
@@ -27,7 +27,7 @@ inherit cmake features_check pkgconfig | |||
27 | # These recipes need to be updated in lockstep with each other: | 27 | # These recipes need to be updated in lockstep with each other: |
28 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, | 28 | # glslang, vulkan-headers, vulkan-loader, vulkan-tools, |
29 | # vulkan-validation-layers, spirv-headers, spirv-tools, | 29 | # vulkan-validation-layers, spirv-headers, spirv-tools, |
30 | # vulkan-utility-libraries. | 30 | # vulkan-utility-libraries, vulkan-volk. |
31 | # The tags versions should always be sdk-x.y.z, as this is what | 31 | # The tags versions should always be sdk-x.y.z, as this is what |
32 | # upstream considers a release. | 32 | # upstream considers a release. |
33 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" | 33 | UPSTREAM_CHECK_GITTAGREGEX = "sdk-(?P<pver>\d+(\.\d+)+)" |
diff --git a/meta/recipes-graphics/wayland/wayland-protocols_1.35.bb b/meta/recipes-graphics/wayland/wayland-protocols_1.36.bb index 7e70de346c..9b008ca534 100644 --- a/meta/recipes-graphics/wayland/wayland-protocols_1.35.bb +++ b/meta/recipes-graphics/wayland/wayland-protocols_1.36.bb | |||
@@ -10,9 +10,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ | |||
10 | file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" | 10 | file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" |
11 | 11 | ||
12 | SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" | 12 | SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" |
13 | SRC_URI[sha256sum] = "37a2716a28133dc819341c568a29d21e8cb72130e5c126a1fcfc9f42c23d95ab" | 13 | SRC_URI[sha256sum] = "71fd4de05e79f9a1ca559fac30c1f8365fa10346422f9fe795f74d77b9ef7e92" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" | 15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" |
16 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)" | ||
16 | 17 | ||
17 | inherit meson pkgconfig allarch | 18 | inherit meson pkgconfig allarch |
18 | 19 | ||
diff --git a/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb index 878c7a267e..59d414a0a6 100644 --- a/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb +++ b/meta/recipes-graphics/wayland/wayland-utils_1.2.0.bb | |||
@@ -13,6 +13,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV} | |||
13 | SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" | 13 | SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" |
14 | 14 | ||
15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/tags" | 15 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/tags" |
16 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>.+)" | ||
16 | 17 | ||
17 | inherit meson pkgconfig | 18 | inherit meson pkgconfig |
18 | 19 | ||
diff --git a/meta/recipes-graphics/wayland/wayland_1.22.0.bb b/meta/recipes-graphics/wayland/wayland_1.22.0.bb index 6aa76063ea..e7babc9ec6 100644 --- a/meta/recipes-graphics/wayland/wayland_1.22.0.bb +++ b/meta/recipes-graphics/wayland/wayland_1.22.0.bb | |||
@@ -20,7 +20,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downl | |||
20 | SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" | 20 | SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" |
21 | 21 | ||
22 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags" | 22 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags" |
23 | UPSTREAM_CHECK_REGEX = "wayland-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 23 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
24 | 24 | ||
25 | inherit meson pkgconfig ptest | 25 | inherit meson pkgconfig ptest |
26 | 26 | ||
diff --git a/meta/recipes-graphics/wayland/weston-init.bb b/meta/recipes-graphics/wayland/weston-init.bb index ca3d1478dc..83f0cea49c 100644 --- a/meta/recipes-graphics/wayland/weston-init.bb +++ b/meta/recipes-graphics/wayland/weston-init.bb | |||
@@ -13,7 +13,8 @@ SRC_URI = "file://init \ | |||
13 | file://weston-autologin \ | 13 | file://weston-autologin \ |
14 | file://weston-start" | 14 | file://weston-start" |
15 | 15 | ||
16 | S = "${WORKDIR}" | 16 | S = "${WORKDIR}/sources" |
17 | UNPACKDIR = "${S}" | ||
17 | 18 | ||
18 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)}" | 19 | PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)}" |
19 | PACKAGECONFIG:append:qemuriscv64 = " use-pixman" | 20 | PACKAGECONFIG:append:qemuriscv64 = " use-pixman" |
diff --git a/meta/recipes-graphics/wayland/weston_13.0.0.bb b/meta/recipes-graphics/wayland/weston_13.0.0.bb index 798cf6f19c..cb0024c5ca 100644 --- a/meta/recipes-graphics/wayland/weston_13.0.0.bb +++ b/meta/recipes-graphics/wayland/weston_13.0.0.bb | |||
@@ -17,7 +17,7 @@ SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downlo | |||
17 | SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" | 17 | SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" |
18 | 18 | ||
19 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" | 19 | UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" |
20 | UPSTREAM_CHECK_REGEX = "weston-(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" | 20 | UPSTREAM_CHECK_REGEX = "releases/(?P<pver>\d+\.\d+\.(?!9\d+)\d+)" |
21 | 21 | ||
22 | inherit meson pkgconfig useradd | 22 | inherit meson pkgconfig useradd |
23 | 23 | ||
diff --git a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb index 4e38b4da34..cd4acf8155 100644 --- a/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb +++ b/meta/recipes-graphics/x11-common/xserver-nodm-init_3.0.bb | |||
@@ -12,7 +12,8 @@ SRC_URI = "file://xserver-nodm \ | |||
12 | file://capability.conf \ | 12 | file://capability.conf \ |
13 | " | 13 | " |
14 | 14 | ||
15 | S = "${WORKDIR}" | 15 | S = "${WORKDIR}/sources" |
16 | UNPACKDIR = "${S}" | ||
16 | 17 | ||
17 | # Since we refer to ROOTLESS_X which is normally enabled per-machine | 18 | # Since we refer to ROOTLESS_X which is normally enabled per-machine |
18 | PACKAGE_ARCH = "${MACHINE_ARCH}" | 19 | PACKAGE_ARCH = "${MACHINE_ARCH}" |
diff --git a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb index 5c9742fb20..f4516e6975 100644 --- a/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb +++ b/meta/recipes-graphics/xinput-calibrator/pointercal-xinput_0.0.bb | |||
@@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 | |||
7 | 7 | ||
8 | 8 | ||
9 | SRC_URI = "file://pointercal.xinput" | 9 | SRC_URI = "file://pointercal.xinput" |
10 | S = "${WORKDIR}" | 10 | |
11 | S = "${WORKDIR}/sources" | ||
12 | UNPACKDIR = "${S}" | ||
11 | 13 | ||
12 | do_install() { | 14 | do_install() { |
13 | # Only install file if it has a contents | 15 | # Only install file if it has a contents |
diff --git a/meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch b/meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch index 5b159d646d..604e987551 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch +++ b/meta/recipes-graphics/xorg-lib/libxcb/0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d55b6b1fa87700f3eae3a29522972d2e7be7d53e Mon Sep 17 00:00:00 2001 | 1 | From b529f25a3dcd1547f49d341a0a34fbc1379ed58d Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Sat, 14 Jan 2023 10:11:35 -0800 | 3 | Date: Sat, 14 Jan 2023 10:11:35 -0800 |
4 | Subject: [PATCH] use _Alignof to avoid UB in ALIGNOF | 4 | Subject: [PATCH] use _Alignof to avoid UB in ALIGNOF |
@@ -20,7 +20,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> | |||
20 | 1 file changed, 1 insertion(+), 2 deletions(-) | 20 | 1 file changed, 1 insertion(+), 2 deletions(-) |
21 | 21 | ||
22 | diff --git a/src/c_client.py b/src/c_client.py | 22 | diff --git a/src/c_client.py b/src/c_client.py |
23 | index fd256f0..4e48f13 100644 | 23 | index b7db543..ec81758 100644 |
24 | --- a/src/c_client.py | 24 | --- a/src/c_client.py |
25 | +++ b/src/c_client.py | 25 | +++ b/src/c_client.py |
26 | @@ -288,7 +288,6 @@ def c_open(self): | 26 | @@ -288,7 +288,6 @@ def c_open(self): |
@@ -40,6 +40,3 @@ index fd256f0..4e48f13 100644 | |||
40 | % (space, | 40 | % (space, |
41 | 'char' | 41 | 'char' |
42 | if field.c_field_type == 'void' or field.type.is_switch | 42 | if field.c_field_type == 'void' or field.type.is_switch |
43 | -- | ||
44 | 2.39.0 | ||
45 | |||
diff --git a/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb b/meta/recipes-graphics/xorg-lib/libxcb_1.17.0.bb index de3290aa9f..fcd8aad303 100644 --- a/meta/recipes-graphics/xorg-lib/libxcb_1.16.1.bb +++ b/meta/recipes-graphics/xorg-lib/libxcb_1.17.0.bb | |||
@@ -12,7 +12,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d763b081cb10c223435b01e00dc0aba7" | |||
12 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ | 12 | SRC_URI = "http://xcb.freedesktop.org/dist/libxcb-${PV}.tar.xz \ |
13 | file://0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch" | 13 | file://0001-use-_Alignof-to-avoid-UB-in-ALIGNOF.patch" |
14 | 14 | ||
15 | SRC_URI[sha256sum] = "f24d187154c8e027b358fc7cb6588e35e33e6a92f11c668fe77396a7ae66e311" | 15 | SRC_URI[sha256sum] = "599ebf9996710fea71622e6e184f3a8ad5b43d0e5fa8c4e407123c88a59a6d55" |
16 | 16 | ||
17 | BBCLASSEXTEND = "native nativesdk" | 17 | BBCLASSEXTEND = "native nativesdk" |
18 | 18 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb index a3a4733785..0972a5dd78 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xf86-config_0.1.bb | |||
@@ -6,7 +6,8 @@ LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384 | |||
6 | 6 | ||
7 | SRC_URI = "file://xorg.conf" | 7 | SRC_URI = "file://xorg.conf" |
8 | 8 | ||
9 | S = "${WORKDIR}" | 9 | S = "${WORKDIR}/sources" |
10 | UNPACKDIR = "${S}" | ||
10 | 11 | ||
11 | CONFFILES:${PN} = "${sysconfdir}/X11/xorg.conf" | 12 | CONFFILES:${PN} = "${sysconfdir}/X11/xorg.conf" |
12 | 13 | ||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch index 11d5546537..e9cbc9b4da 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-Avoid-duplicate-definitions-of-IOPortBase.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From ce3b8a230a3805c9b557c1f106795675bd034860 Mon Sep 17 00:00:00 2001 | 1 | From cedc797e1a0850039a25b7e387b342e54fffcc97 Mon Sep 17 00:00:00 2001 |
2 | From: Khem Raj <raj.khem@gmail.com> | 2 | From: Khem Raj <raj.khem@gmail.com> |
3 | Date: Mon, 17 Aug 2020 10:50:51 -0700 | 3 | Date: Mon, 17 Aug 2020 10:50:51 -0700 |
4 | Subject: [PATCH] Avoid duplicate definitions of IOPortBase | 4 | Subject: [PATCH] Avoid duplicate definitions of IOPortBase |
@@ -10,7 +10,6 @@ compiler.h:528: multiple definition of `IOPortBase'; | |||
10 | 10 | ||
11 | Upstream-Status: Pending | 11 | Upstream-Status: Pending |
12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> | 12 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
13 | |||
14 | --- | 13 | --- |
15 | hw/xfree86/os-support/linux/lnx_video.c | 1 + | 14 | hw/xfree86/os-support/linux/lnx_video.c | 1 + |
16 | 1 file changed, 1 insertion(+) | 15 | 1 file changed, 1 insertion(+) |
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch index d05eec5bb9..d1516c2f52 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg/0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch | |||
@@ -1,4 +1,4 @@ | |||
1 | From d77cdc5e1eee26821ab98c947abea53fb7b18fe5 Mon Sep 17 00:00:00 2001 | 1 | From ad8967de36e6e2a185b71ce1d701448cda4ef3e2 Mon Sep 17 00:00:00 2001 |
2 | From: California Sullivan <california.l.sullivan@intel.com> | 2 | From: California Sullivan <california.l.sullivan@intel.com> |
3 | Date: Fri, 16 Mar 2018 17:23:11 -0700 | 3 | Date: Fri, 16 Mar 2018 17:23:11 -0700 |
4 | Subject: [PATCH] xf86pciBus.c: use Intel ddx only for pre-gen4 hardware | 4 | Subject: [PATCH] xf86pciBus.c: use Intel ddx only for pre-gen4 hardware |
@@ -20,10 +20,10 @@ Signed-off-by: California Sullivan <california.l.sullivan@intel.com> | |||
20 | 1 file changed, 17 insertions(+), 1 deletion(-) | 20 | 1 file changed, 17 insertions(+), 1 deletion(-) |
21 | 21 | ||
22 | diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c | 22 | diff --git a/hw/xfree86/common/xf86pciBus.c b/hw/xfree86/common/xf86pciBus.c |
23 | index e61ae0cd4..d70c99197 100644 | 23 | index aeeed8b..db705bf 100644 |
24 | --- a/hw/xfree86/common/xf86pciBus.c | 24 | --- a/hw/xfree86/common/xf86pciBus.c |
25 | +++ b/hw/xfree86/common/xf86pciBus.c | 25 | +++ b/hw/xfree86/common/xf86pciBus.c |
26 | @@ -1173,7 +1173,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev, | 26 | @@ -1174,7 +1174,23 @@ xf86VideoPtrToDriverList(struct pci_device *dev, XF86MatchedDrivers *md) |
27 | case 0x0bef: | 27 | case 0x0bef: |
28 | /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */ | 28 | /* Use fbdev/vesa driver on Oaktrail, Medfield, CDV */ |
29 | break; | 29 | break; |
@@ -48,6 +48,3 @@ index e61ae0cd4..d70c99197 100644 | |||
48 | driverList[0] = "intel"; | 48 | driverList[0] = "intel"; |
49 | break; | 49 | break; |
50 | } | 50 | } |
51 | -- | ||
52 | 2.14.3 | ||
53 | |||
diff --git a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb index 6506d775ca..1f18c22fa8 100644 --- a/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.11.bb +++ b/meta/recipes-graphics/xorg-xserver/xserver-xorg_21.1.13.bb | |||
@@ -3,7 +3,7 @@ require xserver-xorg.inc | |||
3 | SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ | 3 | SRC_URI += "file://0001-xf86pciBus.c-use-Intel-ddx-only-for-pre-gen4-hardwar.patch \ |
4 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ | 4 | file://0001-Avoid-duplicate-definitions-of-IOPortBase.patch \ |
5 | " | 5 | " |
6 | SRC_URI[sha256sum] = "1d3dadbd57fb86b16a018e9f5f957aeeadf744f56c0553f55737628d06d326ef" | 6 | SRC_URI[sha256sum] = "b45a02d5943f72236a360d3cc97e75134aa4f63039ff88c04686b508a3dc740c" |
7 | 7 | ||
8 | # These extensions are now integrated into the server, so declare the migration | 8 | # These extensions are now integrated into the server, so declare the migration |
9 | # path for in-place upgrades. | 9 | # path for in-place upgrades. |
diff --git a/meta/recipes-graphics/xwayland/xwayland_23.2.6.bb b/meta/recipes-graphics/xwayland/xwayland_24.1.0.bb index f51429bc8c..251b3af857 100644 --- a/meta/recipes-graphics/xwayland/xwayland_23.2.6.bb +++ b/meta/recipes-graphics/xwayland/xwayland_24.1.0.bb | |||
@@ -10,7 +10,7 @@ LICENSE = "MIT" | |||
10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" | 10 | LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" |
11 | 11 | ||
12 | SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" | 12 | SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" |
13 | SRC_URI[sha256sum] = "1c9a366b4e7ccadba0f9bd313c59eae12d23bd72543b22a26eaf8b20835cfc6d" | 13 | SRC_URI[sha256sum] = "bef21c4f18807a4ed571c4e2df60ab63b5466bbd502ecceb2485b892ab76dcc2" |
14 | 14 | ||
15 | UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" | 15 | UPSTREAM_CHECK_REGEX = "xwayland-(?P<pver>\d+(\.(?!90\d)\d+)+)\.tar" |
16 | 16 | ||