diff options
| author | Andrew Geissler <geissonator@yahoo.com> | 2021-02-19 21:26:16 +0300 |
|---|---|---|
| committer | Brad Bishop <bradleyb@fuzziesquirrel.com> | 2021-02-25 23:15:06 +0300 |
| commit | 9b4d8b0ea6b5862f279fab62e6ccee3bd51ddcc2 (patch) | |
| tree | 3766042390932e4b7cb839d6ed617bbb1a7a29b9 /poky/meta/recipes-graphics | |
| parent | d1e894976442c78577f52fe7b169812d00289120 (diff) | |
| download | openbmc-9b4d8b0ea6b5862f279fab62e6ccee3bd51ddcc2.tar.xz | |
poky: subtree update:9294bc4bb4..488e39b623
Alejandro Hernandez Samaniego (1):
sstate.bbclass: Split sstate summary into locally and network found artifacts
Alexander Kanavin (1):
selftest/reproducible: track unusued entries in the exclusion list
Andrei Gherzan (1):
oe/recipeutils: Fix copying patches when BBLAYERS entries are not normalised
Anthony Bagwell (1):
kernel-fitimage: fix dtbo support for fit images
Anuj Mittal (38):
git: upgrade 2.30.0 -> 2.30.1
glib-2.0: upgrade 2.66.4 -> 2.66.7
help2man: upgrade 1.47.16 -> 1.48.1
libevdev: upgrade 1.10.1 -> 1.11.0
stress-ng: upgrade 0.12.02 -> 0.12.03
vte: upgrade 0.62.1 -> 0.62.2
x264: upgrade to latest revision
createrepo-c: upgrade 0.16.2 -> 0.17.0
libuv: upgrade 1.40.0 -> 1.41.0
piglit: upgrade to latest revision
pigz: upgrade 2.4 -> 2.6
python3-git: upgrade 3.1.12 -> 3.1.13
sysstat: upgrade 12.4.2 -> 12.4.3
python3-hypothesis: upgrade 6.0.2 -> 6.2.0
python3-more-itertools: upgrade 8.6.0 -> 8.7.0
python3-numpy: upgrade 1.20.0 -> 1.20.1
python3-pygments: upgrade 2.7.4 -> 2.8.0
python3-pytest: upgrade 6.2.1 -> 6.2.2
python3-setuptools: upgrade 52.0.0 -> 53.0.0
psmisc: upgrade 23.3 -> 23.4
gtk+3: upgrade 3.24.24 -> 3.24.25
lighttpd: upgrade 1.4.58 -> 1.4.59
libwebp: upgrade 1.1.0 -> 1.2.0
libcap: upgrade 2.47 -> 2.48
libxt: upgrade 1.2.0 -> 1.2.1
sysklogd: upgrade 2.1.2 -> 2.2.1
cmake: upgrade 3.19.3 -> 3.19.5
curl: upgrade 7.74.0 -> 7.75.0
diffoscope: upgrade 164 -> 166
libfm-extra: upgrade 1.3.1 -> 1.3.2
pcmanfm: upgrade 1.3.1 -> 1.3.2
json-glib: upgrade 1.6.0 -> 1.6.2
mesa: upgrade 20.3.2 -> 20.3.4
kmscube: upgrade to latest revision
btrfs-tools: upgrade 5.10 -> 5.10.1
man-db: upgrade 2.9.3 -> 2.9.4
asciidoc: fix upstream check
linux-yocto: update genericx86* to v5.4.94
Bruce Ashfield (6):
linux-yocto-rt/5.10: update to -rt25
linux-yocto/5.10: update to v5.10.14
linux-yocto/5.4: update to v5.4.96
linux-yocto/5.10: update to v5.10.16
linux-yocto/5.4: update to v5.4.98
linux-yocto-dev: bump version to v5.11+
Jan-Simon Möller (2):
oe-selftests: add rpm to reproducible build selftest
package_rpm: Enable use_source_date_epoch_as_buildtime in package_rpm class
Jose Quaresma (5):
spirv-tools: disable tests
spirv-tools: build all libaries as shared
glslang: generate glslang pkg-config
glslang: add comment about unversioned libraries
shaderc: remove the receipe configure hack and use a patch for that
Joshua Watt (7):
libomxil: Fix up commercial license flag
weston: remoting backend requires GStreamer base plugins
oeqa: reproducible: Fix SSTATE_MIRRORS variable
oeqa: reproducible: Add more logging
bitbake: contrib: Add Dockerfile for building hash server
bison: Fix up file name mapping
acpica: Fix reproducibility issues
Khem Raj (8):
tcf-agent: Fix build on riscv32
security_flags.inc: Add same O<level> as in SELECTED_OPTIMIZATION
autoconf: Add missing perl modules to rdeps
gdb: Drop SIGRTMIN definition patch
musl: Update to latest master
go: Update to 1.15.8
ruby: Do not use ucontext implementation for coroutines on musl/riscv
libunwind: Disable for riscv
Konrad Weihmann (1):
cmake: set CMAKE_EXPORT_NO_PACKAGE_REGISTRY
Luca Boccassi (1):
systemd: add hostname fallback when polkit is not available
Marek Vasut (1):
weston-init: Fix weston-keyboard path in weston.ini
Michael Halstead (1):
yocto-uninative.inc: version 3.0 incorporate seccomp filter workaround
Oleksandr Kravchuk (2):
cryptodev: upgrade to 1.12
tar: update to 1.34
Richard Purdie (31):
pseudo: Update for rename and faccessat fixes
nativesdk-buildtools-perl-dummy: Add new autoconf dependencies
selftest/reproducible: Sort the unused exclusion list
selftest/reproducible: Remove no longer needed exclusions
pseudo: Update to include fixes for glibc 2.33
bitbake: bitbake-worker/runqueue: Add support for BB_DEFAULT_UMASK
bitbake: bitbake: Bump version to 1.49.2
systemd: Simplify mount error patch
bitbake.conf: Set as default task umask of 022
classes: Drop now unneeded umask flags
cwautomacros: Ensure version is set deterministically
vim: Improve determinism
vim: Fix a race over creation of the desktop files
package_manager/deb: Fix image generation with package removal
quilt: Be determnistic about column presence
buildtools-extended-tarball: Add glibc-gconvs needed for build
watchdog: Fix determinism issue from sendmail host path
watchdog: Avoid reproducibility failures after fixing build
xorg-fonts-minimal: Fix reproducibility
xmlto: Fix reproducibility
selftest/reproducible: Update exclusions
distutils3-base: Fix after native packaging changes
subversion: upgrade 1.14.0 -> 1.14.1
python3-jinja2: upgrade 2.11.2 -> 2.11.3
systemd: Drop unneeded musl patches
qemu: Refresh mmap fixes patch status/content
Revert "oe-selftests: add rpm to reproducible build selftest"
local.conf.sample.extended: Bring back into sync with OE-Core
xorg-minimal-fonts: Really fix determinism
git: Fix determinism issue
groff: Fix determinism issue
Ross Burton (2):
glibc: add workaround for faccessat2 being blocked by seccomp filters
rootfs_deb: handle aarch64 SDK_ARCH
Suji Velupillai (1):
ffmpeg: move ffmpeg config into packageconfig
Teoh Jay Shen (1):
oeqa/runlevel : add test for runlevels
Thomas Viehweger (1):
mtd-utils: Remove duplicate assignments to alternative link names
Tomasz Dziendzielski (1):
bitbake: event: Prevent bitbake from executing event handler for wrong multiconfig target
Vivien Didelot (2):
local.conf.sample.extended: fix double 'of' typo
local.conf.sample.extended: prefer INIT_MANAGER
Wes Lindauer (1):
df.py: Add feature check for read-only-rootfs
Yi Fan Yu (2):
valgrind: Disable ptest nlcontrolc for x86-64
valgrind: Remove reference to non-existent ptests
Yoann Congal (1):
npm.bbclass: avoid building target nodejs for native npm recipes
akuster (1):
connman: update to 1.39
Revert "libpam: remove unused code"
This reverts commit e5b5c38a76bbf3f56353954bdc65fa8736ed76bf.
This is needed for the backported libpam support
Signed-off-by: Andrew Geissler <geissonator@yahoo.com>
Change-Id: Ia802c1f09ccbd2967e01098edb059e72ee670ad8
Diffstat (limited to 'poky/meta/recipes-graphics')
17 files changed, 261 insertions, 75 deletions
diff --git a/poky/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch b/poky/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch new file mode 100644 index 000000000..ef092f17a --- /dev/null +++ b/poky/meta/recipes-graphics/glslang/glslang/0001-generate-glslang-pkg-config.patch @@ -0,0 +1,47 @@ +From 6692611126b40d499c94bbcc8e29604560262072 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sun, 7 Feb 2021 01:30:39 +0000 +Subject: [PATCH] generate glslang pkg-config + +Based on https://src.fedoraproject.org/rpms/glslang/blob/main/f/0001-pkg-config-compatibility.patch + +Upstream-Status: Pending + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> + +--- + glslang/CMakeLists.txt | 2 ++ + glslang/glslang.pc.cmake.in | 11 +++++++++++ + 2 files changed, 13 insertions(+) + create mode 100644 glslang/glslang.pc.cmake.in + +diff --git a/glslang/CMakeLists.txt b/glslang/CMakeLists.txt +index 1c7d22a2..10c1e841 100644 +--- a/glslang/CMakeLists.txt ++++ b/glslang/CMakeLists.txt +@@ -209,6 +209,8 @@ if(ENABLE_GLSLANG_INSTALL) + EXPORT glslangTargets + ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) + endif() ++ configure_file(${CMAKE_CURRENT_SOURCE_DIR}/glslang.pc.cmake.in ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc @ONLY) ++ install(FILES ${CMAKE_CURRENT_BINARY_DIR}/pkgconfig/glslang.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + + install(EXPORT glslangTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake) + +diff --git a/glslang/glslang.pc.cmake.in b/glslang/glslang.pc.cmake.in +new file mode 100644 +index 00000000..64b6882d +--- /dev/null ++++ b/glslang/glslang.pc.cmake.in +@@ -0,0 +1,11 @@ ++ prefix=@CMAKE_INSTALL_PREFIX@ ++ exec_prefix=@CMAKE_INSTALL_PREFIX@ ++ libdir=${exec_prefix}/@CMAKE_INSTALL_LIBDIR@ ++ includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@ ++ ++ Name: @PROJECT_NAME@ ++ Description: OpenGL and OpenGL ES shader front end and validator ++ Requires: ++ Version: @GLSLANG_VERSION@ ++ Libs: -L${libdir} -lglslang -lOSDependent -lHLSL -lOGLCompiler -lSPVRemapper ++ Cflags: -I${includedir} diff --git a/poky/meta/recipes-graphics/glslang/glslang_11.1.0.bb b/poky/meta/recipes-graphics/glslang/glslang_11.1.0.bb index fe21dbcf5..53d90c916 100644 --- a/poky/meta/recipes-graphics/glslang/glslang_11.1.0.bb +++ b/poky/meta/recipes-graphics/glslang/glslang_11.1.0.bb @@ -9,7 +9,8 @@ LICENSE = "BSD-3-Clause & BSD-2-Clause & MIT & Apache-2.0 & GPL-3-with-bison-exc LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=c5ce49c0456e9b413b98a4368c378229" SRCREV = "c594de23cdd790d64ad5f9c8b059baae0ee2941d" -SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https" +SRC_URI = "git://github.com/KhronosGroup/glslang.git;protocol=https \ + file://0001-generate-glslang-pkg-config.patch" UPSTREAM_CHECK_GITTAGREGEX = "^(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git" @@ -24,6 +25,7 @@ EXTRA_OECMAKE = " \ " SOLIBSDEV = "glslang.so" +# all the other libraries are unversioned, so pack it on PN FILES_${PN} += "${libdir}/*.so" BBCLASSEXTEND = "native nativesdk" diff --git a/poky/meta/recipes-graphics/kmscube/kmscube_git.bb b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb index 478d5c4de..bf4cb235a 100644 --- a/poky/meta/recipes-graphics/kmscube/kmscube_git.bb +++ b/poky/meta/recipes-graphics/kmscube/kmscube_git.bb @@ -6,7 +6,7 @@ DEPENDS = "virtual/libgles2 virtual/egl libdrm" LIC_FILES_CHKSUM = "file://kmscube.c;beginline=1;endline=23;md5=8b309d4ee67b7315ff7381270dd631fb" -SRCREV = "e6386d1b99366ea7559438c0d3abd2ae2d6d61ac" +SRCREV = "9f63f359fab1b5d8e862508e4e51c9dfe339ccb0" SRC_URI = "git://gitlab.freedesktop.org/mesa/kmscube;branch=master;protocol=https" UPSTREAM_CHECK_COMMITS = "1" diff --git a/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.2.bb b/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb index e50782be1..e50782be1 100644 --- a/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.2.bb +++ b/poky/meta/recipes-graphics/mesa/mesa-gl_20.3.4.bb diff --git a/poky/meta/recipes-graphics/mesa/mesa.inc b/poky/meta/recipes-graphics/mesa/mesa.inc index cb075a8b8..9f8ec112c 100644 --- a/poky/meta/recipes-graphics/mesa/mesa.inc +++ b/poky/meta/recipes-graphics/mesa/mesa.inc @@ -22,7 +22,7 @@ SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ file://0001-anv-fix-a-build-race-between-generating-a-header-and.patch \ " -SRC_URI[sha256sum] = "cce001b685d23afb976b04138714906abcf7e7f996da6355e6a43e5ca486533d" +SRC_URI[sha256sum] = "dc21a987ec1ff45b278fe4b1419b1719f1968debbb80221480e44180849b4084" UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P<pver>\d+(\.\d+)+)" diff --git a/poky/meta/recipes-graphics/mesa/mesa_20.3.2.bb b/poky/meta/recipes-graphics/mesa/mesa_20.3.4.bb index 96e8aa38d..96e8aa38d 100644 --- a/poky/meta/recipes-graphics/mesa/mesa_20.3.2.bb +++ b/poky/meta/recipes-graphics/mesa/mesa_20.3.4.bb diff --git a/poky/meta/recipes-graphics/piglit/piglit_git.bb b/poky/meta/recipes-graphics/piglit/piglit_git.bb index 484b59df0..52c39fd68 100644 --- a/poky/meta/recipes-graphics/piglit/piglit_git.bb +++ b/poky/meta/recipes-graphics/piglit/piglit_git.bb @@ -16,7 +16,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/piglit.git;protocol=https \ " UPSTREAM_CHECK_COMMITS = "1" -SRCREV = "d3a6e1293c43a6d989d4bcd59132317195d420c6" +SRCREV = "d4d9353b7290ed22cb7349226a8e4017402d3f02" # (when PV goes above 1.0 remove the trailing r) PV = "1.0+gitr${SRCPV}" diff --git a/poky/meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch b/poky/meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch deleted file mode 100644 index 40cc84df2..000000000 --- a/poky/meta/recipes-graphics/shaderc/files/0001-cmake-de-vendor-libs-and-disable-git-versioning.patch +++ /dev/null @@ -1,48 +0,0 @@ -From a07ac322a5a5fd4f0339913eb4456321ad1a69fd Mon Sep 17 00:00:00 2001 -From: Jose Quaresma <quaresma.jose@gmail.com> -Date: Sat, 17 Oct 2020 12:51:50 +0100 -Subject: [PATCH] cmake: de-vendor libs and disable git versioning - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> - ---- - CMakeLists.txt | 2 -- - glslc/CMakeLists.txt | 1 - - glslc/src/build-version.inc | 0 - 3 files changed, 3 deletions(-) - create mode 100644 glslc/src/build-version.inc - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 5c74cd8..9451fbc 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -102,12 +102,10 @@ endif(MSVC) - - # Configure subdirectories. - # We depend on these for later projects, so they should come first. --add_subdirectory(third_party) - - add_subdirectory(libshaderc_util) - add_subdirectory(libshaderc) - add_subdirectory(glslc) --add_subdirectory(examples) - - add_custom_target(build-version - ${PYTHON_EXECUTABLE} -diff --git a/glslc/CMakeLists.txt b/glslc/CMakeLists.txt -index 31664d1..358d91b 100644 ---- a/glslc/CMakeLists.txt -+++ b/glslc/CMakeLists.txt -@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe) - target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include) - set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc) - target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc) --add_dependencies(glslc_exe build-version) - - shaderc_add_tests( - TEST_PREFIX glslc -diff --git a/glslc/src/build-version.inc b/glslc/src/build-version.inc -new file mode 100644 -index 0000000..e69de29 diff --git a/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch b/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch new file mode 100644 index 000000000..cc9a40002 --- /dev/null +++ b/poky/meta/recipes-graphics/shaderc/files/0001-cmake-disable-building-external-dependencies.patch @@ -0,0 +1,109 @@ +From 071a9d71bea91bbefcf15e061fc87e53568f3188 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sat, 13 Feb 2021 00:45:56 +0000 +Subject: [PATCH 1/3] cmake: disable building external dependencies + +- add cmake option to disable the build of the third_party dependencies +- change the update_build_version.py to use pkg-config when third_party dependencies not found + +Upstream-Status: Inappropriate [OE-core specific] + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> +--- + CMakeLists.txt | 13 ++++++++++--- + utils/update_build_version.py | 22 +++++++++++++++------- + 2 files changed, 25 insertions(+), 10 deletions(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 5c74cd8..b358f6b 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -41,6 +41,7 @@ else() + endif() + + option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) ++option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) + + set (CMAKE_CXX_STANDARD 11) + +@@ -101,8 +102,14 @@ endif(MSVC) + + + # Configure subdirectories. +-# We depend on these for later projects, so they should come first. +-add_subdirectory(third_party) ++if(BUILD_EXTERNAL) ++ # We depend on these for later projects, so they should come first. ++ add_subdirectory(third_party) ++else() ++ find_package(PkgConfig REQUIRED) ++ pkg_check_modules (PKG_CHECK REQUIRED SPIRV-Tools) ++ pkg_check_modules (PKG_CHECK REQUIRED glslang) ++endif() + + add_subdirectory(libshaderc_util) + add_subdirectory(libshaderc) +@@ -112,7 +119,7 @@ add_subdirectory(examples) + add_custom_target(build-version + ${PYTHON_EXECUTABLE} + ${CMAKE_CURRENT_SOURCE_DIR}/utils/update_build_version.py +- ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ++ ${CMAKE_CURRENT_BINARY_DIR}/build-version.inc ${shaderc_SOURCE_DIR} ${spirv-tools_SOURCE_DIR} ${glslang_SOURCE_DIR} + COMMENT "Update build-version.inc in the Shaderc build directory (if necessary).") + + function(define_pkg_config_file NAME LIBS) +diff --git a/utils/update_build_version.py b/utils/update_build_version.py +index 5785390..f72b762 100755 +--- a/utils/update_build_version.py ++++ b/utils/update_build_version.py +@@ -30,6 +30,7 @@ import re + import subprocess + import sys + import time ++import itertools + + def mkdir_p(directory): + """Make the directory, and all its ancestors as required. Any of the +@@ -121,25 +122,32 @@ def get_version_string(project, directory): + directory, which consists of software version string and git description + string.""" + detailed_version_string_lst = [project] +- if project != 'glslang': +- detailed_version_string_lst.append(deduce_software_version(directory)) +- detailed_version_string_lst.append(describe(directory).replace('"', '\\"')) ++ if isinstance(directory, str) and os.path.isdir(directory): ++ if project != 'glslang': ++ detailed_version_string_lst.append(deduce_software_version(directory)) ++ detailed_version_string_lst.append(describe(directory).replace('"', '\\"')) ++ else: ++ if project == 'spirv-tools': ++ project = 'SPIRV-Tools' ++ pkgconfig = ['pkg-config', '--modversion', project] ++ version = subprocess.run(pkgconfig, capture_output=True, text=True).stdout.rstrip() ++ detailed_version_string_lst.append(version) + return ' '.join(detailed_version_string_lst) + + + def main(): +- if len(sys.argv) != 5: +- print(('usage: {} <shaderc-dir> <spirv-tools-dir> <glslang-dir> <output-file>'.format( ++ if len(sys.argv) < 3: ++ print(('usage: {} <output-file> <shaderc-dir> [spirv-tools-dir] [glslang-dir]'.format( + sys.argv[0]))) + sys.exit(1) + + projects = ['shaderc', 'spirv-tools', 'glslang'] + new_content = ''.join([ + '"{}\\n"\n'.format(get_version_string(p, d)) +- for (p, d) in zip(projects, sys.argv[1:]) ++ for (p, d) in itertools.zip_longest(projects, sys.argv[2:]) + ]) + +- output_file = sys.argv[4] ++ output_file = sys.argv[1] + mkdir_p(os.path.dirname(output_file)) + + if os.path.isfile(output_file): +-- +2.30.1 + diff --git a/poky/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch b/poky/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch new file mode 100644 index 000000000..df670cdde --- /dev/null +++ b/poky/meta/recipes-graphics/shaderc/files/0002-libshaderc_util-fix-glslang-header-file-location.patch @@ -0,0 +1,28 @@ +From 046c3c2da9c4ff66f14db5bd68e9557504a49241 Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sat, 13 Feb 2021 00:45:56 +0000 +Subject: [PATCH 2/3] libshaderc_util: fix glslang header file location + +Upstream-Status: Pending + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> +--- + libshaderc_util/src/compiler.cc | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/libshaderc_util/src/compiler.cc b/libshaderc_util/src/compiler.cc +index c5ce37e..4703634 100644 +--- a/libshaderc_util/src/compiler.cc ++++ b/libshaderc_util/src/compiler.cc +@@ -20,7 +20,7 @@ + #include <thread> + #include <tuple> + +-#include "SPIRV/GlslangToSpv.h" ++#include "glslang/SPIRV/GlslangToSpv.h" + #include "libshaderc_util/format.h" + #include "libshaderc_util/io.h" + #include "libshaderc_util/message.h" +-- +2.30.1 + diff --git a/poky/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch new file mode 100644 index 000000000..43f9edc03 --- /dev/null +++ b/poky/meta/recipes-graphics/shaderc/files/0003-cmake-add-option-to-skip-build-the-examples.patch @@ -0,0 +1,47 @@ +From f1064e4b6cfc5955bc7e2b036f2d05540da9f09b Mon Sep 17 00:00:00 2001 +From: Jose Quaresma <quaresma.jose@gmail.com> +Date: Sat, 13 Feb 2021 00:45:56 +0000 +Subject: [PATCH 3/3] cmake: add option to skip build the examples + +Upstream-Status: Backport [https://github.com/google/shaderc/commit/8d081127ee28ff5df8123c994c00bc66a57e9e9c] + +Signed-off-by: Jose Quaresma <quaresma.jose@gmail.com> +--- + CMakeLists.txt | 14 +++++++++++++- + 1 file changed, 13 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index b358f6b..d8a5405 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -40,6 +40,16 @@ else() + message(STATUS "Configuring Shaderc to avoid building tests.") + endif() + ++option(SHADERC_SKIP_EXAMPLES "Skip building examples" ${SHADERC_SKIP_EXAMPLES}) ++if(NOT ${SHADERC_SKIP_EXAMPLES}) ++ set(SHADERC_ENABLE_EXAMPLES ON) ++endif() ++if(${SHADERC_ENABLE_EXAMPLES}) ++ message(STATUS "Configuring Shaderc to build examples.") ++else() ++ message(STATUS "Configuring Shaderc to avoid building examples.") ++endif() ++ + option(SHADERC_ENABLE_WERROR_COMPILE "Enable passing -Werror to compiler, if available" ON) + option(BUILD_EXTERNAL "Build external dependencies in /third_party" ON) + +@@ -114,7 +124,9 @@ endif() + add_subdirectory(libshaderc_util) + add_subdirectory(libshaderc) + add_subdirectory(glslc) +-add_subdirectory(examples) ++if(${SHADERC_ENABLE_EXAMPLES}) ++ add_subdirectory(examples) ++endif() + + add_custom_target(build-version + ${PYTHON_EXECUTABLE} +-- +2.30.1 + diff --git a/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb b/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb index e966ed3d7..73aa0ee96 100644 --- a/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb +++ b/poky/meta/recipes-graphics/shaderc/shaderc_2020.4.bb @@ -8,7 +8,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=86d3f3a95c324c9479bd8986968f4327" SRCREV = "0dbd899941a43ffd55df527d65128b3b66e75c9c" SRC_URI = "git://github.com/google/shaderc.git;protocol=https;branch=main \ - file://0001-cmake-de-vendor-libs-and-disable-git-versioning.patch \ + file://0001-cmake-disable-building-external-dependencies.patch \ + file://0002-libshaderc_util-fix-glslang-header-file-location.patch \ + file://0003-cmake-add-option-to-skip-build-the-examples.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git" @@ -19,21 +21,9 @@ DEPENDS = "spirv-headers spirv-tools glslang" EXTRA_OECMAKE = " \ -DCMAKE_BUILD_TYPE=Release \ + -DBUILD_EXTERNAL=OFF \ -DSHADERC_SKIP_TESTS=ON \ - -Dglslang_SOURCE_DIR=${STAGING_INCDIR}/glslang \ + -DSHADERC_SKIP_EXAMPLES=ON \ " BBCLASSEXTEND = "native nativesdk" - -# TODO: probably there is better solution for this. -# I don't know any method for get the version of a receipe in DEPENDS, -# so do this ugly hack -inherit pkgconfig -DEPENDS += "glslang-native" -do_configure_prepend() { - cat <<- EOF > ${S}/glslc/src/build-version.inc -"${PV}\\n" -"$(pkg-config --modversion SPIRV-Tools)\\n" -"$(glslangValidator --version | head -1 | cut -d' ' -f3)\\n" -EOF -} diff --git a/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb b/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb index b1899d395..4f45c68bb 100644 --- a/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb +++ b/poky/meta/recipes-graphics/spir/spirv-tools_2020.6.bb @@ -11,11 +11,16 @@ SRC_URI = "git://github.com/KhronosGroup/SPIRV-Tools.git" UPSTREAM_CHECK_GITTAGREGEX = "^v(?P<pver>\d+(\.\d+)+)$" S = "${WORKDIR}/git" -inherit cmake python3native +inherit cmake DEPENDS = "spirv-headers" -EXTRA_OECMAKE += "-DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR}" +EXTRA_OECMAKE += "\ + -DSPIRV-Headers_SOURCE_DIR=${STAGING_EXECPREFIXDIR} \ + -DSPIRV_TOOLS_BUILD_STATIC=OFF \ + -DBUILD_SHARED_LIBS=ON \ + -DSPIRV_SKIP_TESTS=ON \ +" do_install_append_class-target() { # reproducibility: remove build host path @@ -23,8 +28,9 @@ do_install_append_class-target() { -e 's:${STAGING_DIR_HOST}::g' } +# all the libraries are unversioned, so don't pack it on PN-dev +SOLIBS = ".so" FILES_SOLIBSDEV = "" -FILES_${PN} += "${libdir}/*.so" PACKAGES =+ "${PN}-lesspipe" FILES_${PN}-lesspipe = "${base_bindir}/spirv-lesspipe.sh" diff --git a/poky/meta/recipes-graphics/wayland/weston-init/weston.ini b/poky/meta/recipes-graphics/wayland/weston-init/weston.ini index b48726d59..6bd5aef55 100644 --- a/poky/meta/recipes-graphics/wayland/weston-init/weston.ini +++ b/poky/meta/recipes-graphics/wayland/weston-init/weston.ini @@ -42,7 +42,7 @@ require-input=false #path=/build/weston-0lEgCh/weston-1.11.0/weston-flower #[input-method] -#path=/usr/lib/weston/weston-keyboard +#path=/usr/libexec/weston-keyboard #[output] #name=LVDS1 diff --git a/poky/meta/recipes-graphics/wayland/weston_9.0.0.bb b/poky/meta/recipes-graphics/wayland/weston_9.0.0.bb index 8cb105c78..50fbfa613 100644 --- a/poky/meta/recipes-graphics/wayland/weston_9.0.0.bb +++ b/poky/meta/recipes-graphics/wayland/weston_9.0.0.bb @@ -76,7 +76,7 @@ PACKAGECONFIG[colord] = "-Dcolor-management-colord=true,-Dcolor-management-color # Clients support PACKAGECONFIG[clients] = "-Dsimple-clients=all -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" # Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0" +PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" # Weston with PAM support PACKAGECONFIG[pam] = "-Dpam=true,-Dpam=false,libpam" # Weston with screen-share support diff --git a/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb index 1ea08a6c9..bf8385fe6 100644 --- a/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb +++ b/poky/meta/recipes-graphics/xorg-font/xorg-minimal-fonts.bb @@ -10,8 +10,12 @@ LIC_FILES_CHKSUM = "file://../misc/fonts.dir;md5=82a143d94d6a974aafe97132d2d519a SRC_URI = "file://misc" +SOURCE_DATE_EPOCH = "1613559011" + PE = "1" -PR = "r2" +PR = "r3" +HASHEQUIV_HASH_VERSION .= ".1" + inherit allarch features_check @@ -27,6 +31,8 @@ RDEPENDS_${PN} += "font-alias" do_install() { install -d ${D}/${datadir}/fonts/X11/misc install -m 0644 ${S}/* ${D}/${datadir}/fonts/X11/misc/ + # Pick a date/time as otherwise it would be the git checkout/modify time + touch -d @1613559011 ${D}/${datadir}/fonts/X11/misc/* install -d ${D}/${libdir}/X11 ln -sf ${datadir}/fonts/X11/ ${D}/${libdir}/X11/fonts -s } diff --git a/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb b/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb index 54384521c..8f2cded1d 100644 --- a/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.0.bb +++ b/poky/meta/recipes-graphics/xorg-lib/libxt_1.2.1.bb @@ -24,8 +24,7 @@ XORG_PN = "libXt" SRC_URI += "file://libxt_fix_for_x32.patch" -SRC_URI[md5sum] = "a9019421d3ee8b4937b6afd9025f018a" -SRC_URI[sha256sum] = "b31df531dabed9f4611fc8980bc51d7782967e2aff44c4105251a1acb5a77831" +SRC_URI[sha256sum] = "679cc08f1646dbd27f5e48ffe8dd49406102937109130caab02ca32c083a3d60" BBCLASSEXTEND = "native nativesdk" |