subtree updates
meta-raspberrypi: 62a84833d9..b6a1645a97:
Andrei Gherzan (22):
ci: Migrate worflow to using latest git-mirror-me-action revision
ci: Run the cancel workflow on generic workers and update action
ci: Run the compliance workflow on generic workers
ci: Run the mirror workflow on generic workers
ci: Don't run yocto builds on PRs that don't affect them
raspberrypi-tools.inc: Bump to latest revision
rpi-gpio: Bump to 0.7.1
python3-adafruit-platformdetect: Bump to 3.27.0
python3-adafruit-circuitpython-register: Bump to 1.9.10
userland: Bump revision to the current HEAD
bluez-firmware-rpidistro: Backport patch to fix CYW43455 and various CVEs
linux-raspberrypi: Update 5.15 recipe to 5.15.56
linux-raspberrypi: Update 5.10 recipe to latest revision
linux-firmware-rpidistro: Update to 1:20210315-3+rpt7 release
omxplayer: Bump to latest revision
linux-firmware-rpidistro: Revamp, cleanup and restructure recipe
linux-firmware-rpidistro: Guard the recipe under a license flag
ci: Set LICENSE_FLAGS_ACCEPTED in builder docker container
README.md: Mention Yocto Compatible Layer
README.md: Refactor top table
Add initial version of CODE_OF_CONDUCT.md
Use a png with transparency for balena logo
Vincent Davis Jr (1):
docs: remove backticks
poky: 4161dbbbd6..fc59c28724:
Aatir Manzur (1):
ref-manual: Sphinx note directive for DISTRO_FEATURES definition
Alejandro Hernandez Samaniego (1):
package.bbclass: Fix kernel source handling when not using externalsrc
Alex Kiernan (1):
bind: Remove legacy python3 PACKAGECONFIG code
Alexander Kanavin (61):
conf/local.conf.sample: mention site.conf.sample as well
sato-icon-theme: check for new commits rather than tags
gcr: exclude x.9y versions from upstream version check
efibootmgr: update 17 -> 18
systemd-boot: update 251.2 -> 251.3
libva: upgrade 2.14.0 -> 2.15.0
libva-utils: update 2.14.0 -> 2.15.0
xev: update 1.2.4 -> 1.2.5
xmodmap: update 1.0.10 -> 1.0.11
xf86-input-synaptics: update 1.9.1 -> 1.9.2
xf86-video-cirrus: update 1.5.3 -> 1.6.0
encodings: update 1.0.5 -> 1.0.6
font-util: update 1.3.2 -> 1.3.3
linux-firmware: update 20220610 -> 20220708
rt-tests: update 2.3 -> 2.4
libgit2: update 1.4.3 -> 1.5.0
u-boot: update 2022.04 -> 2022.07
go: update 1.18.3 -> 1.18.4
llvm: update 14.0.4 -> 14.0.6
vulkan-samples: update to latest revision
xserver-xorg: update 21.1.3 -> 21.1.4
alsa-lib: upgrade 1.2.7.1 -> 1.2.7.2
alsa-ucm-conf: upgrade 1.2.7.1 -> 1.2.7.2
diffoscope: upgrade 217 -> 218
git: upgrade 2.37.0 -> 2.37.1
hdparm: upgrade 9.63 -> 9.64
libdrm: upgrade 2.4.111 -> 2.4.112
libhandy: upgrade 1.6.2 -> 1.6.3
libidn2: upgrade 2.3.2 -> 2.3.3
libnl: upgrade 3.6.0 -> 3.7.0
libnotify: upgrade 0.7.12 -> 0.8.0
libuv: upgrade 1.44.1 -> 1.44.2
log4cplus: upgrade 2.0.7 -> 2.0.8
meson: upgrade 0.62.2 -> 0.63.0
mmc-utils: upgrade to latest revision
mpg123: upgrade 1.30.0 -> 1.30.1
pango: upgrade 1.50.7 -> 1.50.8
piglit: upgrade to latest revision
python3-dtschema: upgrade 2022.5 -> 2022.7
python3-hypothesis: upgrade 6.48.2 -> 6.50.1
python3-setuptools-rust: upgrade 1.3.0 -> 1.4.1
python3-setuptools-scm: upgrade 7.0.3 -> 7.0.5
python3-setuptools: upgrade 62.6.0 -> 63.2.0
python3-zipp: upgrade 3.8.0 -> 3.8.1
sqlite3: upgrade 3.39.0 -> 3.39.1
vala: upgrade 0.56.1 -> 0.56.2
wayland-protocols: upgrade 1.25 -> 1.26
webkitgtk: upgrade 2.36.3 -> 2.36.4
xwayland: upgrade 22.1.2 -> 22.1.3
epiphany: upgrade 42.2 -> 42.3
xf86-input-keyboard: remove the recipe
toolchain-scripts.bbclass: adjust toolchain_create_tree_env_script to better replicate (e)SDK
meta-ide-support: adjust to provide (e)SDK experience directly in a yocto build
oeqa/sdk: add a test class for running SDK tests directly in a Yocto build
oeqa/sdk: allow epoxy/galculator tests to run in esdk and direct yocto builds
meson: provide relocation script and native/cross wrappers also for meson-native
selftest/meta_ide: add a test for running SDK tests directly in a yocto build
scripts/oe-setup-builddir: make it known where configurations come from
devtool/upgrade: correctly clean up when recipe filename isn't yet known
devtool/upgrade: catch bb.fetch2.decodeurl errors
poky-floating-revisions.inc: remove xf86-input-keyboard entry
Aníbal Limón (1):
rng-tools: Change systemd service name to work with sysvinit
Armin Kuster (1):
poky.conf: remove EOL and Centos7 hosts
Aryaman Gupta (1):
bitbake: runqueue: add cpu/io pressure regulation
Changhyeok Bae (1):
repo: upgrade 2.27 -> 2.28
Chen Qi (2):
glibc: make glibc-dev depend on kernel headers
image_types_wic.bbclass: fix cross binutils dependency
Daniel Gomez (1):
dropbear: Add configuration file to CONFFILES
Dmitry Baryshkov (1):
linux-firwmare: restore WHENCE_CHKSUM variable
He Zhe (1):
lttng-modules: Fix build failure for kernel v5.15.58
Hitendra Prajapati (1):
qemu: CVE-2022-35414 can perform an uninitialized read on the translate_fail path, leading to an io_readx or io_writex crash
Jan Kiszka (2):
wic/bootimg-efi: Factor out some common bits
wic/bootimg-efi: Add support for loading devicetree files
Jan Vermaete (1):
python3-jsonschema: 4.7.1 -> 4.7.2 + fixed the rdepends
Jose Quaresma (5):
bitbake: bitbake: bitbake-user-manual: hashserv can be accessed on a dedicated domain
archiver.bbclass: remove unsed do_deploy_archives[dirs]
bitbake: bb/utils: remove: check the path again the expand python glob
bitbake: bb/utils: movefile: use the logger for printing
create-spdx: ignore packing control files from ipk and deb
Joshua Watt (3):
sstatesig: Include all dependencies in SPDX task signatures
bitbake: asyncrpc: Add TCP Keep Alives
classes/sanity: Add comment about github & gitlab archives
Kai Kang (1):
mesa: fix compile error when debug build enabled
Khem Raj (11):
lua: Backport fix for CVE-2022-33099
gcc-runtime: Pass -nostartfiles when building dummy libstdc++.so
gcc-runtime: Use --with-target-subdir for baremetal targets
systemd: Drop backported patch applied in 251.3
gcc-runtime: Use static dummy libstdc++
libgcc: Fix standalone target builds with usrmerge distro feature
systemd: Fix conflict between glibc mount.h and kernel mount.h
libarchive: Avoid mount.h conflict between kernel and glibc
btrfs-tools: Use linux/mount.h instead of sys/mount.h
gcc-sanitizers: Fix mount.h glibc 2.36 conflict
hdparm: Fix build with glibc 2.36
LUIS ENRIQUEZ (1):
kernel-fitimage.bbclass: add padding algorithm property in config nodes
Lee Chee Yang (1):
migration guides: release notes for 4.0.2
Mark Hatle (4):
runqemu: Add missing space on default display option
default-distrovars: seccomp doesn't support microblaze
openssl: Move microblaze to linux-latomic config
elfutils: Microblaze does not support symvers
Martin Beeger (1):
cmake: remove CMAKE_ASM_FLAGS variable in toolchain file
Martin Jansa (6):
python3-setuptools: move patch from 'files' to 'python3-setuptools'
kernel.bbclass: pass LD also in savedefconfig
ltp: fix build with ld-is-gold in DISTRO_FEATURES
pybootchartgui: render memory pressure as well
pybootchartgui: fix 2 SyntaxWarnings
pybootchartgui: write the max values in the graph legend
Michael Opdenacker (2):
docs: BB_HASHSERVE_UPSTREAM: update to new host
bitbake: bitbake-user-manual: npm fetcher: improve description of SRC_URI format
Mihai Lindner (2):
wic/plugins/rootfs: Fix NameError for 'orig_path'
create-spdx: Fix supplier field
Ming Liu (2):
rootfs-postcommands.bbclass: move host-user-contaminated.txt to ${S}
udev-extraconf:mount.sh: fix a umount issue
Mingli Yu (1):
strace: set COMPATIBLE_HOST for riscv32
Otavio Salvador (2):
cargo-cross-canadian: Use SDK's flags during target linking
oeqa/sdk: Add basic rust cargo test
Petr Vorel (1):
ltp: Add post release runtime fixes
Quentin Schulz (2):
docs: ref-manual: variables: remove sphinx directive from literal block
docs: auto-generate releases.rst
Randy MacLeod (1):
vim: update from 9.0.0063 to 9.0.0115
Richard Purdie (16):
curl: Fix determinism issues in ptest package
build-appliance-image: Update to master head revision
base/reproducible: Change Source Date Epoch generation methods
vim: Upgrade 9.0.0021 -> 9.0.0063
rust-common: Set llvm-target correctly for cross SDK targets
rust-cross-canadian: Fix ordering of target json config generation
rust-cross/rust-common: Merge arm target handling code to fix cross-canadian
rust-cross: Simplfy the rust_gen_target calls
rust-common/rust-cross: Clean up target json generation code
rust-target-config: Create new class to contain target json config generation
rust-target-config: Allow the targets generated to be configurable
native: Clear TUNE_FEATURES/ABIEXTENSION
populate_sdk: Add SDK toolchain language selection support
populate_sdk_base: Fix mingw override name
poky: Enable debug-kernel for SPDX license manifests
oeqa/sdk/rust: Fix file deletion for multilib SDKs
Roland Hieber (1):
devtool: error out when workspace is using old override syntax
Ross Burton (13):
pulseaudio: add m4-native to DEPENDS
python3-picobuild: upgrade to 0.2
oeqa/runtime: add test that the kernel has CONFIG_PREEMPT_RT enabled
perf: fix reproduciblity in older releases of Linux
zstd: do verbose builds
zlib: remove historical movement of libz.so to /lib
oeqa/selftest: rename git.py to intercept.py
oeqa/gotoolchain: put writable files in the Go module cache
oeqa/gotoolchain: set CGO_ENABLED=1
qemu: add io_uring PACKAGECONFIG
wic: add target tools to PATH when executing native commands
wic/bootimg-efi: use cross objcopy when building unified kernel image
wic: depend on cross-binutils
Shruthi Ravichandran (2):
initscripts: run umountnfs as a KILL script
package_manager/ipk: do not pipe stderr to stdout
Tom Hochstein (2):
gobject-introspection-data: Disable cache for g-ir-scanner
uboot-config.bbclass: Raise error for bad key
gr embeter (1):
efivar: fix import functionality
leimaohui (1):
systemd: Added base_bindir into pkg_postinst:udev-hwdb.
wangmy (10):
python3-docutils: upgrade 0.18.1 -> 0.19
python3-attrs: upgrade 21.4.0 -> 22.1.0
python3-cython: upgrade 0.29.30 -> 0.29.32
python3-dbusmock: upgrade 0.28.1 -> 0.28.4
python3-hatchling: upgrade 1.5.0 -> 1.6.0
python3-jsonschema: upgrade 4.7.2 -> 4.9.0
python3-scons: upgrade 4.3.0 -> 4.4.0
python3-setuptools: upgrade 63.2.0 -> 63.3.0
python3-pygobject: upgrade 3.42.1 -> 3.42.2
python3-pip: upgrade 22.1.2 -> 22.2.1
meta-security: 7ad5f6a9da..2a2d650ee0:
Alex Kiernan (1):
bubblewrap: Add recipe
Armin Kuster (28):
packagegroup-core-security.bb: add bubblewrap to pkg grp
packagegroup-security-tpm: add libhoth to pkg grp
python3-privacyidea: update to 3.7.2
suricata: update to 6.0.5
chipsec: update to 1.8.7
fail2ban: add UPSTREAM_CHECK vars
ibmtpm2tss: fix SRC_URI
tpm2-tss-engine: add UPSTREAM_CHECK_URI
tpm2-tss: add UPSTREAM_CHECK_URI
tpm2-tools: Add UPSTREAM_CHECK_URI
tpm2-openssl: Add UPSTREAM_CHECK_URI
tpm2-pkcs11: Add UPSTREAM_CHECK_URI
tpm2-abrmd: add UPSTREAM_CHECK_URI
tpm2-tcti-uefi: Add UPSTREAM_CHECK_URI
aide: add UPSTREAM_CHECK_URI
ecryptfs-utils: add UPSTREAM_CHECK_URI
krill: update to 0.9.6
packagegroup-core-security: add krill to pkg grps
packagegroup-core-security: add chipsec pkg to grp
apparmor: update to 3.0.5
clamav: update to 0.104.4
ibmtpm2tss: update version format
ibmswtpm2: fix UPSTREAM_CHECK
ibmswtpm2: update to 1682
swtpm: update to 0.7.3
lkrg: update to 0.9.4
krill: only builds on x86/x86-64 and arm64
packagegroup-core-security: remove krill for some archs
Armpit's Upgrade Helper (1):
libtpm: upgrade 0.9.3 -> 0.9.5
John Edward Broadbent (1):
meta-security: Add recipe for libhoth
Upgrade Helper (1):
sssd: upgrade 2.7.1 -> 2.7.3
meta-arm: 80d60e7b1c..20a629180c:
Peter Hoyes (1):
runfvp: Stop the FVP when telnet shuts down cleanly
meta-openembedded: 31c10bd3e6..2eb39477a7:
Alexander Thoma (1):
Fix tigervnc crash due to missing xkbcomp rdepends
Armin Kuster (1):
bigbuckbunny-1080p: update SRC_URI
Aryaman Gupta (1):
rsyslog: update 8.2202->8.2206
Chen Qi (1):
catfish: fix buildpaths issue
Davide Gardenal (7):
freeradius: ignore patched CVEs
openflow: ignore unrelated CVEs
libplist: ignore patched CVEs
meta-oe: ignore patched CVEs
mongodb: ignore unrelated CVEs
php: ignore patched CVEs
postgresql: ignore unrelated CVE
Gianfranco (1):
vboxguestdrivers: fix build failure on 32 bit architectures
Gianfranco Costamagna (1):
vboxguestdrivers: upgrade 6.1.34 -> 6.1.36
Jan Vermaete (8):
python3-pyzmq: version bump 22.3.0 -> 23.2.0
python3-aspectlib: updated the summary and added a description.
python3-jsonrpcclient: Added the jsonrpcclient Python package
python3-oslash: added the oslash Python package
python3-jsonrpcserver: added the python3-oslash rdepends
python-ptyprocess: fixed test_pass_fds
python3-pyzmq: added ptest
python3-pyzmq: fixed oelint-adv warnings
Johannes Schneider (1):
python3-pystemd: Upgrade 0.8.0 -> 0.10.0
Khem Raj (11):
poco: Link with libatomic on riscv32
python3-antlr4-runtime: Inherit setuptools3 instead of python_setuptools_build_meta
catfish: Inherit setuptools3 instead of python_setuptools_build_meta
python3-pycups: Inherit setuptools3 instead of python_setuptools_build_meta
python3-qface: Inherit setuptools3 instead of python_setuptools_build_meta
xscreensaver: Upgrade to 6.04
poco: Link with libatomic on mips
Revert "catfish: Inherit setuptools3 instead of python_setuptools_build_meta"
Revert "python3-pycups: Inherit setuptools3 instead of python_setuptools_build_meta"
Revert "python3-antlr4-runtime: Inherit setuptools3 instead of python_setuptools_build_meta"
libmtp: Upgrade to 1.1.20
Martin Großhauser (1):
Add runtime dependencies for python3-supervisor
Mingli Yu (1):
s-nail: fix buildpaths issue
Radovan Scasny (1):
libwebsockets: update to version 4.3.2
Ross Burton (9):
python3-cbor2: add missing build dependency
python3-simpleeval: remove 'build' build dependency
python3-pyrad: fix build system specification
python3-pytest-html: fix DEPENDS, don't depend on pip
python3-ansi2html: fix DEPENDS
python3-pytest-helpers-namespace: add missing build dependencies
python3-pyzmq: add missing build dependency
python3-path: add missing build dependencies
python3-pytest-forked: loosen dependency checking
Sergey Kizunov (2):
Add python3-pycares 4.2.1
Add python3-aiodns 3.0.0
Trevor Gamblin (1):
README: Remove maintainer info for tvgamblin
Wang Mingyu (10):
php: upgrade 8.1.7 -> 8.1.8
ndisc6: upgrade 1.0.5 -> 1.0.6
python3-elementpath: upgrade 2.5.3 -> 3.0.1
python3-pymongo: upgrade 4.1.1 -> 4.2.0
python3-pyscaffold: upgrade 4.2.3 -> 4.3
python3-regex: upgrade 2022.7.9 -> 2022.7.24
python3-rsa: upgrade 4.8 -> 4.9
python3-sh: upgrade 1.14.2 -> 1.14.3
python3-werkzeug: upgrade 2.1.2 -> 2.2.0
python3-xmlschema: upgrade 1.11.3 -> 2.0.1
Xu Huan (14):
python3-eth-hash: upgrade 0.3.3 -> 0.4.0
python3-socketio: upgrade 5.6.0 -> 5.7.0
python3-ujson: upgrade 5.3.0 -> 5.4.0
python3-web3: upgrade 5.29.2 -> 5.30.0
python3-fastjsonschema: upgrade 2.15.3 -> 2.16.1
python3-flask: upgrade 2.1.2 -> 2.1.3
python3-googleapis-common-protos: upgrade 1.56.3 -> 1.56.4
python3-iso3166: upgrade 2.0.2 -> 2.1.1
python3-kiwisolver: upgrade 1.4.3 -> 1.4.4
python3-portalocker: upgrade 2.4.0 -> 2.5.1
python3-imageio: upgrade 2.19.3 -> 2.19.5
python3-lz4: upgrade 4.0.1 -> 4.0.2
python3-mypy: upgrade 0.961 -> 0.971
python3-protobuf: upgrade 4.21.2 -> 4.21.3
kazuki0824 (1):
ttf-fonts: fix URIs, upgrade 1.004 -> 2.004
wangmy (30):
gegl: upgrade 0.4.36 -> 0.4.38
libadwaita: upgrade 1.1.2 -> 1.1.3
libgsf: upgrade 1.14.49 -> 1.14.50
nbdkit: upgrade 1.31.10 -> 1.31.12
irssi: upgrade 1.4.1 -> 1.4.2
libp11: upgrade 0.4.11 -> 0.4.12
modemmanager: upgrade 1.18.8 -> 1.18.10
pegtl: upgrade 3.2.6 -> 3.2.7
PATCH] logcheck: upgrade 1.3.23 -> 1.3.24
python3-lru-dict: upgrade 1.1.7 -> 1.1.8
python3-pyfanotify: upgrade 0.1.3 -> 0.2.0
python3-pylint: upgrade 2.14.4 -> 2.14.5
python3-pytest-metadata: upgrade 2.0.1 -> 2.0.2
python3-regex: upgrade 2022.6.2 -> 2022.7.9
python3-socketio: upgrade 5.7.0 -> 5.7.1
python3-stevedore: upgrade 3.5.0 -> 4.0.0
tracker: upgrade 3.3.1 -> 3.3.2
zenity: upgrade 3.42.1 -> 3.43.0
nbdkit: upgrade 1.31.12 -> 1.31.14
stunnel: upgrade 5.64 -> 5.65
unbound: upgrade 1.16.0 -> 1.16.1
wolfssl: upgrade 5.3.0 -> 5.4.0
atkmm-2.36: upgrade 2.36.1 -> 2.36.2
nanopb: upgrade 0.4.5 -> 0.4.6.4
redis-plus-plus: upgrade 1.3.3 -> 1.3.5
redis: upgrade 7.0.2 -> 7.0.4
ser2net: upgrade 4.3.6 -> 4.3.7
unattended-upgrades: upgrade 2.6 -> 2.9.1
valijson: upgrade 0.6 -> 0.7
googlebenchmark: upgrade 1.6.1 -> 1.7.0
zhengruoqin (17):
python3-redis: upgrade 4.3.3 -> 4.3.4
python3-ldap: upgrade 3.4.0 -> 3.4.2
python3-pillow: upgrade 9.1.1 -> 9.2.0
python3-pylint: upgrade 2.14.3 -> 2.14.4
python3-alembic: upgrade 1.8.0 -> 1.8.1
python3-astroid: upgrade 2.11.6 -> 2.12.2
python3-attr: upgrade 0.3.1 -> 0.3.2
python3-blinker: upgrade 1.4 -> 1.5
python3-cmd2: upgrade 2.4.1 -> 2.4.2
python3-ecdsa: upgrade 0.17.0 -> 0.18.0
python3-evdev: upgrade 1.5.0 -> 1.6.0
python3-absl: upgrade 1.1.0 -> 1.2.0
python3-bitarray: upgrade 2.5.1 -> 2.6.0
python3-eth-hash: upgrade 0.4.0 -> 0.5.0
python3-google-api-python-client: upgrade 2.51.0 -> 2.54.0
python3-google-auth: upgrade 2.9.0 -> 2.9.1
python3-graphviz: upgrade 0.20 -> 0.20.1
Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Change-Id: I50c531a69ce8abb23e33c380f9228015f2764682
diff --git a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb
index aa597cd..4c51af6 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb
@@ -31,6 +31,10 @@
SRC_URI[sha256sum] = "6b16bf990df114195be669773a1dae975dbbffada45e1de2849ddeb5851bb9a8"
+CVE_CHECK_IGNORE += "\
+ CVE-2014-9157 \
+"
+
PACKAGECONFIG ??= "librsvg"
PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb
index 4c17105..27dff82 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb
@@ -6,6 +6,10 @@
SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master"
SRCREV = "fe00207dc10db1d7cc6f2757961c5c6bdfd10973"
+CVE_CHECK_IGNORE += "\
+ CVE-2015-8751 \
+"
+
S = "${WORKDIR}/git"
inherit cmake
diff --git a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
index 5f404f2..5cde7c9 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb
@@ -3,7 +3,7 @@
LICENSE = "GPL-2.0-or-later"
SECTION = "x11/utils"
DEPENDS = "xserver-xorg gnutls jpeg libxtst gettext-native fltk libpam"
-RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash"
+RDEPENDS:${PN} = "coreutils hicolor-icon-theme perl bash xkbcomp"
LIC_FILES_CHKSUM = "file://LICENCE.TXT;md5=75b02c2872421380bbd47781d2bd75d3"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
similarity index 80%
rename from meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
index fcc6a23..b4a5985 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_1.004.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb
@@ -3,7 +3,7 @@
SUMMARY = "Adobe OpenType Pan-CJK font family for Simplified Chinese"
HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans"
LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55719faa0112708e946b820b24b14097"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90"
inherit allarch fontcache
@@ -11,7 +11,7 @@
#EXCLUDE_FROM_WORLD = "1"
SRC_URI = " \
- https://github.com/adobe-fonts/source-han-sans/raw/release/SubsetOTF/SourceHanSansCN.zip \
+ svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/CN;protocol=http;rev=82 \
file://44-source-han-sans-cn.conf \
"
SRC_URI[md5sum] = "d16abc21f6575bb08894efedbed484a2"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
similarity index 80%
rename from meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
index 27fe9db..6a45090 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_1.004.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb
@@ -3,7 +3,7 @@
SUMMARY = "Adobe OpenType Pan-CJK font family for Japanese"
HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans"
LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55719faa0112708e946b820b24b14097"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90"
inherit allarch fontcache
@@ -11,7 +11,7 @@
#EXCLUDE_FROM_WORLD = "1"
SRC_URI = " \
- https://github.com/adobe-fonts/source-han-sans/raw/release/SubsetOTF/SourceHanSansJP.zip \
+ svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/JP;protocol=http;rev=82 \
file://44-source-han-sans-jp.conf \
"
SRC_URI[md5sum] = "908fbf97f3df04a6838708c093f1e900"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
similarity index 80%
rename from meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
index fc3a6b7..5ab5057 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_1.004.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb
@@ -3,7 +3,7 @@
SUMMARY = "Adobe OpenType Pan-CJK font family for Korean"
HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans"
LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55719faa0112708e946b820b24b14097"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90"
inherit allarch fontcache
@@ -11,7 +11,7 @@
#EXCLUDE_FROM_WORLD = "1"
SRC_URI = " \
- https://github.com/adobe-fonts/source-han-sans/raw/release/SubsetOTF/SourceHanSansKR.zip \
+ svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \
file://44-source-han-sans-kr.conf \
"
SRC_URI[md5sum] = "f8d1bd6c87d8575afdb25e2f46bd81d4"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
similarity index 80%
rename from meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb
rename to meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
index aa43c92..a2b3fff 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_1.004.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb
@@ -3,7 +3,7 @@
SUMMARY = "Adobe OpenType Pan-CJK font family for Traditional Chinese"
HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans"
LICENSE = "OFL-1.1"
-LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=55719faa0112708e946b820b24b14097"
+LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90"
inherit allarch fontcache
@@ -11,7 +11,7 @@
#EXCLUDE_FROM_WORLD = "1"
SRC_URI = " \
- https://github.com/adobe-fonts/source-han-sans/raw/release/SubsetOTF/SourceHanSansTW.zip \
+ svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \
file://44-source-han-sans-tw.conf \
"
SRC_URI[md5sum] = "6533b71b31c19e548768f0fc963202f3"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch
similarity index 92%
rename from meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch
index 4ce2fae..1d0d20d 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/tweak-app-defaults.patch
+++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-Tweak-app-defaults.patch
@@ -1,3 +1,14 @@
+From f2c592352360e52a7c817a1adcc8b09fd92cd941 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sat, 16 Jul 2022 09:58:24 -0700
+Subject: [PATCH 1/2] Tweak app defaults
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ driver/XScreenSaver.ad.in | 259 +-------------------------------------
+ 1 file changed, 6 insertions(+), 253 deletions(-)
+
--- a/driver/XScreenSaver.ad.in
+++ b/driver/XScreenSaver.ad.in
@@ -29,7 +29,7 @@
@@ -32,7 +43,7 @@
*splashDuration: 0:00:05
*visualID: default
*installColormap: True
-@@ -324,250 +324,8 @@ XScreenSaver.bourneShell: /bin/sh
+@@ -324,256 +324,8 @@ XScreenSaver.bourneShell: /bin/sh
!=============================================================================
*programs: \
@@ -74,7 +85,7 @@
- munch -root \n\
- penrose -root \n\
-@GL_KLUDGE@ GL: pipes -root \n\
-- rd-bomb -root \n\
+- rdbomb -root \n\
-@GL_KLUDGE@ GL: rubik -root \n\
-- sierpinski -root \n\
- slip -root \n\
@@ -277,7 +288,13 @@
-@GL_KLUDGE@ GL: etruscanvenus -root \n\
-@GL_KLUDGE@ GL: gibson -root \n\
-@GL_KLUDGE@ GL: headroom -root \n\
--@GL_KLUDGE@ GL: sphereeversion -root \n
+-@GL_KLUDGE@ GL: sphereeversion -root \n\
+- binaryhorizon -root \n\
+- marbling -root \n\
+-@GL_KLUDGE@ GL: chompytower -root \n\
+-@GL_KLUDGE@ GL: mapscroller -root \n\
+-@GL_KLUDGE@ GL: nakagin -root \n\
+-@GL_KLUDGE@ GL: squirtorus -root \n
-
-
+- fontglide -root -program "date +'%F %H:%M %z'"
diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
new file mode 100644
index 0000000..ea3f25a
--- /dev/null
+++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch
@@ -0,0 +1,47 @@
+From 516fbcdcfe6343b1d64d35957ddb768346713ff6 Mon Sep 17 00:00:00 2001
+From: Khem Raj <raj.khem@gmail.com>
+Date: Sun, 17 Jul 2022 09:47:35 -0700
+Subject: [PATCH] configure: Ignore CONF_STATUS for gtk and openGL needs
+
+These are just warnings
+
+Upstream-Status: Inappropriate [OE-Specific]
+Signed-off-by: Khem Raj <raj.khem@gmail.com>
+---
+ configure.ac | 4 ----
+ 1 file changed, 4 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index c4fd38f..d7463cf 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -4522,7 +4522,6 @@ fi
+ if test "$gtk_halfassed" != no ; then
+ warnL "GTK was found, but $gtk_halfassed_lib was not, so GTK"
+ warn2 "can't be used."
+- CONF_STATUS=1
+
+ if ( echo $gtk_halfassed_lib | grep -qi pixbuf-xlib ); then
+ echo ''
+@@ -4549,7 +4548,6 @@ if test "$have_motif" = no -a "$have_gtk" = no; then
+ else
+ warnL "The GTK libraries do not seem to be available; the"
+ warn2 "\`xscreensaver-settings' program requires them."
+- CONF_STATUS=1
+ # echo ''
+ # warn2 'You can use Motif or Lesstif instead of GTK (use the'
+ # warn2 "\`--with-motif' option) but that is NOT recommended."
+@@ -4735,10 +4733,8 @@ if test "$have_gl" = no ; then
+ CONF_STATUS=1
+ elif test "$with_gl_req" = no ; then
+ noteL 'The OpenGL 3D library is not being used.'
+- CONF_STATUS=1
+ else
+ noteL 'The OpenGL 3D library was not found.'
+- CONF_STATUS=1
+ fi
+
+ if test "$gl_halfassed" = yes ; then
+--
+2.37.1
+
diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch
similarity index 66%
rename from meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch
rename to meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch
index 7703a43..0ceba7b 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0001-build-Do-not-build-po-files.patch
+++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/files/0002-build-Do-not-build-po-files.patch
@@ -1,18 +1,22 @@
-From 19bd0a979677a81d7399d5b567998398ec81f38b Mon Sep 17 00:00:00 2001
+From 6b5d022f6dd9848a2d5ca08a1968929b8c140981 Mon Sep 17 00:00:00 2001
From: Khem Raj <raj.khem@gmail.com>
-Date: Thu, 8 Jul 2021 15:40:10 -0700
-Subject: [PATCH] build: Do not build po files
+Date: Sat, 16 Jul 2022 09:59:40 -0700
+Subject: [PATCH 2/2] build: Do not build po files
Fixes
| make[1]: Entering directory '/mnt/b/yoe/master/build/tmp/work/cortexa57-yoe-linux/xscreensaver/6.01-r0/xscreensaver-6.01/po'
| make[1]: *** No rule to make target 'default'. Stop.
Upstream-Status: Pending
+
Signed-off-by: Khem Raj <raj.khem@gmail.com>
---
- Makefile.in | 3 +--
- 1 file changed, 1 insertion(+), 2 deletions(-)
+ Makefile.in | 5 ++---
+ driver/Makefile.in | 2 +-
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+diff --git a/Makefile.in b/Makefile.in
+index 9de79b2..1c1d16c 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -6,8 +6,8 @@ srcdir = @srcdir@
@@ -26,14 +30,16 @@
SUBDIRS2 = $(SUBDIRS) OSX android
TARFILES = README README.hacking INSTALL \
configure configure.ac Makefile.in config.h.in \
-@@ -451,4 +451,3 @@ cerebrum::
- --include 'configure*' \
+@@ -461,4 +461,3 @@ cerebrum::
+ --include 'ad2c' \
--include '*/' \
--exclude '*'
-
+diff --git a/driver/Makefile.in b/driver/Makefile.in
+index e1fa1b2..feca6fc 100644
--- a/driver/Makefile.in
+++ b/driver/Makefile.in
-@@ -212,7 +212,7 @@ TEST_EXES = test-passwd test-uid
+@@ -211,7 +211,7 @@ TEST_EXES = test-passwd test-uid test-xdpms test-grab \
xdpyinfo test-screens test-yarandom test-xinput \
test-xkb
@@ -42,3 +48,6 @@
UTIL_EXES = xscreensaver-gfx @EXES_SYSTEMD@
SETUID_EXES = xscreensaver-auth
DEMO_EXES = @ALL_DEMO_PROGRAMS@
+--
+2.37.1
+
diff --git a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
similarity index 66%
rename from meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb
rename to meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
index 2ab5297..d24f666 100644
--- a/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.01.bb
+++ b/meta-openembedded/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb
@@ -3,16 +3,15 @@
LICENSE = "0BSD"
LIC_FILES_CHKSUM = "file://driver/xscreensaver.h;endline=10;md5=c3ce41cdff745eb1dc9d4fcfbffb4d51"
-SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz"
-SRC_URI[sha256sum] = "085484665d91f60b4a1dedacd94bcf9b74b0fb096bcedc89ff1c245168e5473b"
-
-SRC_URI += " \
+SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz \
file://xscreensaver.service \
- file://0001-build-Do-not-build-po-files.patch \
- file://tweak-app-defaults.patch \
+ file://0001-Tweak-app-defaults.patch \
+ file://0002-build-Do-not-build-po-files.patch \
+ file://0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch \
"
+SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152"
-DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam"
+DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam jpeg"
# These are only needed as part of the stopgap screensaver implementation:
RDEPENDS:${PN} = " \
liberation-fonts \
@@ -25,9 +24,17 @@
EXTRA_OECONF += "--with-app-defaults=${datadir}/X11/app-defaults --libdir=${STAGING_LIBDIR} \
--includedir=${STAGING_INCDIR} --with-pam --with-login-manager"
-EXTRA_OEMAKE += "install_prefix=${D}"
+EXTRA_OEMAKE += "install_prefix=${D} GTK_DATADIR=${datadir}"
REQUIRED_DISTRO_FEATURES = "x11 pam"
+PACKAGECONFIG = "png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd','',d)}"
+
+PACKAGECONFIG[systemd] = "--with-systemd=yes,--with-systemd=no,systemd"
+PACKAGECONFIG[png] = "--with-png=yes,--with-png=no,libpng"
+
+CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking ${@append_libtool_sysroot(d)}"
+EXTRA_OECONF:remove = "--disable-static"
+
do_install:append() {
install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service
for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker