diff --git a/meta-citadel/conf/layer.conf b/meta-citadel/conf/layer.conf index 09b85bf..e2cfd43 100644 --- a/meta-citadel/conf/layer.conf +++ b/meta-citadel/conf/layer.conf @@ -14,7 +14,7 @@ BBFILE_COLLECTIONS += "citadel" BBFILE_PATTERN_citadel = "^${LAYERDIR}/" BBFILE_PRIORITY_citadel = "5" -LAYERSERIES_COMPAT_citadel = "mickledore" +LAYERSERIES_COMPAT_citadel = "scarthgap" # This should only be incremented on significant changes that will # cause compatibility issues with other layers diff --git a/meta-citadel/recipes-citadel/bbappends/libblockdev_%.bbappend b/meta-citadel/recipes-citadel/bbappends/libblockdev_%.bbappend index ef83563..48053d7 100644 --- a/meta-citadel/recipes-citadel/bbappends/libblockdev_%.bbappend +++ b/meta-citadel/recipes-citadel/bbappends/libblockdev_%.bbappend @@ -1,3 +1,3 @@ -PACKAGECONFIG = "fs crypto parted mdraid kmod" +PACKAGECONFIG = "fs crypto parted mdraid tools" DEPENDS += "systemd" diff --git a/meta-citadel/recipes-citadel/bbappends/libxcb_1.15.bbappend b/meta-citadel/recipes-citadel/bbappends/libxcb_1.15.bbappend deleted file mode 100644 index 3f13b51..0000000 --- a/meta-citadel/recipes-citadel/bbappends/libxcb_1.15.bbappend +++ /dev/null @@ -1,7 +0,0 @@ - -# Fix Python 3.9 build failure by using native python3 instead of host python3 -# -# https://gitlab.freedesktop.org/xorg/proto/xcbproto/-/merge_requests/8 -# -inherit python3native - diff --git a/meta-citadel/recipes-citadel/bbappends/pulseaudio_16.%.bbappend b/meta-citadel/recipes-citadel/bbappends/pulseaudio_17.%.bbappend similarity index 100% rename from meta-citadel/recipes-citadel/bbappends/pulseaudio_16.%.bbappend rename to meta-citadel/recipes-citadel/bbappends/pulseaudio_17.%.bbappend diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb index 0fe7d1a..7146e9c 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-citadel.bb @@ -6,7 +6,6 @@ RDEPENDS:${PN} = "\ packagegroup-citadel-base \ packagegroup-desktop \ packagegroup-gnome \ - packagegroup-sway \ packagegroup-theme \ citadel-tools \ citadel-tools-realms \ diff --git a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb index 805fd89..c30e733 100644 --- a/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb +++ b/meta-citadel/recipes-citadel/packagegroups/packagegroup-desktop.bb @@ -40,7 +40,6 @@ RDEPENDS:${PN} = "\ ibus \ libsecret \ libwacom \ - libcroco \ librsvg \ librsvg-gtk \ glib-2.0-utils \ diff --git a/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb b/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb index 93dbc39..574cd07 100644 --- a/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb +++ b/meta-citadel/recipes-initrd/images/citadel-initramfs-image.bb @@ -117,6 +117,8 @@ require ${THISDIR}/../../recipes-citadel/images/citadel-image.inc IMAGE_ROOTFS_SIZE = "8192" IMAGE_ROOTFS_EXTRA_SPACE = "0" +IMAGE_NAME_SUFFIX = "" + ROOTFS_POSTPROCESS_COMMAND += "remove_systemd_units; append_initrd_release; " SYSTEMD_UNITS = "\ diff --git a/meta-citadel/recipes-support/drm/libdrm_2.4.120.bb b/meta-citadel/recipes-support/drm/libdrm_2.4.120.bb deleted file mode 100644 index 18b3256..0000000 --- a/meta-citadel/recipes-support/drm/libdrm_2.4.120.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "Userspace interface to the kernel DRM services" -DESCRIPTION = "The runtime library for accessing the kernel DRM services. DRM \ -stands for \"Direct Rendering Manager\", which is the kernel portion of the \ -\"Direct Rendering Infrastructure\" (DRI). DRI is required for many hardware \ -accelerated OpenGL drivers." -HOMEPAGE = "http://dri.freedesktop.org" -SECTION = "x11/base" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://xf86drm.c;beginline=9;endline=32;md5=c8a3b961af7667c530816761e949dc71" -PROVIDES = "drm" -DEPENDS = "libpthread-stubs" - -SRC_URI = "http://dri.freedesktop.org/libdrm/${BP}.tar.xz \ - " - -SRC_URI[sha256sum] = "3bf55363f76c7250946441ab51d3a6cc0ae518055c0ff017324ab76cdefb327a" - -inherit meson pkgconfig manpages - -PACKAGECONFIG ??= "intel radeon amdgpu nouveau vmwgfx omap freedreno vc4 etnaviv tests install-test-programs" -PACKAGECONFIG[intel] = "-Dintel=enabled,-Dintel=disabled,libpciaccess" -PACKAGECONFIG[radeon] = "-Dradeon=enabled,-Dradeon=disabled" -PACKAGECONFIG[amdgpu] = "-Damdgpu=enabled,-Damdgpu=disabled" -PACKAGECONFIG[nouveau] = "-Dnouveau=enabled,-Dnouveau=disabled" -PACKAGECONFIG[vmwgfx] = "-Dvmwgfx=enabled,-Dvmwgfx=disabled" -PACKAGECONFIG[omap] = "-Domap=enabled,-Domap=disabled" -PACKAGECONFIG[exynos] = "-Dexynos=enabled,-Dexynos=disabled" -PACKAGECONFIG[freedreno] = "-Dfreedreno=enabled,-Dfreedreno=disabled" -PACKAGECONFIG[tegra] = "-Dtegra=enabled,-Dtegra=disabled" -PACKAGECONFIG[vc4] = "-Dvc4=enabled,-Dvc4=disabled" -PACKAGECONFIG[etnaviv] = "-Detnaviv=enabled,-Detnaviv=disabled" -PACKAGECONFIG[freedreno-kgsl] = "-Dfreedreno-kgsl=true,-Dfreedreno-kgsl=false" -PACKAGECONFIG[valgrind] = "-Dvalgrind=enabled,-Dvalgrind=disabled,valgrind" -PACKAGECONFIG[install-test-programs] = "-Dinstall-test-programs=true,-Dinstall-test-programs=false" -PACKAGECONFIG[cairo-tests] = "-Dcairo-tests=enabled,-Dcairo-tests=disabled" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" -PACKAGECONFIG[udev] = "-Dudev=true,-Dudev=false,udev" -PACKAGECONFIG[manpages] = "-Dman-pages=enabled,-Dman-pages=disabled,libxslt-native xmlto-native python3-docutils-native" - -ALLOW_EMPTY:${PN}-drivers = "1" -PACKAGES =+ "${PN}-tests ${PN}-drivers ${PN}-radeon ${PN}-nouveau ${PN}-omap \ - ${PN}-intel ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ - ${PN}-etnaviv" - -RRECOMMENDS:${PN}-drivers = "${PN}-radeon ${PN}-nouveau ${PN}-omap ${PN}-intel \ - ${PN}-exynos ${PN}-freedreno ${PN}-amdgpu \ - ${PN}-etnaviv" - -FILES:${PN}-tests = "${bindir}/*" -FILES:${PN}-radeon = "${libdir}/libdrm_radeon.so.*" -FILES:${PN}-nouveau = "${libdir}/libdrm_nouveau.so.*" -FILES:${PN}-omap = "${libdir}/libdrm_omap.so.*" -FILES:${PN}-intel = "${libdir}/libdrm_intel.so.*" -FILES:${PN}-exynos = "${libdir}/libdrm_exynos.so.*" -FILES:${PN}-freedreno = "${libdir}/libdrm_freedreno.so.*" -FILES:${PN}-amdgpu = "${libdir}/libdrm_amdgpu.so.* ${datadir}/${PN}/amdgpu.ids" -FILES:${PN}-etnaviv = "${libdir}/libdrm_etnaviv.so.*" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-citadel/recipes-support/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch b/meta-citadel/recipes-support/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch new file mode 100644 index 0000000..ecc5b00 --- /dev/null +++ b/meta-citadel/recipes-support/keyutils/files/0001-Adhere-to-the-SOURCE_DATE_EPOCH-standard.patch @@ -0,0 +1,32 @@ +From 3f7f70c746277e1a89978166533374a8b9bd5407 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Wed, 25 Jan 2023 17:05:25 +0000 +Subject: [PATCH] Adhere to the SOURCE_DATE_EPOCH standard + +Adhere to the SOURCE_DATE_EPOCH standard and use it's date when set +otherwise fall back to the default behaviour. + +Signed-off-by: Jelle van der Waa +Signed-off-by: Alex Kiernan +--- +Upstream-Status: Pending + + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 599b1452a05a..7776b0f0d63d 100644 +--- a/Makefile ++++ b/Makefile +@@ -109,7 +109,7 @@ all: keyctl request-key key.dns_resolver cxx + ############################################################################### + #RPATH = -Wl,-rpath,$(LIBDIR) + +-VCPPFLAGS := -DPKGBUILD="\"$(shell date -u +%F)\"" ++VCPPFLAGS := -DPKGBUILD="\"$(date --utc --date="@${SOURCE_DATE_EPOCH:-$(date +%s)}" +%F)\"" + VCPPFLAGS += -DPKGVERSION="\"keyutils-$(VERSION)\"" + VCPPFLAGS += -DAPIVERSION="\"libkeyutils-$(APIVERSION)\"" + +-- +2.39.0 + diff --git a/meta-citadel/recipes-support/keyutils/files/0001-tests-builtin_trusted-Failure-command-is-failed.patch b/meta-citadel/recipes-support/keyutils/files/0001-tests-builtin_trusted-Failure-command-is-failed.patch new file mode 100644 index 0000000..b78d7f7 --- /dev/null +++ b/meta-citadel/recipes-support/keyutils/files/0001-tests-builtin_trusted-Failure-command-is-failed.patch @@ -0,0 +1,27 @@ +From 714542f009860e1652bc06d05ab939290374a114 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 26 Jan 2023 08:27:12 +0000 +Subject: [PATCH 1/2] tests: builtin_trusted: Failure command is `failed` + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + tests/features/builtin_trusted/runtest.sh | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tests/features/builtin_trusted/runtest.sh b/tests/features/builtin_trusted/runtest.sh +index 27910b5fa8e7..437f5ad1d6b2 100644 +--- a/tests/features/builtin_trusted/runtest.sh ++++ b/tests/features/builtin_trusted/runtest.sh +@@ -24,7 +24,7 @@ id_key --to=blk %:.blacklist + # There should be at least one built-in trusted key for module signing. + list_keyring $btk + expect_keyring_rlist bkeys +-if [ `echo $bkeys | wc -w` = 0 ]; then fail; fi ++if [ `echo $bkeys | wc -w` = 0 ]; then failed; fi + + # Check we can't add random keys to those keyrings + marker "TRY ADDING USER KEYS" +-- +2.39.0 + diff --git a/meta-citadel/recipes-support/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch b/meta-citadel/recipes-support/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch new file mode 100644 index 0000000..314487a --- /dev/null +++ b/meta-citadel/recipes-support/keyutils/files/0001-tests-toolbox.inc.sh-update-regex-for-getting-endian.patch @@ -0,0 +1,35 @@ +From b84ecc2e3e56a25a3efd56c8942ad6bab3ff9ba1 Mon Sep 17 00:00:00 2001 +From: Changqing Li +Date: Fri, 2 Dec 2022 15:35:40 +0800 +Subject: [PATCH] tests/toolbox.inc.sh: update regex for getting endian + +Update regex for getting endian in following condition: +/proc/777/exe: ELF 64-bit LSB pie executable, x86-64, version 1 (SYSV), dynamically linked, interpreter /lib64/ld-linux-x86-64.so.2 + +Upstream-Status: Submitted [Submitted to keyrings@vger.kernel.org ] + +Signed-off-by: Changqing Li +--- + tests/toolbox.inc.sh | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh +index 8bf0db6f6d87..7ea2f253ba7d 100644 +--- a/tests/toolbox.inc.sh ++++ b/tests/toolbox.inc.sh +@@ -13,10 +13,10 @@ + echo === $OUTPUTFILE === + + endian=`file -L /proc/$$/exe` +-if expr "$endian" : '.* MSB \+\(pie executable\|executable\|shared object\).*' >&/dev/null ++if expr "$endian" : '.* MSB .*\(pie executable\|executable\|shared object\).*' >&/dev/null + then + endian=BE +-elif expr "$endian" : '.* LSB \+\(pie executable\|executable\|shared object\).*' >&/dev/null ++elif expr "$endian" : '.* LSB .*\(pie executable\|executable\|shared object\).*' >&/dev/null + then + endian=LE + else +-- +2.39.0 + diff --git a/meta-citadel/recipes-support/keyutils/files/0002-tests-Use-head-n1-for-busybox-compatibility.patch b/meta-citadel/recipes-support/keyutils/files/0002-tests-Use-head-n1-for-busybox-compatibility.patch new file mode 100644 index 0000000..900f2f0 --- /dev/null +++ b/meta-citadel/recipes-support/keyutils/files/0002-tests-Use-head-n1-for-busybox-compatibility.patch @@ -0,0 +1,64 @@ +From 5e660f246bb04560692ac9fc144574732c7e19e7 Mon Sep 17 00:00:00 2001 +From: Alex Kiernan +Date: Thu, 26 Jan 2023 08:28:16 +0000 +Subject: [PATCH 2/2] tests: Use `head -n1` for busybox compatibility + +Upstream-Status: Pending +Signed-off-by: Alex Kiernan +--- + tests/keyctl/session/valid/runtest.sh | 4 ++-- + tests/keyctl/show/noargs/runtest.sh | 2 +- + tests/toolbox.inc.sh | 2 +- + 3 files changed, 4 insertions(+), 4 deletions(-) + +diff --git a/tests/keyctl/session/valid/runtest.sh b/tests/keyctl/session/valid/runtest.sh +index 4c831314c0b0..456e9f32de23 100644 +--- a/tests/keyctl/session/valid/runtest.sh ++++ b/tests/keyctl/session/valid/runtest.sh +@@ -17,7 +17,7 @@ then + expect_key_rdesc rdesc "keyring@.*@.*@.*@_ses[^@]*\$" + + # check the session keyring ID is shown +- seskeyring="`tail -2 $OUTPUTFILE | head -1`" ++ seskeyring="`tail -2 $OUTPUTFILE | head -n1`" + if ! expr "$seskeyring" : "Joined session keyring: [0-9]*" >&/dev/null + then + failed +@@ -30,7 +30,7 @@ new_session qwerty keyctl rdescribe @s "@" + expect_key_rdesc rdesc "keyring@.*@.*@.*@qwerty" + + # check the session keyring ID is shown +-seskeyring="`tail -2 $OUTPUTFILE | head -1`" ++seskeyring="`tail -2 $OUTPUTFILE | head -n1`" + if ! expr "$seskeyring" : "Joined session keyring: [0-9]*" >&/dev/null + then + failed +diff --git a/tests/keyctl/show/noargs/runtest.sh b/tests/keyctl/show/noargs/runtest.sh +index d5072716c76a..a6d8b6b585c4 100644 +--- a/tests/keyctl/show/noargs/runtest.sh ++++ b/tests/keyctl/show/noargs/runtest.sh +@@ -31,7 +31,7 @@ then + fi + + # the first key listed (line 2) should be a keying (the session keyring) ... +-keyring1="`grep -n keyring $OUTPUTFILE | cut -d: -f1 | head -1`" ++keyring1="`grep -n keyring $OUTPUTFILE | cut -d: -f1 | head -n1`" + if [ "$keyring1" != "4" ] + then + failed +diff --git a/tests/toolbox.inc.sh b/tests/toolbox.inc.sh +index 7ea2f253ba7d..a461a73daaa3 100644 +--- a/tests/toolbox.inc.sh ++++ b/tests/toolbox.inc.sh +@@ -229,7 +229,7 @@ function check_notify () + if [ "$1" = "-2" ] + then + shift +- my_logline="`tail -2 $watch_log | head -1`" ++ my_logline="`tail -2 $watch_log | head -n1`" + else + my_logline="`tail -1 $watch_log`" + fi +-- +2.39.0 + diff --git a/meta-citadel/recipes-support/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch b/meta-citadel/recipes-support/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch new file mode 100644 index 0000000..ec3a9fe --- /dev/null +++ b/meta-citadel/recipes-support/libblockdev/files/0001-fix-pythondir-for-multilib-when-cross-compiling.patch @@ -0,0 +1,32 @@ +From 297abed277ce3aa0cf12adbfda3c8581afdba850 Mon Sep 17 00:00:00 2001 +From: Chen Qi +Date: Sun, 8 Oct 2023 19:30:29 -0700 +Subject: [PATCH] fix pythondir for multilib when cross compiling + +In case of cross compiling + multilib, the 'shell python3' line is +not likely to give out correct result. Make use of pythondir instead. + +This patch is related to meta/recipes-devtools/automake/automake/0001-automake-Update-for-python.m4-to-respect-libdir.patch +in oe-core, so this one is marked as oe specific. + +Upstream-Status: Inappropriate [OE Specific] + +Signed-off-by: Chen Qi +--- + src/python/gi/overrides/Makefile.am | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/python/gi/overrides/Makefile.am b/src/python/gi/overrides/Makefile.am +index 5e8e75f7..7c30601c 100644 +--- a/src/python/gi/overrides/Makefile.am ++++ b/src/python/gi/overrides/Makefile.am +@@ -1,5 +1,5 @@ + if WITH_PYTHON3 +-py3libdir = $(shell python3 -c "import sysconfig; print(sysconfig.get_path('platlib', vars={'platbase': '${exec_prefix}'}))") ++py3libdir = $(pythondir) + py3overridesdir = $(py3libdir)/gi/overrides + dist_py3overrides_DATA = BlockDev.py + endif +-- +2.42.0 + diff --git a/meta-citadel/recipes-support/libblockdev/libblockdev_3.1.1.bb b/meta-citadel/recipes-support/libblockdev/libblockdev_3.1.1.bb new file mode 100644 index 0000000..e62e952 --- /dev/null +++ b/meta-citadel/recipes-support/libblockdev/libblockdev_3.1.1.bb @@ -0,0 +1,39 @@ +DESCRIPTION = "libblockdev is a C library supporting GObject introspection for manipulation of \ +block devices. It has a plugin-based architecture where each technology (like \ +LVM, Btrfs, MD RAID, Swap,...) is implemented in a separate plugin, possibly \ +with multiple implementations (e.g. using LVM CLI or the new LVM DBus API)." +HOMEPAGE = "http://rhinstaller.github.io/libblockdev/" +LICENSE = "LGPL-2.0-or-later" +SECTION = "devel/lib" + +LIC_FILES_CHKSUM = "file://LICENSE;md5=c07cb499d259452f324bb90c3067d85c" + +inherit autotools gobject-introspection pkgconfig lib_package + +DEPENDS = "autoconf-archive-native glib-2.0 kmod udev libnvme" + +SRC_URI = "git://github.com/storaged-project/libblockdev;branch=3.1.x-devel;protocol=https \ + file://0001-fix-pythondir-for-multilib-when-cross-compiling.patch \ + " +SRCREV = "68aaff5556afe26be749c29a2b7cbd714dce3050" +S = "${WORKDIR}/git" + +FILES:${PN} += "${PYTHON_SITEPACKAGES_DIR}" + +PACKAGECONFIG ??= "python3 lvm lvm-dbus dm parted fs escrow btrfs crypto mdraid mpath nvdimm tools" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[lvm] = "--with-lvm, --without-lvm, multipath-tools, lvm2" +PACKAGECONFIG[lvm-dbus] = "--with-lvm_dbus, --without-lvm_dbus, multipath-tools, lvm2" +PACKAGECONFIG[dm] = "--with-dm, --without-dm, multipath-tools, lvm2" +PACKAGECONFIG[parted] = "--with-part, --without-part, parted" +PACKAGECONFIG[fs] = "--with-fs, --without-fs, util-linux e2fsprogs" +PACKAGECONFIG[doc] = "--with-gtk-doc, --without-gtk-doc, gtk-doc-native" +PACKAGECONFIG[nvdimm] = "--with-nvdimm, --without-nvdimm, ndctl util-linux" +PACKAGECONFIG[escrow] = "--with-escrow, --without-escrow, nss volume-key" +PACKAGECONFIG[btrfs] = "--with-btrfs,--without-btrfs,libbytesize btrfs-tools" +PACKAGECONFIG[crypto] = "--with-crypto,--without-crypto,cryptsetup nss volume-key keyutils" +PACKAGECONFIG[mdraid] = "--with-mdraid,--without-mdraid,libbytesize" +PACKAGECONFIG[mpath] = "--with-mpath,--without-mpath, multipath-tools, lvm2" +PACKAGECONFIG[tools] = "--with-tools,--without-tools,libbytesize libdevmapper" + +export GIR_EXTRA_LIBS_PATH="${B}/src/utils/.libs" diff --git a/meta-citadel/recipes-support/libnvme/libnvme_1.8.bb b/meta-citadel/recipes-support/libnvme/libnvme_1.8.bb new file mode 100644 index 0000000..3894fac --- /dev/null +++ b/meta-citadel/recipes-support/libnvme/libnvme_1.8.bb @@ -0,0 +1,22 @@ +SUMMARY = "libnvme development C library" +DESCRIPTION = "\ +libnvme provides type definitions for NVMe specification structures, \ +enumerations, and bit fields, helper functions to construct, dispatch, \ +and decode commands and payloads, and utilities to connect, scan, and \ +manage nvme devices on a Linux system." +HOMEPAGE = "https://github.com/linux-nvme/${BPN}" +SECTION = "libs" +LICENSE = "LGPL-2.1-only & CC0-1.0 & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c \ + file://ccan/licenses/CC0;md5=c17af43b05840255a6fedc5eda9d56cc \ + file://ccan/licenses/BSD-MIT;md5=838c366f69b72c5df05c96dff79b35f2" +DEPENDS = "json-c" +SRCREV = "bff7dda7e2a0f883d0b89e23fed725c916de3e61" + +SRC_URI = "git://github.com/linux-nvme/libnvme;protocol=https;branch=master" + +S = "${WORKDIR}/git" + +inherit meson pkgconfig + +EXTRA_OEMESON += "-Dkeyutils=disabled -Dopenssl=disabled -Dpython=disabled" diff --git a/meta-citadel/recipes-support/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch b/meta-citadel/recipes-support/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch deleted file mode 100644 index f6d95c8..0000000 --- a/meta-citadel/recipes-support/mesa/files/0001-Revert-meson-do-not-pull-in-clc-for-clover.patch +++ /dev/null @@ -1,56 +0,0 @@ -From fe4600de549549fbb3033fc1b37904ba6b3fe2af Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Fri, 8 Mar 2024 15:53:11 +0100 -Subject: [PATCH] Revert "meson: do not pull in clc for clover" - -This reverts commit 815a6647eb1383e9dc704ffcc266d85f3b13338a. -Upstream-Status: Inappropriate [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27783/diffs?commit_id=a976f2c9f0c07f9e06cc9affd9124b45bc60c2bd] - -Once the merge request above was added, it will only be possible to provide opencl spir-v with gallium-rusticl=true. This is not yet supported in the mesa recipe. -For now reverting this commit allows to still use clover with opencl-spirv, which would otherwise be broken starting from mesa 24.0.2. - -After it was merged, this patch needs to be removed and rusticl support will be required - -Signed-off-by: Markus Volk ---- - meson.build | 3 ++- - src/compiler/meson.build | 2 +- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 25e92ea5f95..3956e19c08f 100644 ---- a/meson.build -+++ b/meson.build -@@ -818,6 +818,7 @@ if _opencl != 'disabled' - error('The Clover OpenCL state tracker requires rtti') - endif - -+ with_clc = true - with_gallium_opencl = true - with_opencl_icd = _opencl == 'icd' - else -@@ -842,7 +843,7 @@ if with_gallium_rusticl - endif - - dep_clc = null_dep --if with_gallium_opencl or with_clc -+if with_clc - dep_clc = dependency('libclc') - endif - -diff --git a/src/compiler/meson.build b/src/compiler/meson.build -index 8d73544c6d8..1dae56d1b2b 100644 ---- a/src/compiler/meson.build -+++ b/src/compiler/meson.build -@@ -79,7 +79,7 @@ subdir('nir') - - subdir('spirv') - --if with_clc -+if with_opencl_spirv - subdir('clc') - endif - if with_gallium --- -2.44.0 - diff --git a/meta-citadel/recipes-support/mesa/files/0001-drisw-fix-build-without-dri3.patch b/meta-citadel/recipes-support/mesa/files/0001-drisw-fix-build-without-dri3.patch deleted file mode 100644 index ab16152..0000000 --- a/meta-citadel/recipes-support/mesa/files/0001-drisw-fix-build-without-dri3.patch +++ /dev/null @@ -1,58 +0,0 @@ -From 4bd15a419e892da843489c374c58c5b29c40b5d6 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 6 Feb 2024 09:47:09 +0100 -Subject: [PATCH 1/2] drisw: fix build without dri3 - -commit 1887368df41 ("glx/sw: check for modifier support in the kopper path") -added dri3_priv.h header and dri3_check_multibuffer() function in drisw that -can be build without dri3. - - i686-buildroot-linux-gnu/bin/ld: src/glx/libglx.a.p/drisw_glx.c.o: in function `driswCreateScreenDriver': - drisw_glx.c:(.text.driswCreateScreenDriver+0x3a0): undefined reference to `dri3_check_multibuffer' - collect2: error: ld returned 1 exit status - -Add HAVE_DRI3 guard around dri3_priv.h header and the zink code using -dri3_check_multibuffer(). - -Fixes: 1887368df41 ("glx/sw: check for modifier support in the kopper path") - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478] -Signed-off-by: Romain Naour -Signed-off-by: Khem Raj ---- - src/glx/drisw_glx.c | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/src/glx/drisw_glx.c b/src/glx/drisw_glx.c -index 3d3f752..4b19e2d 100644 ---- a/src/glx/drisw_glx.c -+++ b/src/glx/drisw_glx.c -@@ -32,7 +32,9 @@ - #include - #include "dri_common.h" - #include "drisw_priv.h" -+#ifdef HAVE_DRI3 - #include "dri3_priv.h" -+#endif - #include - #include - #include -@@ -995,6 +997,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, - goto handle_error; - } - -+#ifdef HAVE_DRI3 - if (pdpyp->zink) { - bool err; - psc->has_multibuffer = dri3_check_multibuffer(priv->dpy, &err); -@@ -1005,6 +1008,7 @@ driswCreateScreenDriver(int screen, struct glx_display *priv, - goto handle_error; - } - } -+#endif - - glx_config_destroy_list(psc->base.configs); - psc->base.configs = configs; --- -2.44.0 - diff --git a/meta-citadel/recipes-support/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch b/meta-citadel/recipes-support/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch deleted file mode 100644 index ceb0153..0000000 --- a/meta-citadel/recipes-support/mesa/files/0001-gallium-Fix-build-with-llvm-17.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 3e1e5c475b52651657c906e6b03ee13567cccdd7 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Fri, 23 Jun 2023 01:20:38 -0700 -Subject: [PATCH] gallium: Fix build with llvm 17 - -These headers are not available for C files in llvm 17+ -and they seem to be not needed to compile after all with llvm 17 -so add conditions to exclude them for llvm >= 17 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/23827] -Signed-off-by: Khem Raj ---- - src/gallium/auxiliary/gallivm/lp_bld_init.c | 6 +++++- - 1 file changed, 5 insertions(+), 1 deletion(-) - -diff --git a/src/gallium/auxiliary/gallivm/lp_bld_init.c b/src/gallium/auxiliary/gallivm/lp_bld_init.c -index cd2108f..b1a4d03 100644 ---- a/src/gallium/auxiliary/gallivm/lp_bld_init.c -+++ b/src/gallium/auxiliary/gallivm/lp_bld_init.c -@@ -46,15 +46,19 @@ - #if GALLIVM_USE_NEW_PASS == 1 - #include - #elif GALLIVM_HAVE_CORO == 1 -+#if LLVM_VERSION_MAJOR < 17 - #include --#if LLVM_VERSION_MAJOR >= 7 -+#endif -+#if LLVM_VERSION_MAJOR >= 7 && LLVM_VERSION_MAJOR < 17 - #include - #endif - #if LLVM_VERSION_MAJOR <= 8 && (DETECT_ARCH_AARCH64 || DETECT_ARCH_ARM || DETECT_ARCH_S390 || DETECT_ARCH_MIPS64) - #include - #endif -+#if LLVM_VERSION_MAJOR < 17 - #include - #endif -+#endif - - unsigned gallivm_perf = 0; - diff --git a/meta-citadel/recipes-support/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch b/meta-citadel/recipes-support/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch deleted file mode 100644 index baa98a0..0000000 --- a/meta-citadel/recipes-support/mesa/files/0001-meson-misdetects-64bit-atomics-on-mips-clang.patch +++ /dev/null @@ -1,24 +0,0 @@ -From 02cc21800fe29f566add525e63f619c0536d6e7b Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Mon, 13 Jan 2020 15:23:47 -0800 -Subject: [PATCH] meson misdetects 64bit atomics on mips/clang - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- - src/util/u_atomic.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/util/u_atomic.c b/src/util/u_atomic.c -index 5a5eab4..e499516 100644 ---- a/src/util/u_atomic.c -+++ b/src/util/u_atomic.c -@@ -21,7 +21,7 @@ - * IN THE SOFTWARE. - */ - --#if defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) -+#if !defined(__clang__) && defined(MISSING_64BIT_ATOMICS) && defined(HAVE_PTHREAD) - - #include - #include diff --git a/meta-citadel/recipes-support/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch b/meta-citadel/recipes-support/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch deleted file mode 100644 index 7be7d81..0000000 --- a/meta-citadel/recipes-support/mesa/files/0001-meson.build-check-for-all-linux-host_os-combinations.patch +++ /dev/null @@ -1,42 +0,0 @@ -From e8ec6b1cc5e401ba719095722d8b317d755ae613 Mon Sep 17 00:00:00 2001 -From: Alistair Francis -Date: Thu, 14 Nov 2019 13:04:49 -0800 -Subject: [PATCH] meson.build: check for all linux host_os combinations - -Make sure that we are also looking for our host_os combinations like -linux-musl etc. when assuming support for DRM/KMS. - -Also delete a duplicate line. - -Upstream-Status: Pending - -Signed-off-by: Anuj Mittal -Signed-off-by: Fabio Berton -Signed-off-by: Otavio Salvador -Signed-off-by: Alistair Francis ---- - meson.build | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/meson.build b/meson.build -index 133fd9a..817861e 100644 ---- a/meson.build -+++ b/meson.build -@@ -128,7 +128,7 @@ with_any_opengl = with_opengl or with_gles1 or with_gles2 - # Only build shared_glapi if at least one OpenGL API is enabled - with_shared_glapi = with_shared_glapi and with_any_opengl - --system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) -+system_has_kms_drm = ['openbsd', 'netbsd', 'freebsd', 'gnu/kfreebsd', 'dragonfly', 'linux', 'sunos', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') - - gallium_drivers = get_option('gallium-drivers') - if gallium_drivers.contains('auto') -@@ -997,7 +997,7 @@ if cc.has_function('fmemopen') - endif - - # TODO: this is very incomplete --if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) -+if ['linux', 'cygwin', 'gnu', 'freebsd', 'gnu/kfreebsd', 'haiku', 'android', 'managarm'].contains(host_machine.system()) or host_machine.system().startswith('linux') - pre_args += '-D_GNU_SOURCE' - elif host_machine.system() == 'sunos' - pre_args += '-D__EXTENSIONS__' diff --git a/meta-citadel/recipes-support/mesa/files/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch b/meta-citadel/recipes-support/mesa/files/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch deleted file mode 100644 index 036a0b4..0000000 --- a/meta-citadel/recipes-support/mesa/files/0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 62495ebb977866c52d5bed8499a547c49f0d9bc1 Mon Sep 17 00:00:00 2001 -From: Romain Naour -Date: Tue, 6 Feb 2024 09:47:10 +0100 -Subject: [PATCH 2/2] glxext: don't try zink if not enabled in mesa - -Commit 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") -added an automatic zink fallback even when the zink gallium is not -enabled at build time. - -It leads to unexpected error log while loading drisw driver and -zink is not installed on the rootfs: - - MESA-LOADER: failed to open zink: /usr/lib/dri/zink_dri.so - -Fixes: 7d9ea77b459 ("glx: add automatic zink fallback loading between hw and sw drivers") - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/27478] -Signed-off-by: Romain Naour -Signed-off-by: Khem Raj ---- - src/glx/glxext.c | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/glx/glxext.c b/src/glx/glxext.c -index 05c825a..7a06aa9 100644 ---- a/src/glx/glxext.c -+++ b/src/glx/glxext.c -@@ -908,9 +908,11 @@ __glXInitialize(Display * dpy) - #endif /* HAVE_DRI3 */ - if (!debug_get_bool_option("LIBGL_DRI2_DISABLE", false)) - dpyPriv->dri2Display = dri2CreateDisplay(dpy); -+#if defined(HAVE_ZINK) - if (!dpyPriv->dri3Display && !dpyPriv->dri2Display) - try_zink = !debug_get_bool_option("LIBGL_KOPPER_DISABLE", false) && - !getenv("GALLIUM_DRIVER"); -+#endif /* HAVE_ZINK */ - } - #endif /* GLX_USE_DRM */ - if (glx_direct) --- -2.44.0 - diff --git a/meta-citadel/recipes-support/mesa/libglu_9.0.3.bb b/meta-citadel/recipes-support/mesa/libglu_9.0.3.bb deleted file mode 100644 index 8151727..0000000 --- a/meta-citadel/recipes-support/mesa/libglu_9.0.3.bb +++ /dev/null @@ -1,31 +0,0 @@ -SUMMARY = "The OpenGL utility toolkit" -DESCRIPTION = "GLU is a utility toolkit used with OpenGL implementations" - -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://include/GL/glu.h;endline=29;md5=6b79c570f644363b356456e7d44471d9 \ - file://src/libtess/tess.c;endline=29;md5=6b79c570f644363b356456e7d44471d9" - -# Epoch as this used to be part of mesa -PE = "2" - -SRC_URI = "https://mesa.freedesktop.org/archive/glu/glu-${PV}.tar.xz \ - " - -SRC_URI[sha256sum] = "bd43fe12f374b1192eb15fe20e45ff456b9bc26ab57f0eee919f96ca0f8a330f" - -S = "${WORKDIR}/glu-${PV}" - -DEPENDS = "virtual/libgl" - -inherit meson pkgconfig features_check - -EXTRA_OEMESON = "-Dgl_provider=gl" - -# Requires libGL.so which is provided by mesa when x11 in DISTRO_FEATURES -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -# Remove the mesa-glu dependency in mesa-glu-dev, as mesa-glu is empty -DEV_PKG_DEPENDENCY = "" diff --git a/meta-citadel/recipes-support/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch b/meta-citadel/recipes-support/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch deleted file mode 100644 index 93ee9c2..0000000 --- a/meta-citadel/recipes-support/mesa/mesa-demos/0001-mesa-demos-Add-missing-data-files.patch +++ /dev/null @@ -1,624 +0,0 @@ -From b695c3a3fa3f4cd48c13aa26542110de27075518 Mon Sep 17 00:00:00 2001 -From: Drew Moseley -Date: Mon, 12 May 2014 15:22:32 -0400 -Subject: [PATCH 1/9] mesa-demos: Add missing data files. - -Add some data files that are present in the git repository: - http://cgit.freedesktop.org/mesa/demos/tree/?id=mesa-demos-8.1.0 -but not in the release tarball - ftp://ftp.freedesktop.org/pub/mesa/demos/8.1.0/mesa-demos-8.1.0.tar.bz2 - -Upstream-Status: Backport -Signed-off-by: Drew Moseley -Signed-off-by: Martin Jansa ---- - src/fpglsl/depth-read.glsl | 4 + - src/fpglsl/infinite-loop.glsl | 7 + - src/glsl/CH11-bumpmaptex.frag | 47 +++++++ - src/glsl/blinking-teapot.frag | 31 +++++ - src/glsl/blinking-teapot.vert | 16 +++ - src/glsl/convolution.frag | 21 +++ - src/glsl/simplex-noise.glsl | 279 ++++++++++++++++++++++++++++++++++++++++ - src/glsl/skinning.vert | 24 ++++ - src/perf/glslstateschange1.frag | 19 +++ - src/perf/glslstateschange1.vert | 14 ++ - src/perf/glslstateschange2.frag | 17 +++ - src/perf/glslstateschange2.vert | 14 ++ - src/vpglsl/infinite-loop.glsl | 8 ++ - 13 files changed, 501 insertions(+) - create mode 100644 src/fpglsl/depth-read.glsl - create mode 100644 src/fpglsl/infinite-loop.glsl - create mode 100644 src/glsl/CH11-bumpmaptex.frag - create mode 100644 src/glsl/blinking-teapot.frag - create mode 100644 src/glsl/blinking-teapot.vert - create mode 100644 src/glsl/convolution.frag - create mode 100644 src/glsl/simplex-noise.glsl - create mode 100644 src/glsl/skinning.vert - create mode 100644 src/perf/glslstateschange1.frag - create mode 100644 src/perf/glslstateschange1.vert - create mode 100644 src/perf/glslstateschange2.frag - create mode 100644 src/perf/glslstateschange2.vert - create mode 100644 src/vpglsl/infinite-loop.glsl - -diff --git a/src/fpglsl/depth-read.glsl b/src/fpglsl/depth-read.glsl -new file mode 100644 -index 0000000..86d298e ---- /dev/null -+++ b/src/fpglsl/depth-read.glsl -@@ -0,0 +1,4 @@ -+void main() -+{ -+ gl_FragColor = gl_FragCoord.zzzz; -+} -diff --git a/src/fpglsl/infinite-loop.glsl b/src/fpglsl/infinite-loop.glsl -new file mode 100644 -index 0000000..c6dc6ee ---- /dev/null -+++ b/src/fpglsl/infinite-loop.glsl -@@ -0,0 +1,7 @@ -+void main() { -+ vec4 sum = vec4(0); -+ for (int i = 1; i != 2; i += 2) { -+ sum += vec4(0.1, 0.1, 0.1, 0.1); -+ } -+ gl_FragColor = sum; -+} -diff --git a/src/glsl/CH11-bumpmaptex.frag b/src/glsl/CH11-bumpmaptex.frag -new file mode 100644 -index 0000000..b5dabb4 ---- /dev/null -+++ b/src/glsl/CH11-bumpmaptex.frag -@@ -0,0 +1,47 @@ -+// -+// Fragment shader for procedural bumps -+// -+// Authors: John Kessenich, Randi Rost -+// -+// Copyright (c) 2002-2006 3Dlabs Inc. Ltd. -+// -+// See 3Dlabs-License.txt for license information -+// -+// Texture mapping/modulation added by Brian Paul -+// -+ -+varying vec3 LightDir; -+varying vec3 EyeDir; -+ -+uniform float BumpDensity; // = 16.0 -+uniform float BumpSize; // = 0.15 -+uniform float SpecularFactor; // = 0.5 -+ -+uniform sampler2D Tex; -+ -+void main() -+{ -+ vec3 ambient = vec3(0.25); -+ vec3 litColor; -+ vec2 c = BumpDensity * gl_TexCoord[0].st; -+ vec2 p = fract(c) - vec2(0.5); -+ -+ float d, f; -+ d = p.x * p.x + p.y * p.y; -+ f = inversesqrt(d + 1.0); -+ -+ if (d >= BumpSize) -+ { p = vec2(0.0); f = 1.0; } -+ -+ vec3 SurfaceColor = texture2D(Tex, gl_TexCoord[0].st).xyz; -+ -+ vec3 normDelta = vec3(p.x, p.y, 1.0) * f; -+ litColor = SurfaceColor * (ambient + max(dot(normDelta, LightDir), 0.0)); -+ vec3 reflectDir = reflect(LightDir, normDelta); -+ -+ float spec = max(dot(EyeDir, reflectDir), 0.0); -+ spec *= SpecularFactor; -+ litColor = min(litColor + spec, vec3(1.0)); -+ -+ gl_FragColor = vec4(litColor, 1.0); -+} -diff --git a/src/glsl/blinking-teapot.frag b/src/glsl/blinking-teapot.frag -new file mode 100644 -index 0000000..0db060b ---- /dev/null -+++ b/src/glsl/blinking-teapot.frag -@@ -0,0 +1,31 @@ -+#extension GL_ARB_uniform_buffer_object : enable -+ -+layout(std140) uniform colors0 -+{ -+ float DiffuseCool; -+ float DiffuseWarm; -+ vec3 SurfaceColor; -+ vec3 WarmColor; -+ vec3 CoolColor; -+ vec4 some[8]; -+}; -+ -+varying float NdotL; -+varying vec3 ReflectVec; -+varying vec3 ViewVec; -+ -+void main (void) -+{ -+ -+ vec3 kcool = min(CoolColor + DiffuseCool * SurfaceColor, 1.0); -+ vec3 kwarm = min(WarmColor + DiffuseWarm * SurfaceColor, 1.0); -+ vec3 kfinal = mix(kcool, kwarm, NdotL); -+ -+ vec3 nreflect = normalize(ReflectVec); -+ vec3 nview = normalize(ViewVec); -+ -+ float spec = max(dot(nreflect, nview), 0.0); -+ spec = pow(spec, 32.0); -+ -+ gl_FragColor = vec4 (min(kfinal + spec, 1.0), 1.0); -+} -diff --git a/src/glsl/blinking-teapot.vert b/src/glsl/blinking-teapot.vert -new file mode 100644 -index 0000000..397d733 ---- /dev/null -+++ b/src/glsl/blinking-teapot.vert -@@ -0,0 +1,16 @@ -+vec3 LightPosition = vec3(0.0, 10.0, 4.0); -+ -+varying float NdotL; -+varying vec3 ReflectVec; -+varying vec3 ViewVec; -+ -+void main(void) -+{ -+ vec3 ecPos = vec3 (gl_ModelViewMatrix * gl_Vertex); -+ vec3 tnorm = normalize(gl_NormalMatrix * gl_Normal); -+ vec3 lightVec = normalize(LightPosition - ecPos); -+ ReflectVec = normalize(reflect(-lightVec, tnorm)); -+ ViewVec = normalize(-ecPos); -+ NdotL = (dot(lightVec, tnorm) + 1.0) * 0.5; -+ gl_Position = ftransform(); -+} -diff --git a/src/glsl/convolution.frag b/src/glsl/convolution.frag -new file mode 100644 -index 0000000..e49b8ac ---- /dev/null -+++ b/src/glsl/convolution.frag -@@ -0,0 +1,21 @@ -+ -+const int KernelSize = 9; -+ -+//texture offsets -+uniform vec2 Offset[KernelSize]; -+//convolution kernel -+uniform vec4 KernelValue[KernelSize]; -+uniform sampler2D srcTex; -+uniform vec4 ScaleFactor; -+uniform vec4 BaseColor; -+ -+void main(void) -+{ -+ int i; -+ vec4 sum = vec4(0.0); -+ for (i = 0; i < KernelSize; ++i) { -+ vec4 tmp = texture2D(srcTex, gl_TexCoord[0].st + Offset[i]); -+ sum += tmp * KernelValue[i]; -+ } -+ gl_FragColor = sum * ScaleFactor + BaseColor; -+} -diff --git a/src/glsl/simplex-noise.glsl b/src/glsl/simplex-noise.glsl -new file mode 100644 -index 0000000..b6833cb ---- /dev/null -+++ b/src/glsl/simplex-noise.glsl -@@ -0,0 +1,279 @@ -+// -+// Description : Array and textureless GLSL 2D/3D/4D simplex -+// noise functions. -+// Author : Ian McEwan, Ashima Arts. -+// Maintainer : ijm -+// Lastmod : 20110223 -+// License : Copyright (C) 2011 Ashima Arts. All rights reserved. -+// Distributed under the Artistic License 2.0; See LICENCE file. -+// -+ -+#define NORMALIZE_GRADIENTS -+#undef USE_CIRCLE -+#define COLLAPSE_SORTNET -+ -+float permute(float x0,vec3 p) { -+ float x1 = mod(x0 * p.y, p.x); -+ return floor( mod( (x1 + p.z) *x0, p.x )); -+ } -+vec2 permute(vec2 x0,vec3 p) { -+ vec2 x1 = mod(x0 * p.y, p.x); -+ return floor( mod( (x1 + p.z) *x0, p.x )); -+ } -+vec3 permute(vec3 x0,vec3 p) { -+ vec3 x1 = mod(x0 * p.y, p.x); -+ return floor( mod( (x1 + p.z) *x0, p.x )); -+ } -+vec4 permute(vec4 x0,vec3 p) { -+ vec4 x1 = mod(x0 * p.y, p.x); -+ return floor( mod( (x1 + p.z) *x0, p.x )); -+ } -+ -+uniform vec4 pParam; -+// Example -+// const vec4 pParam = vec4( 17.* 17., 34., 1., 7.); -+ -+float taylorInvSqrt(float r) -+ { -+ return ( 0.83666002653408 + 0.7*0.85373472095314 - 0.85373472095314 * r ); -+ } -+ -+float simplexNoise2(vec2 v) -+ { -+ const vec2 C = vec2(0.211324865405187134, // (3.0-sqrt(3.0))/6.; -+ 0.366025403784438597); // 0.5*(sqrt(3.0)-1.); -+ const vec3 D = vec3( 0., 0.5, 2.0) * 3.14159265358979312; -+// First corner -+ vec2 i = floor(v + dot(v, C.yy) ); -+ vec2 x0 = v - i + dot(i, C.xx); -+ -+// Other corners -+ vec2 i1 = (x0.x > x0.y) ? vec2(1.,0.) : vec2(0.,1.) ; -+ -+ // x0 = x0 - 0. + 0. * C -+ vec2 x1 = x0 - i1 + 1. * C.xx ; -+ vec2 x2 = x0 - 1. + 2. * C.xx ; -+ -+// Permutations -+ i = mod(i, pParam.x); -+ vec3 p = permute( permute( -+ i.y + vec3(0., i1.y, 1. ), pParam.xyz) -+ + i.x + vec3(0., i1.x, 1. ), pParam.xyz); -+ -+#ifndef USE_CIRCLE -+// ( N points uniformly over a line, mapped onto a diamond.) -+ vec3 x = fract(p / pParam.w) ; -+ vec3 h = 0.5 - abs(x) ; -+ -+ vec3 sx = vec3(lessThan(x,D.xxx)) *2. -1.; -+ vec3 sh = vec3(lessThan(h,D.xxx)); -+ -+ vec3 a0 = x + sx*sh; -+ vec2 p0 = vec2(a0.x,h.x); -+ vec2 p1 = vec2(a0.y,h.y); -+ vec2 p2 = vec2(a0.z,h.z); -+ -+#ifdef NORMALISE_GRADIENTS -+ p0 *= taylorInvSqrt(dot(p0,p0)); -+ p1 *= taylorInvSqrt(dot(p1,p1)); -+ p2 *= taylorInvSqrt(dot(p2,p2)); -+#endif -+ -+ vec3 g = 2.0 * vec3( dot(p0, x0), dot(p1, x1), dot(p2, x2) ); -+#else -+// N points around a unit circle. -+ vec3 phi = D.z * mod(p,pParam.w) /pParam.w ; -+ vec4 a0 = sin(phi.xxyy+D.xyxy); -+ vec2 a1 = sin(phi.zz +D.xy); -+ vec3 g = vec3( dot(a0.xy, x0), dot(a0.zw, x1), dot(a1.xy, x2) ); -+#endif -+// mix -+ vec3 m = max(0.5 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); -+ m = m*m ; -+ return 1.66666* 70.*dot(m*m, g); -+ } -+ -+float simplexNoise3(vec3 v) -+ { -+ const vec2 C = vec2(1./6. , 1./3. ) ; -+ const vec4 D = vec4(0., 0.5, 1.0, 2.0); -+ -+// First corner -+ vec3 i = floor(v + dot(v, C.yyy) ); -+ vec3 x0 = v - i + dot(i, C.xxx) ; -+ -+// Other corners -+#ifdef COLLAPSE_SORTNET -+ vec3 g = vec3( greaterThan( x0.xyz, x0.yzx) ); -+ vec3 l = vec3( lessThanEqual( x0.xyz, x0.yzx) ); -+ -+ vec3 i1 = g.xyz * l.zxy; -+ vec3 i2 = max( g.xyz, l.zxy); -+#else -+// Keeping this clean - let the compiler optimize. -+ vec3 q1; -+ q1.x = max(x0.x, x0.y); -+ q1.y = min(x0.x, x0.y); -+ q1.z = x0.z; -+ -+ vec3 q2; -+ q2.x = max(q1.x,q1.z); -+ q2.z = min(q1.x,q1.z); -+ q2.y = q1.y; -+ -+ vec3 q3; -+ q3.y = max(q2.y, q2.z); -+ q3.z = min(q2.y, q2.z); -+ q3.x = q2.x; -+ -+ vec3 i1 = vec3(equal(q3.xxx, x0)); -+ vec3 i2 = i1 + vec3(equal(q3.yyy, x0)); -+#endif -+ -+ // x0 = x0 - 0. + 0. * C -+ vec3 x1 = x0 - i1 + 1. * C.xxx; -+ vec3 x2 = x0 - i2 + 2. * C.xxx; -+ vec3 x3 = x0 - 1. + 3. * C.xxx; -+ -+// Permutations -+ i = mod(i, pParam.x ); -+ vec4 p = permute( permute( permute( -+ i.z + vec4(0., i1.z, i2.z, 1. ), pParam.xyz) -+ + i.y + vec4(0., i1.y, i2.y, 1. ), pParam.xyz) -+ + i.x + vec4(0., i1.x, i2.x, 1. ), pParam.xyz); -+ -+// Gradients -+// ( N*N points uniformly over a square, mapped onto a octohedron.) -+ float n_ = 1.0/pParam.w ; -+ vec3 ns = n_ * D.wyz - D.xzx ; -+ -+ vec4 j = p - pParam.w*pParam.w*floor(p * ns.z *ns.z); // mod(p,N*N) -+ -+ vec4 x_ = floor(j * ns.z) ; -+ vec4 y_ = floor(j - pParam.w * x_ ) ; // mod(j,N) -+ -+ vec4 x = x_ *ns.x + ns.yyyy; -+ vec4 y = y_ *ns.x + ns.yyyy; -+ vec4 h = 1. - abs(x) - abs(y); -+ -+ vec4 b0 = vec4( x.xy, y.xy ); -+ vec4 b1 = vec4( x.zw, y.zw ); -+ -+ vec4 s0 = vec4(lessThan(b0,D.xxxx)) *2. -1.; -+ vec4 s1 = vec4(lessThan(b1,D.xxxx)) *2. -1.; -+ vec4 sh = vec4(lessThan(h, D.xxxx)); -+ -+ vec4 a0 = b0.xzyw + s0.xzyw*sh.xxyy ; -+ vec4 a1 = b1.xzyw + s1.xzyw*sh.zzww ; -+ -+ vec3 p0 = vec3(a0.xy,h.x); -+ vec3 p1 = vec3(a0.zw,h.y); -+ vec3 p2 = vec3(a1.xy,h.z); -+ vec3 p3 = vec3(a1.zw,h.w); -+ -+#ifdef NORMALISE_GRADIENTS -+ p0 *= taylorInvSqrt(dot(p0,p0)); -+ p1 *= taylorInvSqrt(dot(p1,p1)); -+ p2 *= taylorInvSqrt(dot(p2,p2)); -+ p3 *= taylorInvSqrt(dot(p3,p3)); -+#endif -+ -+// Mix -+ vec4 m = max(0.6 - vec4(dot(x0,x0), dot(x1,x1), dot(x2,x2), dot(x3,x3)), 0.); -+ m = m * m; -+//used to be 64. -+ return 48.0 * dot( m*m, vec4( dot(p0,x0), dot(p1,x1), -+ dot(p2,x2), dot(p3,x3) ) ); -+ } -+ -+vec4 grad4(float j, vec4 ip) -+ { -+ const vec4 ones = vec4(1.,1.,1.,-1.); -+ vec4 p,s; -+ -+ p.xyz = floor( fract (vec3(j) * ip.xyz) *pParam.w) * ip.z -1.0; -+ p.w = 1.5 - dot(abs(p.xyz), ones.xyz); -+ s = vec4(lessThan(p,vec4(0.))); -+ p.xyz = p.xyz + (s.xyz*2.-1.) * s.www; -+ -+ return p; -+ } -+ -+float simplexNoise4(vec4 v) -+ { -+ const vec2 C = vec2( 0.138196601125010504, // (5 - sqrt(5))/20 G4 -+ 0.309016994374947451); // (sqrt(5) - 1)/4 F4 -+// First corner -+ vec4 i = floor(v + dot(v, C.yyyy) ); -+ vec4 x0 = v - i + dot(i, C.xxxx); -+ -+// Other corners -+ -+// Force existance of strict total ordering in sort. -+ vec4 q0 = floor(x0 * 1024.0) + vec4( 0., 1./4., 2./4. , 3./4.); -+ vec4 q1; -+ q1.xy = max(q0.xy,q0.zw); // x:z y:w -+ q1.zw = min(q0.xy,q0.zw); -+ -+ vec4 q2; -+ q2.xz = max(q1.xz,q1.yw); // x:y z:w -+ q2.yw = min(q1.xz,q1.yw); -+ -+ vec4 q3; -+ q3.y = max(q2.y,q2.z); // y:z -+ q3.z = min(q2.y,q2.z); -+ q3.xw = q2.xw; -+ -+ vec4 i1 = vec4(lessThanEqual(q3.xxxx, q0)); -+ vec4 i2 = vec4(lessThanEqual(q3.yyyy, q0)); -+ vec4 i3 = vec4(lessThanEqual(q3.zzzz, q0)); -+ -+ // x0 = x0 - 0. + 0. * C -+ vec4 x1 = x0 - i1 + 1. * C.xxxx; -+ vec4 x2 = x0 - i2 + 2. * C.xxxx; -+ vec4 x3 = x0 - i3 + 3. * C.xxxx; -+ vec4 x4 = x0 - 1. + 4. * C.xxxx; -+ -+// Permutations -+ i = mod(i, pParam.x ); -+ float j0 = permute( permute( permute( permute ( -+ i.w, pParam.xyz) + i.z, pParam.xyz) -+ + i.y, pParam.xyz) + i.x, pParam.xyz); -+ vec4 j1 = permute( permute( permute( permute ( -+ i.w + vec4(i1.w, i2.w, i3.w, 1. ), pParam.xyz) -+ + i.z + vec4(i1.z, i2.z, i3.z, 1. ), pParam.xyz) -+ + i.y + vec4(i1.y, i2.y, i3.y, 1. ), pParam.xyz) -+ + i.x + vec4(i1.x, i2.x, i3.x, 1. ), pParam.xyz); -+// Gradients -+// ( N*N*N points uniformly over a cube, mapped onto a 4-octohedron.) -+ vec4 ip = pParam ; -+ ip.xy *= pParam.w ; -+ ip.x *= pParam.w ; -+ ip = vec4(1.,1.,1.,2.) / ip ; -+ -+ vec4 p0 = grad4(j0, ip); -+ vec4 p1 = grad4(j1.x, ip); -+ vec4 p2 = grad4(j1.y, ip); -+ vec4 p3 = grad4(j1.z, ip); -+ vec4 p4 = grad4(j1.w, ip); -+ -+#ifdef NORMALISE_GRADIENTS -+ p0 *= taylorInvSqrt(dot(p0,p0)); -+ p1 *= taylorInvSqrt(dot(p1,p1)); -+ p2 *= taylorInvSqrt(dot(p2,p2)); -+ p3 *= taylorInvSqrt(dot(p3,p3)); -+ p4 *= taylorInvSqrt(dot(p4,p4)); -+#endif -+ -+// Mix -+ vec3 m0 = max(0.6 - vec3(dot(x0,x0), dot(x1,x1), dot(x2,x2)), 0.); -+ vec2 m1 = max(0.6 - vec2(dot(x3,x3), dot(x4,x4) ), 0.); -+ m0 = m0 * m0; -+ m1 = m1 * m1; -+ return 32. * ( dot(m0*m0, vec3( dot( p0, x0 ), dot( p1, x1 ), dot( p2, x2 ))) -+ + dot(m1*m1, vec2( dot( p3, x3 ), dot( p4, x4 ) ) ) ) ; -+ -+ } -+ -+ -+ -diff --git a/src/glsl/skinning.vert b/src/glsl/skinning.vert -new file mode 100644 -index 0000000..28970ee ---- /dev/null -+++ b/src/glsl/skinning.vert -@@ -0,0 +1,24 @@ -+// Vertex weighting/blendin shader -+// Brian Paul -+// 4 Nov 2008 -+ -+uniform mat4 mat0, mat1; -+attribute float weight; -+ -+void main() -+{ -+ // simple diffuse shading -+ // Note that we should really transform the normal vector along with -+ // the postion below... someday. -+ vec3 lightVec = vec3(0, 0, 1); -+ vec3 norm = gl_NormalMatrix * gl_Normal; -+ float dot = 0.2 + max(0.0, dot(norm, lightVec)); -+ gl_FrontColor = vec4(dot); -+ -+ // compute sum of weighted transformations -+ vec4 pos0 = mat0 * gl_Vertex; -+ vec4 pos1 = mat1 * gl_Vertex; -+ vec4 pos = mix(pos0, pos1, weight); -+ -+ gl_Position = gl_ModelViewProjectionMatrix * pos; -+} -diff --git a/src/perf/glslstateschange1.frag b/src/perf/glslstateschange1.frag -new file mode 100644 -index 0000000..0839436 ---- /dev/null -+++ b/src/perf/glslstateschange1.frag -@@ -0,0 +1,19 @@ -+// Multi-texture fragment shader -+// Brian Paul -+ -+// Composite second texture over first. -+// We're assuming the 2nd texture has a meaningful alpha channel. -+ -+uniform sampler2D tex1; -+uniform sampler2D tex2; -+uniform vec4 UniV1; -+uniform vec4 UniV2; -+ -+void main() -+{ -+ vec4 t3; -+ vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); -+ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); -+ t3 = mix(t1, t2, t2.w); -+ gl_FragColor = t3 + UniV1 + UniV2; -+} -diff --git a/src/perf/glslstateschange1.vert b/src/perf/glslstateschange1.vert -new file mode 100644 -index 0000000..cef50db ---- /dev/null -+++ b/src/perf/glslstateschange1.vert -@@ -0,0 +1,14 @@ -+// Multi-texture vertex shader -+// Brian Paul -+ -+ -+attribute vec4 TexCoord0, TexCoord1; -+attribute vec4 VertCoord; -+ -+void main() -+{ -+ gl_TexCoord[0] = TexCoord0; -+ gl_TexCoord[1] = TexCoord1; -+ // note: may use gl_Vertex or VertCoord here for testing: -+ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -+} -diff --git a/src/perf/glslstateschange2.frag b/src/perf/glslstateschange2.frag -new file mode 100644 -index 0000000..0df0319 ---- /dev/null -+++ b/src/perf/glslstateschange2.frag -@@ -0,0 +1,17 @@ -+// Multi-texture fragment shader -+// Brian Paul -+ -+// Composite second texture over first. -+// We're assuming the 2nd texture has a meaningful alpha channel. -+ -+uniform sampler2D tex1; -+uniform sampler2D tex2; -+uniform vec4 UniV1; -+uniform vec4 UniV2; -+ -+void main() -+{ -+ vec4 t1 = texture2D(tex1, gl_TexCoord[0].xy); -+ vec4 t2 = texture2D(tex2, gl_TexCoord[1].xy); -+ gl_FragColor = t1 + t2 + UniV1 + UniV2; -+} -diff --git a/src/perf/glslstateschange2.vert b/src/perf/glslstateschange2.vert -new file mode 100644 -index 0000000..cef50db ---- /dev/null -+++ b/src/perf/glslstateschange2.vert -@@ -0,0 +1,14 @@ -+// Multi-texture vertex shader -+// Brian Paul -+ -+ -+attribute vec4 TexCoord0, TexCoord1; -+attribute vec4 VertCoord; -+ -+void main() -+{ -+ gl_TexCoord[0] = TexCoord0; -+ gl_TexCoord[1] = TexCoord1; -+ // note: may use gl_Vertex or VertCoord here for testing: -+ gl_Position = gl_ModelViewProjectionMatrix * gl_Vertex; -+} -diff --git a/src/vpglsl/infinite-loop.glsl b/src/vpglsl/infinite-loop.glsl -new file mode 100644 -index 0000000..bc7ae4b ---- /dev/null -+++ b/src/vpglsl/infinite-loop.glsl -@@ -0,0 +1,8 @@ -+void main() { -+ gl_Position = gl_Vertex; -+ vec4 sum = vec4(0); -+ for (int i = 1; i != 2; i += 2) { -+ sum += vec4(0.1, 0.1, 0.1, 0.1); -+ } -+ gl_FrontColor = sum; -+} --- -2.0.0 - diff --git a/meta-citadel/recipes-support/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch b/meta-citadel/recipes-support/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch deleted file mode 100644 index f77b97f..0000000 --- a/meta-citadel/recipes-support/mesa/mesa-demos/0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch +++ /dev/null @@ -1,234 +0,0 @@ -From 5e10108d76a59abac21c7e540bcfd2ddaccca2cb Mon Sep 17 00:00:00 2001 -From: Drew Moseley -Date: Fri, 9 May 2014 11:50:24 -0400 -Subject: [PATCH 4/9] Use DEMOS_DATA_DIR to locate data files - -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=78496] -Signed-off-by: Drew Moseley ---- - src/glsl/bezier.c | 2 +- - src/glsl/blinking-teapot.c | 4 ++-- - src/glsl/brick.c | 4 ++-- - src/glsl/bump.c | 6 +++--- - src/glsl/convolutions.c | 2 +- - src/glsl/mandelbrot.c | 4 ++-- - src/glsl/multitex.c | 4 ++-- - src/glsl/simplex-noise.c | 2 +- - src/glsl/skinning.c | 4 ++-- - src/glsl/texdemo1.c | 8 ++++---- - src/glsl/toyball.c | 4 ++-- - src/objviewer/objview.c | 12 ++++++------ - src/perf/glslstateschange.c | 8 ++++---- - 13 files changed, 32 insertions(+), 32 deletions(-) - -diff --git a/src/glsl/bezier.c b/src/glsl/bezier.c -index 0b56bc1..e01603d 100644 ---- a/src/glsl/bezier.c -+++ b/src/glsl/bezier.c -@@ -13,7 +13,7 @@ - #include "glut_wrap.h" - #include "shaderutil.h" - --static const char *filename = "bezier.geom"; -+static const char *filename = DEMOS_DATA_DIR "bezier.geom"; - - static GLuint fragShader; - static GLuint vertShader; -diff --git a/src/glsl/blinking-teapot.c b/src/glsl/blinking-teapot.c -index e3bf24d..7662b1f 100644 ---- a/src/glsl/blinking-teapot.c -+++ b/src/glsl/blinking-teapot.c -@@ -63,8 +63,8 @@ init_opengl (void) - exit(1); - } - -- vshad_id = CompileShaderFile (GL_VERTEX_SHADER, "blinking-teapot.vert"); -- fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, "blinking-teapot.frag"); -+ vshad_id = CompileShaderFile (GL_VERTEX_SHADER, DEMOS_DATA_DIR "blinking-teapot.vert"); -+ fshad_id = CompileShaderFile (GL_FRAGMENT_SHADER, DEMOS_DATA_DIR "blinking-teapot.frag"); - prog_id = LinkShaders (vshad_id, fshad_id); - - UseProgram (prog_id); -diff --git a/src/glsl/brick.c b/src/glsl/brick.c -index 3021856..fe5f190 100644 ---- a/src/glsl/brick.c -+++ b/src/glsl/brick.c -@@ -14,8 +14,8 @@ - #include "shaderutil.h" - - --static char *FragProgFile = "CH06-brick.frag"; --static char *VertProgFile = "CH06-brick.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "CH06-brick.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "CH06-brick.vert"; - - /* program/shader objects */ - static GLuint fragShader; -diff --git a/src/glsl/bump.c b/src/glsl/bump.c -index 59f62cd..3a1b20a 100644 ---- a/src/glsl/bump.c -+++ b/src/glsl/bump.c -@@ -15,9 +15,9 @@ - #include "readtex.h" - - --static char *FragProgFile = "CH11-bumpmap.frag"; --static char *FragTexProgFile = "CH11-bumpmaptex.frag"; --static char *VertProgFile = "CH11-bumpmap.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "CH11-bumpmap.frag"; -+static char *FragTexProgFile = DEMOS_DATA_DIR "CH11-bumpmaptex.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "CH11-bumpmap.vert"; - static char *TextureFile = DEMOS_DATA_DIR "tile.rgb"; - - /* program/shader objects */ -diff --git a/src/glsl/convolutions.c b/src/glsl/convolutions.c -index a120cfe..9312f00 100644 ---- a/src/glsl/convolutions.c -+++ b/src/glsl/convolutions.c -@@ -340,7 +340,7 @@ static void init(void) - - menuInit(); - readTexture(textureLocation); -- createProgram("convolution.vert", "convolution.frag"); -+ createProgram(DEMOS_DATA_DIR "convolution.vert", DEMOS_DATA_DIR "convolution.frag"); - - glEnable(GL_TEXTURE_2D); - glClearColor(1.0, 1.0, 1.0, 1.0); -diff --git a/src/glsl/mandelbrot.c b/src/glsl/mandelbrot.c -index 31ede1d..ab34a0f 100644 ---- a/src/glsl/mandelbrot.c -+++ b/src/glsl/mandelbrot.c -@@ -14,8 +14,8 @@ - #include "shaderutil.h" - - --static char *FragProgFile = "CH18-mandel.frag"; --static char *VertProgFile = "CH18-mandel.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "CH18-mandel.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "CH18-mandel.vert"; - - /* program/shader objects */ - static GLuint fragShader; -diff --git a/src/glsl/multitex.c b/src/glsl/multitex.c -index 262ea50..546bd27 100644 ---- a/src/glsl/multitex.c -+++ b/src/glsl/multitex.c -@@ -35,8 +35,8 @@ - - static const char *Demo = "multitex"; - --static const char *VertFile = "multitex.vert"; --static const char *FragFile = "multitex.frag"; -+static const char *VertFile = DEMOS_DATA_DIR "multitex.vert"; -+static const char *FragFile = DEMOS_DATA_DIR "multitex.frag"; - - static const char *TexFiles[2] = - { -diff --git a/src/glsl/simplex-noise.c b/src/glsl/simplex-noise.c -index 13fdd5d..885f01e 100644 ---- a/src/glsl/simplex-noise.c -+++ b/src/glsl/simplex-noise.c -@@ -169,7 +169,7 @@ SpecialKey(int key, int x, int y) - static void - Init(void) - { -- const char *filename = "simplex-noise.glsl"; -+ const char *filename = DEMOS_DATA_DIR "simplex-noise.glsl"; - char noiseText[10000]; - FILE *f; - int len; -diff --git a/src/glsl/skinning.c b/src/glsl/skinning.c -index bf38d77..536d475 100644 ---- a/src/glsl/skinning.c -+++ b/src/glsl/skinning.c -@@ -20,8 +20,8 @@ - #define M_PI 3.1415926535 - #endif - --static char *FragProgFile = "skinning.frag"; --static char *VertProgFile = "skinning.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "skinning.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "skinning.vert"; - - /* program/shader objects */ - static GLuint fragShader; -diff --git a/src/glsl/texdemo1.c b/src/glsl/texdemo1.c -index 6cde239..a082342 100644 ---- a/src/glsl/texdemo1.c -+++ b/src/glsl/texdemo1.c -@@ -35,11 +35,11 @@ - - static const char *Demo = "texdemo1"; - --static const char *ReflectVertFile = "reflect.vert"; --static const char *CubeFragFile = "cubemap.frag"; -+static const char *ReflectVertFile = DEMOS_DATA_DIR "reflect.vert"; -+static const char *CubeFragFile = DEMOS_DATA_DIR "cubemap.frag"; - --static const char *SimpleVertFile = "simple.vert"; --static const char *SimpleTexFragFile = "shadowtex.frag"; -+static const char *SimpleVertFile = DEMOS_DATA_DIR "simple.vert"; -+static const char *SimpleTexFragFile = DEMOS_DATA_DIR "shadowtex.frag"; - - static const char *GroundImage = DEMOS_DATA_DIR "tile.rgb"; - -diff --git a/src/glsl/toyball.c b/src/glsl/toyball.c -index 5f27951..4e7e832 100644 ---- a/src/glsl/toyball.c -+++ b/src/glsl/toyball.c -@@ -14,8 +14,8 @@ - #include "shaderutil.h" - - --static char *FragProgFile = "CH11-toyball.frag"; --static char *VertProgFile = "CH11-toyball.vert"; -+static char *FragProgFile = DEMOS_DATA_DIR "CH11-toyball.frag"; -+static char *VertProgFile = DEMOS_DATA_DIR "CH11-toyball.vert"; - - /* program/shader objects */ - static GLuint fragShader; -diff --git a/src/objviewer/objview.c b/src/objviewer/objview.c -index 6def726..78a6acf 100644 ---- a/src/objviewer/objview.c -+++ b/src/objviewer/objview.c -@@ -162,12 +162,12 @@ init_model(void) - static void - init_skybox(void) - { -- SkyboxTex = LoadSkyBoxCubeTexture("alpine_east.rgb", -- "alpine_west.rgb", -- "alpine_up.rgb", -- "alpine_down.rgb", -- "alpine_south.rgb", -- "alpine_north.rgb"); -+ SkyboxTex = LoadSkyBoxCubeTexture(DEMOS_DATA_DIR "alpine_east.rgb", -+ DEMOS_DATA_DIR "alpine_west.rgb", -+ DEMOS_DATA_DIR "alpine_up.rgb", -+ DEMOS_DATA_DIR "alpine_down.rgb", -+ DEMOS_DATA_DIR "alpine_south.rgb", -+ DEMOS_DATA_DIR "alpine_north.rgb"); - glmSpecularTexture(Model, SkyboxTex); - } - -diff --git a/src/perf/glslstateschange.c b/src/perf/glslstateschange.c -index 7422b78..dbf8332 100644 ---- a/src/perf/glslstateschange.c -+++ b/src/perf/glslstateschange.c -@@ -33,10 +33,10 @@ - #include "glmain.h" - #include "common.h" - --static const char *VertFile1 = "glslstateschange1.vert"; --static const char *FragFile1 = "glslstateschange1.frag"; --static const char *VertFile2 = "glslstateschange2.vert"; --static const char *FragFile2 = "glslstateschange2.frag"; -+static const char *VertFile1 = DEMOS_DATA_DIR "glslstateschange1.vert"; -+static const char *FragFile1 = DEMOS_DATA_DIR "glslstateschange1.frag"; -+static const char *VertFile2 = DEMOS_DATA_DIR "glslstateschange2.vert"; -+static const char *FragFile2 = DEMOS_DATA_DIR "glslstateschange2.frag"; - static struct uniform_info Uniforms1[] = { - { "tex1", 1, GL_SAMPLER_2D, { 0, 0, 0, 0 }, -1 }, - { "tex2", 1, GL_SAMPLER_2D, { 1, 0, 0, 0 }, -1 }, --- -2.0.0 - diff --git a/meta-citadel/recipes-support/mesa/mesa-demos_8.5.0.bb b/meta-citadel/recipes-support/mesa/mesa-demos_8.5.0.bb deleted file mode 100644 index 12f41d7..0000000 --- a/meta-citadel/recipes-support/mesa/mesa-demos_8.5.0.bb +++ /dev/null @@ -1,43 +0,0 @@ -SUMMARY = "Mesa demo applications" -DESCRIPTION = "This package includes the demonstration application, such as glxgears. \ -These applications can be used for Mesa validation and benchmarking." -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" - -LICENSE = "MIT & PD" -LIC_FILES_CHKSUM = "file://src/xdemos/glxgears.c;beginline=1;endline=20;md5=914225785450eff644a86c871d3ae00e \ - file://src/xdemos/glxdemo.c;beginline=1;endline=8;md5=b01d5ab1aee94d35b7efaa2ef48e1a06" - -SRC_URI = "https://mesa.freedesktop.org/archive/demos/${PV}/${BPN}-${PV}.tar.bz2 \ - file://0001-mesa-demos-Add-missing-data-files.patch \ - file://0004-Use-DEMOS_DATA_DIR-to-locate-data-files.patch \ - " -SRC_URI[sha256sum] = "cea2df0a80f09a30f635c4eb1a672bf90c5ddee0b8e77f4d70041668ef71aac1" - -inherit meson pkgconfig features_check -# depends on virtual/egl, virtual/libgl ... -REQUIRED_DISTRO_FEATURES = "opengl x11" - -EXTRA_OEMESON = "-Dwith-system-data-files=true" - -PACKAGECONFIG ?= "drm egl gles1 gles2 \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11 wayland', d)}" - -PACKAGECONFIG[drm] = "-Dlibdrm=enabled,-Dlibdrm=disabled,libdrm" -PACKAGECONFIG[egl] = "-Degl=enabled,-Degl=disabled,virtual/egl" -PACKAGECONFIG[gles1] = "-Dgles1=enabled,-Dgles1=disabled,virtual/libgles1" -PACKAGECONFIG[gles2] = "-Dgles2=enabled,-Dgles2=disabled,virtual/libgles2" -PACKAGECONFIG[glut] = "-Dwith-glut=${STAGING_EXECPREFIXDIR},,freeglut" -PACKAGECONFIG[osmesa] = "-Dosmesa=enabled,-Dosmesa=disabled," -PACKAGECONFIG[wayland] = "-Dwayland=enabled,-Dwayland=disabled,virtual/libgl wayland wayland-native wayland-protocols" -PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,virtual/libx11 libglu" - -do_install:append() { - # it can be completely empty when all PACKAGECONFIG options are disabled - rmdir --ignore-fail-on-non-empty ${D}${bindir} - - if [ -f ${D}${bindir}/clear ]; then - mv ${D}${bindir}/clear ${D}${bindir}/clear.mesa-demos - fi -} diff --git a/meta-citadel/recipes-support/mesa/mesa-gl_24.0.2.bb b/meta-citadel/recipes-support/mesa/mesa-gl_24.0.2.bb deleted file mode 100644 index ca160f1..0000000 --- a/meta-citadel/recipes-support/mesa/mesa-gl_24.0.2.bb +++ /dev/null @@ -1,15 +0,0 @@ -require mesa.inc - -SUMMARY += " (OpenGL only, no EGL/GLES)" - -PROVIDES = "virtual/libgl virtual/mesa" - -S = "${WORKDIR}/mesa-${PV}" - -TARGET_CFLAGS = "-I${STAGING_INCDIR}/drm" - -# At least one DRI rendering engine is required to build mesa. -# When no X11 is available, use osmesa for the rendering engine. -PACKAGECONFIG ??= "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" -PACKAGECONFIG:class-target = "opengl gallium ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', 'osmesa', d)}" - diff --git a/meta-citadel/recipes-support/mesa/mesa.inc b/meta-citadel/recipes-support/mesa/mesa.inc deleted file mode 100644 index a8088e6..0000000 --- a/meta-citadel/recipes-support/mesa/mesa.inc +++ /dev/null @@ -1,369 +0,0 @@ -SUMMARY = "A free implementation of the OpenGL API" -DESCRIPTION = "Mesa is an open-source implementation of the OpenGL specification - \ -a system for rendering interactive 3D graphics. \ -A variety of device drivers allows Mesa to be used in many different environments \ -ranging from software emulation to complete hardware acceleration for modern GPUs. \ -Mesa is used as part of the overall Direct Rendering Infrastructure and X.org \ -environment." - -HOMEPAGE = "http://mesa3d.org" -BUGTRACKER = "https://bugs.freedesktop.org" -SECTION = "x11" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://docs/license.rst;md5=63779ec98d78d823a9dc533a0735ef10" - -PE = "2" - -SRC_URI = "https://mesa.freedesktop.org/archive/mesa-${PV}.tar.xz \ - file://0001-meson.build-check-for-all-linux-host_os-combinations.patch \ - file://0001-meson-misdetects-64bit-atomics-on-mips-clang.patch \ - file://0001-gallium-Fix-build-with-llvm-17.patch \ - file://0001-drisw-fix-build-without-dri3.patch \ - file://0002-glxext-don-t-try-zink-if-not-enabled-in-mesa.patch \ - file://0001-Revert-meson-do-not-pull-in-clc-for-clover.patch \ -" - -SRC_URI[sha256sum] = "94e28a8edad06d8ed2b83eb53f253b9eb5aa62c3080f939702e1b3039b56c9e8" - -UPSTREAM_CHECK_GITTAGREGEX = "mesa-(?P\d+(\.\d+)+)" - -#because we cannot rely on the fact that all apps will use pkgconfig, -#make eglplatform.h independent of MESA_EGL_NO_X11_HEADER -do_install:append() { - # sed can't find EGL/eglplatform.h as it doesn't get installed when glvnd enabled. - # So, check if EGL/eglplatform.h exists before running sed. - if ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'true', 'false', d)} && [ -f ${D}${includedir}/EGL/eglplatform.h ]; then - sed -i -e 's/^#elif defined(__unix__) && defined(EGL_NO_X11)$/#elif defined(__unix__) \&\& defined(EGL_NO_X11) || ${@bb.utils.contains('PACKAGECONFIG', 'x11', '0', '1', d)}/' ${D}${includedir}/EGL/eglplatform.h - fi -} - -DEPENDS = "expat makedepend-native flex-native bison-native libxml2-native zlib chrpath-replacement-native python3-mako-native gettext-native" -DEPENDS:append:class-target = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'mesa-native', '', d)}" -EXTRANATIVEPATH += "chrpath-native" -PROVIDES = " \ - ${@bb.utils.contains('PACKAGECONFIG', 'opengl', 'virtual/libgl', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'glvnd', 'virtual/libglx', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gles', 'virtual/libgles1 virtual/libgles2 virtual/libgles3', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'egl', 'virtual/egl', '', d)} \ - ${@bb.utils.contains('PACKAGECONFIG', 'gbm', 'virtual/libgbm', '', d)} \ - virtual/mesa \ - " - -inherit meson pkgconfig python3native gettext features_check - -BBCLASSEXTEND = "native nativesdk" - -ANY_OF_DISTRO_FEATURES = "opengl vulkan" - -PLATFORMS ??= "${@bb.utils.filter('PACKAGECONFIG', 'x11 wayland', d)}" - -# set the MESA_BUILD_TYPE to either 'release' (default) or 'debug' -# by default the upstream mesa sources build a debug release -# here we assume the user will want a release build by default -MESA_BUILD_TYPE ?= "release" -def check_buildtype(d): - _buildtype = d.getVar('MESA_BUILD_TYPE') - if _buildtype not in ['release', 'debug']: - bb.fatal("unknown build type (%s), please set MESA_BUILD_TYPE to either 'release' or 'debug'" % _buildtype) - if _buildtype == 'debug': - return 'debugoptimized' - return 'plain' -MESON_BUILDTYPE = "${@check_buildtype(d)}" - -EXTRA_OEMESON = " \ - -Dshared-glapi=enabled \ - -Dglx-read-only-text=true \ - -Dplatforms='${@",".join("${PLATFORMS}".split())}' \ -" - -EXTRA_OEMESON:append:class-target = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=system', '', d)}" -EXTRA_OEMESON:append:class-native = " ${@bb.utils.contains('PACKAGECONFIG', 'opencl', '-Dintel-clc=enabled', '', d)}" - -def strip_comma(s): - return s.strip(',') - -PACKAGECONFIG = " \ - gallium \ - video-codecs \ - ${@bb.utils.filter('DISTRO_FEATURES', 'x11 vulkan wayland', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'opengl egl gles gbm virgl', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'dri3', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'zink', '', d)} \ -" - -PACKAGECONFIG:append:class-native = "gallium-llvm r600" - -# "gbm" requires "opengl" -PACKAGECONFIG[gbm] = "-Dgbm=enabled,-Dgbm=disabled" - -X11_DEPS = "xorgproto virtual/libx11 libxext libxxf86vm libxdamage libxfixes xrandr" -# "x11" requires "opengl" -PACKAGECONFIG[x11] = ",-Dglx=disabled,${X11_DEPS}" -PACKAGECONFIG[wayland] = ",,wayland-native wayland libdrm wayland-protocols" - -PACKAGECONFIG[dri3] = "-Ddri3=enabled, -Ddri3=disabled, xorgproto libxshmfence" - -# Vulkan drivers need dri3 enabled -# amd could be enabled as well but requires gallium-llvm with llvm >= 3.9 -VULKAN_DRIVERS = "" -VULKAN_DRIVERS:append:x86 = ",intel,amd" -VULKAN_DRIVERS:append:x86-64 = ",intel,amd" -# i686 is a 32 bit override for mesa-native -VULKAN_DRIVERS:append:i686 = ",intel,amd" -VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" -VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'broadcom', ',broadcom', '', d)}" -VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', ',swrast', '', d)}" -VULKAN_DRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'imagination', ',imagination-experimental', '', d)}" -PACKAGECONFIG[vulkan] = "-Dvulkan-drivers=${@strip_comma('${VULKAN_DRIVERS}')}, -Dvulkan-drivers='',glslang-native vulkan-loader vulkan-headers" - -# mesa development and testing tools support, per driver -TOOLS = "" -TOOLS_DEPS = "" -TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" -TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" -TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" -TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" -TOOLS:append = "${@bb.utils.contains('PACKAGECONFIG', 'imagination', ',imagination', '', d)}" - -# dependencies for tools. -TOOLS_DEPS:append = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ' ncurses libxml2 ', '', d)}" - -# the fdperf tool requires libconfig (a part of meta-oe) so it needs special -# treatment in addition to the usual 'freedreno tools'. -PACKAGECONFIG[freedreno-fdperf] = ",,libconfig" - -PACKAGECONFIG[tools] = "-Dtools=${@strip_comma('${TOOLS}')}, -Dtools='', ${TOOLS_DEPS}" - -PACKAGECONFIG[opengl] = "-Dopengl=true, -Dopengl=false" -PACKAGECONFIG[glvnd] = "-Dglvnd=true, -Dglvnd=false, libglvnd" - -# "gles" requires "opengl" -PACKAGECONFIG[gles] = "-Dgles1=enabled -Dgles2=enabled, -Dgles1=disabled -Dgles2=disabled" - -# "egl" requires "opengl" -PACKAGECONFIG[egl] = "-Degl=enabled, -Degl=disabled" - -# "opencl" requires libclc from meta-clang and spirv-tools from OE-Core -OPENCL_NATIVE = "${@bb.utils.contains('PACKAGECONFIG', 'freedreno', '-Dopencl-native=true', '', d)}" -PACKAGECONFIG[opencl] = "-Dgallium-opencl=icd -Dopencl-spirv=true ${OPENCL_NATIVE},-Dgallium-opencl=disabled -Dopencl-spirv=false,libclc spirv-tools python3-ply-native" - -PACKAGECONFIG[broadcom] = "" -PACKAGECONFIG[etnaviv] = "" -PACKAGECONFIG[freedreno] = "" -PACKAGECONFIG[kmsro] = "" -PACKAGECONFIG[vc4] = "" -PACKAGECONFIG[v3d] = "" -PACKAGECONFIG[zink] = "" - -GALLIUMDRIVERS = "swrast" -# gallium swrast was found to crash Xorg on startup in x32 qemu -GALLIUMDRIVERS:x86-x32 = "" -GALLIUMDRIVERS:append:x86 = ",i915,iris,crocus" -GALLIUMDRIVERS:append:x86-64 = ",i915,iris,crocus" -# i686 is a 32 bit override for mesa-native -GALLIUMDRIVERS:append:i686 = ",i915,iris,crocus" - -GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'etnaviv', ',etnaviv', '', d)}" -GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'freedreno', ',freedreno', '', d)}" -GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'kmsro', ',kmsro', '', d)}" -GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'vc4', ',vc4', '', d)}" -GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'v3d', ',v3d', '', d)}" -GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'zink', ',zink', '', d)}" - -# radeonsi requires LLVM -GALLIUMDRIVERS_RADEONSI = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',radeonsi', '', d)}" -GALLIUMDRIVERS_LLVM = ",r300,nouveau${GALLIUMDRIVERS_RADEONSI}" -GALLIUMDRIVERS_LLVM:append:x86 = ",svga" -GALLIUMDRIVERS_LLVM:append:x86-64 = ",svga" -# i686 is a 32 bit override for mesa-native -GALLIUMDRIVERS_LLVM:append:i686 = ",svga" - -PACKAGECONFIG[r600] = "" -PACKAGECONFIG[virgl] = "" - -GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'gallium-llvm', '${GALLIUMDRIVERS_LLVM}', '', d)}" -GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'r600', ',r600', '', d)}" -GALLIUMDRIVERS:append = "${@bb.utils.contains('PACKAGECONFIG', 'virgl', ',virgl', '', d)}" - -PACKAGECONFIG[gallium] = "-Dgallium-drivers=${@strip_comma('${GALLIUMDRIVERS}')}, -Dgallium-drivers='', libdrm" -PACKAGECONFIG[gallium-llvm] = "-Dllvm=enabled -Dshared-llvm=enabled, -Dllvm=disabled, llvm llvm-native elfutils" -PACKAGECONFIG[xa] = "-Dgallium-xa=enabled, -Dgallium-xa=disabled" -PACKAGECONFIG[va] = "-Dgallium-va=enabled,-Dgallium-va=disabled,libva-initial" -PACKAGECONFIG[vdpau] = "-Dgallium-vdpau=enabled,-Dgallium-vdpau=disabled,libvdpau" - -PACKAGECONFIG[imagination] = "-Dimagination-srv=true,-Dimagination-srv=false" - -PACKAGECONFIG[lima] = "" -GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'lima', ',lima', '', d)}" - -PACKAGECONFIG[panfrost] = "" -GALLIUMDRIVERS:append ="${@bb.utils.contains('PACKAGECONFIG', 'panfrost', ',panfrost', '', d)}" - -PACKAGECONFIG[vulkan-beta] = "-Dvulkan-beta=true,-Dvulkan-beta=false" - -PACKAGECONFIG[osmesa] = "-Dosmesa=true,-Dosmesa=false" - -PACKAGECONFIG[perfetto] = "-Dperfetto=true,-Dperfetto=false,libperfetto" - -PACKAGECONFIG[unwind] = "-Dlibunwind=enabled,-Dlibunwind=disabled,libunwind" - -PACKAGECONFIG[lmsensors] = "-Dlmsensors=enabled,-Dlmsensors=disabled,lmsensors" - -VIDEO_CODECS ?= "${@bb.utils.contains('LICENSE_FLAGS_ACCEPTED', 'commercial', 'all', 'all_free', d)}" -PACKAGECONFIG[video-codecs] = "-Dvideo-codecs=${VIDEO_CODECS}, -Dvideo-codecs=''" - -# llvmpipe is slow if compiled with -fomit-frame-pointer (e.g. -O2) -FULL_OPTIMIZATION:append = " -fno-omit-frame-pointer" - -CFLAGS:append:armv5 = " -DMISSING_64BIT_ATOMICS" -CFLAGS:append:armv6 = " -DMISSING_64BIT_ATOMICS" - -# Remove the mesa dependency on mesa-dev, as mesa is empty -DEV_PKG_DEPENDENCY = "" - -# Khronos documentation says that include/GLES2/gl2ext.h can be used for -# OpenGL ES 3 specification as well as for OpenGL ES 2. -# There can be applications including GLES2/gl2ext.h instead of GLES3/gl3ext.h -# meaning we should probably bring in GLES2/gl2ext.h if someone asks for -# development package of libgles3. -RDEPENDS:libgles3-mesa-dev += "libgles2-mesa-dev" - -RDEPENDS:libopencl-mesa += "${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'libclc spirv-tools', '', d)}" - -PACKAGES =+ "libegl-mesa libegl-mesa-dev \ - libosmesa libosmesa-dev \ - libgl-mesa libgl-mesa-dev \ - libglx-mesa libglx-mesa-dev \ - libglapi libglapi-dev \ - libgbm libgbm-dev \ - libgles1-mesa libgles1-mesa-dev \ - libgles2-mesa libgles2-mesa-dev \ - libgles3-mesa libgles3-mesa-dev \ - libopencl-mesa libopencl-mesa-dev \ - libxatracker libxatracker-dev \ - mesa-megadriver mesa-vulkan-drivers \ - mesa-vdpau-drivers mesa-tools \ - " - -do_install:append () { - # Drivers never need libtool .la files - rm -f ${D}${libdir}/dri/*.la - rm -f ${D}${libdir}/egl/*.la - rm -f ${D}${libdir}/gallium-pipe/*.la - rm -f ${D}${libdir}/gbm/*.la - - # libwayland-egl has been moved to wayland 1.15+ - rm -f ${D}${libdir}/libwayland-egl* - rm -f ${D}${libdir}/pkgconfig/wayland-egl.pc -} - -do_install:append:class-native () { - if ${@bb.utils.contains('PACKAGECONFIG', 'opencl', 'true', 'false', d)}; then - install -d ${D}${bindir} - install -m0755 ${B}/src/intel/compiler/intel_clc ${D}${bindir} - fi -} - -# For the packages that make up the OpenGL interfaces, inject variables so that -# they don't get Debian-renamed (which would remove the -mesa suffix), and -# RPROVIDEs/RCONFLICTs on the generic libgl name. -python __anonymous() { - pkgconfig = (d.getVar('PACKAGECONFIG') or "").split() - suffix = "" - if "-native" in d.getVar("PN"): - suffix = "-native" - for p in (("egl", "libegl", "libegl1"), - ("opengl", "libgl", "libgl1"), - ("glvnd", "libglx",), - ("gles", "libgles1", "libglesv1-cm1"), - ("gles", "libgles2", "libglesv2-2"), - ("gles", "libgles3",), - ("opencl", "libopencl",)): - if not p[0] in pkgconfig: - continue - mlprefix = d.getVar("MLPREFIX") - fullp = mlprefix + p[1] + "-mesa" + suffix - mlprefix = d.getVar("MLPREFIX") - pkgs = " " + " ".join(mlprefix + x + suffix for x in p[1:]) - d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") - d.appendVar("RREPLACES:" + fullp, pkgs) - d.appendVar("RPROVIDES:" + fullp, pkgs) - d.appendVar("RCONFLICTS:" + fullp, pkgs) - - d.appendVar("RRECOMMENDS:" + fullp, " ${MLPREFIX}mesa-megadriver" + suffix) - - # For -dev, the first element is both the Debian and original name - fullp = mlprefix + p[1] + "-mesa-dev" + suffix - pkgs = " " + mlprefix + p[1] + "-dev" + suffix - d.setVar("DEBIAN_NOAUTONAME:" + fullp, "1") - d.appendVar("RREPLACES:" + fullp, pkgs) - d.appendVar("RPROVIDES:" + fullp, pkgs) - d.appendVar("RCONFLICTS:" + fullp, pkgs) -} - -python mesa_populate_packages() { - pkgs = ['mesa', 'mesa-dev', 'mesa-dbg'] - for pkg in pkgs: - d.setVar("RPROVIDES:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - d.setVar("RCONFLICTS:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - d.setVar("RREPLACES:%s" % pkg, pkg.replace("mesa", "mesa-dri", 1)) - - import re - dri_drivers_root = oe.path.join(d.getVar('PKGD'), d.getVar('libdir'), "dri") - if os.path.isdir(dri_drivers_root): - dri_pkgs = sorted(os.listdir(dri_drivers_root)) - lib_name = d.expand("${MLPREFIX}mesa-megadriver") - for p in dri_pkgs: - m = re.match(r'^(.*)_dri\.so$', p) - if m: - pkg_name = " ${MLPREFIX}mesa-driver-%s" % legitimize_package_name(m.group(1)) - d.appendVar("RPROVIDES:%s" % lib_name, pkg_name) - d.appendVar("RCONFLICTS:%s" % lib_name, pkg_name) - d.appendVar("RREPLACES:%s" % lib_name, pkg_name) - - pipe_drivers_root = os.path.join(d.getVar('libdir'), "gallium-pipe") - do_split_packages(d, pipe_drivers_root, r'^pipe_(.*)\.so$', 'mesa-driver-pipe-%s', 'Mesa %s pipe driver', extra_depends='') -} - -PACKAGESPLITFUNCS =+ "mesa_populate_packages" - -PACKAGES_DYNAMIC += "^mesa-driver-.*" -PACKAGES_DYNAMIC:class-native = "^mesa-driver-.*-native" - -FILES:mesa-megadriver = "${libdir}/dri/* ${datadir}/drirc.d" -FILES:mesa-vulkan-drivers = "${libdir}/libvulkan_*.so ${libdir}/libpowervr_rogue.so ${datadir}/vulkan" -FILES:${PN}-vdpau-drivers = "${libdir}/vdpau/*.so.*" -FILES:libegl-mesa = "${libdir}/libEGL*.so.* ${datadir}/glvnd/egl_vendor.d" -FILES:libgbm = "${libdir}/libgbm.so.*" -FILES:libgles1-mesa = "${libdir}/libGLESv1*.so.*" -FILES:libgles2-mesa = "${libdir}/libGLESv2.so.*" -FILES:libgl-mesa = "${libdir}/libGL.so.*" -FILES:libglx-mesa = "${libdir}/libGLX*.so.*" -FILES:libopencl-mesa = "${libdir}/libMesaOpenCL.so.* ${libdir}/gallium-pipe/*.so ${sysconfdir}/OpenCL/vendors/mesa.icd" -FILES:libglapi = "${libdir}/libglapi.so.*" -FILES:libosmesa = "${libdir}/libOSMesa.so.*" -FILES:libxatracker = "${libdir}/libxatracker.so.*" - -FILES:${PN}-dev = "${libdir}/pkgconfig/dri.pc ${includedir}/vulkan ${libdir}/vdpau/*.so" -FILES:libegl-mesa-dev = "${libdir}/libEGL*.* ${includedir}/EGL ${includedir}/KHR ${libdir}/pkgconfig/egl.pc" -FILES:libgbm-dev = "${libdir}/libgbm.* ${libdir}/pkgconfig/gbm.pc ${includedir}/gbm.h" -FILES:libgl-mesa-dev = "${libdir}/libGL.* ${includedir}/GL ${libdir}/pkgconfig/gl.pc" -FILES:libglx-mesa-dev = "${libdir}/libGLX*.*" -FILES:libglapi-dev = "${libdir}/libglapi.*" -FILES:libgles1-mesa-dev = "${libdir}/libGLESv1*.* ${includedir}/GLES ${libdir}/pkgconfig/glesv1*.pc" -FILES:libgles2-mesa-dev = "${libdir}/libGLESv2.* ${includedir}/GLES2 ${libdir}/pkgconfig/glesv2.pc" -FILES:libgles3-mesa-dev = "${includedir}/GLES3" -FILES:libopencl-mesa-dev = "${libdir}/libMesaOpenCL.so" -FILES:libosmesa-dev = "${libdir}/libOSMesa.* ${includedir}/GL/osmesa.h ${libdir}/pkgconfig/osmesa.pc" -FILES:libxatracker-dev = "${libdir}/libxatracker.so ${libdir}/libxatracker.la \ - ${includedir}/xa_tracker.h ${includedir}/xa_composite.h ${includedir}/xa_context.h \ - ${libdir}/pkgconfig/xatracker.pc" -# catch all to get all the tools and data -FILES:${PN}-tools = "${bindir} ${datadir}" -ALLOW_EMPTY:${PN}-tools = "1" - -# Fix upgrade path from mesa to mesa-megadriver -RREPLACES:mesa-megadriver = "mesa" -RCONFLICTS:mesa-megadriver = "mesa" -RPROVIDES:mesa-megadriver = "mesa" diff --git a/meta-citadel/recipes-support/mesa/mesa_24.0.2.bb b/meta-citadel/recipes-support/mesa/mesa_24.0.2.bb deleted file mode 100644 index 96e8aa3..0000000 --- a/meta-citadel/recipes-support/mesa/mesa_24.0.2.bb +++ /dev/null @@ -1,2 +0,0 @@ -require ${BPN}.inc - diff --git a/meta-citadel/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch b/meta-citadel/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch new file mode 100644 index 0000000..8515075 --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/0001-Fix-Wincompatible-function-pointer-types.patch @@ -0,0 +1,39 @@ +From d24dc9bebaefbd8abf32707bad5efc0c811c0cd4 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Wed, 18 Jan 2023 13:04:56 -0800 +Subject: [PATCH] Fix -Wincompatible-function-pointer-types + +Fixes warnings with clang16 +testfile.c:576:31: error: incompatible function pointer types passing 'PRInt32 (void *)' (aka 'int (void *)') to parameter of type 'void (*)(void *)' [-Wincompatible-function-pointe r-types] + +Upstream-Status: Pending +Signed-off-by: Khem Raj +--- + pr/tests/testfile.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/pr/tests/testfile.c b/pr/tests/testfile.c +index 79d8a05..42aa6a7 100644 +--- a/pr/tests/testfile.c ++++ b/pr/tests/testfile.c +@@ -123,7 +123,7 @@ PRThread* create_new_thread(PRThreadType type, + if (native_thread) { + #if defined(_PR_PTHREADS) + pthread_t tid; +- if (!pthread_create(&tid, NULL, start, arg)) { ++ if (!pthread_create(&tid, NULL, (void*(*)(void*))start, arg)) { + return((PRThread *) tid); + } + else { +@@ -573,7 +573,7 @@ static PRInt32 RunDirTest(void) + + thrarg.done= 0; + t = create_new_thread(PR_USER_THREAD, +- DirTest, &thrarg, ++ (void (*)(void *))DirTest, &thrarg, + PR_PRIORITY_NORMAL, + PR_LOCAL_THREAD, + PR_UNJOINABLE_THREAD, +-- +2.39.1 + diff --git a/meta-citadel/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch b/meta-citadel/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch new file mode 100644 index 0000000..6ebc9c4 --- /dev/null +++ b/meta-citadel/recipes-support/nspr/nspr/0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch @@ -0,0 +1,30 @@ +From 13e9d66c24d1dce5179805ae5e1bf940409b4914 Mon Sep 17 00:00:00 2001 +From: Mingli Yu +Date: Wed, 10 Aug 2022 15:21:07 +0800 +Subject: [PATCH] config/nspr-config.in: don't pass LDFLAGS + +Don't pass LDFLAGS to avoid exposing the build env info. + +Upstream-Status: Inappropriate [oe specific] + +Signed-off-by: Mingli Yu +--- + config/nspr-config.in | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/config/nspr-config.in b/config/nspr-config.in +index 2cb62a0..2bec715 100755 +--- a/config/nspr-config.in ++++ b/config/nspr-config.in +@@ -136,7 +136,7 @@ if test "$echo_libs" = "yes"; then + if test -n "$lib_nspr"; then + libdirs="$libdirs -lnspr${major_version}" + fi +- os_ldflags="@LDFLAGS@" ++ os_ldflags="LDFLAGS" + for i in $os_ldflags ; do + if echo $i | grep \^-L >/dev/null; then + libdirs="$libdirs $i" +-- +2.25.1 + diff --git a/meta-citadel/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch b/meta-citadel/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch index d2b9bf6..09855a0 100644 --- a/meta-citadel/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch +++ b/meta-citadel/recipes-support/nspr/nspr/0001-md-Fix-build-with-musl.patch @@ -1,4 +1,4 @@ -From 147f3c2acbd96d44025cec11800ded0282327764 Mon Sep 17 00:00:00 2001 +From 5f6fcaeb0b7a319c8afd32ddb48b3515b63a6c0c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Mon, 18 Sep 2017 17:22:43 -0700 Subject: [PATCH] md: Fix build with musl @@ -6,24 +6,17 @@ Subject: [PATCH] md: Fix build with musl The MIPS specific header is not provided by musl linux kernel headers provide which has same definitions -Signed-off-by: Khem Raj ---- Upstream-Status: Pending +Signed-off-by: Khem Raj +--- pr/include/md/_linux.cfg | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) +diff --git a/pr/include/md/_linux.cfg b/pr/include/md/_linux.cfg +index aa3af78..899826f 100644 --- a/pr/include/md/_linux.cfg +++ b/pr/include/md/_linux.cfg -@@ -499,7 +499,7 @@ - #elif defined(__mips__) - - /* For _ABI64 */ --#include -+#include - - #ifdef __MIPSEB__ - #define IS_BIG_ENDIAN 1 @@ -511,7 +511,7 @@ #error "Unknown MIPS endianness." #endif diff --git a/meta-citadel/recipes-support/nspr/nspr/0002-Add-nios2-support.patch b/meta-citadel/recipes-support/nspr/nspr/0002-Add-nios2-support.patch index 3a04d42..dab2a4e 100644 --- a/meta-citadel/recipes-support/nspr/nspr/0002-Add-nios2-support.patch +++ b/meta-citadel/recipes-support/nspr/nspr/0002-Add-nios2-support.patch @@ -1,4 +1,4 @@ -From 95bda64fb4cf1825fea745e918cfe8202843f0ba Mon Sep 17 00:00:00 2001 +From 4760065a58153e4dae24e4e437a5136592c624bc Mon Sep 17 00:00:00 2001 From: Marek Vasut Date: Sat, 30 Jan 2016 07:18:02 +0100 Subject: [PATCH] Add nios2 support @@ -7,15 +7,14 @@ Add support for the nios2 CPU. Signed-off-by: Marek Vasut Upstream-Status: Submitted [ https://bugzilla.mozilla.org/show_bug.cgi?id=1244421 ] ---- - nspr/pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++++++++++ - nspr/pr/include/md/_linux.h | 14 ++++++++++++++ - 2 files changed, 59 insertions(+) -Index: nspr/pr/include/md/_linux.cfg -=================================================================== ---- nspr.orig/pr/include/md/_linux.cfg -+++ nspr/pr/include/md/_linux.cfg +--- + pr/include/md/_linux.cfg | 45 +++++++++++++++++++++++++++++++++++ + pr/include/md/_linux.h | 4 +++- + 2 files changed, 48 insertions(+), 1 deletion(-) + +--- a/pr/include/md/_linux.cfg ++++ b/pr/include/md/_linux.cfg @@ -975,6 +975,51 @@ #define PR_BYTES_PER_WORD_LOG2 2 #define PR_BYTES_PER_DWORD_LOG2 3 @@ -68,10 +67,8 @@ Index: nspr/pr/include/md/_linux.cfg #elif defined(__or1k__) #undef IS_LITTLE_ENDIAN -Index: nspr/pr/include/md/_linux.h -=================================================================== ---- nspr.orig/pr/include/md/_linux.h -+++ nspr/pr/include/md/_linux.h +--- a/pr/include/md/_linux.h ++++ b/pr/include/md/_linux.h @@ -55,6 +55,8 @@ #define _PR_SI_ARCHITECTURE "avr32" #elif defined(__m32r__) @@ -81,22 +78,12 @@ Index: nspr/pr/include/md/_linux.h #elif defined(__or1k__) #define _PR_SI_ARCHITECTURE "or1k" #elif defined(__riscv) && (__riscv_xlen == 32) -@@ -129,6 +131,18 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn +@@ -143,7 +145,7 @@ extern PRInt32 _PR_x86_64_AtomicSet(PRIn #define _MD_ATOMIC_SET _PR_x86_64_AtomicSet #endif -+#if defined(__nios2__) -+#if defined(__GNUC__) -+/* Use GCC built-in functions */ -+#define _PR_HAVE_ATOMIC_OPS -+#define _MD_INIT_ATOMIC() -+#define _MD_ATOMIC_INCREMENT(ptr) __sync_add_and_fetch(ptr, 1) -+#define _MD_ATOMIC_DECREMENT(ptr) __sync_sub_and_fetch(ptr, 1) -+#define _MD_ATOMIC_ADD(ptr, i) __sync_add_and_fetch(ptr, i) -+#define _MD_ATOMIC_SET(ptr, nv) __sync_lock_test_and_set(ptr, nv) -+#endif -+#endif -+ - #if defined(__or1k__) +-#if defined(__loongarch__) ++#if defined(__loongarch__) || defined(__nios2__) #if defined(__GNUC__) /* Use GCC built-in functions */ + #define _PR_HAVE_ATOMIC_OPS diff --git a/meta-citadel/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch b/meta-citadel/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch deleted file mode 100644 index bde715c..0000000 --- a/meta-citadel/recipes-support/nspr/nspr/remove-srcdir-from-configure-in.patch +++ /dev/null @@ -1,19 +0,0 @@ -the $srcdir is not defined at the time of gnu-configurize. - -Upstream-Status: Inappropriate [OE-Core specific] - -Signed-off-by: Saul Wold - -Index: nspr/configure.in -=================================================================== ---- nspr.orig/configure.in -+++ nspr/configure.in -@@ -8,7 +8,7 @@ AC_PREREQ(2.61) - AC_INIT - AC_CONFIG_SRCDIR([pr/include/nspr.h]) - --AC_CONFIG_AUX_DIR(${srcdir}/build/autoconf) -+AC_CONFIG_AUX_DIR(build/autoconf) - AC_CANONICAL_TARGET - - dnl ======================================================== diff --git a/meta-citadel/recipes-support/nspr/nspr_4.29.bb b/meta-citadel/recipes-support/nspr/nspr_4.35.bb similarity index 91% rename from meta-citadel/recipes-support/nspr/nspr_4.29.bb rename to meta-citadel/recipes-support/nspr/nspr_4.35.bb index f224bcd..f8d3293 100644 --- a/meta-citadel/recipes-support/nspr/nspr_4.29.bb +++ b/meta-citadel/recipes-support/nspr/nspr_4.35.bb @@ -8,23 +8,23 @@ SECTION = "libs/network" SRC_URI = "http://ftp.mozilla.org/pub/nspr/releases/v${PV}/src/nspr-${PV}.tar.gz \ file://remove-rpath-from-tests.patch \ file://fix-build-on-x86_64.patch \ - file://remove-srcdir-from-configure-in.patch \ file://0002-Add-nios2-support.patch \ file://0001-md-Fix-build-with-musl.patch \ file://Makefile.in-remove-_BUILD_STRING-and-_BUILD_TIME.patch \ + file://0001-config-nspr-config.in-don-t-pass-LDFLAGS.patch \ + file://0001-Fix-Wincompatible-function-pointer-types.patch \ file://nspr.pc.in \ -" + " CACHED_CONFIGUREVARS:append:libc-musl = " CFLAGS='${CFLAGS} -D_PR_POLL_AVAILABLE \ - -D_PR_HAVE_OFF64_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ + -D_PR_HAVE_LARGE_OFF_T -D_PR_INET6 -D_PR_HAVE_INET_NTOP \ -D_PR_HAVE_GETHOSTBYNAME2 -D_PR_HAVE_GETADDRINFO \ -D_PR_INET6_PROBE -DNO_DLOPEN_NULL'" UPSTREAM_CHECK_URI = "http://ftp.mozilla.org/pub/nspr/releases/" UPSTREAM_CHECK_REGEX = "v(?P\d+(\.\d+)+)/" -SRC_URI[md5sum] = "a546926d3c8e887be02c668c1293da92" -SRC_URI[sha256sum] = "22286bdb8059d74632cc7c2865c139e63953ecfb33bf4362ab58827e86e92582" +SRC_URI[sha256sum] = "7ea3297ea5969b5d25a5dd8d47f2443cda88e9ee746301f6e1e1426f8a6abc8f" CVE_PRODUCT = "netscape_portable_runtime" @@ -160,6 +160,8 @@ PACKAGECONFIG[ipv6] = "--enable-ipv6,--disable-ipv6," # preferred path upstream. EXTRA_OECONF += "--includedir=${includedir}/nspr" +EXTRA_OEMAKE:append:class-native = " EXTRA_LIBS='-lpthread -lrt -ldl'" + do_compile:prepend() { oe_runmake CROSS_COMPILE=1 CFLAGS="-DXP_UNIX ${BUILD_CFLAGS}" LDFLAGS="" CC="${BUILD_CC}" -C config export } diff --git a/meta-citadel/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch b/meta-citadel/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch new file mode 100644 index 0000000..727c5a3 --- /dev/null +++ b/meta-citadel/recipes-support/udisks/udisks2/0001-Makefile.am-Dont-include-buildpath.patch @@ -0,0 +1,47 @@ +From b1b58f122a3e05b5689358fdd3203ba110cca567 Mon Sep 17 00:00:00 2001 +From: Markus Volk +Date: Sun, 24 Sep 2023 22:20:42 +0200 +Subject: [PATCH] Reproducibility fix + +This fixes: +WARNING: udisks2-2.10.1-r0 do_package_qa: QA Issue: File /usr/lib/udisks2/modules/libudisks2_btrfs.so in package udisks2 contains reference to TMPDIR +File /usr/lib/udisks2/modules/libudisks2_lvm2.so in package udisks2 contains reference to TMPDIR +File /usr/libexec/udisks2/udisksd in package udisks2 contains reference to TMPDIR [buildpaths] + +Upstream-Status: Inappropriate [oe-specific] + +Signed-off-by: Markus Volk +--- + modules/lvm2/Makefile.am | 2 +- + src/Makefile.am | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/modules/lvm2/Makefile.am b/modules/lvm2/Makefile.am +index 67b8aa6b3..e4ae462e7 100644 +--- a/modules/lvm2/Makefile.am ++++ b/modules/lvm2/Makefile.am +@@ -16,7 +16,7 @@ CPPFLAGS = \ + -DLVM_HELPER_DIR=\""$(prefix)/lib/udisks2/"\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GLIB_CFLAGS) \ + $(GIO_CFLAGS) \ +diff --git a/src/Makefile.am b/src/Makefile.am +index 5a174d1ab..0da3a497b 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -20,7 +20,7 @@ CPPFLAGS = \ + -DUDISKS_MODULE_DIR=\"$(libdir)/udisks2/modules\" \ + -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \ + -DUDISKS_COMPILATION \ +- -DBUILD_DIR=\"$(abs_top_builddir)/\" \ ++ -DBUILD_DIR=\"/usr/src/\" \ + $(POLKIT_GOBJECT_1_CFLAGS) \ + $(GUDEV_CFLAGS) \ + $(GLIB_CFLAGS) \ +-- +2.42.0 + diff --git a/meta-citadel/recipes-support/udisks/udisks2_2.9.3.bb b/meta-citadel/recipes-support/udisks/udisks2_2.10.1.bb similarity index 74% rename from meta-citadel/recipes-support/udisks/udisks2_2.9.3.bb rename to meta-citadel/recipes-support/udisks/udisks2_2.10.1.bb index 548c9ba..cb1cbe6 100644 --- a/meta-citadel/recipes-support/udisks/udisks2_2.9.3.bb +++ b/meta-citadel/recipes-support/udisks/udisks2_2.10.1.bb @@ -17,8 +17,11 @@ DEPENDS += "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" RDEPENDS:${PN} = "acl" -SRC_URI = "git://github.com/storaged-project/udisks.git;branch=2.9.x-branch;protocol=https" -SRCREV = "c430dd9a27e158693cc783e9ee91bf6e5b2a8819" +SRC_URI = " \ + git://github.com/storaged-project/udisks.git;branch=2.10.x-branch;protocol=https \ + file://0001-Makefile.am-Dont-include-buildpath.patch \ +" +SRCREV = "18c9faf089e306ad6f3f51f5cb887a6b9aa08350" S = "${WORKDIR}/git" CVE_PRODUCT = "udisks" @@ -35,10 +38,17 @@ do_configure:prepend() { touch ${S}/build-aux/config.rpath } +PACKAGECONFIG ?= "" + +PACKAGECONFIG[lvm2] = "--enable-lvm2,--disable-lvm2,lvm2" +PACKAGECONFIG[btrfs] = "--enable-btrfs,--disable-btrfs,,btrfs-tools" +PACKAGECONFIG[lsm] = "--enable-lsm,--disable-lsm,libstoragemgmt" + FILES:${PN} += " \ ${datadir}/dbus-1/ \ ${datadir}/polkit-1 \ ${datadir}/bash-completion \ + ${datadir}/zsh \ ${libdir}/polkit-1/extensions/*.so \ ${nonarch_base_libdir}/udev/* \ ${exec_prefix}${nonarch_base_libdir}/udisks2/* \ diff --git a/meta-citadel/recipes-support/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch b/meta-citadel/recipes-support/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch deleted file mode 100644 index 3e12495..0000000 --- a/meta-citadel/recipes-support/virglrenderer/virglrenderer/0001-meson.build-use-python3-directly-for-python.patch +++ /dev/null @@ -1,28 +0,0 @@ -From dec8cca59124d7f8796b54902482ceb295a71b51 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Mon, 6 Jan 2020 12:44:42 +0100 -Subject: [PATCH] meson.build: use 'python3' directly for python - -This avoids a dependency on target python (due to meson probing -its configuration). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 9f91ff2f..2391f89d 100644 ---- a/meson.build -+++ b/meson.build -@@ -74,7 +74,7 @@ flags = [ - - add_project_arguments(cc.get_supported_arguments(flags), language : 'c') - --prog_python = import('python').find_installation('python3') -+prog_python = 'python3' - - not_found = dependency('', required: false) - libdrm_dep = dependency('libdrm', version : '>=2.4.50', required: get_option('drm').enabled() or get_option('venus')) diff --git a/meta-citadel/recipes-support/virglrenderer/virglrenderer_1.0.1.bb b/meta-citadel/recipes-support/virglrenderer/virglrenderer_1.0.1.bb deleted file mode 100644 index 0501b0c..0000000 --- a/meta-citadel/recipes-support/virglrenderer/virglrenderer_1.0.1.bb +++ /dev/null @@ -1,33 +0,0 @@ -SUMMARY = "VirGL virtual OpenGL renderer" -DESCRIPTION = "Virgil is a research project to investigate the possibility of \ -creating a virtual 3D GPU for use inside qemu virtual machines, that allows \ -the guest operating system to use the capabilities of the host GPU to \ -accelerate 3D rendering." -HOMEPAGE = "https://virgil3d.github.io/" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c81c08eeefd9418fca8f88309a76db10" - -DEPENDS = "libdrm libepoxy virtual/egl virtual/libgbm" -SRCREV = "690680e5f0f952e22424fca1538c1b24457a0868" -SRC_URI = "git://gitlab.freedesktop.org/virgl/virglrenderer.git;branch=main;protocol=https \ - file://0001-meson.build-use-python3-directly-for-python.patch \ - " - -S = "${WORKDIR}/git" - -inherit meson pkgconfig features_check - -PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'vulkan', 'venus', '', d)}" - -PACKAGECONFIG[venus] = "-Dvenus=true,-Dvenus=false,vulkan-loader vulkan-headers" -PACKAGECONFIG[va] = "-Dvideo=true,-Dvideo=false,libva" -PACKAGECONFIG[render-server] = "-Drender-server=true,-Drender-server=false" -PACKAGECONFIG[drm-msm-experimental] = "-Ddrm-msm-experimental=true,-Ddrm-msm-experimental=false" -PACKAGECONFIG[minigbm_allocation] = "-Dminigbm_allocation=true,-Dminigbm_allocation=false" -PACKAGECONFIG[venus-validate] = "-Dvenus-validate=true,-Dvenus-validate=false" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false,libcheck" - -BBCLASSEXTEND = "native nativesdk" - -REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb b/meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb index faf8dd3..cc03ab4 100644 --- a/meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb +++ b/meta-citadel/recipes-support/volume-key/volume-key_0.3.12.bb @@ -16,7 +16,7 @@ SRC_URI[sha256sum] = "6ca3748fc1dad22c450bbf6601d4e706cb11c5e662d11bb4aeb473a9cd SRCNAME = "volume_key" S = "${WORKDIR}/${SRCNAME}-${PV}" -inherit autotools python3native gettext pkgconfig +inherit autotools python3native python3targetconfig gettext pkgconfig DEPENDS += " \ util-linux \ @@ -27,7 +27,7 @@ DEPENDS += " \ swig-native \ " -PACKAGECONFIG ??= "python3" +PACKAGECONFIG ??= "" PACKAGECONFIG[python3] = "--with-python3,--without-python3,python3,python3" EXTRA_OECONF = "--without-python" diff --git a/meta-citadel/recipes-support/wayland/libinput/run-ptest b/meta-citadel/recipes-support/wayland/libinput/run-ptest deleted file mode 100644 index d11e6eb..0000000 --- a/meta-citadel/recipes-support/wayland/libinput/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -/usr/libexec/libinput/libinput-test-suite -j1 -if [ $? -eq 0 ]; then - echo 'PASS: libinput-test-suite' -else - echo 'FAIL: libinput-test-suite' -fi - diff --git a/meta-citadel/recipes-support/wayland/libinput_1.25.0.bb b/meta-citadel/recipes-support/wayland/libinput_1.25.0.bb deleted file mode 100644 index 517b247..0000000 --- a/meta-citadel/recipes-support/wayland/libinput_1.25.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Library to handle input devices in Wayland compositors" -DESCRIPTION = "libinput is a library to handle input devices in Wayland \ -compositors and to provide a generic X.Org input driver. It provides \ -device detection, device handling, input device event processing and \ -abstraction so minimize the amount of custom input code compositors need to \ -provide the common set of functionality that users expect." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a" - -DEPENDS = "libevdev udev mtdev" - -SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=main \ - file://run-ptest \ - " -SRCREV = "3fd38d89276b679ac3565efd7c2150fd047902cb" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig lib_package ptest - -# Patch out build directory, otherwise it leaks into ptest binary -do_configure:append() { - sed -i -e "s,${WORKDIR},,g" config.h - if [ -e "litest-config.h" ]; then - sed -i -e "s,${WORKDIR},,g" litest-config.h - fi -} - -PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" -PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" -PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" -PACKAGECONFIG[tests] = "-Dtests=true -Dinstall-tests=true,-Dtests=false -Dinstall-tests=false,libcheck" - -UDEVDIR = "`pkg-config --variable=udevdir udev`" - -EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ - -Ddocumentation=false \ - -Dzshcompletiondir=no" - -# package name changed in 1.8.1 upgrade: make sure package upgrades work -RPROVIDES:${PN} = "libinput" -RREPLACES:${PN} = "libinput" -RCONFLICTS:${PN} = "libinput" - -FILES:${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite" diff --git a/meta-citadel/recipes-support/wayland/mtdev_1.1.6.bb b/meta-citadel/recipes-support/wayland/mtdev_1.1.6.bb deleted file mode 100644 index 7c1cb5e..0000000 --- a/meta-citadel/recipes-support/wayland/mtdev_1.1.6.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Multitouch Protocol Translation Library" - -DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ -multitouch events to the slotted type B protocol. The events put into mtdev may \ -be from any MT device, specifically type A without contact tracking, type A with \ -contact tracking, or type B with contact tracking" - -HOMEPAGE = "http://bitmath.org/code/mtdev/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" - -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" -SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" -SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" - -inherit autotools pkgconfig diff --git a/meta-citadel/recipes-support/wayland/required-distro-features.inc b/meta-citadel/recipes-support/wayland/required-distro-features.inc deleted file mode 100644 index bb4a0e8..0000000 --- a/meta-citadel/recipes-support/wayland/required-distro-features.inc +++ /dev/null @@ -1,8 +0,0 @@ -# distro features required by weston recipes - -inherit features_check - -# requires pam enabled if started via systemd -# -REQUIRED_DISTRO_FEATURES = "wayland opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" - diff --git a/meta-citadel/recipes-support/wayland/wayland-protocols_1.33.bb b/meta-citadel/recipes-support/wayland/wayland-protocols_1.33.bb deleted file mode 100644 index 074ea36..0000000 --- a/meta-citadel/recipes-support/wayland/wayland-protocols_1.33.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" -SRC_URI[sha256sum] = "94f0c50b090d6e61a03f62048467b19abbe851be4e11ae7b36f65f8b98c3963a" - -UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/tags" - -inherit meson pkgconfig allarch - -EXTRA_OEMESON += "-Dtests=false" - -PACKAGES = "${PN}" -FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-citadel/recipes-support/wayland/wayland-utils_1.2.0.bb b/meta-citadel/recipes-support/wayland/wayland-utils_1.2.0.bb deleted file mode 100644 index 878c7a2..0000000 --- a/meta-citadel/recipes-support/wayland/wayland-utils_1.2.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Wayland utilities" -DESCRIPTION = "Wayland-utils contains (for now) \ -wayland-info, a utility for displaying information about the Wayland \ -protocols supported by a Wayland compositor. \ -wayland-info is basically a standalone version of weston-info as found \ -in weston repository. " -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ - " - -SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" - -UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/tags" - -inherit meson pkgconfig - -DEPENDS += "wayland wayland-native wayland-protocols" - -PACKAGECONFIG ??= "drm" -PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm" diff --git a/meta-citadel/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta-citadel/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch deleted file mode 100644 index bc753de..0000000 --- a/meta-citadel/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b4c64b6f07743e3fb63ce52359bc664ab7d60df0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Thu, 20 Feb 2020 15:20:45 -0600 -Subject: [PATCH] build: Fix strndup detection on MinGW - -GCC and meson conspire together to incorrectly detect that strndup() -exists on MinGW as __builtin_strndup, when no such function exists. As a -work around, meson will skip looking for __builtin functions if an -'#include' is in the prefix, so add '#include ' when looking -for strndup(). - -See: https://github.com/mesonbuild/meson/issues/3672 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] - -Signed-off-by: Joshua Watt -Signed-off-by: Denys Dmytriyenko ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3bc25c9..adde7b9 100644 ---- a/meson.build -+++ b/meson.build -@@ -38,11 +38,11 @@ have_funcs = [ - 'prctl', - 'memfd_create', - 'mremap', -- 'strndup', - ] - foreach f: have_funcs - config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) - endforeach -+config_h.set('HAVE_STRNDUP', cc.has_function('strndup') and cc.has_header_symbol('string.h', 'strndup')) - config_h.set10('HAVE_XUCRED_CR_PID', cc.has_member('struct xucred', 'cr_pid', prefix : '#include ')) - have_broken_msg_cmsg_cloexec = false - if host_machine.system() == 'freebsd' --- -2.7.4 - diff --git a/meta-citadel/recipes-support/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch b/meta-citadel/recipes-support/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch deleted file mode 100644 index 4573bb6..0000000 --- a/meta-citadel/recipes-support/wayland/wayland/0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch +++ /dev/null @@ -1,46 +0,0 @@ -From ff8ecbe8891d592e645927659318720f9e190054 Mon Sep 17 00:00:00 2001 -From: Andreas Cord-Landwehr -Date: Sun, 6 Feb 2022 17:23:46 +0100 -Subject: [PATCH] Consider pkgconfig sysroot for pkgdatadir - -For libs/cflags this is done automatically, but not for manually accessed -variables. This matches what wayland-protocols does. - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/-/merge_requests/272] ---- - src/meson.build | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/src/meson.build b/src/meson.build -index a8a1d2b..721e151 100644 ---- a/src/meson.build -+++ b/src/meson.build -@@ -65,7 +65,7 @@ if get_option('scanner') - version: meson.project_version(), - variables: [ - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), -- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()), -+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()), - 'bindir=' + join_paths('${prefix}', get_option('bindir')), - 'wayland_scanner=${bindir}/wayland-scanner' - ], -@@ -211,7 +211,7 @@ if get_option('libraries') - filebase: 'wayland-server', - variables: [ - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), -- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) -+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()) - ] - ) - -@@ -250,7 +250,7 @@ if get_option('libraries') - filebase: 'wayland-client', - variables: [ - 'datarootdir=' + join_paths('${prefix}', get_option('datadir')), -- 'pkgdatadir=' + join_paths('${datarootdir}', meson.project_name()) -+ 'pkgdatadir=' + join_paths('${pc_sysrootdir}${datarootdir}', meson.project_name()) - ] - ) - --- -2.37.2 diff --git a/meta-citadel/recipes-support/wayland/wayland/run-ptest b/meta-citadel/recipes-support/wayland/wayland/run-ptest deleted file mode 100644 index 7e8d9de..0000000 --- a/meta-citadel/recipes-support/wayland/wayland/run-ptest +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -export WAYLAND_SCANNER=wayland-scanner -export TEST_DATA_DIR=tests/data -export TEST_OUTPUT_DIR=tests/output -export SED=sed -export WAYLAND_EGL_LIB=/usr/lib/libwayland-egl.so.1 -export NM=nm - -for i in `ls tests/*-test tests/wayland-egl-symbols-check tests/scanner-test.sh`; do - $i - if [ $? -eq 0 ]; then - echo "PASS: $i" - else - echo "FAIL: $i" - fi -done diff --git a/meta-citadel/recipes-support/wayland/wayland_1.22.0.bb b/meta-citadel/recipes-support/wayland/wayland_1.22.0.bb deleted file mode 100644 index 6aa7606..0000000 --- a/meta-citadel/recipes-support/wayland/wayland_1.22.0.bb +++ /dev/null @@ -1,62 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ - file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" - -DEPENDS = "expat libffi wayland-native" - -SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ - file://run-ptest \ - file://0001-build-Fix-strndup-detection-on-MinGW.patch \ - file://0002-Consider-pkgconfig-sysroot-for-pkgdatadir.patch \ - " -SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" - -UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/tags" -UPSTREAM_CHECK_REGEX = "wayland-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig ptest - -PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," - -EXTRA_OEMESON = "-Ddocumentation=false" -EXTRA_OEMESON:class-native = "-Ddocumentation=false" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install:append:class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} - -do_install_ptest() { - mkdir -p ${D}${PTEST_PATH}/tests/data - cp -rf ${B}/tests/*-test ${B}/tests/*-checker ${D}${PTEST_PATH}/tests - cp -rf ${B}/tests/*-checker ${D}${PTEST_PATH} - cp -rf ${S}/tests/scanner-test.sh ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/data/* ${D}${PTEST_PATH}/tests/data/ - cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ -} - -sysroot_stage_all:append:class-target () { - rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 - cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ -} - -PACKAGES =+ "${PN}-tools" - -FILES:${PN}-tools = "${bindir}/wayland-scanner" -FILES:${PN}-dev += "${datadir}/${BPN}/wayland-scanner.mk" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN}-ptest += "binutils sed ${PN}-tools" diff --git a/meta-citadel/recipes-support/wayland/weston-init.bb b/meta-citadel/recipes-support/wayland/weston-init.bb deleted file mode 100644 index 024e400..0000000 --- a/meta-citadel/recipes-support/wayland/weston-init.bb +++ /dev/null @@ -1,106 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "file://init \ - file://weston.env \ - file://weston.ini \ - file://weston.service \ - file://weston.socket \ - file://weston-socket.sh \ - file://weston-autologin \ - file://weston-start" - -S = "${WORKDIR}" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)}" -PACKAGECONFIG:append:qemuriscv64 = " use-pixman" -PACKAGECONFIG:append:qemuppc64 = " use-pixman" - -PACKAGECONFIG[xwayland] = ",," -PACKAGECONFIG[no-idle-timeout] = ",," -PACKAGECONFIG[use-pixman] = ",," - -DEFAULTBACKEND ??= "" -DEFAULTBACKEND:qemuall ?= "drm" - -do_install() { - # Install weston-start script - if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start - install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston - sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston - fi - - # Install Weston systemd service - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service - install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket - install -D -p -m0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh - sed -i -e s:/etc:${sysconfdir}:g \ - -e s:/usr/bin:${bindir}:g \ - -e s:/var:${localstatedir}:g \ - ${D}${systemd_system_unitdir}/weston.service - fi - - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin - fi - - install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini - install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston - - if [ -n "${DEFAULTBACKEND}" ]; then - sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then - sed -i -e "/^\[core\]/a xwayland=true" ${D}${sysconfdir}/xdg/weston/weston.ini - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'no-idle-timeout', 'yes', 'no', d)}" = "yes" ]; then - sed -i -e "/^\[core\]/a idle-time=0" ${D}${sysconfdir}/xdg/weston/weston.ini - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'use-pixman', 'yes', 'no', d)}" = "yes" ]; then - sed -i -e "/^\[core\]/a use-pixman=true" ${D}${sysconfdir}/xdg/weston/weston.ini - fi - - install -dm 755 -o weston -g weston ${D}/home/weston -} - -INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}" - -inherit update-rc.d systemd useradd - -USERADD_PACKAGES = "${PN}" - -# rdepends on weston which depends on virtual/egl -# -require ${THISDIR}/required-distro-features.inc - -RDEPENDS:${PN} = "weston kbd" - -INITSCRIPT_NAME = "weston" -INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." - -FILES:${PN} += "\ - ${sysconfdir}/xdg/weston/weston.ini \ - ${sysconfdir}/profile.d/weston-socket.sh \ - ${systemd_system_unitdir}/weston.service \ - ${systemd_system_unitdir}/weston.socket \ - ${sysconfdir}/default/weston \ - ${sysconfdir}/pam.d/ \ - /home/weston \ - " - -CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" - -SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" -USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render,wayland weston" -GROUPADD_PARAM:${PN} = "-r wayland; -r render" - diff --git a/meta-citadel/recipes-support/wayland/weston-init/init b/meta-citadel/recipes-support/wayland/weston-init/init deleted file mode 100644 index a5c54e0..0000000 --- a/meta-citadel/recipes-support/wayland/weston-init/init +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: weston -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -if test -e /etc/default/weston ; then - . /etc/default/weston -fi - -killproc() { - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - weston=false) - echo "Weston disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - . /etc/profile - export HOME=ROOTHOME - - WESTON_USER=weston weston-start $OPTARGS & - ;; - - stop) - echo "Stopping Weston" - killproc weston - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston-autologin b/meta-citadel/recipes-support/wayland/weston-init/weston-autologin deleted file mode 100644 index f6e6d10..0000000 --- a/meta-citadel/recipes-support/wayland/weston-init/weston-autologin +++ /dev/null @@ -1,11 +0,0 @@ -auth required pam_nologin.so -auth required pam_unix.so try_first_pass nullok - -account required pam_nologin.so -account required pam_unix.so - -session required pam_env.so -session required pam_unix.so --session optional pam_systemd.so type=wayland class=user desktop=weston --session optional pam_loginuid.so - diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston-socket.sh b/meta-citadel/recipes-support/wayland/weston-init/weston-socket.sh deleted file mode 100755 index 86389d6..0000000 --- a/meta-citadel/recipes-support/wayland/weston-init/weston-socket.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# set weston variables for use with global weston socket -global_socket="/run/wayland-0" -if [ -e "$global_socket" ]; then - weston_group=$(stat -c "%G" "$global_socket") - if [ "$(id -u)" = "0" ]; then - export WAYLAND_DISPLAY="$global_socket" - else - case "$(groups "$USER")" in - *"$weston_group"*) - export WAYLAND_DISPLAY="$global_socket" - ;; - *) - ;; - esac - fi - unset weston_group -fi -unset global_socket diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston-start b/meta-citadel/recipes-support/wayland/weston-init/weston-start deleted file mode 100755 index 01670cd..0000000 --- a/meta-citadel/recipes-support/wayland/weston-init/weston-start +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# Copyright (C) 2016 O.S. Systems Software LTDA. -# Copyright (C) 2016 Freescale Semiconductor - -export PATH="/sbin:/usr/sbin:/bin:/usr/bin" - -usage() { - cat <] -EOF -} - -## Module support -modules_dir=@DATADIR@/weston-start - -# Add weston extra argument -add_weston_argument() { - weston_args="$weston_args $1" -} - -## Add module to --modules argument -add_weston_module() { - if [[ "x${weston_modules}" == "x" ]]; then - weston_modules="--modules " - fi; - weston_modules+="${1}," -} - -if [ -n "$WAYLAND_DISPLAY" ]; then - echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." - exit 1 -fi - -if [ -n "$WESTON_USER" ]; then - if [ -z "$WESTON_GROUP" ]; then - # no explicit WESTON_GROUP given, therefore use WESTON_USER - export WESTON_GROUP="${WESTON_USER}" - fi -fi - -weston_args=$* - -# Load and run modules -if [ -d "$modules_dir" ]; then - for m in "$modules_dir"/*; do - # Skip backup files - if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then - continue - fi - - # process module - . $m - if [[ x"{$weston_modules}" != "x" ]]; then - add_weston_argument "${weston_modules}" - fi; - done -fi - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - if [ -n "$WESTON_USER" ] - then - chown $WESTON_USER:$WESTON_GROUP $XDG_RUNTIME_DIR - fi -fi - -su -c "XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` weston $weston_args --log=/tmp/weston.log" $WESTON_USER diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston.env b/meta-citadel/recipes-support/wayland/weston-init/weston.env deleted file mode 100644 index e69de29..0000000 diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston.ini b/meta-citadel/recipes-support/wayland/weston-init/weston.ini deleted file mode 100644 index 6bd5aef..0000000 --- a/meta-citadel/recipes-support/wayland/weston-init/weston.ini +++ /dev/null @@ -1,75 +0,0 @@ -# configuration file for Weston - -[core] -#modules=xwayland.so,cms-colord.so -#shell=desktop-shell.so -#gbm-format=xrgb2101010 -require-input=false - -#[shell] -#background-image=/usr/share/backgrounds/gnome/Aqua.jpg -#background-color=0xff002244 -#background-type=tile -#clock-format=minutes -#panel-color=0x90ff0000 -#locking=true -#animation=zoom -#startup-animation=fade -#binding-modifier=ctrl -#num-workspaces=6 -#cursor-theme=whiteglass -#cursor-size=24 - -#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png -#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg -#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg -#animation=fade - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -#path=/usr/bin/gnome-terminal - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -#path=/usr/bin/weston-terminal - -#[launcher] -#icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png -#path=/usr/bin/google-chrome - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/arts.png -#path=/build/weston-0lEgCh/weston-1.11.0/weston-flower - -#[input-method] -#path=/usr/libexec/weston-keyboard - -#[output] -#name=LVDS1 -#mode=1680x1050 -#transform=90 -#icc_profile=/usr/share/color/icc/colord/Bluish.icc - -#[output] -#name=VGA1 -#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync -#transform=flipped - -#[output] -#name=X1 -#mode=1024x768 -#transform=flipped-90 - -#[libinput] -#enable_tap=true - -#[touchpad] -#constant_accel_factor = 50 -#min_accel_factor = 0.16 -#max_accel_factor = 1.0 - -[screen-share] -command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize - -#[xwayland] -#path=/usr/bin/Xwayland diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston.service b/meta-citadel/recipes-support/wayland/weston-init/weston.service deleted file mode 100644 index 8074599..0000000 --- a/meta-citadel/recipes-support/wayland/weston-init/weston.service +++ /dev/null @@ -1,71 +0,0 @@ -# This is a system unit for launching Weston with auto-login as the -# user configured here. -# -# Weston must be built with systemd support, and your weston.ini must load -# the plugin systemd-notify.so. -[Unit] -Description=Weston, a Wayland compositor, as a system service -Documentation=man:weston(1) man:weston.ini(5) -Documentation=http://wayland.freedesktop.org/ - -# Make sure we are started after logins are permitted. -Requires=systemd-user-sessions.service -After=systemd-user-sessions.service - -# If Plymouth is used, we want to start when it is on its way out. -After=plymouth-quit-wait.service - -# D-Bus is necessary for contacting logind. Logind is required. -Wants=dbus.socket -After=dbus.socket - -# Ensure the socket is present -Requires=weston.socket - -# Since we are part of the graphical session, make sure we are started before -# it is complete. -Before=graphical.target - -# Prevent starting on systems without virtual consoles, Weston requires one -# for now. -ConditionPathExists=/dev/tty0 - -[Service] -# Requires systemd-notify.so Weston plugin. -Type=notify -EnvironmentFile=/etc/default/weston -ExecStart=/usr/bin/weston --modules=systemd-notify.so - -# Optional watchdog setup -#TimeoutStartSec=60 -#WatchdogSec=20 - -# The user to run Weston as. -User=weston -Group=weston - -# Make sure the working directory is the users home directory -WorkingDirectory=/home/weston - -# Set up a full user session for the user, required by Weston. -PAMName=weston-autologin - -# A virtual terminal is needed. -TTYPath=/dev/tty7 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes - -# Fail to start if not controlling the tty. -StandardInput=tty-fail -StandardOutput=journal -StandardError=journal - -# Log this user with utmp, letting it show up with commands 'w' and 'who'. -UtmpIdentifier=tty7 -UtmpMode=user - -[Install] -# Note: If you only want weston to start on-demand, remove this line with a -# service drop file -WantedBy=graphical.target diff --git a/meta-citadel/recipes-support/wayland/weston-init/weston.socket b/meta-citadel/recipes-support/wayland/weston-init/weston.socket deleted file mode 100644 index c1bdc83..0000000 --- a/meta-citadel/recipes-support/wayland/weston-init/weston.socket +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Weston socket -RequiresMountsFor=/run - -[Socket] -ListenStream=/run/wayland-0 -SocketMode=0775 -SocketUser=weston -SocketGroup=wayland -RemoveOnStop=yes - -[Install] -WantedBy=sockets.target - diff --git a/meta-citadel/recipes-support/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch b/meta-citadel/recipes-support/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch deleted file mode 100644 index 1d281fa..0000000 --- a/meta-citadel/recipes-support/wayland/weston/0001-libweston-tools-Include-libgen.h-for-basename-signat.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2b53236ac637dfa7fb0f438f7391a73f6ef92a06 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Thu, 14 Dec 2023 09:13:54 -0800 -Subject: [PATCH] libweston,tools: Include libgen.h for basename signature - -Latest musl has removed the declaration from string.h [1] as it only -implements POSIX version alone and string.h in glibc implements GNU -version of basename. This now results in compile errors on musl. - -This might be a warning with older compilers but it is error with -Clang-17+ as it treats -Wimplicit-function-declaration as error - -[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/weston/-/merge_requests/1420] -Signed-off-by: Khem Raj ---- - libweston/backend-drm/libbacklight.c | 1 + - tools/zunitc/src/zunitc_impl.c | 1 + - 2 files changed, 2 insertions(+) - -diff --git a/libweston/backend-drm/libbacklight.c b/libweston/backend-drm/libbacklight.c -index ca7f2d68..74690fa7 100644 ---- a/libweston/backend-drm/libbacklight.c -+++ b/libweston/backend-drm/libbacklight.c -@@ -41,6 +41,7 @@ - #include - #include - #include -+#include - #include - #include - -diff --git a/tools/zunitc/src/zunitc_impl.c b/tools/zunitc/src/zunitc_impl.c -index 18f03015..9b460fa0 100644 ---- a/tools/zunitc/src/zunitc_impl.c -+++ b/tools/zunitc/src/zunitc_impl.c -@@ -27,6 +27,7 @@ - - #include - #include -+#include - #include - #include - #include --- -2.43.0 - diff --git a/meta-citadel/recipes-support/wayland/weston/systemd-notify.weston-start b/meta-citadel/recipes-support/wayland/weston/systemd-notify.weston-start deleted file mode 100644 index a97e7b3..0000000 --- a/meta-citadel/recipes-support/wayland/weston/systemd-notify.weston-start +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: Huawei Inc. -# SPDX-License-Identifier: Apache-2.0 - - -if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then - add_weston_module "systemd-notify.so" -fi diff --git a/meta-citadel/recipes-support/wayland/weston/weston.desktop b/meta-citadel/recipes-support/wayland/weston/weston.desktop deleted file mode 100644 index 1086ae8..0000000 --- a/meta-citadel/recipes-support/wayland/weston/weston.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Weston -Comment=Wayland Compostitor -Exec=weston -Icon=weston -Terminal=false -Categories=Utility; diff --git a/meta-citadel/recipes-support/wayland/weston/weston.png b/meta-citadel/recipes-support/wayland/weston/weston.png deleted file mode 100644 index ea8b7e0..0000000 Binary files a/meta-citadel/recipes-support/wayland/weston/weston.png and /dev/null differ diff --git a/meta-citadel/recipes-support/wayland/weston/xwayland.weston-start b/meta-citadel/recipes-support/wayland/weston/xwayland.weston-start deleted file mode 100644 index 342ac8d..0000000 --- a/meta-citadel/recipes-support/wayland/weston/xwayland.weston-start +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if type Xwayland >/dev/null 2>/dev/null; then - mkdir -m 775 -p /tmp/.X11-unix - chown root:video /tmp/.X11-unix -fi diff --git a/meta-citadel/recipes-support/wayland/weston_13.0.0.bb b/meta-citadel/recipes-support/wayland/weston_13.0.0.bb deleted file mode 100644 index b728bd0..0000000 --- a/meta-citadel/recipes-support/wayland/weston_13.0.0.bb +++ /dev/null @@ -1,146 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ - " - -SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ - file://0001-libweston-tools-Include-libgen.h-for-basename-signat.patch \ - file://weston.png \ - file://weston.desktop \ - file://xwayland.weston-start \ - file://systemd-notify.weston-start \ - " - -SRC_URI[sha256sum] = "52ff1d4aa2394a2e416c85a338b627ce97fa71d43eb762fd4aaf145d36fc795a" - -UPSTREAM_CHECK_URI = "https://gitlab.freedesktop.org/wayland/weston/-/tags" -UPSTREAM_CHECK_REGEX = "weston-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig useradd - -# depends on virtual/egl -# -require ${THISDIR}/required-distro-features.inc - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" -DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" - -LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" - -WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" - -EXTRA_OEMESON += "-Dpipewire=false" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ - ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - image-jpeg \ - screenshare \ - shell-desktop \ - shell-fullscreen \ - shell-ivi \ - shell-kiosk \ - " - -# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all' -SIMPLECLIENTS ?= "all" - -# -# Compositor choices -# -# Weston on KMS -PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev seatd virtual/egl virtual/libgles2 virtual/libgbm mtdev" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" -# Weston on X11 -PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcursor" -# Headless Weston -PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" -# Weston on RDP -PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" -# VA-API desktop recorder -PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" -# Weston with EGL support -PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" -# Weston with lcms support -PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" -# Weston with webp support -PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" -# Weston with systemd support -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus" -# Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland" -# colord CMS support -PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" -# Clients support -PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" -# Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" -# Weston with screen-share support -PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" -# Traditional desktop shell -PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" -# Fullscreen shell -PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" -# In-Vehicle Infotainment (IVI) shell -PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" -# Kiosk shell -PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" -# JPEG image loading support -PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" -# screencasting via PipeWire -PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" -# VNC remote screensharing -PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc" - - -do_install:append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la - - # If X11, ship a desktop file to launch it - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then - chmod u+s ${D}${bindir}/weston-launch - fi -} - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ - libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" - -FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" -FILES:${PN} = "${sysconfdir} ${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" - -FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" -SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." - -FILES:${PN}-examples = "${bindir}/*" - -FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" -RDEPENDS:${PN}-xwayland += "xwayland" - -RDEPENDS:${PN} += "xkeyboard-config" -RRECOMMENDS:${PN} = "weston-init liberation-fonts" -RRECOMMENDS:${PN}-dev += "wayland-protocols" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system weston-launch" diff --git a/meta-gnome/conf/layer.conf b/meta-gnome/conf/layer.conf index 56c0d22..e000166 100644 --- a/meta-gnome/conf/layer.conf +++ b/meta-gnome/conf/layer.conf @@ -1,7 +1,7 @@ # We have a conf and classes directory, add to BBPATH BBPATH .= ":${LAYERDIR}" -LAYERSERIES_COMPAT_meta-gnome = "mickledore" +LAYERSERIES_COMPAT_meta-gnome = "scarthgap" # We have recipes-* directories, add to BBFILES BBFILES += "${LAYERDIR}/recipes-*/*/*.bb \ diff --git a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb index b06e3eb..c1be8e3 100644 --- a/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb +++ b/meta-gnome/recipes-connectivity/modemmanager/modemmanager_1.18.12.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=4fbd65380cdd255951079008b364516c \ " -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext systemd gobject-introspection bash-completion DEPENDS = "glib-2.0 libgudev libxslt-native dbus" diff --git a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb index 10241e1..2c1e54e 100644 --- a/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb +++ b/meta-gnome/recipes-connectivity/networkmanager/networkmanager_1.40.0.bb @@ -21,7 +21,6 @@ DEPENDS = " \ " DEPENDS:append:class-target = " bash-completion" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gettext update-rc.d systemd gobject-introspection gtk-doc update-alternatives upstream-version-is-even SRC_URI = " \ diff --git a/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb b/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb index 6d1356e..9e4b6e2 100644 --- a/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb +++ b/meta-gnome/recipes-devtools/gnome-common/gnome-common_3.18.0.bb @@ -6,6 +6,7 @@ LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" SECTION = "x11/gnome" +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase allarch SRC_URI = "${GNOME_MIRROR}/${GNOMEBN}/${@gnome_verdir("${PV}")}/${GNOMEBN}-${PV}.tar.${GNOME_COMPRESS_TYPE};name=archive" diff --git a/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_46.0.bb b/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_46.0.bb index ed2e486..2f3e4e7 100644 --- a/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_46.0.bb +++ b/meta-gnome/recipes-gnome/adwaita-icon-theme/adwaita-icon-theme_46.0.bb @@ -10,7 +10,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c84cac88e46fc07647ea07e6c24eeb7c \ file://COPYING_CCBYSA3;md5=96143d33de3a79321b1006c4e8ed07e7 \ file://COPYING_LGPL;md5=e6a600fd5e1d9cbde2d983680233ad02" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase allarch gtk-icon-cache SRC_URI[archive.sha256sum] = "4bcb539bd75d64da385d6fa08cbaa9ddeaceb6ac8e82b85ba6c41117bf5ba64e" diff --git a/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb index 958d43b..6173a71 100644 --- a/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb +++ b/meta-gnome/recipes-gnome/dconf/dconf_0.40.0.bb @@ -7,8 +7,6 @@ SRC_URI[archive.sha256sum] = "cf7f22a4c9200421d8d3325c5c1b8b93a36843650c9f95d645 DEPENDS = "dbus glib-2.0 xmlto-native glib-2.0-native" -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase bash-completion vala SRC_URI += "file://0001-meson.build-do-not-compile-docs.patch" diff --git a/meta-gnome/recipes-gnome/gdm/gdm_45.0.1.bb b/meta-gnome/recipes-gnome/gdm/gdm_45.0.1.bb index 7bbaf4c..49e7a3c 100644 --- a/meta-gnome/recipes-gnome/gdm/gdm_45.0.1.bb +++ b/meta-gnome/recipes-gnome/gdm/gdm_45.0.1.bb @@ -16,8 +16,6 @@ DEPENDS = " \ REQUIRED_DISTRO_FEATURES = "x11 systemd pam polkit gobject-introspection-data" GIR_MESON_OPTION = "" -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gsettings pkgconfig gobject-introspection gettext systemd useradd itstool gnome-help features_check SRC_URI = "https://download.gnome.org/sources/gdm/${@oe.utils.trim_version("${PV}", 1)}/gdm-${PV}.tar.xz" SRC_URI[sha256sum] = "6572578c05e3c6569d6ed269f7de2aaf3a035657654586d8243907bb7a6ffa85" diff --git a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb index 42659d0..a1495d6 100644 --- a/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb +++ b/meta-gnome/recipes-gnome/geocode-glib/geocode-glib_3.26.4.bb @@ -3,7 +3,6 @@ SUMMARY = "A convenience library for the geocoding" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=55ca817ccb7d5b5b66355690e9abc605" -GNOMEBASEBUILDCLASS = "meson" GIR_MESON_OPTION = "enable-introspection" GTKDOC_MESON_OPTION = "enable-gtk-doc" diff --git a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb index afec302..a7138e4 100644 --- a/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb +++ b/meta-gnome/recipes-gnome/gexiv2/gexiv2_0.14.0.bb @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=625f055f41728f84a8d7938acc35bdc2" DEPENDS = "exiv2 python3-pygobject-native" -GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" inherit gnomebase gobject-introspection gtk-doc python3native diff --git a/meta-gnome/recipes-gnome/gjs/gjs_1.80.0.bb b/meta-gnome/recipes-gnome/gjs/gjs_1.80.0.bb index 05f4cff..2dc9d6b 100644 --- a/meta-gnome/recipes-gnome/gjs/gjs_1.80.0.bb +++ b/meta-gnome/recipes-gnome/gjs/gjs_1.80.0.bb @@ -2,8 +2,6 @@ SUMMARY = "Javascript bindings for GNOME" LICENSE = "MIT & LGPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=8dcea832f6acf45d856abfeb2d51ec48" -GNOMEBASEBUILDCLASS = "meson" - DEPENDS = "mozjs-115 cairo" inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even pkgconfig diff --git a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb index 017d67b..44f38e4 100644 --- a/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb +++ b/meta-gnome/recipes-gnome/gnome-autoar/gnome-autoar_0.4.3.bb @@ -7,7 +7,6 @@ DEPENDS = " \ libarchive \ " -GNOMEBASEBUILDCLASS = "meson" GIR_MESON_ENABLE_FLAG = 'enabled' GIR_MESON_DISABLE_FLAG = 'disabled' GTKDOC_MESON_OPTION = "gtk_doc" diff --git a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb index 764e06e..3ef708f 100644 --- a/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-backgrounds/gnome-backgrounds_46.0.bb @@ -4,8 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b52fb0a6df395efb7047cb6fc56bfd7e" SECTION = "x11/gnome" -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gettext allarch SRC_URI[archive.sha256sum] = "4ddd3ac439a4a067876805921bb75f4d3c8b85a218d47c276dddde8928443c2e" diff --git a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb index c8559f6..1b29e52 100644 --- a/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-bluetooth/gnome-bluetooth_46.0.bb @@ -18,7 +18,6 @@ DEPENDS = " \ libadwaita \ " -GNOMEBASEBUILDCLASS = "meson" GTKDOC_MESON_OPTION = "gtk_doc" GTKIC_VERSION = "4" diff --git a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb index d1deea6..867a397 100644 --- a/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-control-center/gnome-control-center_46.0.bb @@ -3,14 +3,13 @@ DESCRIPTION = "GNOME Settings is GNOME's main interface for configuration of var LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" -GNOMEBASEBUILDCLASS = "meson" GTKIC_VERSION = "4" export XDG_DATA_DIRS = "${STAGING_DATADIR}:${STAGING_LIBDIR}" DEPENDS = " \ accountsservice \ colord-gtk \ - gcr3 \ + gcr \ gdk-pixbuf \ glib-2.0 \ gnome-bluetooth \ diff --git a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb index 03411c8..641737c 100644 --- a/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb +++ b/meta-gnome/recipes-gnome/gnome-desktop/gnome-desktop_44.0.bb @@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LIB;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ " -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase itstool pkgconfig upstream-version-is-even gobject-introspection features_check gtk-doc REQUIRED_DISTRO_FEATURES = "x11 opengl" diff --git a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb index 8f9289b..7d903b3 100644 --- a/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-disk-utility/gnome-disk-utility_46.0.bb @@ -16,8 +16,6 @@ DEPENDS = " \ xz \ " -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gsettings gtk-icon-cache gettext features_check mime-xdg ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb index fa7e161..4f82492 100644 --- a/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb +++ b/meta-gnome/recipes-gnome/gnome-screenshot/gnome-screenshot_41.0.bb @@ -6,8 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" SECTION = "x11/gnome" -GNOMEBASEBUILDCLASS = "meson" - inherit features_check gnomebase gettext upstream-version-is-even pkgconfig SRC_URI += " file://0001-meson-remove-extraneous-positional-argument.patch" diff --git a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb index 7a90eb5..86582bb 100644 --- a/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-session/gnome-session_46.0.bb @@ -14,8 +14,6 @@ DEPENDS = " \ systemd \ " -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gettext gsettings upstream-version-is-even features_check REQUIRED_DISTRO_FEATURES = "polkit systemd pam gobject-introspection-data" diff --git a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb index 4abd2e7..dc32246 100644 --- a/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-settings-daemon/gnome-settings-daemon_46.0.bb @@ -2,8 +2,6 @@ SUMMARY = "Window navigation construction toolkit" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gsettings gobject-introspection gettext features_check upstream-version-is-even DEPENDS = " \ diff --git a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb index a826b0c..03843fd 100644 --- a/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-shell/gnome-shell_46.0.bb @@ -11,8 +11,6 @@ SRCREV = "fdacdf5cc80a94e04549d864f2d4dbac5f15f4bc" EXTERNAL_TREE_VAR="CITADEL_GNOME_SHELL_PATH" GIT_URI = "gitsm://github.com/brl/gnome-shell.git;branch=citadel-46.0;protocol=https" -GNOMEBASEBUILDCLASS = "meson" - DEPENDS = " \ libxml2-native \ sassc-native \ @@ -24,7 +22,6 @@ DEPENDS = " \ gnome-autoar \ polkit \ libsoup-3.0 \ - libcroco \ startup-notification \ ibus \ gsettings-desktop-schemas \ diff --git a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb index ce3bb0f..305b0ff 100644 --- a/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb +++ b/meta-gnome/recipes-gnome/gnome-system-monitor/gnome-system-monitor_46.0.bb @@ -16,8 +16,6 @@ DEPENDS = " \ libhandy \ " -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gsettings gnome-help itstool gtk-icon-cache features_check gettext ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb index 061da27..1f48f1b 100644 --- a/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb +++ b/meta-gnome/recipes-gnome/gnome-terminal/gnome-terminal_3.42.2.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GFDL;md5=a22d0be1ce2284b67950a4d1673dd1b0 \ " -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gsettings gnome-help gettext itstool upstream-version-is-even DEPENDS = " \ diff --git a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_46.0.bb b/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_46.0.bb deleted file mode 100644 index c634c7a..0000000 --- a/meta-gnome/recipes-gnome/gsettings-desktop-schema/gsettings-desktop-schemas_46.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -SUMMARY = "GNOME desktop-wide GSettings schemas" -DESCRIPTION = "GSettings desktop-wide schemas contains a collection of \ -GSettings schemas for settings shared by various components of a desktop." -HOMEPAGE = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/gsettings-desktop-schemas/issues" - -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - -DEPENDS = "glib-2.0" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gsettings gobject-introspection gettext - -SRC_URI[archive.sha256sum] = "493a46a1161b6388d57aa72f632a79ce96c42d5ffbd1d0b00f496ec5876f8575" diff --git a/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb b/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb index af67370..01cdb4e 100644 --- a/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb +++ b/meta-gnome/recipes-gnome/gvfs/gvfs_1.54.0.bb @@ -2,7 +2,6 @@ DESCRIPTION = "gvfs is a userspace virtual filesystem" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=05df38dd77c35ec8431f212410a3329e" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings bash-completion gettext upstream-version-is-even features_check useradd DEPENDS += "\ diff --git a/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.5.0.bb b/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.5.0.bb deleted file mode 100644 index 6a27c1e..0000000 --- a/meta-gnome/recipes-gnome/libadwaita/libadwaita_1.5.0.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Building blocks for modern GNOME applications" -HOMEPAGE = "https://gitlab.gnome.org/GNOME/libadwaita" -LICENSE="LGPL-2.1-or-later" -LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" - - -DEPENDS = " \ - gtk4 \ - appstream \ -" - -GNOMEBASEBUILDCLASS = "meson" -inherit gnomebase gobject-introspection gi-docgen vala features_check - -SRC_URI[archive.sha256sum] = "fd92287df9bb95c963654fb6e70d3e082e2bcb37b147e0e3c905567167993783" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" - -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' -GTKDOC_MESON_OPTION = 'gtk_doc' - -PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" - -FILES:${PN} += "${datadir}/metainfo" - -EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" diff --git a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb index b318117..acf2885 100644 --- a/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb +++ b/meta-gnome/recipes-gnome/libgweather/libgweather4_4.4.2.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" GNOMEBN = "libgweather" S = "${WORKDIR}/${GNOMEBN}-${PV}" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gsettings gobject-introspection gettext gi-docgen vala features_check REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb b/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb index 7e39b64..b3d5048 100644 --- a/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb +++ b/meta-gnome/recipes-gnome/mutter/mutter_46.0.bb @@ -43,8 +43,6 @@ SRCREV = "ab32580b4c916914aec8429b3d4d68fef1dd583e" EXTERNAL_TREE_VAR="CITADEL_MUTTER_PATH" GIT_URI = "git://github.com/brl/mutter.git;branch=citadel-46.0;protocol=https" -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gsettings gobject-introspection gettext upstream-version-is-even features_check external-tree # x11 is still mandatory - see meson.build diff --git a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.26.0.bb b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.26.0.bb index 8046b13..83cf7d9 100644 --- a/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.26.0.bb +++ b/meta-gnome/recipes-gnome/network-manager-applet/network-manager-applet_1.26.0.bb @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "gtk+3 libnma libnotify libsecret libgudev networkmanager iso-codes nss" -GNOMEBASEBUILDCLASS = "meson" inherit features_check gnomebase gsettings gtk-icon-cache gettext REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb b/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb index 2256a18..75730fe 100644 --- a/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb +++ b/meta-gnome/recipes-gnome/rest/rest_0.9.0.bb @@ -3,8 +3,6 @@ HOMEPAGE = "https://wiki.gnome.org/Projects/Librest" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" -GNOMEBASEBUILDCLASS = "meson" - DEPENDS = " \ gi-docgen \ gi-docgen-native \ diff --git a/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb index a5da859..b436cfa 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp-tools_42.0.bb @@ -5,8 +5,6 @@ LIC_FILES_CHKSUM = " \ file://COPYING.GPL;md5=eb723b61539feef013de476e68b5c50a \ " -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase itstool DEPENDS += " \ diff --git a/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb b/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb index 54a6aa6..2d74135 100644 --- a/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb +++ b/meta-gnome/recipes-gnome/yelp/yelp-xsl_42.0.bb @@ -6,6 +6,7 @@ LIC_FILES_CHKSUM = " \ file://COPYING.LGPL;md5=a6f89e2100d9b6cdffcea4f398e37343 \ " +GNOMEBASEBUILDCLASS = "autotools" inherit gnomebase gettext itstool DEPENDS += "libxml2" diff --git a/meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb b/meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb index d48eb82..18c5306 100644 --- a/meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb +++ b/meta-gnome/recipes-gnome/zenity/zenity_3.42.1.bb @@ -3,8 +3,6 @@ SECTION = "x11/gnome" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=4fbd65380cdd255951079008b364516c" -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase pkgconfig itstool gnome-help features_check gettext DEPENDS = " \ diff --git a/meta-gnome/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch b/meta-gnome/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch deleted file mode 100644 index d4f2951..0000000 --- a/meta-gnome/recipes-support/appstream/appstream/0001-meson-do-not-rely-on-an-exe-wrapper.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 79bf322768990b28c29a9d907edcca52ff48e0b8 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Marc-Andr=C3=A9=20Lureau?= -Date: Wed, 26 Jul 2023 23:21:10 +0400 -Subject: meson: do not rely on an exe wrapper -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Signed-off-by: Marc-André Lureau - -Upstream-Status: Backport [https://github.com/ximion/appstream/commit/79bf322768990b28c29a9d907edcca52ff48e0b8] ---- - data/meson.build | 7 +++++++ - 1 file changed, 7 insertions(+) - -diff --git a/data/meson.build b/data/meson.build -index aea0cb25..ec0e434f 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -7,6 +7,13 @@ install_data('its/metainfo.its', - install_data('its/metainfo.loc', - install_dir: join_paths(get_option('datadir'), 'gettext', 'its')) - -+# Do not rely on an exe wrapper for rel-info, use the system one in that case -+if meson.is_cross_build() -+ dependency('appstream', version: '>=' + as_version, native: true, -+ not_found_message: 'Native appstream required for cross-building') -+ ascli_exe = find_program('appstreamcli') -+endif -+ - # NOTE: We do not translate the release notes on purpose here. - # If you do want to give translators a chance to translate them, - # ascli news-to-metainfo needs to produce a temporary file to translate --- -2.41.0 - diff --git a/meta-gnome/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch b/meta-gnome/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch deleted file mode 100644 index 9cbfaca..0000000 --- a/meta-gnome/recipes-support/appstream/appstream/0001-remove-hardcoded-path.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 6ab00a4279823829a9b82dc9e4d055da4de88c6e Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Mon, 12 Dec 2022 15:42:42 +0100 -Subject: [PATCH] remove hardcoded path - -Signed-off-by: Markus Volk - -Dont include hardcoded path. This fixes: -| cc1: error: include location "/usr/include" is unsafe for cross-compilation [-Werror=poison-system-directories] - -Upstream-Status: Inappropriate [oe-specific] ---- - meson.build | 2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/meson.build b/meson.build -index fd0e3373..2f273ada 100644 ---- a/meson.build -+++ b/meson.build -@@ -124,7 +124,7 @@ if get_option ('gir') - dependency('gobject-introspection-1.0', version: '>=1.56') - endif - --stemmer_inc_dirs = include_directories(['/usr/include']) -+stemmer_inc_dirs = include_directories(['']) - if get_option('stemming') - stemmer_lib = cc.find_library('stemmer', required: true) - if not cc.has_header('libstemmer.h') --- -2.34.1 - diff --git a/meta-gnome/recipes-support/appstream/appstream_0.16.3.bb b/meta-gnome/recipes-support/appstream/appstream_0.16.3.bb deleted file mode 100644 index bde679e..0000000 --- a/meta-gnome/recipes-support/appstream/appstream_0.16.3.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "AppStream is a collaborative effort for making machine-readable software metadata easily available." -HOMEPAGE = "https://github.com/ximion/appstream" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=435ed639f84d4585d93824e7da3d85da" - -DEPENDS = " \ - appstream-native \ - curl-native \ - curl \ - docbook-xml-dtd4-native \ - gperf-native \ - glib-2.0 \ - libyaml \ - libxml2 \ - libxmlb \ - libxslt-native \ - itstool-native \ - docbook-xsl-stylesheets-native \ - python3-pygments-native \ -" - -inherit meson gobject-introspection gettext gtk-doc pkgconfig vala - -GIR_MESON_OPTION = "gir" -GTKDOC_MESON_OPTION = "apidocs" - -SRC_URI = " \ - https://www.freedesktop.org/software/appstream/releases/AppStream-${PV}.tar.xz \ - file://0001-remove-hardcoded-path.patch \ - file://0001-meson-do-not-rely-on-an-exe-wrapper.patch \ -" -SRC_URI[sha256sum] = "081c917646e94d7221c9e4aae54dacda95a27c607fa93cd8e6344a2b318b98b1" - -S = "${WORKDIR}/AppStream-${PV}" - -PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)}" - -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd" -PACKAGECONFIG[stemming] = "-Dstemming=true,-Dstemming=false,libstemmer" - -FILES:${PN} += "${datadir}" - -EXTRA_OEMESON += "${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-Dvapi=true', '-Dvapi=false', d)}" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-support/gcr/gcr_4.2.0.bb b/meta-gnome/recipes-support/gcr/gcr_4.2.0.bb deleted file mode 100644 index 484f696..0000000 --- a/meta-gnome/recipes-support/gcr/gcr_4.2.0.bb +++ /dev/null @@ -1,59 +0,0 @@ -SUMMARY = "A library for bits of crypto UI and parsing etc" -DESCRIPTION = "GCR is a library for displaying certificates, and crypto UI, \ -accessing key stores. It also provides the viewer for crypto files on the \ -GNOME desktop." -HOMEPAGE = "https://gitlab.gnome.org/GNOME/gcr" -BUGTRACKER = "https://gitlab.gnome.org/GNOME/gcr/issues" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=55ca817ccb7d5b5b66355690e9abc605" - -DEPENDS = "p11-kit glib-2.0 libgcrypt gnupg-native \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'libxslt-native', '', d)}" - -CACHED_CONFIGUREVARS += "ac_cv_path_GPG='gpg2'" - -CFLAGS += "-D_GNU_SOURCE" - -GNOMEBASEBUILDCLASS = "meson" -GTKDOC_MESON_OPTION = "gtk_doc" -inherit gnomebase gtk-icon-cache gi-docgen features_check vala gobject-introspection gettext mime mime-xdg - -REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'opengl', '', d)}" - -SRC_URI[archive.sha256sum] = "e15e31329e0171229d552d25563f176c5b6179795bf91fae2b141f69a9b7c480" - -PACKAGECONFIG ??= " \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'gtk', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'gtk', '', d)} \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'vapi', '', d)} \ -" -PACKAGECONFIG[gtk] = "-Dgtk4=true,-Dgtk4=false,gtk4" -PACKAGECONFIG[ssh_agent] = "-Dssh_agent=true,-Dssh_agent=false,libsecret,openssh" -#'Use systemd socket activation for server programs' -PACKAGECONFIG[systemd] = "-Dsystemd=enabled,-Dsystemd=disabled,systemd" -PACKAGECONFIG[vapi] = "-Dvapi=true,-Dvapi=false," - -FILES:${PN} += " \ - ${datadir}/dbus-1 \ - ${datadir}/gcr-4 \ - ${systemd_user_unitdir}/gcr-ssh-agent.socket \ - ${systemd_user_unitdir}/gcr-ssh-agent.service \ -" - -# http://errors.yoctoproject.org/Errors/Details/20229/ -ARM_INSTRUCTION_SET:armv4 = "arm" -ARM_INSTRUCTION_SET:armv5 = "arm" -ARM_INSTRUCTION_SET:armv6 = "arm" - -EXTRA_OEMESON += "--cross-file=${WORKDIR}/meson-${PN}.cross" - -do_write_config:append() { - cat >${WORKDIR}/meson-${PN}.cross < -Date: Fri, 15 Feb 2019 11:17:27 +0100 -Subject: [PATCH] Do not write $bindir into pkg-config files - -This would otherwise break when using the files to build other target -components (we need to rely on PATH containing the paths to utilities, -rather than use target paths). - -Upstream-Status: Inappropriate [upstream wants the paths in .pc files] -Signed-off-by: Alexander Kanavin - ---- - gio/meson.build | 16 ++++++++-------- - glib/meson.build | 6 +++--- - 2 files changed, 11 insertions(+), 11 deletions(-) - -diff --git a/gio/meson.build b/gio/meson.build -index a320c0f..86ce7c4 100644 ---- a/gio/meson.build -+++ b/gio/meson.build -@@ -884,14 +884,14 @@ pkg.generate(libgio, - 'dtdsdir=' + '${datadir}' / dtds_subdir, - 'bindir=' + '${prefix}' / get_option('bindir'), - 'giomoduledir=' + pkgconfig_giomodulesdir, -- 'gio=' + '${bindir}' / 'gio', -- 'gio_querymodules=' + pkgconfig_multiarch_bindir / 'gio-querymodules', -- 'glib_compile_schemas=' + pkgconfig_multiarch_bindir / 'glib-compile-schemas', -- 'glib_compile_resources=' + '${bindir}' / 'glib-compile-resources', -- 'gdbus=' + '${bindir}' /'gdbus', -- 'gdbus_codegen=' + '${bindir}' / 'gdbus-codegen', -- 'gresource=' + '${bindir}' / 'gresource', -- 'gsettings=' + '${bindir}' / 'gsettings', -+ 'gio=gio', -+ 'gio_querymodules=gio-querymodules', -+ 'glib_compile_schemas=glib-compile-schemas', -+ 'glib_compile_resources=glib-compile-resources', -+ 'gdbus=gdbus', -+ 'gdbus_codegen=gdbus-codegen', -+ 'gresource=gresource', -+ 'gsettings=gsettings', - ], - version : glib_version, - install_dir : glib_pkgconfigreldir, -diff --git a/glib/meson.build b/glib/meson.build -index c26a35e..1d8ca6b 100644 ---- a/glib/meson.build -+++ b/glib/meson.build -@@ -447,9 +447,9 @@ pkg.generate(libglib, - variables : [ - 'bindir=' + '${prefix}' / get_option('bindir'), - 'datadir=' + '${prefix}' / get_option('datadir'), -- 'glib_genmarshal=' + '${bindir}' / 'glib-genmarshal', -- 'gobject_query=' + '${bindir}' / 'gobject-query', -- 'glib_mkenums=' + '${bindir}' / 'glib-mkenums', -+ 'glib_genmarshal=glib-genmarshal', -+ 'gobject_query=gobject-query', -+ 'glib_mkenums=glib-mkenums', - 'glib_valgrind_suppressions=' + '${datadir}' / - valgrind_suppression_file_install_subdir / - fs.name(valgrind_suppression_file), diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch deleted file mode 100644 index 16f2d31..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Fix-DATADIRNAME-on-uclibc-Linux.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c94e669de98a3892c699bd8d0d2b5164b2de747e Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Mar 2014 22:42:29 -0700 -Subject: [PATCH] Fix DATADIRNAME on uclibc/Linux - -translation files are always installed under PREFIX/share/locale in uclibc -based systems therefore lets set DATADIRNAME to "share". - -Signed-off-by: Khem Raj -Upstream-Status: Pending - - ---- - m4macros/glib-gettext.m4 | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/m4macros/glib-gettext.m4 b/m4macros/glib-gettext.m4 -index df6fbf0..47db864 100644 ---- a/m4macros/glib-gettext.m4 -+++ b/m4macros/glib-gettext.m4 -@@ -293,6 +293,10 @@ msgstr "" - CATOBJEXT=.mo - DATADIRNAME=share - ;; -+ *-*-musl* | *-*-linux-uclibc*) -+ CATOBJEXT=.gmo -+ DATADIRNAME=share -+ ;; - *) - CATOBJEXT=.mo - DATADIRNAME=lib diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch deleted file mode 100644 index 597864d..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Install-gio-querymodules-as-libexec_PROGRAM.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 0015db45cd1bfefc04959dffab5dabeead93136f Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Tue, 22 Mar 2016 15:14:58 +0200 -Subject: [PATCH] Install gio-querymodules as libexec_PROGRAM - -We want to install this binary with the gio library, and debian -renamer does not cope with library packages with files in ${bindir} - -Signed-off-by: Jussi Kukkonen -Upstream-Status: Inappropriate [OE specific] - ---- - gio/meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/gio/meson.build b/gio/meson.build -index 2ef60ed..532b086 100644 ---- a/gio/meson.build -+++ b/gio/meson.build -@@ -936,6 +936,7 @@ gio_querymodules = executable('gio-querymodules', 'gio-querymodules.c', 'giomodu - c_args : gio_c_args, - # intl.lib is not compatible with SAFESEH - link_args : noseh_link_args, -+ install_dir: glib_libexecdir, - dependencies : [libgio_dep, libgobject_dep, libgmodule_dep, libglib_dep]) - - glib_compile_schemas = executable('glib-compile-schemas', diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch deleted file mode 100644 index 6fd9352..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 4f47b8a8d650d185aa61aec2f56a283522a723c4 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 12 Jun 2015 17:08:46 +0300 -Subject: [PATCH] Remove the warning about deprecated paths in schemas - -Some schemas in gsettings-desktop-schemas (such as proxy and locale) -are still using deprecated paths, as of 3.16.1. This causes warning -messages, and meta/lib/oe/rootfs.py complaints about them. - -Upstream-Status: Inappropriate -Signed-off-by: Alexander Kanavin - ---- - gio/glib-compile-schemas.c | 13 ------------- - 1 file changed, 13 deletions(-) - -diff --git a/gio/glib-compile-schemas.c b/gio/glib-compile-schemas.c -index 7888120..7acbd5b 100644 ---- a/gio/glib-compile-schemas.c -+++ b/gio/glib-compile-schemas.c -@@ -1232,19 +1232,6 @@ parse_state_start_schema (ParseState *state, - return; - } - -- if (path && (g_str_has_prefix (path, "/apps/") || -- g_str_has_prefix (path, "/desktop/") || -- g_str_has_prefix (path, "/system/"))) -- { -- gchar *message = NULL; -- message = g_strdup_printf (_("Warning: Schema “%s” has path “%s”. " -- "Paths starting with " -- "“/apps/”, “/desktop/” or “/system/” are deprecated."), -- id, path); -- g_printerr ("%s\n", message); -- g_free (message); -- } -- - state->schema_state = schema_state_new (path, gettext_domain, - extends, extends_name, list_of); - diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch deleted file mode 100644 index 2e1e231..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-Set-host_machine-correctly-when-building-with-mingw3.patch +++ /dev/null @@ -1,81 +0,0 @@ -From ba1728bc27c88597164957d000b70ec4be6edf28 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 13 Feb 2019 15:32:05 +0100 -Subject: [PATCH] Set host_machine correctly when building with mingw32 - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - gio/tests/meson.build | 8 ++++---- - glib/tests/meson.build | 2 +- - meson.build | 3 +++ - 3 files changed, 8 insertions(+), 5 deletions(-) - -diff --git a/gio/tests/meson.build b/gio/tests/meson.build -index f644aa2..64a8684 100644 ---- a/gio/tests/meson.build -+++ b/gio/tests/meson.build -@@ -29,7 +29,7 @@ endif - - test_cpp_args = test_c_args - --if host_machine.system() == 'windows' -+if host_system == 'windows' - common_gio_tests_deps += [iphlpapi_dep, winsock2, cc.find_library ('secur32')] - endif - -@@ -210,7 +210,7 @@ if have_dbus_daemon - endif - - # Test programs buildable on UNIX only --if host_machine.system() != 'windows' -+if host_system != 'windows' - gio_tests += { - 'file' : {}, - 'gdbus-peer-object-manager' : {}, -@@ -462,7 +462,7 @@ if host_machine.system() != 'windows' - endif # unix - - # Test programs buildable on Windows only --if host_machine.system() == 'windows' -+if host_system == 'windows' - gio_tests += {'win32-streams' : {}} - endif - -@@ -532,7 +532,7 @@ if cc.get_id() != 'msvc' and cc.get_id() != 'clang-cl' - } - endif - --if host_machine.system() != 'windows' -+if host_system != 'windows' - test_extra_programs += { - 'gdbus-example-unix-fd-client' : { - 'install' : false, -diff --git a/glib/tests/meson.build b/glib/tests/meson.build -index db01b54..6950817 100644 ---- a/glib/tests/meson.build -+++ b/glib/tests/meson.build -@@ -188,7 +188,7 @@ if glib_conf.has('HAVE_EVENTFD') - } - endif - --if host_machine.system() == 'windows' -+if host_system == 'windows' - if winsock2.found() - glib_tests += { - 'gpoll' : { -diff --git a/meson.build b/meson.build -index 43bb468..5f9b59c 100644 ---- a/meson.build -+++ b/meson.build -@@ -43,6 +43,9 @@ else - endif - - host_system = host_machine.system() -+if host_system == 'mingw32' -+ host_system = 'windows' -+endif - - if host_system == 'darwin' - ios_test_code = '''#include diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch deleted file mode 100644 index d33fdd4..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 92de6c7eb30b961b24a2dce812d5276487b7d23d Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Wed, 8 Jan 2020 18:22:46 +0100 -Subject: [PATCH] gio/tests/resources.c: comment out a build host-only test - -This test requires building resources in a way that is -not cross-compatible (hardcodes ld and objcopy). - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - gio/tests/resources.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/gio/tests/resources.c b/gio/tests/resources.c -index c44d214..e289a01 100644 ---- a/gio/tests/resources.c -+++ b/gio/tests/resources.c -@@ -993,7 +993,7 @@ main (int argc, - g_test_add_func ("/resource/automatic", test_resource_automatic); - /* This only uses automatic resources too, so it tests the constructors and destructors */ - g_test_add_func ("/resource/module", test_resource_module); -- g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); -+ /* g_test_add_func ("/resource/binary-linked", test_resource_binary_linked); */ - #endif - g_test_add_func ("/resource/uri/query-info", test_uri_query_info); - g_test_add_func ("/resource/uri/file", test_uri_file); diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch deleted file mode 100644 index 44482dd..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-meson-Run-atomics-test-on-clang-as-well.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 4b97f457b7b44117e27d2a218c4b68e7fe3fe4ce Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 12 Oct 2019 17:46:26 -0700 -Subject: [PATCH] meson: Run atomics test on clang as well - -Fixes -./glib-2.62.1/glib/gatomic.c:675:2: error: G_ATOMIC_LOCK_FREE defined, but incapable of lock-free atomics. -^ - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index afb6eaa..6aa70f5 100644 ---- a/meson.build -+++ b/meson.build -@@ -1692,7 +1692,7 @@ atomicdefine = ''' - # We know that we can always use real ("lock free") atomic operations with MSVC - if cc.get_id() == 'msvc' or cc.get_id() == 'clang-cl' or cc.links(atomictest, name : 'atomic ops') - have_atomic_lock_free = true -- if cc.get_id() == 'gcc' and not cc.compiles(atomicdefine, name : 'atomic ops define') -+ if (cc.get_id() == 'gcc' or cc.get_id() == 'clang') and not cc.compiles(atomicdefine, name : 'atomic ops define') - # Old gcc release may provide - # __sync_bool_compare_and_swap but doesn't define - # __GCC_HAVE_SYNC_COMPARE_AND_SWAP_4 diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch deleted file mode 100644 index 788f420..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 9aa9574861fad39d0679025e35fe1e188345f685 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Sat, 16 Sep 2023 22:28:27 +0200 -Subject: [PATCH] meson.build: do not enable pidfd features on native glib - builds - -We still use host distros like alma 8 with kernels older than 5.4, -where these features are not implemented. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - meson.build | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 1c36993..bbf97fc 100644 ---- a/meson.build -+++ b/meson.build -@@ -981,7 +981,8 @@ if cc.links('''#include - waitid (P_PIDFD, 0, &child_info, WEXITED | WNOHANG); - return 0; - }''', name : 'pidfd_open(2) system call') -- glib_conf.set('HAVE_PIDFD', 1) -+ #requires kernel 5.4+ -+ #glib_conf.set('HAVE_PIDFD', 1) - endif - - # Check for __uint128_t (gcc) by checking for 128-bit division --- -2.30.2 - diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch deleted file mode 100644 index 1c645f3..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/0010-Do-not-hardcode-python-path-into-various-tools.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 79ce7e545dd3a93f77d2146d50b6fa061fbceed9 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Tue, 3 Oct 2017 10:45:55 +0300 -Subject: [PATCH] Do not hardcode python path into various tools - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - gio/gdbus-2.0/codegen/gdbus-codegen.in | 2 +- - gobject/glib-genmarshal.in | 2 +- - gobject/glib-mkenums.in | 2 +- - 3 files changed, 3 insertions(+), 3 deletions(-) - -diff --git a/gio/gdbus-2.0/codegen/gdbus-codegen.in b/gio/gdbus-2.0/codegen/gdbus-codegen.in -index 67d3675..4e92a7a 100755 ---- a/gio/gdbus-2.0/codegen/gdbus-codegen.in -+++ b/gio/gdbus-2.0/codegen/gdbus-codegen.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python3 - - # GDBus - GLib D-Bus Library - # -diff --git a/gobject/glib-genmarshal.in b/gobject/glib-genmarshal.in -index 7380f24..c8abeaa 100755 ---- a/gobject/glib-genmarshal.in -+++ b/gobject/glib-genmarshal.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python3 - - # pylint: disable=too-many-lines, missing-docstring, invalid-name - -diff --git a/gobject/glib-mkenums.in b/gobject/glib-mkenums.in -index 91ad779..3ebef62 100755 ---- a/gobject/glib-mkenums.in -+++ b/gobject/glib-mkenums.in -@@ -1,4 +1,4 @@ --#!/usr/bin/env @PYTHON@ -+#!/usr/bin/env python3 - - # If the code below looks horrible and unpythonic, do not panic. - # diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common b/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common deleted file mode 100644 index 0d7c5fa..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common +++ /dev/null @@ -1,3 +0,0 @@ -[properties] -# On all known supported architectures the stack grows down -growing_stack = false diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-glibc b/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-glibc deleted file mode 100644 index 3049e51..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-glibc +++ /dev/null @@ -1,6 +0,0 @@ -[properties] -have_c99_vsnprintf = true -have_c99_snprintf = true -have_unix98_printf = true -va_val_copy = true -have_strlcpy = true diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-linux b/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-linux deleted file mode 100644 index adad7e6..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-linux +++ /dev/null @@ -1,5 +0,0 @@ -[properties] -have_proc_self_cmdline = true - -[binaries] -env = '/usr/bin/env' diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-mingw b/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-mingw deleted file mode 100644 index 75f911b..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-mingw +++ /dev/null @@ -1,6 +0,0 @@ -[properties] -have_c99_vsnprintf = false -have_c99_snprintf = false -have_unix98_printf = false -va_val_copy = true -have_proc_self_cmdline = false diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-musl b/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-musl deleted file mode 100644 index 3049e51..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/meson.cross.d/common-musl +++ /dev/null @@ -1,6 +0,0 @@ -[properties] -have_c99_vsnprintf = true -have_c99_snprintf = true -have_unix98_printf = true -va_val_copy = true -have_strlcpy = true diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/relocate-modules.patch b/meta-gnome/recipes-support/glib-2.0/glib-2.0/relocate-modules.patch deleted file mode 100644 index 841fede..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/relocate-modules.patch +++ /dev/null @@ -1,45 +0,0 @@ -From b90d13900dd2777c2ab90c5b0be1a872c10a17da Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 11 Mar 2016 15:35:55 +0000 -Subject: [PATCH] glib-2.0: relocate the GIO module directory for native builds - -Instead of hard-coding GIO_MODULE_PATH when glib is built, use dladdr() to -determine where libglib.so is and use that path to calculate GIO_MODULES_DIR. - -This solves relocation problems with GIOModule for native builds of glib. - -Upstream-Status: Inappropriate -Signed-off-by: Ross Burton - -Port patch to 2.48 -Signed-off-by: Jussi Kukkonen - ---- - gio/giomodule.c | 7 ------- - 1 file changed, 7 deletions(-) - -diff --git a/gio/giomodule.c b/gio/giomodule.c -index 17fabe6..8021208 100644 ---- a/gio/giomodule.c -+++ b/gio/giomodule.c -@@ -1271,11 +1271,6 @@ get_gio_module_dir (void) - g_free (install_dir); - #else - module_dir = g_strdup (GIO_MODULE_DIR); --#ifdef __APPLE__ --#include "TargetConditionals.h" --/* Only auto-relocate on macOS, not watchOS etc; older macOS SDKs only define TARGET_OS_MAC */ --#if (defined (TARGET_OS_OSX) && TARGET_OS_OSX) || \ -- (!defined (TARGET_OS_OSX) && defined (TARGET_OS_MAC) && TARGET_OS_MAC) - #include - { - g_autofree gchar *path = NULL; -@@ -1294,8 +1289,6 @@ get_gio_module_dir (void) - } - } - } --#endif --#endif - #endif - } - diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0/run-ptest b/meta-gnome/recipes-support/glib-2.0/glib-2.0/run-ptest deleted file mode 100644 index 831bc3b..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0/run-ptest +++ /dev/null @@ -1,10 +0,0 @@ -#! /bin/sh - -set -eux -if id -u glib2-test; then - userdel glib2-test -fi -useradd glib2-test -cd /tmp -su glib2-test -c 'G_TEST_TMPDIR=`readlink -f /tmp` gnome-desktop-testing-runner glib' -userdel glib2-test diff --git a/meta-gnome/recipes-support/glib-2.0/glib-2.0_2.78.0.bb b/meta-gnome/recipes-support/glib-2.0/glib-2.0_2.78.0.bb deleted file mode 100644 index 500e4e8..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib-2.0_2.78.0.bb +++ /dev/null @@ -1,53 +0,0 @@ -require glib.inc - -PE = "1" - -SHRT_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "${GNOME_MIRROR}/glib/${SHRT_VER}/glib-${PV}.tar.xz \ - file://run-ptest \ - file://0001-Fix-DATADIRNAME-on-uclibc-Linux.patch \ - file://0001-Remove-the-warning-about-deprecated-paths-in-schemas.patch \ - file://0001-Install-gio-querymodules-as-libexec_PROGRAM.patch \ - file://0010-Do-not-hardcode-python-path-into-various-tools.patch \ - file://0001-Set-host_machine-correctly-when-building-with-mingw3.patch \ - file://0001-Do-not-write-bindir-into-pkg-config-files.patch \ - file://0001-meson-Run-atomics-test-on-clang-as-well.patch \ - file://0001-gio-tests-resources.c-comment-out-a-build-host-only-.patch \ - " -SRC_URI:append:class-native = " file://relocate-modules.patch \ - file://0001-meson.build-do-not-enable-pidfd-features-on-native-g.patch \ - " - -SRC_URI[sha256sum] = "44eaab8b720877ce303c5540b657b126f12dc94972d9880b52959f43fb537b30" - -# Find any meson cross files in FILESPATH that are relevant for the current -# build (using siteinfo) and add them to EXTRA_OEMESON. -inherit siteinfo -def find_meson_cross_files(d): - if bb.data.inherits_class('native', d): - return "" - - thisdir = os.path.normpath(d.getVar("THISDIR")) - import collections - sitedata = siteinfo_data(d) - # filename -> found - files = collections.OrderedDict() - for path in d.getVar("FILESPATH").split(":"): - for element in sitedata: - filename = os.path.normpath(os.path.join(path, "meson.cross.d", element)) - sanitized_path = filename.replace(thisdir, "${THISDIR}") - if sanitized_path == filename: - if os.path.exists(filename): - bb.error("Cannot add '%s' to --cross-file, because it's not relative to THISDIR '%s' and sstate signature would contain this full path" % (filename, thisdir)) - continue - files[filename.replace(thisdir, "${THISDIR}")] = os.path.exists(filename) - - items = ["--cross-file=" + k for k,v in files.items() if v] - d.appendVar("EXTRA_OEMESON", " " + " ".join(items)) - items = ["%s:%s" % (k, "True" if v else "False") for k,v in files.items()] - d.appendVarFlag("do_configure", "file-checksums", " " + " ".join(items)) - -python () { - find_meson_cross_files(d) -} diff --git a/meta-gnome/recipes-support/glib-2.0/glib.inc b/meta-gnome/recipes-support/glib-2.0/glib.inc deleted file mode 100644 index c314594..0000000 --- a/meta-gnome/recipes-support/glib-2.0/glib.inc +++ /dev/null @@ -1,202 +0,0 @@ -SUMMARY = "A general-purpose utility library" -DESCRIPTION = "GLib is a general-purpose utility library, which provides many useful data types, macros, type conversions, string utilities, file utilities, a main loop abstraction, and so on." -HOMEPAGE = "https://developer.gnome.org/glib/" - -# pcre is under BSD; -# docs/reference/COPYING is with a 'public domain'-like license! -LICENSE = "LGPL-2.1-or-later & BSD-3-Clause & PD" -LIC_FILES_CHKSUM = "file://COPYING;md5=41890f71f740302b785c27661123bff5 \ - file://glib/glib.h;beginline=4;endline=17;md5=72f7cc2847407f65d8981ef112e4e630 \ - file://LICENSES/LGPL-2.1-or-later.txt;md5=41890f71f740302b785c27661123bff5 \ - file://gmodule/gmodule.h;beginline=4;endline=17;md5=72f7cc2847407f65d8981ef112e4e630 \ - file://docs/reference/COPYING;md5=f51a5100c17af6bae00735cd791e1fcc" -BUGTRACKER = "http://bugzilla.gnome.org" -SECTION = "libs" - -CVE_PRODUCT = "glib" - -BBCLASSEXTEND = "native nativesdk" - -DEPENDS = "glib-2.0-native \ - virtual/libintl \ - virtual/libiconv \ - libffi \ - libpcre2 \ - zlib" - -PACKAGES += "${PN}-codegen ${PN}-utils" - -LEAD_SONAME = "libglib-2.0.*" - -inherit meson gettext gtk-doc pkgconfig ptest-gnome upstream-version-is-even bash-completion gio-module-cache manpages - -DEPENDS:append:class-target = "${@' gtk-doc' if d.getVar('GTKDOC_ENABLED') == 'True' else ''}" - -GTKDOC_MESON_OPTION = "gtk_doc" - -S = "${WORKDIR}/glib-${PV}" - -PACKAGECONFIG ??= "libmount \ - ${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" -PACKAGECONFIG[libmount] = "-Dlibmount=enabled,-Dlibmount=disabled,util-linux" -PACKAGECONFIG[manpages] = "-Dman=true, -Dman=false, libxslt-native xmlto-native" -PACKAGECONFIG[libelf] = "-Dlibelf=enabled,-Dlibelf=disabled,elfutils" -PACKAGECONFIG[tests] = "-Dinstalled_tests=true,-Dinstalled_tests=false," -PACKAGECONFIG[selinux] = "-Dselinux=enabled,-Dselinux=disabled,libselinux" - -EXTRA_OEMESON = "-Ddtrace=false -Dsystemtap=false" - -do_configure:prepend() { - sed -i -e '1s,#!.*,#!${USRBINPATH}/env python3,' ${S}/gio/gdbus-2.0/codegen/gdbus-codegen.in -} - -FILES:${PN} = "${libdir}/lib*${SOLIBS} \ - ${libdir}/gio \ - ${libexecdir}/*gio-querymodules \ - ${libexecdir}/*gio-launch-desktop \ - ${datadir}/glib-2.0/dtds \ - ${datadir}/glib-2.0/schemas" - -FILES:${PN}-utils += "${bindir}/glib-genmarshal \ - ${bindir}/glib-gettextize \ - ${bindir}/glib-mkenums \ - ${bindir}/glib-compile-resources" - -FILES:${PN}-dev += "${libdir}/glib-2.0/include \ - ${libdir}/gio/modules/lib*${SOLIBSDEV} \ - ${libdir}/gio/modules/*.la \ - ${datadir}/glib-2.0/gettext/po/Makefile.in.in \ - ${datadir}/glib-2.0/schemas/gschema.dtd \ - ${datadir}/glib-2.0/valgrind/glib.supp \ - ${datadir}/gettext/its" -FILES:${PN}-dbg += "${datadir}/glib-2.0/gdb ${datadir}/gdb" -FILES:${PN}-codegen = "${datadir}/glib-2.0/codegen/*.py \ - ${bindir}/gdbus-codegen" -FILES:${PN}-utils = "${bindir}/*" - -SHAREDMIMEDEP = "shared-mime-info" -SHAREDMIMEDEP:class-native = "" -# When cross compiling for Windows we don't want to include this -SHAREDMIMEDEP:mingw32 = "" - -RRECOMMENDS:${PN} += "${SHAREDMIMEDEP}" - -ARM_INSTRUCTION_SET:armv4 = "arm" -ARM_INSTRUCTION_SET:armv5 = "arm" -# Valgrind runtime detection works using hand-written assembly, which -# doesn't support mips16e -CPPFLAGS:append:class-target:mips16e = " -DNVALGRIND=1" - -# GLib generally requires gettext to be present so for USE_NLS to yes. For -# native builds as i18n is disabled globally we have to add a gettext-native dependency. -USE_NLS:class-target = "yes" -USE_NLS:class-nativesdk = "yes" -DEPENDS:append:class-native = " gettext-native" - -EXEEXT = "" -EXEEXT:mingw32 = ".exe" - -do_install:append () { - if [ -f ${D}${bindir}/gtester-report ]; then - sed ${D}${bindir}/gtester-report -i -e '1s|^#!.*|#!/usr/bin/env python3|' - fi - - # Remove some unpackaged files - rm -rf ${D}${datadir}/glib-2.0/codegen/__pycache__ - rm -f ${D}${datadir}/glib-2.0/codegen/*.pyc - rm -f ${D}${datadir}/glib-2.0/codegen/*.pyo - - if [ -e ${D}${libdir}/charset.alias ]; then - rm -f ${D}${libdir}/charset.alias - fi - - # Make sure gio-querymodules is unique among multilibs - if test "x${MLPREFIX}" != "x"; then - mv ${D}${libexecdir}/gio-querymodules${EXEEXT} ${D}${libexecdir}/${MLPREFIX}gio-querymodules${EXEEXT} - fi - # Autotools does this, meson does not - mkdir -p ${D}${libdir}/gio/modules -} - -do_install:append:class-target () { - # Tests are only installed on targets, not native builds. Separating this out - # keeps glib-2.0-native from depending on DISTRO_FEATURES - if [ -f ${D}${datadir}/installed-tests/glib/gdbus-serialization.test ]; then - if ${@bb.utils.contains("DISTRO_FEATURES", "x11", "false", "true", d)}; then - rm ${D}${datadir}/installed-tests/glib/gdbus-serialization.test - fi - fi - if [ -f ${D}${datadir}/installed-tests/glib/static-link.test ]; then - if test "x${MLPREFIX}" != "x"; then - mv ${D}${datadir}/installed-tests/glib/static-link.test ${D}${datadir}/installed-tests/glib/${MLPREFIX}static-link.test - fi - fi - # https://gitlab.gnome.org/GNOME/glib/-/issues/2810 - rm -f ${D}${datadir}/installed-tests/glib/thread-pool-slow.test -} - -# As we do not build python3 for windows, makes no sense to ship the script that's using it -do_install:append:mingw32() { - rm -f ${D}${bindir}/gtester-report -} - -CODEGEN_PYTHON_RDEPENDS = "python3 python3-distutils python3-xml" -CODEGEN_PYTHON_RDEPENDS:mingw32 = "" - -RDEPENDS:${PN}-codegen += "${CODEGEN_PYTHON_RDEPENDS}" - -RDEPENDS:${PN}-ptest += "${PN}-utils" - -RDEPENDS:${PN}-ptest += "\ - coreutils \ - libgcc \ - dbus \ - desktop-file-utils \ - gnome-desktop-testing \ - tzdata \ - tzdata-americas \ - tzdata-asia \ - tzdata-europe \ - tzdata-posix \ - shared-mime-info \ - ${PN}-locale-ja \ - ${PN}-locale-fr \ - ${PN}-locale-el \ - ${PN}-locale-hr \ - ${PN}-locale-lt \ - ${PN}-locale-pl \ - ${PN}-locale-ru \ - ${PN}-locale-th \ - python3-core \ - python3-modules \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', 'python3-dbusmock', '', d)} \ - ${PN}-codegen \ - " - -RDEPENDS:${PN}-ptest:append:libc-glibc = "\ - glibc-gconv-utf-16 \ - glibc-charmap-utf-8 \ - glibc-gconv-cp1255 \ - glibc-charmap-cp1255 \ - glibc-gconv-utf-32 \ - glibc-gconv-utf-7 \ - glibc-gconv-euc-jp \ - glibc-gconv-iso8859-1 \ - glibc-gconv-iso8859-15 \ - glibc-charmap-invariant \ - glibc-localedata-translit-cjk-variants \ - locale-base-tr-tr \ - locale-base-lt-lt \ - locale-base-ja-jp.euc-jp \ - locale-base-fa-ir \ - locale-base-ru-ru \ - locale-base-de-de \ - locale-base-hr-hr \ - locale-base-el-gr \ - locale-base-fr-fr \ - locale-base-es-es \ - locale-base-en-gb \ - locale-base-en-us \ - locale-base-pl-pl \ - locale-base-pl-pl.iso-8859-2 \ - " diff --git a/meta-gnome/recipes-support/gsound/gsound_1.0.3.bb b/meta-gnome/recipes-support/gsound/gsound_1.0.3.bb index bdef603..32ddadd 100644 --- a/meta-gnome/recipes-support/gsound/gsound_1.0.3.bb +++ b/meta-gnome/recipes-support/gsound/gsound_1.0.3.bb @@ -7,8 +7,6 @@ DEPENDS = " \ libcanberra \ " -GNOMEBASEBUILDCLASS = "meson" - inherit gnomebase gettext gobject-introspection vala SRC_URI[archive.sha256sum] = "ca2d039e1ebd148647017a7f548862350bc9af01986d39f10cfdc8e95f07881a" diff --git a/meta-gnome/recipes-support/gtk+/gtk+3.inc b/meta-gnome/recipes-support/gtk+/gtk+3.inc deleted file mode 100644 index 8d01e60..0000000 --- a/meta-gnome/recipes-support/gtk+/gtk+3.inc +++ /dev/null @@ -1,151 +0,0 @@ - -SUMMARY = "Multi-platform toolkit for creating GUIs" -DESCRIPTION = "GTK+ is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK+ is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "libs" - -DEPENDS = "glib-2.0 cairo pango atk jpeg libpng gdk-pixbuf gdk-pixbuf-native" - -LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" - -inherit meson gettext pkgconfig gtk-doc update-alternatives gtk-immodules-cache gsettings features_check gobject-introspection - -BBCLASSEXTEND = "native nativesdk" - -GSETTINGS_PACKAGE:class-native = "" - -# versions >= 3.90 are development versions, otherwise like upstream-version-is-even -UPSTREAM_CHECK_REGEX = "[^\d\.](?P3\.([1-8]?[02468])+(\.\d+)+)\.tar" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" - -do_configure:prepend() { - # These files are generated by wayland-scanner but will race over modification - # time between the copies in the sysroot from wayland-protocols and the copy - # in the source tree. Solve the race by deleting so they need to be regenerated. - rm -f ${S}/modules/input/*-text-input-*.[ch] -} - -GTKDOC_MESON_OPTION = 'gtk_doc' - -EXTRA_OEMESON = "-Dxinerama=no -Dtests=false" -EXTRA_OEMESON:append:class-native = " -Ddemos=false -Dexamples=false" - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'opengl wayland x11', d)}" -PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -PACKAGECONFIG[x11] = "-Dx11_backend=true,-Dx11_backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes" -# this is provided by oe-core patch that removes epoxy/gl dependency from a X11 build -PACKAGECONFIG[opengl] = "-Dopengl=true,-Dopengl=false,libepoxy" -PACKAGECONFIG[wayland] = "-Dwayland_backend=true,-Dwayland_backend=false,wayland wayland-protocols libxkbcommon virtual/egl virtual/libgles2 wayland-native" -PACKAGECONFIG[cups] = ",,cups,cups" -PACKAGECONFIG[colord] = "-Dcolord=yes,-Dcolord=no,colord" -PACKAGECONFIG[cloudproviders] = "-Dcloudproviders=true,-Dcloudproviders=false,libcloudproviders" -PACKAGECONFIG[tracker3] = "-Dtracker3=true,-Dtracker3=false,tracker,tracker-miners" - -prepare_gtk_scripts() { - mv ${D}${bindir}/gtk-update-icon-cache ${D}${bindir}/gtk-update-icon-cache-3.0 - - # duplicate gtk-query-immodules for post install script update_gtk_immodules_cache - mkdir -p ${D}${libexecdir} - ln ${D}${bindir}/gtk-query-immodules-3.0 ${D}${libexecdir}/${MLPREFIX}gtk-query-immodules-3.0 -} - -do_install:append:class-target() { - prepare_gtk_scripts -} - -do_install:append:class-nativesdk() { - prepare_gtk_scripts -} - -do_install:append:class-native() { - create_wrapper ${D}/${bindir}/gtk-update-icon-cache \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache - create_wrapper ${D}/${bindir}/gtk-encode-symbolic-svg \ - GDK_PIXBUF_MODULE_FILE=${STAGING_LIBDIR_NATIVE}/gdk-pixbuf-2.0/2.10.0/loaders.cache -} - -PROVIDES += "gtk-icon-utils" -PACKAGES =+ "${PN}-demo" -LIBV = "3.0.0" - -FILES:${PN}-demo = "${bindir}/gtk3-demo \ - ${bindir}/gtk3-demo-application \ - ${bindir}/gtk3-icon-browser \ - ${bindir}/gtk3-widget-factory \ - ${datadir}/gtk-3.0/demo \ - ${datadir}/applications/gtk3-demo.desktop \ - ${datadir}/applications/gtk3-icon-browser.desktop \ - ${datadir}/applications/gtk3-widget-factory.desktop \ - ${datadir}/icons/hicolor/*/apps/gtk3-demo*.png \ - ${datadir}/icons/hicolor/*/apps/gtk3-widget-factory*.png" - -FILES:${PN}:append = " ${bindir}/gtk-update-icon-cache-3.0 \ - ${bindir}/gtk-query-immodules-3.0 \ - ${bindir}/gtk-launch \ - ${datadir}/themes ${datadir}/gtk-3.0/emoji \ - ${sysconfdir} ${datadir}/glib-2.0/schemas/ \ - ${libdir}/gtk-3.0/${LIBV}/engines/libpixmap.so \ - ${libdir}/gtk-3.0/modules/*.so" - -FILES:${PN}-dev += " \ - ${datadir}/gtk-3.0/gtkbuilder.rng \ - ${datadir}/gtk-3.0/include \ - ${datadir}/gtk-3.0/valgrind \ - ${datadir}/gettext/its \ - ${libdir}/gtk-3.0/include \ - ${libdir}/gtk-3.0/${LIBV}/loaders/*.la \ - ${libdir}/gtk-3.0/${LIBV}/immodules/*.la \ - ${libdir}/gtk-3.0/3.0.0/printbackends/*.la \ - ${libdir}/gtk-3.0/${LIBV}/engines/*.la \ - ${libdir}/gtk-3.0/modules/*.la \ - ${bindir}/gtk-builder-convert \ - ${bindir}/gtk-encode-symbolic-svg \ - ${bindir}/gtk-builder-tool \ - ${bindir}/gtk-query-settings \ - " - -GTKBASE_RRECOMMENDS ?= "liberation-fonts \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-jpeg \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-xpm \ - shared-mime-info \ - adwaita-icon-theme-symbolic \ - " - -GTKBASE_RRECOMMENDS:class-native ?= "\ - " - -GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" - -RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" -RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" -RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" - -PACKAGES_DYNAMIC += "^gtk3-immodule-.* ^gtk3-printbackend-.*" - -ALTERNATIVE:${PN} = "gtk-update-icon-cache" -ALTERNATIVE_TARGET[gtk-update-icon-cache] = "${bindir}/gtk-update-icon-cache-3.0" -ALTERNATIVE_PRIORITY = "30" - -python populate_packages:prepend () { - import os.path - - gtk_libdir = d.expand('${libdir}/gtk-3.0/${LIBV}') - immodules_root = os.path.join(gtk_libdir, 'immodules') - printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - - immodules = do_split_packages(d, immodules_root, r'^im-(.*)\.so$', 'gtk3-immodule-%s', 'GTK input module for %s') - if immodules: - d.setVar("GTKIMMODULES_PACKAGES", " ".join(immodules)) - - do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk3-printbackend-%s', 'GTK printbackend module for %s') - - if (d.getVar('DEBIAN_NAMES')): - d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-3.0') -} diff --git a/meta-gnome/recipes-support/gtk+/gtk+3/opengl.patch b/meta-gnome/recipes-support/gtk+/gtk+3/opengl.patch deleted file mode 100644 index 7354265..0000000 --- a/meta-gnome/recipes-support/gtk+/gtk+3/opengl.patch +++ /dev/null @@ -1,737 +0,0 @@ -From 4a0716f04fb25b51b08e994bd5a900b2e7f7fed5 Mon Sep 17 00:00:00 2001 -From: Jussi Kukkonen -Date: Fri, 16 Oct 2015 16:35:16 +0300 -Subject: [PATCH] Do not try to initialize GL without libGL - -_gdk_x11_screen_update_visuals_for_gl() will end up calling epoxys -GLX api which will exit() if libGL.so.1 is not present. We do not -want that to happen and we don't want every app to have to set -"GDK_GL=disabled" environment variable: so use #ifdef set based on -opengl distro feature. - -Upstream is not interested in the fix as it is: Either epoxy should be -fixed (to not exit) or GTK+ possibly could do some additional probing -before calling epoxy APIs. - -Upstream-Status: Denied -Signed-off-by: Jussi Kukkonen ---- - demos/gtk-demo/meson.build | 5 ++++- - docs/tools/meson.build | 7 +++++-- - docs/tools/widgets.c | 6 +++++- - gdk/gdkconfig.h.meson | 1 + - gdk/gdkdisplay.c | 4 ++++ - gdk/gdkgl.c | 10 ++++++++++ - gdk/gdkglcontext.c | 6 ++++++ - gdk/gdkwindow.c | 13 +++++++++++++ - gdk/meson.build | 8 +++++++- - gdk/x11/gdkdisplay-x11.c | 6 +++++- - gdk/x11/gdkvisual-x11.c | 5 +++++ - gdk/x11/gdkwindow-x11.c | 4 ++++ - gdk/x11/gdkx-autocleanups.h | 2 ++ - gdk/x11/gdkx.h | 2 ++ - gdk/x11/meson.build | 7 +++++-- - gtk/gtkglarea.c | 19 +++++++++++++++++++ - gtk/inspector/general.c | 6 ++++++ - meson.build | 17 ++++++++++++++--- - meson_options.txt | 2 ++ - tests/meson.build | 9 +++++++-- - testsuite/gtk/objects-finalize.c | 2 ++ - 21 files changed, 128 insertions(+), 13 deletions(-) - -diff --git a/demos/gtk-demo/meson.build b/demos/gtk-demo/meson.build -index 252da16d05..4b57cff6ac 100644 ---- a/demos/gtk-demo/meson.build -+++ b/demos/gtk-demo/meson.build -@@ -28,7 +28,6 @@ demos = files([ - 'fishbowl.c', - 'foreigndrawing.c', - 'gestures.c', -- 'glarea.c', - 'headerbar.c', - 'hypertext.c', - 'iconview.c', -@@ -87,6 +86,10 @@ elif harfbuzz_dep.found() and pangoft_dep.found() - gtkdemo_deps += [harfbuzz_dep, pangoft_dep] - endif - -+if opengl_enabled -+ demos += files('glarea.c') -+endif -+ - if os_unix - demos += files('pagesetup.c') - endif -diff --git a/docs/tools/meson.build b/docs/tools/meson.build -index 05621ee7ed..3d0a333b32 100644 ---- a/docs/tools/meson.build -+++ b/docs/tools/meson.build -@@ -2,10 +2,13 @@ if x11_enabled - doc_shooter_sources = [ - 'shadow.c', - 'shooter.c', -- 'widgets.c', -- '../../tests/gtkgears.c', -+ 'widgets.c' - ] - -+ if opengl_enabled -+ doc_shooter_sources += ['../../tests/gtkgears.c'] -+ endif -+ - doc_shooter = executable('doc-shooter', doc_shooter_sources, - include_directories: [ confinc, gdkinc, gtkinc, testinc, ], - dependencies: libgtk_dep) -diff --git a/docs/tools/widgets.c b/docs/tools/widgets.c -index 932daf1746..348807e133 100644 ---- a/docs/tools/widgets.c -+++ b/docs/tools/widgets.c -@@ -8,7 +8,9 @@ - #include - #include - #include "widgets.h" -+#ifdef HAVE_OPENGL - #include "gtkgears.h" -+#endif - - #define SMALL_WIDTH 240 - #define SMALL_HEIGHT 75 -@@ -1526,9 +1528,11 @@ create_gl_area (void) - widget = gtk_frame_new (NULL); - gtk_frame_set_shadow_type (GTK_FRAME (widget), GTK_SHADOW_IN); - -+#ifdef HAVE_OPENGL - gears = gtk_gears_new (); - gtk_container_add (GTK_CONTAINER (widget), gears); -- -+#endif -+ - info = new_widget_info ("glarea", widget, MEDIUM); - - return info; -diff --git a/gdk/gdkconfig.h.meson b/gdk/gdkconfig.h.meson -index 7db19e0470..088651bafa 100644 ---- a/gdk/gdkconfig.h.meson -+++ b/gdk/gdkconfig.h.meson -@@ -15,6 +15,7 @@ G_BEGIN_DECLS - #mesondefine GDK_WINDOWING_WAYLAND - #mesondefine GDK_WINDOWING_WIN32 - #mesondefine GDK_WINDOWING_QUARTZ -+#mesondefine GDK_WITH_OPENGL - - G_END_DECLS - -diff --git a/gdk/gdkdisplay.c b/gdk/gdkdisplay.c -index 748f54860c..04ef2c09d4 100644 ---- a/gdk/gdkdisplay.c -+++ b/gdk/gdkdisplay.c -@@ -2420,7 +2420,11 @@ gboolean - gdk_display_make_gl_context_current (GdkDisplay *display, - GdkGLContext *context) - { -+#ifdef HAVE_OPENGL - return GDK_DISPLAY_GET_CLASS (display)->make_gl_context_current (display, context); -+#else -+ return FALSE; -+#endif - } - - GdkRenderingMode -diff --git a/gdk/gdkgl.c b/gdk/gdkgl.c -index 9690077cc2..55f85ef605 100644 ---- a/gdk/gdkgl.c -+++ b/gdk/gdkgl.c -@@ -26,7 +26,9 @@ - # include "win32/gdkwin32.h" - #endif - -+#ifdef HAVE_OPENGL - #include -+#endif - #include - #include - -@@ -40,6 +42,7 @@ gdk_cairo_surface_mark_as_direct (cairo_surface_t *surface, - g_object_ref (window), g_object_unref); - } - -+#ifdef HAVE_OPENGL - static const char * - get_vertex_type_name (int type) - { -@@ -212,6 +215,7 @@ use_texture_rect_program (GdkGLContextPaintData *paint_data) - glUseProgram (paint_data->current_program->program); - } - } -+#endif - - void - gdk_gl_texture_quads (GdkGLContext *paint_context, -@@ -220,6 +224,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, - GdkTexturedQuad *quads, - gboolean flip_colors) - { -+#ifdef HAVE_OPENGL - GdkGLContextPaintData *paint_data = gdk_gl_context_get_paint_data (paint_context); - GdkGLContextProgram *program; - GdkWindow *window = gdk_gl_context_get_window (paint_context); -@@ -293,6 +298,7 @@ gdk_gl_texture_quads (GdkGLContext *paint_context, - - glDisableVertexAttribArray (program->position_location); - glDisableVertexAttribArray (program->uv_location); -+#endif - } - - /* x,y,width,height describes a rectangle in the gl render buffer -@@ -341,6 +347,7 @@ gdk_cairo_draw_from_gl (cairo_t *cr, - int width, - int height) - { -+#ifdef HAVE_OPENGL - GdkGLContext *paint_context; - cairo_surface_t *image; - cairo_matrix_t matrix; -@@ -718,6 +725,7 @@ out: - if (clip_region) - cairo_region_destroy (clip_region); - -+#endif - } - - /* This is always called with the paint context current */ -@@ -725,6 +733,7 @@ void - gdk_gl_texture_from_surface (cairo_surface_t *surface, - cairo_region_t *region) - { -+#ifdef HAVE_OPENGL - GdkGLContext *paint_context; - cairo_surface_t *image; - double device_x_offset, device_y_offset; -@@ -825,4 +834,5 @@ gdk_gl_texture_from_surface (cairo_surface_t *surface, - - glDisable (GL_SCISSOR_TEST); - glDeleteTextures (1, &texture_id); -+#endif - } -diff --git a/gdk/gdkglcontext.c b/gdk/gdkglcontext.c -index 3b23639e1c..1f04f8e0b2 100644 ---- a/gdk/gdkglcontext.c -+++ b/gdk/gdkglcontext.c -@@ -85,7 +85,9 @@ - #include "gdkintl.h" - #include "gdk-private.h" - -+#ifdef HAVE_OPENGL - #include -+#endif - - typedef struct { - GdkDisplay *display; -@@ -243,6 +245,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, - int height, - guint texture_target) - { -+#ifdef HAVE_OPENGL - GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); - - g_return_if_fail (GDK_IS_GL_CONTEXT (context)); -@@ -286,6 +289,7 @@ gdk_gl_context_upload_texture (GdkGLContext *context, - glTexSubImage2D (texture_target, 0, 0, i, width, 1, GL_BGRA, GL_UNSIGNED_INT_8_8_8_8_REV, (unsigned char*) data + (i * stride)); - } - } -+#endif - } - - static gboolean -@@ -774,6 +778,7 @@ gdk_gl_context_realize (GdkGLContext *context, - static void - gdk_gl_context_check_extensions (GdkGLContext *context) - { -+#ifdef HAVE_OPENGL - GdkGLContextPrivate *priv = gdk_gl_context_get_instance_private (context); - gboolean has_npot, has_texture_rectangle; - -@@ -853,6 +858,7 @@ gdk_gl_context_check_extensions (GdkGLContext *context) - priv->use_texture_rectangle ? "yes" : "no")); - - priv->extensions_checked = TRUE; -+#endif - } - - /** -diff --git a/gdk/gdkwindow.c b/gdk/gdkwindow.c -index 727b0cf1f4..d4d91b0d16 100644 ---- a/gdk/gdkwindow.c -+++ b/gdk/gdkwindow.c -@@ -45,7 +45,9 @@ - - #include - -+#ifdef HAVE_OPENGL - #include -+#endif - - /* for the use of round() */ - #include "fallback-c89.c" -@@ -2844,6 +2846,13 @@ gdk_window_get_paint_gl_context (GdkWindow *window, - { - GError *internal_error = NULL; - -+#ifndef HAVE_OPENGL -+ g_set_error_literal (error, GDK_GL_ERROR, -+ GDK_GL_ERROR_NOT_AVAILABLE, -+ _("GL support disabled with --disable-opengl")); -+ return NULL; -+#endif -+ - if (_gdk_gl_flags & GDK_GL_DISABLE) - { - g_set_error_literal (error, GDK_GL_ERROR, -@@ -2979,6 +2988,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, - } - else - { -+#ifdef HAVE_OPENGL - gdk_gl_context_make_current (context); - /* With gl we always need a surface to combine the gl - drawing with the native drawing. */ -@@ -2993,6 +3003,7 @@ gdk_window_begin_paint_internal (GdkWindow *window, - glBlendFunc (GL_ONE, GL_ONE_MINUS_SRC_ALPHA); - - glViewport (0, 0, ww, wh); -+#endif - } - } - -@@ -3056,6 +3067,7 @@ gdk_window_end_paint_internal (GdkWindow *window) - - gdk_gl_context_make_current (window->gl_paint_context); - -+#ifdef HAVE_OPENGL - if (!cairo_region_is_empty (opaque_region)) - gdk_gl_texture_from_surface (window->current_paint.surface, - opaque_region); -@@ -3066,6 +3078,7 @@ gdk_window_end_paint_internal (GdkWindow *window) - window->current_paint.need_blend_region); - glDisable(GL_BLEND); - } -+#endif - - cairo_region_destroy (opaque_region); - -diff --git a/gdk/meson.build b/gdk/meson.build -index 4bb1bf2b6c..64172b8d3e 100644 ---- a/gdk/meson.build -+++ b/gdk/meson.build -@@ -56,7 +56,6 @@ gdk_gir_public_headers = files( - 'gdkdrawingcontext.h', - 'gdkevents.h', - 'gdkframetimings.h', -- 'gdkglcontext.h', - 'gdkkeys.h', - 'gdkkeysyms.h', - 'gdkmain.h', -@@ -78,6 +77,12 @@ gdk_gir_public_headers = files( - 'gdkwindow.h', - ) - gdk_nogir_public_headers = [files('gdkkeysyms-compat.h')] -+if opengl_enabled -+gdk_gir_public_headers += files('gdkglcontext.h') -+else -+gdk_nogir_public_headers += files('gdkglcontext.h') -+endif -+ - gdk_public_headers = gdk_gir_public_headers + gdk_nogir_public_headers - install_headers(gdk_public_headers, subdir : 'gtk-3.0/gdk') - -@@ -166,6 +171,7 @@ gdkconfig_cdata.set('GDK_WINDOWING_WAYLAND', wayland_enabled) - gdkconfig_cdata.set('GDK_WINDOWING_WIN32', win32_enabled) - gdkconfig_cdata.set('GDK_WINDOWING_BROADWAY', broadway_enabled) - gdkconfig_cdata.set('GDK_WINDOWING_QUARTZ', quartz_enabled) -+gdkconfig_cdata.set('GDK_WITH_OPENGL', opengl_enabled) - - gdkconfig = configure_file( - input : 'gdkconfig.h.meson', -diff --git a/gdk/x11/gdkdisplay-x11.c b/gdk/x11/gdkdisplay-x11.c -index 7e08f472cc..30fd7b6089 100644 ---- a/gdk/x11/gdkdisplay-x11.c -+++ b/gdk/x11/gdkdisplay-x11.c -@@ -37,7 +37,9 @@ - #include "gdkdisplay-x11.h" - #include "gdkprivate-x11.h" - #include "gdkscreen-x11.h" -+#ifdef HAVE_OPENGL - #include "gdkglcontext-x11.h" -+#endif - #include "gdk-private.h" - #include "gdkprofilerprivate.h" - -@@ -3191,7 +3193,9 @@ gdk_x11_display_class_init (GdkX11DisplayClass * class) - display_class->text_property_to_utf8_list = _gdk_x11_display_text_property_to_utf8_list; - display_class->utf8_to_string_target = _gdk_x11_display_utf8_to_string_target; - -- display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current; -+#ifdef HAVE_OPENGL -+ display_class->make_gl_context_current = gdk_x11_display_make_gl_context_current; -+#endif - - display_class->get_default_seat = gdk_x11_display_get_default_seat; - -diff --git a/gdk/x11/gdkvisual-x11.c b/gdk/x11/gdkvisual-x11.c -index 81479d81f4..3c8c5c02ff 100644 ---- a/gdk/x11/gdkvisual-x11.c -+++ b/gdk/x11/gdkvisual-x11.c -@@ -306,7 +306,12 @@ _gdk_x11_screen_init_visuals (GdkScreen *screen) - /* If GL is available we want to pick better default/rgba visuals, - as we care about glx details such as alpha/depth/stencil depth, - stereo and double buffering */ -+ /* update_visuals_for_gl() will end up calling epoxy GLX api which -+ will exit if libgl is not there: so only do this if we know GL -+ is available */ -+#ifdef HAVE_GLX - _gdk_x11_screen_update_visuals_for_gl (screen); -+#endif - } - - gint -diff --git a/gdk/x11/gdkwindow-x11.c b/gdk/x11/gdkwindow-x11.c -index 194bc82e29..0302bb68d4 100644 ---- a/gdk/x11/gdkwindow-x11.c -+++ b/gdk/x11/gdkwindow-x11.c -@@ -36,7 +36,9 @@ - #include "gdkasync.h" - #include "gdkeventsource.h" - #include "gdkdisplay-x11.h" -+#ifdef HAVE_OPENGL - #include "gdkglcontext-x11.h" -+#endif - #include "gdkprivate-x11.h" - #include "gdk-private.h" - -@@ -5888,7 +5890,9 @@ gdk_window_impl_x11_class_init (GdkWindowImplX11Class *klass) - impl_class->set_opaque_region = gdk_x11_window_set_opaque_region; - impl_class->set_shadow_width = gdk_x11_window_set_shadow_width; - impl_class->show_window_menu = gdk_x11_window_show_window_menu; -+#ifdef HAVE_OPENGL - impl_class->create_gl_context = gdk_x11_window_create_gl_context; - impl_class->invalidate_for_new_frame = gdk_x11_window_invalidate_for_new_frame; -+#endif - impl_class->get_unscaled_size = gdk_x11_window_get_unscaled_size; - } -diff --git a/gdk/x11/gdkx-autocleanups.h b/gdk/x11/gdkx-autocleanups.h -index edb0ea7dbf..a317d61cca 100644 ---- a/gdk/x11/gdkx-autocleanups.h -+++ b/gdk/x11/gdkx-autocleanups.h -@@ -30,7 +30,9 @@ G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DeviceXI2, g_object_unref) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Display, g_object_unref) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DisplayManager, g_object_unref) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11DragContext, g_object_unref) -+#ifdef HAVE_OPENGL - G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11GLContext, g_object_unref) -+#endif - G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Keymap, g_object_unref) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Screen, g_object_unref) - G_DEFINE_AUTOPTR_CLEANUP_FUNC(GdkX11Visual, g_object_unref) -diff --git a/gdk/x11/gdkx.h b/gdk/x11/gdkx.h -index 1f64bccb6d..4db6c18351 100644 ---- a/gdk/x11/gdkx.h -+++ b/gdk/x11/gdkx.h -@@ -43,7 +43,9 @@ - #include - #include - #include -+#ifdef GDK_WITH_OPENGL - #include -+#endif - #include - #include - #include -diff --git a/gdk/x11/meson.build b/gdk/x11/meson.build -index 754ae0a615..0318c83877 100644 ---- a/gdk/x11/meson.build -+++ b/gdk/x11/meson.build -@@ -14,7 +14,6 @@ gdk_x11_sources = files( - 'gdkeventsource.c', - 'gdkeventtranslator.c', - 'gdkgeometry-x11.c', -- 'gdkglcontext-x11.c', - 'gdkkeys-x11.c', - 'gdkmain-x11.c', - 'gdkproperty-x11.c', -@@ -42,7 +41,6 @@ gdk_x11_public_headers = files( - 'gdkx11display.h', - 'gdkx11displaymanager.h', - 'gdkx11dnd.h', -- 'gdkx11glcontext.h', - 'gdkx11keys.h', - 'gdkx11monitor.h', - 'gdkx11property.h', -@@ -53,6 +51,11 @@ gdk_x11_public_headers = files( - 'gdkx11window.h', - ) - -+if opengl_enabled -+ gdk_x11_sources += files('gdkglcontext-x11.c') -+ gdk_x11_public_headers += files('gdkx11glcontext.h') -+endif -+ - install_headers(gdk_x11_public_headers, subdir: 'gtk-3.0/gdk/x11/') - install_headers('gdkx.h', subdir: 'gtk-3.0/gdk/') - -diff --git a/gtk/gtkglarea.c b/gtk/gtkglarea.c -index 802303ea9f..6439d7745d 100644 ---- a/gtk/gtkglarea.c -+++ b/gtk/gtkglarea.c -@@ -29,7 +29,9 @@ - #include "gtkprivate.h" - #include "gtkrender.h" - -+#ifdef HAVE_OPENGL - #include -+#endif - - /** - * SECTION:gtkglarea -@@ -369,9 +371,12 @@ gtk_gl_area_real_create_context (GtkGLArea *area) - static void - gtk_gl_area_resize (GtkGLArea *area, int width, int height) - { -+#ifdef HAVE_OPENGL - glViewport (0, 0, width, height); -+#endif - } - -+#ifdef HAVE_OPENGL - /* - * Creates all the buffer objects needed for rendering the scene - */ -@@ -483,6 +488,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) - - priv->needs_render = TRUE; - } -+#endif - - /** - * gtk_gl_area_attach_buffers: -@@ -501,6 +507,7 @@ gtk_gl_area_allocate_buffers (GtkGLArea *area) - void - gtk_gl_area_attach_buffers (GtkGLArea *area) - { -+#ifdef HAVE_OPENGL - GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); - - g_return_if_fail (GTK_IS_GL_AREA (area)); -@@ -533,11 +540,13 @@ gtk_gl_area_attach_buffers (GtkGLArea *area) - glFramebufferRenderbuffer (GL_FRAMEBUFFER, GL_STENCIL_ATTACHMENT, - GL_RENDERBUFFER, priv->depth_stencil_buffer); - } -+#endif - } - - static void - gtk_gl_area_delete_buffers (GtkGLArea *area) - { -+#ifdef HAVE_OPENGL - GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); - - if (priv->context == NULL) -@@ -569,6 +578,7 @@ gtk_gl_area_delete_buffers (GtkGLArea *area) - glDeleteFramebuffers (1, &priv->frame_buffer); - priv->frame_buffer = 0; - } -+#endif - } - - static void -@@ -679,6 +689,7 @@ gtk_gl_area_draw (GtkWidget *widget, - GtkGLArea *area = GTK_GL_AREA (widget); - GtkGLAreaPrivate *priv = gtk_gl_area_get_instance_private (area); - gboolean unused; -+#ifdef HAVE_OPENGL - int w, h, scale; - GLenum status; - -@@ -736,6 +747,14 @@ gtk_gl_area_draw (GtkWidget *widget, - } - - return TRUE; -+#else -+ if (priv->error != NULL) -+ gtk_gl_area_draw_error_screen (area, -+ cr, -+ gtk_widget_get_allocated_width (widget), -+ gtk_widget_get_allocated_height (widget)); -+ return FALSE; -+#endif - } - - static gboolean -diff --git a/gtk/inspector/general.c b/gtk/inspector/general.c -index 4fd0c3039c..a8e59ed077 100644 ---- a/gtk/inspector/general.c -+++ b/gtk/inspector/general.c -@@ -33,8 +33,10 @@ - - #ifdef GDK_WINDOWING_X11 - #include "x11/gdkx.h" -+#ifdef HAVE_OPENGL - #include - #endif -+#endif - - #ifdef GDK_WINDOWING_WIN32 - #include "win32/gdkwin32.h" -@@ -217,6 +219,7 @@ add_label_row (GtkInspectorGeneral *gen, - gtk_size_group_add_widget (GTK_SIZE_GROUP (gen->priv->labels), label); - } - -+#ifdef HAVE_OPENGL - #ifdef GDK_WINDOWING_X11 - static void - append_glx_extension_row (GtkInspectorGeneral *gen, -@@ -226,6 +229,7 @@ append_glx_extension_row (GtkInspectorGeneral *gen, - add_check_row (gen, GTK_LIST_BOX (gen->priv->gl_box), ext, epoxy_has_glx_extension (dpy, 0, ext), 0); - } - #endif -+#endif - - #ifdef GDK_WINDOWING_WAYLAND - static void -@@ -275,6 +279,7 @@ wayland_get_display (struct wl_display *wl_display) - static void - init_gl (GtkInspectorGeneral *gen) - { -+#ifdef HAVE_OPENGL - #ifdef GDK_WINDOWING_X11 - if (GDK_IS_X11_DISPLAY (gdk_display_get_default ())) - { -@@ -301,6 +306,7 @@ init_gl (GtkInspectorGeneral *gen) - } - else - #endif -+#endif - #ifdef GDK_WINDOWING_WAYLAND - if (GDK_IS_WAYLAND_DISPLAY (gdk_display_get_default ())) - { -diff --git a/meson.build b/meson.build -index aed48fc3f6..bfc33af0f6 100644 ---- a/meson.build -+++ b/meson.build -@@ -137,6 +137,7 @@ wayland_enabled = get_option('wayland_backend') - broadway_enabled = get_option('broadway_backend') - quartz_enabled = get_option('quartz_backend') - win32_enabled = get_option('win32_backend') -+opengl_enabled = get_option('opengl') - - os_unix = false - os_linux = false -@@ -430,7 +431,7 @@ pangocairo_dep = dependency('pangocairo', version: cairo_req, - fallback : ['pango', 'libpangocairo_dep']) - pixbuf_dep = dependency('gdk-pixbuf-2.0', version: gdk_pixbuf_req, - fallback : ['gdk-pixbuf', 'gdkpixbuf_dep']) --epoxy_dep = dependency('epoxy', version: epoxy_req, -+epoxy_dep = dependency('epoxy', version: epoxy_req, required: opengl_enabled, - fallback: ['libepoxy', 'libepoxy_dep']) - atk_dep = dependency('atk', version: atk_req, - fallback : ['atk', 'libatk_dep']) -@@ -476,6 +477,10 @@ if tracker3_enabled - endif - endif - -+if opengl_enabled -+ cdata.set('HAVE_OPENGL', 1) -+endif -+ - if iso_codes_dep.found() - cdata.set_quoted('ISO_CODES_PREFIX', iso_codes_dep.get_variable(pkgconfig: 'prefix')) - else -@@ -912,9 +917,15 @@ else - gio_packages = ['gio-2.0', glib_req] - endif - -+if opengl_enabled -+ epoxy_packages = ['epoxy', epoxy_req] -+else -+ epoxy_packages = [] -+endif -+ - pkgconf.set('GDK_PRIVATE_PACKAGES', - ' '.join(gio_packages + x11_pkgs + wayland_pkgs + cairo_backends + -- ['epoxy', epoxy_req] + cloudproviders_packages + -+ epoxy_packages + cloudproviders_packages + - ['fribidi', fribidi_req])) - - gtk_packages = ' '.join([ -@@ -928,7 +939,7 @@ pkgconf.set('GTK_PACKAGES', gtk_packages) - # Requires.private - pc_gdk_extra_libs += cairo_libs - --gtk_private_packages = atk_pkgs + wayland_pkgs + ['epoxy', epoxy_req, 'fribidi', fribidi_req] -+gtk_private_packages = atk_pkgs + wayland_pkgs + epoxy_packages + ['fribidi', fribidi_req] - if wayland_enabled or x11_enabled - gtk_private_packages += ['pangoft2'] - endif -diff --git a/meson_options.txt b/meson_options.txt -index 94099aa01e..8bd096896d 100644 ---- a/meson_options.txt -+++ b/meson_options.txt -@@ -19,6 +19,8 @@ option('profiler', type: 'boolean', value: false, - description : 'Enable profiler support') - option('tracker3', type: 'boolean', value: false, - description : 'Enable Tracker3 filechooser search') -+option('opengl', type: 'boolean', value: true, -+ description : 'Enable use of GL') - - # Print backends - option('print_backends', type : 'string', value : 'auto', -diff --git a/tests/meson.build b/tests/meson.build -index 586fe2f45e..6ecf317dde 100644 ---- a/tests/meson.build -+++ b/tests/meson.build -@@ -5,7 +5,6 @@ gtk_tests = [ - ['scrolling-performance', ['frame-stats.c', 'variable.c']], - ['blur-performance', ['../gtk/gtkcairoblur.c']], - ['flicker'], -- ['gdkgears', ['gtkgears.c']], - ['listmodel'], - ['motion-compression'], - ['styleexamples'], -@@ -54,7 +53,6 @@ gtk_tests = [ - ['testfullscreen'], - ['testgeometry'], - ['testgiconpixbuf'], -- ['testglblending', ['gtkgears.c']], - ['testgmenu'], - ['testgrid'], - ['testgrouping'], -@@ -137,6 +135,13 @@ if x11_enabled - ] - endif - -+if opengl_enabled -+ gtk_tests += [ -+ ['gdkgears', ['gtkgears.c']], -+ ['testglblending', ['gtkgears.c']], -+ ] -+endif -+ - if os_linux - gtk_tests += [['testfontchooserdialog']] - endif -diff --git a/testsuite/gtk/objects-finalize.c b/testsuite/gtk/objects-finalize.c -index 24540e313f..e0f863ab6a 100644 ---- a/testsuite/gtk/objects-finalize.c -+++ b/testsuite/gtk/objects-finalize.c -@@ -116,7 +116,9 @@ main (int argc, char **argv) - all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_CORE && - all_types[i] != GDK_TYPE_X11_DEVICE_MANAGER_XI2 && - all_types[i] != GDK_TYPE_X11_DISPLAY_MANAGER && -+#ifdef HAVE_OPENGL - all_types[i] != GDK_TYPE_X11_GL_CONTEXT && -+#endif - #endif - /* Not allowed to finalize a GdkPixbufLoader without calling gdk_pixbuf_loader_close() */ - all_types[i] != GDK_TYPE_PIXBUF_LOADER && --- -2.30.2 - diff --git a/meta-gnome/recipes-support/gtk+/gtk+3_3.24.38.bb b/meta-gnome/recipes-support/gtk+/gtk+3_3.24.38.bb deleted file mode 100644 index 37fa0a7..0000000 --- a/meta-gnome/recipes-support/gtk+/gtk+3_3.24.38.bb +++ /dev/null @@ -1,15 +0,0 @@ -require gtk+3.inc - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk+/${MAJ_VER}/gtk+-${PV}.tar.xz \ - file://opengl.patch \ - " -SRC_URI[sha256sum] = "ce11decf018b25bdd8505544a4f87242854ec88be054d9ade5f3a20444dd8ee7" - -S = "${WORKDIR}/gtk+-${PV}" - -LIC_FILES_CHKSUM = "file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=1d8dc0fccdbfa26287a271dce88af737 \ - file://gdk/gdk.h;endline=25;md5=c920ce39dc88c6f06d3e7c50e08086f2 \ - file://tests/testgtk.c;endline=25;md5=cb732daee1d82af7a2bf953cf3cf26f1" diff --git a/meta-gnome/recipes-support/gtk+/gtk4_4.14.1.bb b/meta-gnome/recipes-support/gtk+/gtk4_4.14.1.bb deleted file mode 100644 index ce73376..0000000 --- a/meta-gnome/recipes-support/gtk+/gtk4_4.14.1.bb +++ /dev/null @@ -1,130 +0,0 @@ -SUMMARY = "Multi-platform toolkit for creating GUIs" -DESCRIPTION = "GTK is a multi-platform toolkit for creating graphical user interfaces. Offering a complete \ -set of widgets, GTK is suitable for projects ranging from small one-off projects to complete application suites." -HOMEPAGE = "http://www.gtk.org" -BUGTRACKER = "https://bugzilla.gnome.org/" -SECTION = "libs" - -DEPENDS = " \ - atk \ - cairo \ - fribidi \ - gdk-pixbuf \ - gdk-pixbuf-native \ - gi-docgen \ - glib-2.0 \ - graphene \ - harfbuzz \ - jpeg \ - libepoxy \ - libpng \ - librsvg \ - libxkbcommon \ - pango \ - tiff \ -" - -LICENSE = "LGPL-2.0-only & LGPL-2.0-or-later & LGPL-2.1-or-later" -LIC_FILES_CHKSUM = " \ - file://COPYING;md5=5f30f0716dfdd0d91eb439ebec522ec2 \ - file://gtk/gtk.h;endline=25;md5=61900d77e8d5bc67cf15ad93de9a3490 \ - file://gdk/gdk.h;endline=25;md5=a0fb26c1f6b94e66d148279e192c333f \ - file://tests/testgtk.c;endline=25;md5=49d06770681b8322466b52ed19d29fb2 \ -" - -MAJ_VER = "${@oe.utils.trim_version("${PV}", 2)}" - -UPSTREAM_CHECK_REGEX = "gtk-(?P\d+\.(\d*[02468])+(\.\d+)+)\.tar.xz" - -SRC_URI = "http://ftp.gnome.org/pub/gnome/sources/gtk/${MAJ_VER}/gtk-${PV}.tar.xz" -SRC_URI[sha256sum] = "fcefb3f132f8cc4711a9efa5b353c9ae9bb5eeff0246fa74dbc2f2f839b9e308" - -S = "${WORKDIR}/gtk-${PV}" - -CVE_PRODUCT = "gnome:gtk" - -inherit meson gettext pkgconfig gi-docgen update-alternatives gsettings features_check gobject-introspection - -# TBD: nativesdk -# gobject-introspection.bbclass pins introspection off for nativesk. As long as -# we do not remove this wisdom or hack gtk4, it is not possible to build -# nativesdk-gtk4 -BBCLASSEXTEND = "native" - -GSETTINGS_PACKAGE:class-native = "" - -ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" -REQUIRED_DISTRO_FEATURES = "opengl" -GTKDOC_MESON_OPTION = "documentation" -GIR_MESON_ENABLE_FLAG = 'enabled' -GIR_MESON_DISABLE_FLAG = 'disabled' - -EXTRA_OEMESON = " -Dbuild-tests=false -Dbuild-testsuite=false -Dbuild-demos=false" - -PACKAGECONFIG ??= "gstreamer ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11 vulkan', d)}" -PACKAGECONFIG:class-native = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" -PACKAGECONFIG:class-nativesdk = "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" - -PACKAGECONFIG[x11] = "-Dx11-backend=true,-Dx11-backend=false,at-spi2-atk fontconfig libx11 libxext libxcursor libxi libxdamage libxrandr libxrender libxcomposite libxfixes xinerama" -PACKAGECONFIG[wayland] = "-Dwayland-backend=true,-Dwayland-backend=false,wayland wayland-protocols virtual/egl virtual/libgles2 wayland-native" -PACKAGECONFIG[cloudproviders] = "-Dcloudproviders=enabled,-Dcloudproviders=disabled,libcloudproviders" -PACKAGECONFIG[cups] = "-Dprint-cups=enabled,-Dprint-cups=disabled,cups,cups gtk4-printbackend-cups" -PACKAGECONFIG[colord] = "-Dcolord=enabled,-Dcolord=disabled,colord" -PACKAGECONFIG[iso-codes] = ",,iso-codes,iso-codes" -# gtk4 wants gstreamer-player-1.0 -> gstreamer1.0-plugins-bad -PACKAGECONFIG[gstreamer] = "-Dmedia-gstreamer=enabled,-Dmedia-gstreamer=disabled,gstreamer1.0-plugins-bad" -PACKAGECONFIG[tracker] = "-Dtracker=enabled,-Dtracker=disabled,tracker,tracker-miners" -PACKAGECONFIG[vulkan] = "-Dvulkan=enabled,-Dvulkan=disabled, vulkan-loader vulkan-headers shaderc-native" - -LIBV = "4.0.0" - -FILES:${PN}:append = " \ - ${datadir}/glib-2.0/schemas/ \ - ${datadir}/gtk-4.0/emoji/ \ - ${datadir}/metainfo/ \ - ${datadir}/icons/hicolor/*/apps/org.gtk.PrintEditor4*.* \ - ${libdir}/gtk-4.0/${LIBV}/media \ - ${bindir}/gtk4-update-icon-cache \ - ${bindir}/gtk4-launch \ -" - -FILES:${PN}-dev += " \ - ${datadir}/gtk-4.0/gtk4builder.rng \ - ${datadir}/gtk-4.0/include \ - ${datadir}/gtk-4.0/valgrind \ - ${datadir}/gettext/its \ - ${bindir}/gtk4-builder-tool \ - ${bindir}/gtk4-encode-symbolic-svg \ - ${bindir}/gtk4-query-settings \ -" - -GTKBASE_RRECOMMENDS ?= " \ - liberation-fonts \ - gdk-pixbuf-loader-png \ - gdk-pixbuf-loader-jpeg \ - gdk-pixbuf-loader-gif \ - gdk-pixbuf-loader-xpm \ - shared-mime-info \ - adwaita-icon-theme-symbolic \ -" - -GTKBASE_RRECOMMENDS:class-native ?= "" - -GTKGLIBC_RRECOMMENDS ?= "${GTKBASE_RRECOMMENDS} glibc-gconv-iso8859-1" - -RRECOMMENDS:${PN} = "${GTKBASE_RRECOMMENDS}" -RRECOMMENDS:${PN}:libc-glibc = "${GTKGLIBC_RRECOMMENDS}" -RDEPENDS:${PN}-dev += "${@bb.utils.contains("PACKAGECONFIG", "wayland", "wayland-protocols", "", d)}" - -PACKAGES_DYNAMIC += "^gtk4-printbackend-.*" -python populate_packages:prepend () { - import os.path - - gtk_libdir = d.expand('${libdir}/gtk-4.0/${LIBV}') - printmodules_root = os.path.join(gtk_libdir, 'printbackends'); - - do_split_packages(d, printmodules_root, r'^libprintbackend-(.*)\.so$', 'gtk4-printbackend-%s', 'GTK printbackend module for %s') - - if (d.getVar('DEBIAN_NAMES')): - d.setVar(d.expand('PKG:${PN}'), '${MLPREFIX}libgtk-4.0') -} diff --git a/meta-gnome/recipes-support/ibus/ibus.bb b/meta-gnome/recipes-support/ibus/ibus.bb index 2d733ce..141341e 100644 --- a/meta-gnome/recipes-support/ibus/ibus.bb +++ b/meta-gnome/recipes-support/ibus/ibus.bb @@ -8,17 +8,19 @@ DEPENDS += " \ iso-codes \ " -inherit gtk-icon-cache bash-completion +inherit gtk-icon-cache bash-completion features_check # for unicode-ucd EXTRA_OECONF += "--with-ucd-dir=${STAGING_DATADIR}/unicode/ucd" PACKAGECONFIG ??= " \ dconf vala \ - ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)} \ + ${@bb.utils.contains_any('DISTRO_FEATURES', [ 'wayland', 'x11' ], 'gtk3 gtk4', '', d)} \ + ${@bb.utils.filter('DISTRO_FEATURES', 'systemd wayland x11', d)} \ " +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'gtk4', 'opengl', '', d)}" + do_configure:prepend() { # run native unicode-parser sed -i 's:$(builddir)/unicode-parser:unicode-parser:g' ${S}/src/Makefile.am @@ -29,9 +31,11 @@ FILES:${PN} += " \ ${datadir}/GConf \ ${datadir}/glib-2.0 \ ${libdir}/gtk-3.0 \ + ${libdir}/gtk-4.0 \ + ${systemd_user_unitdir} \ " FILES:${PN}-dev += " \ ${datadir}/gettext \ " - +RDEPENDS:${PN} += "python3-core" diff --git a/meta-gnome/recipes-support/ibus/ibus.inc b/meta-gnome/recipes-support/ibus/ibus.inc index 47787c5..9d0600c 100644 --- a/meta-gnome/recipes-support/ibus/ibus.inc +++ b/meta-gnome/recipes-support/ibus/ibus.inc @@ -5,21 +5,24 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=fbc093901857fcd118f065f900982c24" inherit autotools-brokensep pkgconfig gobject-introspection gettext gtk-doc vala -PV = "1.5.23+git${SRCPV}" +PV = "1.5.26" DEPENDS = "unicode-ucd" SRC_URI = " \ git://github.com/ibus/ibus.git;branch=main;protocol=https \ file://0001-Do-not-try-to-start-dbus-we-do-not-have-dbus-lauch.patch \ + file://0001-makefile-don-t-gzip-the-man-pages.patch \ " -SRCREV = "dd4cc5b028c35f9bb8fa9d3bdc8f26bcdfc43d40" +SRCREV = "6a70ab0338206bd1c7d01a4e1874ea0ee5b3a9d3" S = "${WORKDIR}/git" PACKAGECONFIG[appindicator] = "--enable-appindicator,--disable-appindicator,qtbase" PACKAGECONFIG[dconf] = "--enable-dconf,--disable-dconf,dconf" PACKAGECONFIG[gtk2] = "--enable-gtk2,--disable-gtk2,gtk+" PACKAGECONFIG[gtk3] = "--enable-gtk3,--disable-gtk3,gtk+3" +PACKAGECONFIG[gtk4] = "--enable-gtk4,--disable-gtk4,gtk4" +PACKAGECONFIG[systemd] = "--enable-systemd-services,--disable-systemd-services,systemd" PACKAGECONFIG[wayland] = "--enable-wayland,--disable-wayland,wayland" PACKAGECONFIG[vala] = "--enable-vala,--disable-vala" PACKAGECONFIG[x11] = "--enable-xim --enable-ui,--disable-xim --disable-ui,virtual/libx11" @@ -29,6 +32,9 @@ EXTRA_OECONF = " \ --disable-emoji-dict \ --disable-python2 \ " +EXTRA_OECONF:append:class-target = "\ + --with-python=${bindir}/python3 \ +" do_configure:prepend() { touch ${S}/ChangeLog diff --git a/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch b/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch new file mode 100644 index 0000000..105e348 --- /dev/null +++ b/meta-gnome/recipes-support/ibus/ibus/0001-makefile-don-t-gzip-the-man-pages.patch @@ -0,0 +1,164 @@ +From 5307c3b310fabeaa52fafe743c5efaca73ccce46 Mon Sep 17 00:00:00 2001 +From: Emil Velikov +Date: Sun, 11 Jun 2023 16:16:35 +0900 +Subject: [PATCH] makefile: don't gzip the man pages + +Drop the gzip step from the manpages - distributions already do that as +needed. In addition this resolves the final reproducibility issue with +ibus. + +BUG=https://github.com/ibus/ibus/pull/2514 + +Upstream-Status: Backport [https://github.com/ibus/ibus/commit/1a25975d9f55f18eab609e4d147dd32689e367f3] +Note: This commit is included in version >= 1.5.29 and can be dropped +after upgrading. +Signed-off-by: Yoann Congal +--- + bus/Makefile.am | 6 +----- + data/dconf/Makefile.am | 6 +----- + setup/Makefile.am | 6 +----- + tools/Makefile.am | 6 +----- + ui/gtk3/Makefile.am | 6 +----- + 5 files changed, 5 insertions(+), 25 deletions(-) + +diff --git a/bus/Makefile.am b/bus/Makefile.am +index e173ee25..d0445d02 100644 +--- a/bus/Makefile.am ++++ b/bus/Makefile.am +@@ -169,7 +169,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_one_DATA) \ +- $(man_one_files) \ + $(NULL) + + $(libibus): +@@ -181,14 +180,11 @@ test: ibus-daemon + $(builddir)/ibus-daemon -v + + man_one_in_files = ibus-daemon.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + -include $(top_srcdir)/git.mk +diff --git a/data/dconf/Makefile.am b/data/dconf/Makefile.am +index 5360f033..2352f770 100644 +--- a/data/dconf/Makefile.am ++++ b/data/dconf/Makefile.am +@@ -38,15 +38,12 @@ dconfdb_DATA = 00-upstream-settings + { rc=$$?; $(RM) -rf $@; exit $$rc; } + + man_5_in_files = 00-upstream-settings.5.in ibus.5.in +-man_5_files = $(man_5_in_files:.5.in=.5) +-man_5_DATA =$(man_5_files:.5=.5.gz) ++man_5_DATA = $(man_5_in_files:.5.in=.5) + man_5dir = $(mandir)/man5 + %.5: %.5.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.5.gz: %.5 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + install-data-hook: + if test -z "$(DESTDIR)"; then \ +@@ -63,7 +60,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_5_DATA) \ +- $(man_5_files) \ + $(NULL) + + MAINTAINERCLEANFILES = \ +diff --git a/setup/Makefile.am b/setup/Makefile.am +index 34c8f136..b34aa8fc 100644 +--- a/setup/Makefile.am ++++ b/setup/Makefile.am +@@ -56,20 +56,16 @@ org.freedesktop.IBus.Setup.desktop: ibus-setup.desktop + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + + man_one_in_files = ibus-setup.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + CLEANFILES = \ + $(desktop_DATA) \ + $(man_one_DATA) \ +- $(man_one_files) \ + *.pyc \ + ibus-setup \ + $(NULL) +diff --git a/tools/Makefile.am b/tools/Makefile.am +index 5c18d3d6..1c716136 100644 +--- a/tools/Makefile.am ++++ b/tools/Makefile.am +@@ -79,15 +79,12 @@ bash_completion_DATA= \ + bash_completiondir=@datadir@/bash-completion/completions + + man_one_in_files = ibus.1.in +-man_one_files = $(man_one_in_files:.1.in=.1) +-man_one_DATA =$(man_one_files:.1=.1.gz) ++man_one_DATA = $(man_one_in_files:.1.in=.1) + man_onedir = $(mandir)/man1 + %.1: %.1.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.1.gz: %.1 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + EXTRA_DIST = \ + $(man_one_in_files) \ +@@ -96,7 +93,6 @@ EXTRA_DIST = \ + + CLEANFILES = \ + $(man_one_DATA) \ +- $(man_one_files) \ + $(NULL) + + if ENABLE_EMOJI_DICT +diff --git a/ui/gtk3/Makefile.am b/ui/gtk3/Makefile.am +index ab379328..aff035da 100644 +--- a/ui/gtk3/Makefile.am ++++ b/ui/gtk3/Makefile.am +@@ -242,15 +242,12 @@ panelbinding.o: $(srcdir)/panelbinding.c + + MAINTAINERCLEANFILES += extension.c panelbinding.c + +-man_seven_files = $(man_seven_in_files:.7.in=.7) +-man_seven_DATA =$(man_seven_files:.7=.7.gz) ++man_seven_DATA = $(man_seven_in_files:.7.in=.7) + man_sevendir = $(mandir)/man7 + %.7: %.7.in + $(AM_V_GEN) sed \ + -e 's|@VERSION[@]|$(VERSION)|g' $< > $@.tmp && \ + mv $@.tmp $@ +-%.7.gz: %.7 +- $(AM_V_GEN) gzip -c $< > $@.tmp && mv $@.tmp $@ + + desktop_in_files = \ + ibus-ui-emojier.desktop.in \ +@@ -278,7 +275,6 @@ CLEANFILES += \ + $(desktop_DATA) \ + $(desktop_notrans_files) \ + $(man_seven_DATA) \ +- $(man_seven_files) \ + $(NULL) + + endif diff --git a/meta-gnome/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch b/meta-gnome/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch deleted file mode 100644 index 2968d57..0000000 --- a/meta-gnome/recipes-support/icu/icu/0001-Disable-LDFLAGSICUDT-for-Linux.patch +++ /dev/null @@ -1,28 +0,0 @@ -From 0c82d6aa02c08e41b13c83b14782bd7024e25d59 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sat, 15 Feb 2014 21:06:42 +0000 -Subject: [PATCH] Disable LDFLAGSICUDT for Linux - -Upstream-Status: Inappropriate [ OE Configuration ] - -Signed-off-by: Khem Raj ---- - source/config/mh-linux | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/config/mh-linux b/config/mh-linux -index 366f0cc..2689aab 100644 ---- a/config/mh-linux -+++ b/config/mh-linux -@@ -21,7 +21,7 @@ LD_RPATH= -Wl,-zorigin,-rpath,'$$'ORIGIN - LD_RPATH_PRE = -Wl,-rpath, - - ## These are the library specific LDFLAGS --LDFLAGSICUDT=-nodefaultlibs -nostdlib -+# LDFLAGSICUDT=-nodefaultlibs -nostdlib - - ## Compiler switch to embed a library name - # The initial tab in the next line is to prevent icu-config from reading it. --- -1.7.10.4 - diff --git a/meta-gnome/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch b/meta-gnome/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch deleted file mode 100644 index 578517b..0000000 --- a/meta-gnome/recipes-support/icu/icu/0001-icu-Added-armeb-support.patch +++ /dev/null @@ -1,28 +0,0 @@ -From e3c25af4b40d64f098e7b8ae5a91fdc3c90163c4 Mon Sep 17 00:00:00 2001 -From: Lei Maohui -Date: Wed, 8 May 2019 14:42:30 +0900 -Subject: [PATCH] icu: Added armeb support. - -Make icu support arm32 BE. - -Upstream-Status: Pending - -Signed-off-by: Lei Maohui - ---- - i18n/double-conversion-utils.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/source/i18n/double-conversion-utils.h b/source/i18n/double-conversion-utils.h -index 7f23e0a..7f89094 100644 ---- a/i18n/double-conversion-utils.h -+++ b/i18n/double-conversion-utils.h -@@ -115,7 +115,7 @@ int main(int argc, char** argv) { - // - // If it prints "correct" then the architecture should be here, in the "correct" section. - #if defined(_M_X64) || defined(__x86_64__) || \ -- defined(__ARMEL__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ -+ defined(__arm__) || defined(__avr32__) || defined(_M_ARM) || defined(_M_ARM64) || \ - defined(__hppa__) || defined(__ia64__) || \ - defined(__mips__) || \ - defined(__loongarch__) || \ diff --git a/meta-gnome/recipes-support/icu/icu/filter.json b/meta-gnome/recipes-support/icu/icu/filter.json deleted file mode 100644 index 2c63c08..0000000 --- a/meta-gnome/recipes-support/icu/icu/filter.json +++ /dev/null @@ -1,2 +0,0 @@ -{ -} diff --git a/meta-gnome/recipes-support/icu/icu/fix-install-manx.patch b/meta-gnome/recipes-support/icu/icu/fix-install-manx.patch deleted file mode 100644 index 925b064..0000000 --- a/meta-gnome/recipes-support/icu/icu/fix-install-manx.patch +++ /dev/null @@ -1,54 +0,0 @@ -From a6ddabc8cadb76bfe2d2e374a6702442cfe51cce Mon Sep 17 00:00:00 2001 -From: Ross Burton -Date: Fri, 9 Oct 2015 17:50:41 +0100 -Subject: [PATCH] icu: fix install race - -The generic recursive target calls target-local so also adding it to the -dependency list results in races due to install-local being executed twice in -parallel. For example, install-manx can fail if the two install processes race -and one process tries to chown a file that the other process has just deleted. - -Also install-manx should be a phony target, and for clarity use $^ instead of $? -in the install command. - -Upstream-Status: Pending -Signed-off-by: Ross Burton - ---- - source/Makefile.in | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/Makefile.in b/Makefile.in -index be9435b..ada20d7 100644 ---- a/Makefile.in -+++ b/Makefile.in -@@ -77,7 +77,7 @@ EXTRA_DATA = - - ## List of phony targets - .PHONY : all all-local all-recursive install install-local install-udata install-udata-files install-udata-dlls \ --install-recursive clean clean-local clean-recursive distclean \ -+install-recursive install-manx clean clean-local clean-recursive distclean \ - distclean-local distclean-recursive doc dist dist-local dist-recursive \ - check check-local check-recursive clean-recursive-with-twist install-icu \ - doc install-doc tests icu4j-data icu4j-data-install update-windows-makefiles xcheck-local xcheck-recursive xperf xcheck xperf-recursive \ -@@ -88,9 +88,9 @@ check-exhaustive check-exhaustive-local check-exhaustive-recursive releaseDist - - ## List of standard targets - all: all-local all-recursive --install: install-recursive install-local -+install: install-recursive - clean: clean-recursive-with-twist clean-local --distclean : distclean-recursive distclean-local -+distclean : distclean-recursive - dist: dist-recursive - check: all check-recursive - check-recursive: all -@@ -357,7 +357,7 @@ config.status: $(srcdir)/configure $(srcdir)/common/unicode/uvernum.h - install-manx: $(MANX_FILES) - $(MKINSTALLDIRS) $(DESTDIR)$(mandir)/man$(SECTION) - ifneq ($(MANX_FILES),) -- $(INSTALL_DATA) $? $(DESTDIR)$(mandir)/man$(SECTION) -+ $(INSTALL_DATA) $^ $(DESTDIR)$(mandir)/man$(SECTION) - endif - - config/%.$(SECTION): $(srcdir)/config/%.$(SECTION).in diff --git a/meta-gnome/recipes-support/icu/icu_73-2.bb b/meta-gnome/recipes-support/icu/icu_73-2.bb deleted file mode 100644 index 7c59f8b..0000000 --- a/meta-gnome/recipes-support/icu/icu_73-2.bb +++ /dev/null @@ -1,149 +0,0 @@ -SUMMARY = "International Component for Unicode libraries" -DESCRIPTION = "The International Component for Unicode (ICU) is a mature, \ -portable set of C/C++ and Java libraries for Unicode support, software \ -internationalization (I18N) and globalization (G11N), giving applications the \ -same results on all platforms." -HOMEPAGE = "http://site.icu-project.org/" - -LICENSE = "ICU" -DEPENDS = "icu-native autoconf-archive-native" - -CVE_PRODUCT = "international_components_for_unicode" - -S = "${WORKDIR}/icu/source" -SPDX_S = "${WORKDIR}/icu" -STAGING_ICU_DIR_NATIVE = "${STAGING_DATADIR_NATIVE}/${BPN}/${PV}" - -ICU_MAJOR_VER = "${@d.getVar('PV').split('-')[0]}" - -inherit autotools pkgconfig github-releases - -# ICU needs the native build directory as an argument to its --with-cross-build option when -# cross-compiling. Taken the situation that different builds may share a common sstate-cache -# into consideration, the native build directory needs to be staged. -EXTRA_OECONF = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" -EXTRA_OECONF:class-native = "--disable-icu-config" -EXTRA_OECONF:class-nativesdk = "--with-cross-build=${STAGING_ICU_DIR_NATIVE} --disable-icu-config" - -EXTRA_OECONF:append:class-target = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' --with-data-packaging=archive', '', d)}" -TARGET_CXXFLAGS:append = "${@oe.utils.conditional('SITEINFO_ENDIANNESS', 'be', ' -DICU_DATA_DIR=\\""${datadir}/${BPN}/${PV}\\""', '', d)}" - -ASNEEDED = "" - -do_compile:prepend:class-target () { - # Make sure certain build host references do not end up being compiled - # in the image. This only affects libicutu and icu-dbg - sed \ - -e 's,DU_BUILD=,DU_BUILD_unused=,g' \ - -e '/^CPPFLAGS.*/ s,--sysroot=${STAGING_DIR_TARGET},,g' \ - -i ${B}/tools/toolutil/Makefile -} - -PREPROCESS_RELOCATE_DIRS = "${datadir}/${BPN}/${PV}" -do_install:append:class-native() { - mkdir -p ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.mk ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/config/icucross.inc ${D}/${STAGING_ICU_DIR_NATIVE}/config - cp -r ${B}/lib ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/bin ${D}/${STAGING_ICU_DIR_NATIVE} - cp -r ${B}/tools ${D}/${STAGING_ICU_DIR_NATIVE} -} - -do_install:append:class-target() { - # The native pkgdata can not generate the correct data file. - # Use icupkg to re-generate it. - if [ "${SITEINFO_ENDIANNESS}" = "be" ] ; then - rm -f ${D}/${datadir}/${BPN}/${@icu_install_folder(d)}/icudt${ICU_MAJOR_VER}b.dat - icupkg -tb ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat ${D}/${datadir}/${BPN}/${@icu_install_folder(d)}/icudt${ICU_MAJOR_VER}b.dat - fi - - # Remove build host references... - sed -i \ - -e 's,--sysroot=${STAGING_DIR_TARGET},,g' \ - -e 's|${DEBUG_PREFIX_MAP}||g' \ - -e 's:${HOSTTOOLS_DIR}/::g' \ - ${D}/${libdir}/${BPN}/${@icu_install_folder(d)}/Makefile.inc \ - ${D}/${libdir}/${BPN}/${@icu_install_folder(d)}/pkgdata.inc -} - -PACKAGES =+ "libicudata libicuuc libicui18n libicutu libicuio" - -FILES:${PN}-dev += "${libdir}/${BPN}/" - -FILES:libicudata = "${libdir}/libicudata.so.*" -FILES:libicuuc = "${libdir}/libicuuc.so.*" -FILES:libicui18n = "${libdir}/libicui18n.so.*" -FILES:libicutu = "${libdir}/libicutu.so.*" -FILES:libicuio = "${libdir}/libicuio.so.*" - -BBCLASSEXTEND = "native nativesdk" - -LIC_FILES_CHKSUM = "file://../LICENSE;md5=80c2cf39ad8ae12b9b9482a1737c6650" - -def icu_download_version(d): - pvsplit = d.getVar('PV').split('-') - return pvsplit[0] + "_" + pvsplit[1] - -def icu_download_folder(d): - pvsplit = d.getVar('PV').split('-') - return pvsplit[0] + "-" + pvsplit[1] - -def icu_install_folder(d): - pvsplit = d.getVar('PV').split('-') - return pvsplit[0] + "." + pvsplit[1] - -ICU_PV = "${@icu_download_version(d)}" -ICU_FOLDER = "${@icu_download_folder(d)}" - -# http://errors.yoctoproject.org/Errors/Details/20486/ -ARM_INSTRUCTION_SET:armv4 = "arm" -ARM_INSTRUCTION_SET:armv5 = "arm" - -BASE_SRC_URI = "${GITHUB_BASE_URI}/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-src.tgz" -DATA_SRC_URI = "${GITHUB_BASE_URI}/download/release-${ICU_FOLDER}/icu4c-${ICU_PV}-data.zip" -SRC_URI = "${BASE_SRC_URI};name=code \ - ${DATA_SRC_URI};name=data \ - file://filter.json \ - file://fix-install-manx.patch \ - file://0001-icu-Added-armeb-support.patch \ - " - -SRC_URI:append:class-target = "\ - file://0001-Disable-LDFLAGSICUDT-for-Linux.patch \ - " -SRC_URI[code.sha256sum] = "818a80712ed3caacd9b652305e01afc7fa167e6f2e94996da44b90c2ab604ce1" -SRC_URI[data.sha256sum] = "ca1ee076163b438461e484421a7679fc33a64cd0a54f9d4b401893fa1eb42701" - -UPSTREAM_CHECK_REGEX = "releases/tag/release-(?P(?!.+rc).+)" -GITHUB_BASE_URI = "https://github.com/unicode-org/icu/releases" - -EXTRA_OECONF:append:libc-musl = " ac_cv_func_strtod_l=no" - -PACKAGECONFIG ?= "" -PACKAGECONFIG[make-icudata] = ",,," - -do_make_icudata:class-target () { - ${@bb.utils.contains('PACKAGECONFIG', 'make-icudata', '', 'exit 0', d)} - cd ${S} - rm -rf data - cp -a ${WORKDIR}/data . - AR='${BUILD_AR}' \ - CC='${BUILD_CC}' \ - CPP='${BUILD_CPP}' \ - CXX='${BUILD_CXX}' \ - RANLIB='${BUILD_RANLIB}' \ - CFLAGS='${BUILD_CFLAGS}' \ - CPPFLAGS='${BUILD_CPPFLAGS}' \ - CXXFLAGS='${BUILD_CXXFLAGS}' \ - LDFLAGS='${BUILD_LDFLAGS}' \ - ICU_DATA_FILTER_FILE=${WORKDIR}/filter.json \ - ./runConfigureICU Linux --with-data-packaging=archive - oe_runmake - install -Dm644 ${S}/data/out/icudt${ICU_MAJOR_VER}l.dat ${S}/data/in/icudt${ICU_MAJOR_VER}l.dat -} - -do_make_icudata() { - : -} - -addtask make_icudata before do_configure after do_patch do_prepare_recipe_sysroot diff --git a/meta-gnome/recipes-support/libnma/libnma_1.10.6.bb b/meta-gnome/recipes-support/libnma/libnma_1.10.6.bb index bff9a33..997a5a7 100644 --- a/meta-gnome/recipes-support/libnma/libnma_1.10.6.bb +++ b/meta-gnome/recipes-support/libnma/libnma_1.10.6.bb @@ -4,7 +4,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" DEPENDS = "glib-2.0 gtk+3 gtk4 networkmanager" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase gobject-introspection gtk-doc gettext vala features_check REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG','gcr','x11','',d)} opengl" diff --git a/meta-gnome/recipes-support/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch b/meta-gnome/recipes-support/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch deleted file mode 100644 index da8ce68..0000000 --- a/meta-gnome/recipes-support/libxmlb/libxmlb/0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch +++ /dev/null @@ -1,35 +0,0 @@ -From dc208bafc57c1ccaa0ca260f99c8b4c976271ebc Mon Sep 17 00:00:00 2001 -From: Markus Volk -Date: Sat, 16 Sep 2023 14:02:57 +0200 -Subject: [PATCH] xb-self-test.c: hardcode G_TEST_SRCDIR - -This avoids: - libxmlb-0.3.14-r0 do_package_qa: QA Issue: File - /usr/libexec/installed-tests/libxmlb/xb-self-test in package libxmlb-ptest - contains reference to TMPDIR [buildpaths] - -and also fixes the runtime for the ptest. - -Upstream-Status: Inappropriate [oe-specific] - -Signed-off-by: Markus Volk ---- - src/xb-self-test.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/xb-self-test.c b/src/xb-self-test.c -index 47d9728..8b3dd0e 100644 ---- a/src/xb-self-test.c -+++ b/src/xb-self-test.c -@@ -2870,7 +2870,7 @@ xb_speed_func(void) - int - main(int argc, char **argv) - { -- g_setenv("G_TEST_SRCDIR", SRCDIR, FALSE); -+ g_setenv("G_TEST_SRCDIR", "/usr/libexec/installed-tests/libxmlb", FALSE); - - g_test_init(&argc, &argv, NULL); - --- -2.41.0 - diff --git a/meta-gnome/recipes-support/libxmlb/libxmlb/run-ptest b/meta-gnome/recipes-support/libxmlb/libxmlb/run-ptest deleted file mode 100644 index 6d0bb95..0000000 --- a/meta-gnome/recipes-support/libxmlb/libxmlb/run-ptest +++ /dev/null @@ -1,3 +0,0 @@ -#! /bin/sh - -gnome-desktop-testing-runner libxmlb diff --git a/meta-gnome/recipes-support/libxmlb/libxmlb_0.3.14.bb b/meta-gnome/recipes-support/libxmlb/libxmlb_0.3.14.bb deleted file mode 100644 index 1d3b0de..0000000 --- a/meta-gnome/recipes-support/libxmlb/libxmlb_0.3.14.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "A library to help create and query binary XML blobs" -HOMEPAGE = "https://github.com/hughsie/libxmlb" -LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://LICENSE;md5=1803fa9c2c3ce8cb06b4861d75310742" - -SRC_URI = " \ - git://github.com/hughsie/libxmlb.git;branch=main;protocol=https \ - file://0001-xb-selftest.c-hardcode-G_TEST_SRCDIR.patch \ - file://run-ptest \ -" -SRCREV = "aa577b276adc66564f5777f9a522ca3bf0bfa65e" -S = "${WORKDIR}/git" - -DEPENDS = "glib-2.0 xz zstd" - -inherit gobject-introspection gtk-doc meson ptest-gnome lib_package pkgconfig - -PACKAGECONFIG ??= "${@bb.utils.contains('PTEST_ENABLED', '1', 'tests', '', d)}" -PACKAGECONFIG[tests] = "-Dtests=true,-Dtests=false" - -GTKDOC_MESON_OPTION = "gtkdoc" - -FILES:${PN} += "${datadir}" - -BBCLASSEXTEND = "native" diff --git a/meta-gnome/recipes-support/mm/atkmm-2.36_2.36.2.bb b/meta-gnome/recipes-support/mm/atkmm-2.36_2.36.2.bb index 7d097fd..fa47cbd 100644 --- a/meta-gnome/recipes-support/mm/atkmm-2.36_2.36.2.bb +++ b/meta-gnome/recipes-support/mm/atkmm-2.36_2.36.2.bb @@ -9,7 +9,6 @@ DEPENDS = "atk glibmm-2.68" GNOMEBN = "atkmm" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase features_check ANY_OF_DISTRO_FEATURES = "${GTK3DISTROFEATURES}" diff --git a/meta-gnome/recipes-support/mm/cairomm-1.16_1.18.0.bb b/meta-gnome/recipes-support/mm/cairomm-1.16_1.18.0.bb index b18e161..a6872ef 100644 --- a/meta-gnome/recipes-support/mm/cairomm-1.16_1.18.0.bb +++ b/meta-gnome/recipes-support/mm/cairomm-1.16_1.18.0.bb @@ -3,7 +3,6 @@ SUMMARY = "C++ bindings for Cairo graphics library" LICENSE = "LGPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=c46bda00ffbb0ba1dac22f8d087f54d9" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase DEPENDS += "boost cairo libsigc++-3" diff --git a/meta-gnome/recipes-support/mm/glibmm-2.68_2.78.0.bb b/meta-gnome/recipes-support/mm/glibmm-2.68_2.78.0.bb index 2d9dba5..f40a814 100644 --- a/meta-gnome/recipes-support/mm/glibmm-2.68_2.78.0.bb +++ b/meta-gnome/recipes-support/mm/glibmm-2.68_2.78.0.bb @@ -8,7 +8,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=42dfffebc56fec7527aac53b7a89d1d8 \ DEPENDS = "mm-common glib-2.0 libsigc++-3 glib-2.0-native" GNOMEBN = "glibmm" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase SHRT_VER = "${@d.getVar('PV').split('.')[0]}.${@d.getVar('PV').split('.')[1]}" diff --git a/meta-gnome/recipes-support/gtk+/gtkmm4_4.14.0.bb b/meta-gnome/recipes-support/mm/gtkmm4_4.14.0.bb similarity index 95% rename from meta-gnome/recipes-support/gtk+/gtkmm4_4.14.0.bb rename to meta-gnome/recipes-support/mm/gtkmm4_4.14.0.bb index 54ae81a..c8c681c 100644 --- a/meta-gnome/recipes-support/gtk+/gtkmm4_4.14.0.bb +++ b/meta-gnome/recipes-support/mm/gtkmm4_4.14.0.bb @@ -10,7 +10,6 @@ DEPENDS = "glib-2.0-native atkmm-2.36 pangomm-2.48 glibmm-2.68 gtk4 cairomm-1.16 BPN = "gtkmm" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase features_check REQUIRED_DISTRO_FEATURES = "opengl" diff --git a/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb b/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb index 51e1ab2..b9d3ac5 100644 --- a/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb +++ b/meta-gnome/recipes-support/mm/mm-common_1.0.2.bb @@ -2,7 +2,6 @@ SUMMARY = "Common GNOME build files for C++ bindings" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase diff --git a/meta-gnome/recipes-support/mm/pangomm-2.48_2.50.1.bb b/meta-gnome/recipes-support/mm/pangomm-2.48_2.50.1.bb index 2244667..86787a6 100644 --- a/meta-gnome/recipes-support/mm/pangomm-2.48_2.50.1.bb +++ b/meta-gnome/recipes-support/mm/pangomm-2.48_2.50.1.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ DEPENDS = "mm-common cairomm-1.16 glibmm-2.68 pango" GNOMEBN = "pangomm" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase features_check SRC_URI[archive.sha256sum] = "ccc9923413e408c2bff637df663248327d72822f11e394b423e1c5652b7d9214" diff --git a/meta-gnome/recipes-support/mozjs/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-gnome/recipes-support/mozjs/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch deleted file mode 100644 index fe905fe..0000000 --- a/meta-gnome/recipes-support/mozjs/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch +++ /dev/null @@ -1,29 +0,0 @@ -From c860dcbe63b0e393c95bfb0131238f91aaac11d3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Thu, 7 Oct 2021 12:44:18 +0200 -Subject: [PATCH] build: do not use autoconf's config.sub to 'canonicalize' - names - -The outcome is that processed names no longer match our custom rust -target definitions, and the build fails. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - build/moz.configure/init.configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 81f500a0b7..0b7a2ff60f 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -585,7 +585,7 @@ def help_host_target(help, host, target): - - def config_sub(shell, triplet): - config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") -- return check_cmd_output(shell, config_sub, triplet).strip() -+ return triplet - - - @depends("--host", shell) diff --git a/meta-gnome/recipes-support/mozjs/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-gnome/recipes-support/mozjs/0002-moz.configure-do-not-look-for-llvm-objdump.patch deleted file mode 100644 index b3d3c1f..0000000 --- a/meta-gnome/recipes-support/mozjs/0002-moz.configure-do-not-look-for-llvm-objdump.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0133ddb86eb6e0741e02b0032c41468db6438530 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 1 Oct 2021 13:01:10 +0200 -Subject: [PATCH] moz.configure: do not look for llvm-objdump - -This avoid dragging in a dependency that isn't even needed -for js builds. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - moz.configure | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/moz.configure b/moz.configure -index fc66b520d0..15de9a2ee0 100755 ---- a/moz.configure -+++ b/moz.configure -@@ -785,15 +785,15 @@ - return llvm_tool - - --llvm_objdump = check_prog( -- "LLVM_OBJDUMP", -- llvm_tool("llvm-objdump"), -- what="llvm-objdump", -- when="--enable-compile-environment", -- paths=clang_search_path, --) -- --add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) -+#llvm_objdump = check_prog( -+# "LLVM_OBJDUMP", -+# llvm_tool("llvm-objdump"), -+# what="llvm-objdump", -+# when="--enable-compile-environment", -+# paths=clang_search_path, -+#) -+# -+#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) - - - @depends(llvm_tool("llvm-readelf"), toolchain_prefix) - diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/0001-Cargo.toml-do-not-abort-on-panic.patch deleted file mode 100644 index 0dd9361..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-Cargo.toml-do-not-abort-on-panic.patch +++ /dev/null @@ -1,32 +0,0 @@ -From bb46a8a729cc4d66ad36db40c17e36a5111f19c3 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 1 Oct 2021 13:00:24 +0200 -Subject: [PATCH] Cargo.toml: do not abort on panic - -OE's rust is configured to unwind, and this setting clashes with it/ - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - Cargo.toml | 2 -- - 1 file changed, 2 deletions(-) - -diff --git a/Cargo.toml b/Cargo.toml -index f576534bf3..5ecc17c319 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -56,13 +56,11 @@ opt-level = 1 - rpath = false - lto = false - debug-assertions = true --panic = "abort" - - [profile.release] - opt-level = 2 - rpath = false - debug-assertions = false --panic = "abort" - - # Optimize build dependencies, because bindgen and proc macros / style - # compilation take more to run than to build otherwise. diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch deleted file mode 100644 index 02f5e5c..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-add-arm-to-list-of-mozinline.patch +++ /dev/null @@ -1,25 +0,0 @@ -Backport patch from firefox bugzilla to fix compile error for qemuarm with -some armv7ve tunes such as 'armv7vethf' and 'armv7vet-vfpv3d16': - -| /path/to/build/tmp/work/armv7vet2hf-vfp-poky-linux-gnueabi/mozjs-102/102.5.0-r0/build/js/src/jit/AtomicOperationsGenerated.h:240:17: - error: 'asm' operand has impossible constraints -| 240 | asm volatile ( -| | ^~~ - -Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1761665] - -Signed-off-by: Kai Kang - -diff --git a/js/src/jit/GenerateAtomicOperations.py b/js/src/jit/GenerateAtomicOperations.py -index d8a38a0..65f91ab 100644 ---- a/js/src/jit/GenerateAtomicOperations.py -+++ b/js/src/jit/GenerateAtomicOperations.py -@@ -856,7 +856,7 @@ def generate_atomics_header(c_out): - - # Work around a GCC issue on 32-bit x86 by adding MOZ_NEVER_INLINE. - # See bug 1756347. -- if is_gcc and cpu_arch == "x86": -+ if is_gcc and cpu_arch in ("x86", "arm"): - contents = contents.replace("INLINE_ATTR", "MOZ_NEVER_INLINE inline") - else: - contents = contents.replace("INLINE_ATTR", "inline") diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/0001-rewrite-cargo-host-linker-in-python3.patch deleted file mode 100644 index 73bcffe..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-rewrite-cargo-host-linker-in-python3.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 8e318c4e7e732327dabf51027860de45b6fb731e Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 18 Nov 2021 07:16:39 +0000 -Subject: [PATCH] Rewrite cargo-host-linker in python3 - -Mozjs compile failed with this failure: -/bin/sh: /lib64/libc.so.6: version `GLIBC_2.33' not found (required by /build/tmp-glibc/work/corei7-64-wrs-linux/mozjs/91.1.0-r0/recipe-sysroot-native/usr/lib/libtinfo.so.5) - -Root Cause: -cargo-host-linker has /bin/sh as it's interpreter, but cargo run the cmd -with LD_LIBRARY_PATH set to recipe-sysroot-native. The host /bin/sh links -libtinfo.so.5 under recipe-sysroot-native, which needs higher libc. But -host libc is older libc. So the incompatible problem occurred. - -Solution: -rewrite cargo-host-linker in python3 - -Upstream-Status: Inappropriate [oe specific] - -Signed-off-by: Changqing Li - ---- - build/cargo-host-linker | 24 +++++++++++++++++++++--- - 1 file changed, 21 insertions(+), 3 deletions(-) - -diff --git a/build/cargo-host-linker b/build/cargo-host-linker -index cbd0472bf7..87d43ce9ec 100755 ---- a/build/cargo-host-linker -+++ b/build/cargo-host-linker -@@ -1,3 +1,21 @@ --#!/bin/sh --# See comment in cargo-linker. --eval ${MOZ_CARGO_WRAP_HOST_LD} ${MOZ_CARGO_WRAP_HOST_LDFLAGS} '"$@"' -+#!/usr/bin/env python3 -+ -+import os,sys -+ -+if os.environ['MOZ_CARGO_WRAP_HOST_LD'].strip(): -+ binary=os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0] -+else: -+ sys.exit(0) -+ -+if os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS'].strip(): -+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] -+ else: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + [os.environ['MOZ_CARGO_WRAP_HOST_LDFLAGS']] + sys.argv[1:] -+else: -+ if os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:]: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[1:] + sys.argv[1:] -+ else: -+ args=[os.environ['MOZ_CARGO_WRAP_HOST_LD'].split()[0]] + sys.argv[1:] -+ -+os.execvp(binary, args) diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/0001-util.configure-fix-one-occasionally-reproduced-confi.patch deleted file mode 100644 index d732fda..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-util.configure-fix-one-occasionally-reproduced-confi.patch +++ /dev/null @@ -1,48 +0,0 @@ -From 2a6f66f39b4e623428b6d282bd4cb72dde67c1a6 Mon Sep 17 00:00:00 2001 -From: Changqing Li -Date: Thu, 11 Nov 2021 16:05:54 +0800 -Subject: [PATCH] util.configure: fix one occasionally reproduced configure - failure - -error: -| checking whether the C++ compiler supports -Wno-range-loop-analysis... -| DEBUG: Creating /tmp/conftest.jr1qrcw3.cpp with content: -| DEBUG: | int -| DEBUG: | main(void) -| DEBUG: | { -| DEBUG: | -| DEBUG: | ; -| DEBUG: | return 0; -| DEBUG: | } -| DEBUG: Executing: aarch64-wrs-linux-g++ -mcpu=cortex-a53 -march=armv8-a+crc -fstack-protector-strong -O2 -D_FORTIFY_SOURCE=2 -Wformat -Wformat-security -Werror=format-security --sysroot=/mozjs/91.1.0-r0/recipe-sysroot /tmp/conftest.jr1qrcw3.cpp -Werror -Wrange-loop-analysis -c -| DEBUG: The command returned non-zero exit status 1. -| DEBUG: Its error output was: -... -| File "/mozjs/91.1.0-r0/firefox-91.1.0/build/moz.configure/util.configure", line 239, in try_invoke_compiler -| os.remove(path) -| FileNotFoundError: [Errno 2] No such file or directory: '/tmp/conftest.jr1qrcw3.cpp' - -It should be another process that deleted this file by using -"rm -rf conftest*" inappropriately - -Upstream-Status: Submitted [https://bugzilla.mozilla.org/show_bug.cgi?id=1740667] - -Signed-off-by: Changqing Li - ---- - build/moz.configure/util.configure | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/build/moz.configure/util.configure b/build/moz.configure/util.configure -index 80c3a34522..0ac0c6b611 100644 ---- a/build/moz.configure/util.configure -+++ b/build/moz.configure/util.configure -@@ -216,7 +216,7 @@ def try_invoke_compiler(compiler, language, source, flags=None, onerror=None): - "C++": ".cpp", - }[language] - -- fd, path = mkstemp(prefix="conftest.", suffix=suffix, text=True) -+ fd, path = mkstemp(prefix="try_invoke_compiler_conftest.", suffix=suffix, text=True) - try: - source = source.encode("ascii", "replace") - diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/0002-moz.configure-do-not-look-for-llvm-objdump.patch deleted file mode 100644 index b3d3c1f..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/0002-moz.configure-do-not-look-for-llvm-objdump.patch +++ /dev/null @@ -1,44 +0,0 @@ -From 0133ddb86eb6e0741e02b0032c41468db6438530 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 1 Oct 2021 13:01:10 +0200 -Subject: [PATCH] moz.configure: do not look for llvm-objdump - -This avoid dragging in a dependency that isn't even needed -for js builds. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin ---- - moz.configure | 18 +++++++++--------- - 1 file changed, 9 insertions(+), 9 deletions(-) - -diff --git a/moz.configure b/moz.configure -index fc66b520d0..15de9a2ee0 100755 ---- a/moz.configure -+++ b/moz.configure -@@ -785,15 +785,15 @@ - return llvm_tool - - --llvm_objdump = check_prog( -- "LLVM_OBJDUMP", -- llvm_tool("llvm-objdump"), -- what="llvm-objdump", -- when="--enable-compile-environment", -- paths=clang_search_path, --) -- --add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) -+#llvm_objdump = check_prog( -+# "LLVM_OBJDUMP", -+# llvm_tool("llvm-objdump"), -+# what="llvm-objdump", -+# when="--enable-compile-environment", -+# paths=clang_search_path, -+#) -+# -+#add_old_configure_assignment("LLVM_OBJDUMP", llvm_objdump) - - - @depends(llvm_tool("llvm-readelf"), toolchain_prefix) - diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch deleted file mode 100644 index 202f126..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch +++ /dev/null @@ -1,66 +0,0 @@ -From 33ff25e2b126dd4135006139641d8b7f6e4da200 Mon Sep 17 00:00:00 2001 -From: Alexander Kanavin -Date: Fri, 1 Oct 2021 13:02:17 +0200 -Subject: [PATCH] rust.configure: do not try to find a suitable upstream target - -OE is using custom targets and so this is bound to fail. - -Upstream-Status: Inappropriate [oe-core specific] -Signed-off-by: Alexander Kanavin - ---- - build/moz.configure/rust.configure | 34 ++---------------------------- - 1 file changed, 2 insertions(+), 32 deletions(-) - -diff --git a/build/moz.configure/rust.configure b/build/moz.configure/rust.configure -index e64dc5d5ec..edf21baca6 100644 ---- a/build/moz.configure/rust.configure -+++ b/build/moz.configure/rust.configure -@@ -471,33 +471,7 @@ def assert_rust_compile(host_or_target, rustc_target, rustc): - def rust_host_triple( - rustc, host, compiler_info, rustc_host, rust_supported_targets, arm_target - ): -- rustc_target = detect_rustc_target( -- host, compiler_info, arm_target, rust_supported_targets -- ) -- if rustc_target != rustc_host: -- if host.alias == rustc_target: -- configure_host = host.alias -- else: -- configure_host = "{}/{}".format(host.alias, rustc_target) -- die( -- dedent( -- """\ -- The rust compiler host ({rustc}) is not suitable for the configure host ({configure}). -- -- You can solve this by: -- * Set your configure host to match the rust compiler host by editing your -- mozconfig and adding "ac_add_options --host={rustc}". -- * Or, install the rust toolchain for {configure}, if supported, by running -- "rustup default stable-{rustc_target}" -- """.format( -- rustc=rustc_host, -- configure=configure_host, -- rustc_target=rustc_target, -- ) -- ) -- ) -- assert_rust_compile(host, rustc_target, rustc) -- return rustc_target -+ return rustc_host - - - @depends( -@@ -507,11 +481,7 @@ def rust_host_triple( - def rust_target_triple( - rustc, target, compiler_info, rust_supported_targets, arm_target - ): -- rustc_target = detect_rustc_target( -- target, compiler_info, arm_target, rust_supported_targets -- ) -- assert_rust_compile(target, rustc_target, rustc) -- return rustc_target -+ return target.alias - - - set_config("RUST_TARGET", rust_target_triple) diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/0004-use-asm-sgidefs.h.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/0004-use-asm-sgidefs.h.patch deleted file mode 100644 index ff28654..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/0004-use-asm-sgidefs.h.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 0ec73937b01869a701ed9b60a6a84469e035ded4 Mon Sep 17 00:00:00 2001 -From: Andre McCurdy -Date: Sat, 30 Apr 2016 15:29:06 -0700 -Subject: [PATCH] use - -Build fix for MIPS with musl libc - -The MIPS specific header is provided by glibc and uclibc -but not by musl. Regardless of the libc, the kernel headers provide - which provides the same definitions, so use that -instead. - -Upstream-Status: Pending - -[Vincent: -Taken from: https://sourceware.org/bugzilla/show_bug.cgi?id=21070] - -Signed-off-by: Andre McCurdy -Signed-off-by: Khem Raj -Signed-off-by: Vicente Olivert Riera - ---- - mfbt/RandomNum.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/mfbt/RandomNum.cpp b/mfbt/RandomNum.cpp -index 23381db0cd..7f127c0715 100644 ---- a/mfbt/RandomNum.cpp -+++ b/mfbt/RandomNum.cpp -@@ -52,7 +52,7 @@ extern "C" BOOLEAN NTAPI RtlGenRandom(PVOID RandomBuffer, - # elif defined(__s390__) - # define GETRANDOM_NR 349 - # elif defined(__mips__) --# include -+# include - # if _MIPS_SIM == _MIPS_SIM_ABI32 - # define GETRANDOM_NR 4353 - # elif _MIPS_SIM == _MIPS_SIM_ABI64 diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/fix-musl-build.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/fix-musl-build.patch deleted file mode 100644 index 6905282..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/fix-musl-build.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 1110483c6c06adf2d03ed9154a8957defc175c80 Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Wed, 20 Oct 2021 16:21:14 -0700 -Subject: [PATCH] mozjs: Fix musl miscompiles with HAVE_THREAD_TLS_KEYWORD - -Upstream: No -Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: -https://github.com/void-linux/void-packages/issues/2598 - ---- -Upstream-Status: Pending - - js/src/old-configure.in | 3 +++ - 1 file changed, 3 insertions(+) - -diff --git a/js/src/old-configure.in b/js/src/old-configure.in -index 8dfd75c63d..c82e580428 100644 ---- a/js/src/old-configure.in -+++ b/js/src/old-configure.in -@@ -839,6 +839,9 @@ if test "$ac_cv_thread_keyword" = yes; then - *-android*|*-linuxandroid*) - : - ;; -+ *-musl*) -+ : -+ ;; - *) - AC_DEFINE(HAVE_THREAD_TLS_KEYWORD) - ;; diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/musl-disable-stackwalk.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/musl-disable-stackwalk.patch deleted file mode 100644 index a3ba469..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/musl-disable-stackwalk.patch +++ /dev/null @@ -1,18 +0,0 @@ -Musl does not have stack unwinder like glibc therefore -we can not assume that its always available on musl, we -do need to check for target environment as well which -could be musl or glibc. - -Upstream-Status: Pending -Signed-off-by: Khem Raj ---- a/mozglue/misc/StackWalk.cpp -+++ b/mozglue/misc/StackWalk.cpp -@@ -44,7 +44,7 @@ using namespace mozilla; - # define MOZ_STACKWALK_SUPPORTS_MACOSX 0 - #endif - --#if (defined(linux) && \ -+#if (defined(linux) && defined(__GLIBC__) && \ - ((defined(__GNUC__) && (defined(__i386) || defined(PPC))) || \ - defined(HAVE__UNWIND_BACKTRACE))) - # define MOZ_STACKWALK_SUPPORTS_LINUX 1 diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/riscv32.patch b/meta-gnome/recipes-support/mozjs/mozjs-102/riscv32.patch deleted file mode 100644 index a6a0a9e..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/riscv32.patch +++ /dev/null @@ -1,60 +0,0 @@ -From 81385fe53ffde5e1636e9ace0736d914da8dbc0f Mon Sep 17 00:00:00 2001 -From: Khem Raj -Date: Sun, 24 Oct 2021 22:32:50 -0700 -Subject: [PATCH] Add RISCV32 support - -Upstream-Status: Pending -Signed-off-by: Khem Raj - ---- - build/moz.configure/init.configure | 3 +++ - python/mozbuild/mozbuild/configure/constants.py | 2 ++ - .../mozbuild/test/configure/test_toolchain_configure.py | 1 + - 3 files changed, 6 insertions(+) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 0b7a2ff60f..54f8325b44 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -524,6 +524,9 @@ def split_triplet(triplet, allow_msvc=False, allow_wasi=False): - elif cpu.startswith("aarch64"): - canonical_cpu = "aarch64" - endianness = "little" -+ elif cpu in ("riscv32", "riscv32gc"): -+ canonical_cpu = "riscv32" -+ endianness = "little" - elif cpu in ("riscv64", "riscv64gc"): - canonical_cpu = "riscv64" - endianness = "little" -diff --git a/python/mozbuild/mozbuild/configure/constants.py b/python/mozbuild/mozbuild/configure/constants.py -index c71460cb20..15bef93e19 100644 ---- a/python/mozbuild/mozbuild/configure/constants.py -+++ b/python/mozbuild/mozbuild/configure/constants.py -@@ -53,6 +53,7 @@ CPU_bitness = { - "mips64": 64, - "ppc": 32, - "ppc64": 64, -+ 'riscv32': 32, - "riscv64": 64, - "s390": 32, - "s390x": 64, -@@ -95,6 +96,7 @@ CPU_preprocessor_checks = OrderedDict( - ("m68k", "__m68k__"), - ("mips64", "__mips64"), - ("mips32", "__mips__"), -+ ("riscv32", "__riscv && __riscv_xlen == 32"), - ("riscv64", "__riscv && __riscv_xlen == 64"), - ("loongarch64", "__loongarch64"), - ("sh4", "__sh__"), -diff --git a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -index 059cde0139..4f9986eb31 100644 ---- a/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -+++ b/python/mozbuild/mozbuild/test/configure/test_toolchain_configure.py -@@ -1192,6 +1192,7 @@ class LinuxCrossCompileToolchainTest(BaseToolchainTest): - "m68k-unknown-linux-gnu": big_endian + {"__m68k__": 1}, - "mips64-unknown-linux-gnuabi64": big_endian + {"__mips64": 1, "__mips__": 1}, - "mips-unknown-linux-gnu": big_endian + {"__mips__": 1}, -+ "riscv32-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 32}, - "riscv64-unknown-linux-gnu": little_endian + {"__riscv": 1, "__riscv_xlen": 64}, - "sh4-unknown-linux-gnu": little_endian + {"__sh__": 1}, - } diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch index d0841fd..e8dfdea 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-Cargo.toml-do-not-abort-on-panic.patch @@ -1,4 +1,4 @@ -From c7ab27681ff5e0ac9e8ad36e5a9cb33eeffcbd56 Mon Sep 17 00:00:00 2001 +From f501f7c02df4f0ff5d5f100d9eeb74cd4d12ea3d Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Oct 2021 13:00:24 +0200 Subject: [PATCH] Cargo.toml: do not abort on panic diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch index 39cf76a..8318786 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-add-arm-to-list-of-mozinline.patch @@ -1,6 +1,6 @@ -From 194361a4dacb9540c0f4660c58a54f3c6bd91067 Mon Sep 17 00:00:00 2001 +From c5cfb8aa591afd5ad3aedc58fe7f410e89013605 Mon Sep 17 00:00:00 2001 From: Kai Kang -Date: Mon, 18 Sep 2023 19:32:57 +0000 +Date: Fri, 22 Sep 2023 22:59:59 +0000 Subject: [PATCH] Backport patch from firefox bugzilla to fix compile error for qemuarm with some armv7ve tunes such as 'armv7vethf' and 'armv7vet-vfpv3d16': diff --git a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch similarity index 50% rename from meta-gnome/recipes-support/mozjs/mozjs-102/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch rename to meta-gnome/recipes-support/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch index fe905fe..38496ea 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-102/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch @@ -14,16 +14,31 @@ Signed-off-by: Alexander Kanavin build/moz.configure/init.configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 81f500a0b7..0b7a2ff60f 100644 --- a/build/moz.configure/init.configure +++ b/build/moz.configure/init.configure -@@ -585,7 +585,7 @@ def help_host_target(help, host, target): +@@ -647,24 +647,7 @@ def help_host_target(help, host, target) def config_sub(shell, triplet): config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") -- return check_cmd_output(shell, config_sub, triplet).strip() +- # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so +- # munge those before and after calling config.sub. +- suffix = None +- munging = { +- "-windows-msvc": "-mingw32", +- "-windows-gnu": "-mingw32", +- } +- for check_suffix, replacement in munging.items(): +- if triplet.endswith(check_suffix): +- suffix = check_suffix +- triplet = triplet[: -len(suffix)] + replacement +- break +- result = check_cmd_output(shell, config_sub, triplet).strip() +- if suffix: +- assert result.endswith(replacement) +- result = result[: -len(replacement)] + suffix +- return result +- + return triplet - @depends("--host", shell) + @checking("for host system type", lambda h: h.alias) diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-fix-init-configure.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-fix-init-configure.patch deleted file mode 100644 index dfab264..0000000 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-fix-init-configure.patch +++ /dev/null @@ -1,53 +0,0 @@ -From 7a9f989f9ac74b6414982af8ef27848394a8edf8 Mon Sep 17 00:00:00 2001 -From: Bruce Leidl -Date: Mon, 18 Sep 2023 15:28:14 -0400 -Subject: [PATCH] fix init configure - ---- - build/moz.configure/init.configure | 31 +++++++++++++++--------------- - 1 file changed, 16 insertions(+), 15 deletions(-) - -diff --git a/build/moz.configure/init.configure b/build/moz.configure/init.configure -index 2ac40d3d39..dc8a605d06 100644 ---- a/build/moz.configure/init.configure -+++ b/build/moz.configure/init.configure -@@ -650,23 +650,24 @@ def help_host_target(help, host, target): - - def config_sub(shell, triplet): - config_sub = os.path.join(os.path.dirname(__file__), "..", "autoconf", "config.sub") -+ return triplet - # Config.sub doesn't like the *-windows-msvc/*-windows-gnu triplets, so - # munge those before and after calling config.sub. -- suffix = None -- munging = { -- "-windows-msvc": "-mingw32", -- "-windows-gnu": "-mingw32", -- } -- for check_suffix, replacement in munging.items(): -- if triplet.endswith(check_suffix): -- suffix = check_suffix -- triplet = triplet[: -len(suffix)] + replacement -- break -- result = check_cmd_output(shell, config_sub, triplet).strip() -- if suffix: -- assert result.endswith(replacement) -- result = result[: -len(replacement)] + suffix -- return result -+ #suffix = None -+ #munging = { -+ # "-windows-msvc": "-mingw32", -+ # "-windows-gnu": "-mingw32", -+ #} -+ #for check_suffix, replacement in munging.items(): -+ # if triplet.endswith(check_suffix): -+ # suffix = check_suffix -+ # triplet = triplet[: -len(suffix)] + replacement -+ # break -+ #result = check_cmd_output(shell, config_sub, triplet).strip() -+ #if suffix: -+ # assert result.endswith(replacement) -+ # result = result[: -len(replacement)] + suffix -+ #return result - - - @depends("--host", shell) diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch index 970a1a4..83f384e 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-rewrite-cargo-host-linker-in-python3.patch @@ -1,4 +1,4 @@ -From 5936d1a6a11b60320ce496f5937090b770292af4 Mon Sep 17 00:00:00 2001 +From c6a84863454b882695058187cd282987613474ef Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 18 Nov 2021 07:16:39 +0000 Subject: [PATCH] Rewrite cargo-host-linker in python3 diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch index 2e13a05..4921a90 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/0001-util.configure-fix-one-occasionally-reproduced-confi.patch @@ -1,4 +1,4 @@ -From 6cb677e3ea8b5491a923405144b18f5264abc62c Mon Sep 17 00:00:00 2001 +From 0d28cd65efe14022e1d645db71dec74f11ab2ae8 Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Thu, 11 Nov 2021 16:05:54 +0800 Subject: [PATCH] util.configure: fix one occasionally reproduced configure diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch index 7c0a113..4c69155 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/0002-moz.configure-do-not-look-for-llvm-objdump.patch @@ -1,4 +1,4 @@ -From 328c6884bb0201551a0597b572c8310527496417 Mon Sep 17 00:00:00 2001 +From 49cb509abd309e3b74ef4c872ae773f18dabca19 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Oct 2021 13:01:10 +0200 Subject: [PATCH] moz.configure: do not look for llvm-objdump diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch index ded3047..0f9d062 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch @@ -1,4 +1,4 @@ -From fc2afb92f7be4eba7b65bb35859979e02b8f4ada Mon Sep 17 00:00:00 2001 +From ac6a3711917ff3f2b64662cbf4681c22a09da403 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Fri, 1 Oct 2021 13:02:17 +0200 Subject: [PATCH] rust.configure: do not try to find a suitable upstream target diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch index c2b64d0..6443d46 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/0004-use-asm-sgidefs.h.patch @@ -1,4 +1,4 @@ -From 7a2a8e0129db96ec60ba8eb828e1e9965fc5f4ca Mon Sep 17 00:00:00 2001 +From 607aa4d822b0e074ae1b2fc16d7c140c3e889680 Mon Sep 17 00:00:00 2001 From: Andre McCurdy Date: Sat, 30 Apr 2016 15:29:06 -0700 Subject: [PATCH] use diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/armv5.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/armv5.patch new file mode 100644 index 0000000..4c45955 --- /dev/null +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/armv5.patch @@ -0,0 +1,19 @@ +The ISB instruction isn't available in ARMv5 or v6, so +guard it's use to fix the build on qemuarmv5. + +Upstream-Status: Pending +Signed-off-by: Ross Burton + +diff --git a/js/src/jit/arm/Architecture-arm.cpp b/js/src/jit/arm/Architecture-arm.cpp +--- a/js/src/jit/arm/Architecture-arm.cpp 2024-01-18 17:31:32.078718197 +0000 ++++ b/js/src/jit/arm/Architecture-arm.cpp 2024-01-18 18:00:16.738921445 +0000 +@@ -529,7 +529,9 @@ + void FlushExecutionContext() { + #ifndef JS_SIMULATOR_ARM ++#if __ARM_ARCH >= 7 + // Ensure that any instructions already in the pipeline are discarded and + // reloaded from the icache. + asm volatile("isb\n" : : : "memory"); ++#endif + #else + // We assume the icache flushing routines on other platforms take care of this diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/fix-musl-build.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/fix-musl-build.patch index 6dba603..22f31e0 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/fix-musl-build.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/fix-musl-build.patch @@ -1,4 +1,4 @@ -From b27770df435d62b722727d4af898ee22f6f50801 Mon Sep 17 00:00:00 2001 +From e4d8016d0dc56b02e22898d83aad9f80a94d1c3c Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Wed, 20 Oct 2021 16:21:14 -0700 Subject: [PATCH] mozjs: Fix musl miscompiles with HAVE_THREAD_TLS_KEYWORD @@ -8,6 +8,8 @@ Reason: mozjs60 miscompiles on musl if built with HAVE_THREAD_TLS_KEYWORD: https://github.com/void-linux/void-packages/issues/2598 --- +Upstream-Status: Pending + js/src/old-configure.in | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/musl-disable-stackwalk.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/musl-disable-stackwalk.patch index ef727c9..590cddf 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/musl-disable-stackwalk.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/musl-disable-stackwalk.patch @@ -1,6 +1,6 @@ -From 37039e1af278b7776fb6b614ded5deaf0c66ece9 Mon Sep 17 00:00:00 2001 +From 9aae71c6ee73431d2609be0ef74ffd4b22b36c75 Mon Sep 17 00:00:00 2001 From: Khem Raj -Date: Mon, 18 Sep 2023 19:32:55 +0000 +Date: Fri, 22 Sep 2023 22:59:56 +0000 Subject: [PATCH] Musl does not have stack unwinder like glibc therefore we can not assume that its always available on musl, we do need to check for target environment as well which could be musl or glibc. diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115/riscv32.patch b/meta-gnome/recipes-support/mozjs/mozjs-115/riscv32.patch index 5aefbf2..16f9565 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115/riscv32.patch +++ b/meta-gnome/recipes-support/mozjs/mozjs-115/riscv32.patch @@ -1,4 +1,4 @@ -From ff5fd2c08a0d6f0b39a9970f3b10e31a46e99383 Mon Sep 17 00:00:00 2001 +From d6aff068170e56e6773feba42a463dd8c50bc4ff Mon Sep 17 00:00:00 2001 From: Khem Raj Date: Sun, 24 Oct 2021 22:32:50 -0700 Subject: [PATCH] Add RISCV32 support diff --git a/meta-gnome/recipes-support/mozjs/mozjs-115_115.2.0.bb b/meta-gnome/recipes-support/mozjs/mozjs-115_115.8.0.bb similarity index 68% rename from meta-gnome/recipes-support/mozjs/mozjs-115_115.2.0.bb rename to meta-gnome/recipes-support/mozjs/mozjs-115_115.8.0.bb index d931fd5..1269795 100644 --- a/meta-gnome/recipes-support/mozjs/mozjs-115_115.2.0.bb +++ b/meta-gnome/recipes-support/mozjs/mozjs-115_115.8.0.bb @@ -5,20 +5,19 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=dc9b6ecd19a14a54a628edaaf23733bf" SRC_URI = "https://archive.mozilla.org/pub/firefox/releases/${PV}esr/source/firefox-${PV}esr.source.tar.xz \ file://0001-Cargo.toml-do-not-abort-on-panic.patch \ + file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ file://0003-rust.configure-do-not-try-to-find-a-suitable-upstrea.patch \ file://0004-use-asm-sgidefs.h.patch \ file://fix-musl-build.patch \ + file://0001-build-do-not-use-autoconf-s-config.sub-to-canonicali.patch \ file://riscv32.patch \ - file://0002-moz.configure-do-not-look-for-llvm-objdump.patch \ file://0001-util.configure-fix-one-occasionally-reproduced-confi.patch \ - file://0001-rewrite-cargo-host-linker-in-python3.patch \ + file://0001-rewrite-cargo-host-linker-in-python3.patch \ file://musl-disable-stackwalk.patch \ file://0001-add-arm-to-list-of-mozinline.patch \ - file://0001-fix-init-configure.patch \ + file://armv5.patch \ " -#SRC_URI[sha256sum] = "31b074623f09ca821a8a7dee0b3d2df1a45f1164264d31c26b4969a4d6a21dd1" -SRC_URI[sha256sum] = "51534dd2a158d955a2cb67cc1308f100f6c9def0788713ed8b4d743f3ad72457" - +SRC_URI[sha256sum] = "af8086f23efc8492d286671f6035b1a915de6f4ed5c7897e40be0e1cb6b895ea" S = "${WORKDIR}/firefox-${PV}" @@ -30,7 +29,22 @@ DEPENDS:remove:powerpc:toolchain-clang = "icu" B = "${WORKDIR}/build" -export PYTHONPATH = "${S}/build:${S}/third_party/python/PyYAML/lib3:${S}/testing/mozbase/mozfile:${S}/python/mozboot:${S}/third_party/python/distro:${S}/testing/mozbase/mozinfo:${S}/config:${S}/testing/mozbase/manifestparser:${S}/third_party/python/pytoml:${S}/testing/mozbase/mozprocess:${S}/third_party/python/six:${S}/python/mozbuild:${S}/python/mozbuild/mozbuild:${S}/python/mach:${S}/third_party/python/jsmin:${S}/python/mozversioncontrol" +export PYTHONPATH = "${S}/build:\ +${S}/third_party/python/PyYAML/lib3:\ +${S}/testing/mozbase/mozfile:\ +${S}/python/mozboot:\ +${S}/third_party/python/distro:\ +${S}/testing/mozbase/mozinfo:\ +${S}/config:\ +${S}/testing/mozbase/manifestparser:\ +${S}/third_party/python/pytoml:\ +${S}/testing/mozbase/mozprocess:\ +${S}/third_party/python/six:\ +${S}/python/mozbuild:\ +${S}/python/mozbuild/mozbuild:\ +${S}/python/mach:\ +${S}/third_party/python/jsmin:\ +${S}/python/mozversioncontrol" export HOST_CC = "${BUILD_CC}" export HOST_CXX = "${BUILD_CXX}" @@ -61,6 +75,7 @@ do_configure() { ${JIT} \ ${ICU} } +do_configure[cleandirs] += "${B}" do_install() { oe_runmake 'DESTDIR=${D}' install @@ -68,14 +83,16 @@ do_install() { inherit multilib_script multilib_header -MULTILIB_SCRIPTS += " ${PN}-dev:${bindir}/js115-config" +MAJ_VER = "${@oe.utils.trim_version("${PV}", 1)}" +MULTILIB_SCRIPTS += "${PN}-dev:${bindir}/js${MAJ_VER}-config" do_install:append() { - oe_multilib_header mozjs-115/js-config.h + oe_multilib_header mozjs-${MAJ_VER}/js-config.h sed -e 's@${STAGING_DIR_HOST}@@g' \ - -i ${D}${bindir}/js115-config + -i ${D}${bindir}/js${MAJ_VER}-config rm -f ${D}${libdir}/libjs_static.ajs } +PACKAGE_DEBUG_SPLIT_STYLE = "debug-without-src" PACKAGES =+ "lib${BPN}" FILES:lib${BPN} += "${libdir}/lib*" diff --git a/meta-gnome/recipes-support/tecla/tecla_45.0.bb b/meta-gnome/recipes-support/tecla/tecla_45.0.bb index c047e29..197db17 100644 --- a/meta-gnome/recipes-support/tecla/tecla_45.0.bb +++ b/meta-gnome/recipes-support/tecla/tecla_45.0.bb @@ -10,7 +10,6 @@ DEPENDS = " \ " REQUIRED_DISTRO_FEATURES = "wayland" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase pkgconfig features_check diff --git a/meta-gnome/recipes-support/wayland/libinput/run-ptest b/meta-gnome/recipes-support/wayland/libinput/run-ptest deleted file mode 100644 index d11e6eb..0000000 --- a/meta-gnome/recipes-support/wayland/libinput/run-ptest +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -/usr/libexec/libinput/libinput-test-suite -j1 -if [ $? -eq 0 ]; then - echo 'PASS: libinput-test-suite' -else - echo 'FAIL: libinput-test-suite' -fi - diff --git a/meta-gnome/recipes-support/wayland/libinput_1.24.0.bb b/meta-gnome/recipes-support/wayland/libinput_1.24.0.bb deleted file mode 100644 index 49a1da2..0000000 --- a/meta-gnome/recipes-support/wayland/libinput_1.24.0.bb +++ /dev/null @@ -1,49 +0,0 @@ -SUMMARY = "Library to handle input devices in Wayland compositors" -DESCRIPTION = "libinput is a library to handle input devices in Wayland \ -compositors and to provide a generic X.Org input driver. It provides \ -device detection, device handling, input device event processing and \ -abstraction so minimize the amount of custom input code compositors need to \ -provide the common set of functionality that users expect." -HOMEPAGE = "http://www.freedesktop.org/wiki/Software/libinput/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=bab4ac7dc1c10bc0fb037dc76c46ef8a" - -DEPENDS = "libevdev udev mtdev libcheck" - -SRC_URI = "git://gitlab.freedesktop.org/libinput/libinput.git;protocol=https;branch=main \ - file://run-ptest \ - " -SRCREV = "1680f2fbaa63a91739012c6b57988ab1918ea0b7" -S = "${WORKDIR}/git" - -UPSTREAM_CHECK_REGEX = "libinput-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig lib_package ptest - -# Patch out build directory, otherwise it leaks into ptest binary -do_configure:append() { - sed -i -e "s,${WORKDIR},,g" config.h - if [ -e "litest-config.h" ]; then - sed -i -e "s,${WORKDIR},,g" litest-config.h - fi -} - -PACKAGECONFIG ??= "" -PACKAGECONFIG[libwacom] = "-Dlibwacom=true,-Dlibwacom=false,libwacom" -PACKAGECONFIG[gui] = "-Ddebug-gui=true,-Ddebug-gui=false,cairo gtk+3" - -UDEVDIR = "`pkg-config --variable=udevdir udev`" - -EXTRA_OEMESON += "-Dudev-dir=${UDEVDIR} \ - -Ddocumentation=false \ - ${@bb.utils.contains('PTEST_ENABLED', '1', '-Dtests=true -Dinstall-tests=true', '-Dtests=false -Dinstall-tests=false', d)} \ - -Dzshcompletiondir=no" - -# package name changed in 1.8.1 upgrade: make sure package upgrades work -RPROVIDES:${PN} = "libinput" -RREPLACES:${PN} = "libinput" -RCONFLICTS:${PN} = "libinput" - -FILES:${PN}-ptest += "${libexecdir}/libinput/libinput-test-suite" diff --git a/meta-gnome/recipes-support/wayland/mtdev_1.1.6.bb b/meta-gnome/recipes-support/wayland/mtdev_1.1.6.bb deleted file mode 100644 index 7c1cb5e..0000000 --- a/meta-gnome/recipes-support/wayland/mtdev_1.1.6.bb +++ /dev/null @@ -1,18 +0,0 @@ -SUMMARY = "Multitouch Protocol Translation Library" - -DESCRIPTION = "mtdev is a library which transforms all variants of kernel \ -multitouch events to the slotted type B protocol. The events put into mtdev may \ -be from any MT device, specifically type A without contact tracking, type A with \ -contact tracking, or type B with contact tracking" - -HOMEPAGE = "http://bitmath.org/code/mtdev/" -SECTION = "libs" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea6bd0268bb0fcd6b27698616ceee5d6" - -SRC_URI = "http://bitmath.org/code/${BPN}/${BP}.tar.bz2" -SRC_URI[md5sum] = "bf8ef2482e84a00b5db8fbd3ce00e249" -SRC_URI[sha256sum] = "15d7b28da8ac71d8bc8c9287c2045fd174267bc740bec10cfda332dc1204e0e0" - -inherit autotools pkgconfig diff --git a/meta-gnome/recipes-support/wayland/required-distro-features.inc b/meta-gnome/recipes-support/wayland/required-distro-features.inc deleted file mode 100644 index bb4a0e8..0000000 --- a/meta-gnome/recipes-support/wayland/required-distro-features.inc +++ /dev/null @@ -1,8 +0,0 @@ -# distro features required by weston recipes - -inherit features_check - -# requires pam enabled if started via systemd -# -REQUIRED_DISTRO_FEATURES = "wayland opengl ${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', 'pam', '', d)}" - diff --git a/meta-gnome/recipes-support/wayland/wayland-protocols_1.32.bb b/meta-gnome/recipes-support/wayland/wayland-protocols_1.32.bb deleted file mode 100644 index 05943bc..0000000 --- a/meta-gnome/recipes-support/wayland/wayland-protocols_1.32.bb +++ /dev/null @@ -1,25 +0,0 @@ -SUMMARY = "Collection of additional Wayland protocols" -DESCRIPTION = "Wayland protocols that add functionality not \ -available in the Wayland core protocol. Such protocols either add \ -completely new functionality, or extend the functionality of some other \ -protocol either in Wayland core, or some other protocol in \ -wayland-protocols." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=c7b12b6702da38ca028ace54aae3d484 \ - file://stable/presentation-time/presentation-time.xml;endline=26;md5=4646cd7d9edc9fa55db941f2d3a7dc53" - -SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-protocols/-/releases/${PV}/downloads/wayland-protocols-${PV}.tar.xz" -SRC_URI[sha256sum] = "7459799d340c8296b695ef857c07ddef24c5a09b09ab6a74f7b92640d2b1ba11" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit meson pkgconfig allarch - -EXTRA_OEMESON += "-Dtests=false" - -PACKAGES = "${PN}" -FILES:${PN} += "${datadir}/pkgconfig/wayland-protocols.pc" - -BBCLASSEXTEND = "native nativesdk" - diff --git a/meta-gnome/recipes-support/wayland/wayland-utils_1.2.0.bb b/meta-gnome/recipes-support/wayland/wayland-utils_1.2.0.bb deleted file mode 100644 index 657f67f..0000000 --- a/meta-gnome/recipes-support/wayland/wayland-utils_1.2.0.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Wayland utilities" -DESCRIPTION = "Wayland-utils contains (for now) \ -wayland-info, a utility for displaying information about the Wayland \ -protocols supported by a Wayland compositor. \ -wayland-info is basically a standalone version of weston-info as found \ -in weston repository. " -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=548a66038a77415e1df51118625e832f \ - " - -SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland-utils/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz" -SRC_URI[sha256sum] = "d9278c22554586881802540751bcc42569262bf80cd9ac9b0fd12ff4bd09a9e4" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" - -inherit meson pkgconfig - -DEPENDS += "wayland wayland-native wayland-protocols" - -PACKAGECONFIG ??= "drm" -PACKAGECONFIG[drm] = "-Ddrm=enabled,-Ddrm=disabled,libdrm" diff --git a/meta-gnome/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch b/meta-gnome/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch deleted file mode 100644 index bc753de..0000000 --- a/meta-gnome/recipes-support/wayland/wayland/0001-build-Fix-strndup-detection-on-MinGW.patch +++ /dev/null @@ -1,41 +0,0 @@ -From b4c64b6f07743e3fb63ce52359bc664ab7d60df0 Mon Sep 17 00:00:00 2001 -From: Joshua Watt -Date: Thu, 20 Feb 2020 15:20:45 -0600 -Subject: [PATCH] build: Fix strndup detection on MinGW - -GCC and meson conspire together to incorrectly detect that strndup() -exists on MinGW as __builtin_strndup, when no such function exists. As a -work around, meson will skip looking for __builtin functions if an -'#include' is in the prefix, so add '#include ' when looking -for strndup(). - -See: https://github.com/mesonbuild/meson/issues/3672 - -Upstream-Status: Submitted [https://gitlab.freedesktop.org/wayland/wayland/merge_requests/63] - -Signed-off-by: Joshua Watt -Signed-off-by: Denys Dmytriyenko ---- - meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/meson.build b/meson.build -index 3bc25c9..adde7b9 100644 ---- a/meson.build -+++ b/meson.build -@@ -38,11 +38,11 @@ have_funcs = [ - 'prctl', - 'memfd_create', - 'mremap', -- 'strndup', - ] - foreach f: have_funcs - config_h.set('HAVE_' + f.underscorify().to_upper(), cc.has_function(f)) - endforeach -+config_h.set('HAVE_STRNDUP', cc.has_function('strndup') and cc.has_header_symbol('string.h', 'strndup')) - config_h.set10('HAVE_XUCRED_CR_PID', cc.has_member('struct xucred', 'cr_pid', prefix : '#include ')) - have_broken_msg_cmsg_cloexec = false - if host_machine.system() == 'freebsd' --- -2.7.4 - diff --git a/meta-gnome/recipes-support/wayland/wayland/run-ptest b/meta-gnome/recipes-support/wayland/wayland/run-ptest deleted file mode 100644 index 7e8d9de..0000000 --- a/meta-gnome/recipes-support/wayland/wayland/run-ptest +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/sh - -export WAYLAND_SCANNER=wayland-scanner -export TEST_DATA_DIR=tests/data -export TEST_OUTPUT_DIR=tests/output -export SED=sed -export WAYLAND_EGL_LIB=/usr/lib/libwayland-egl.so.1 -export NM=nm - -for i in `ls tests/*-test tests/wayland-egl-symbols-check tests/scanner-test.sh`; do - $i - if [ $? -eq 0 ]; then - echo "PASS: $i" - else - echo "FAIL: $i" - fi -done diff --git a/meta-gnome/recipes-support/wayland/wayland_1.22.0.bb b/meta-gnome/recipes-support/wayland/wayland_1.22.0.bb deleted file mode 100644 index 26bad58..0000000 --- a/meta-gnome/recipes-support/wayland/wayland_1.22.0.bb +++ /dev/null @@ -1,61 +0,0 @@ -SUMMARY = "Wayland, a protocol between a compositor and clients" -DESCRIPTION = "Wayland is a protocol for a compositor to talk to its clients \ -as well as a C library implementation of that protocol. The compositor can be \ -a standalone display server running on Linux kernel modesetting and evdev \ -input devices, an X application, or a wayland client itself. The clients can \ -be traditional applications, X servers (rootless or fullscreen) or other \ -display servers." -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=b31d8f53b6aaf2b4985d7dd7810a70d1 \ - file://src/wayland-server.c;endline=24;md5=b8e046164a766bb1ede8ba38e9dcd7ce" - -DEPENDS = "expat libffi wayland-native" - -SRC_URI = "https://gitlab.freedesktop.org/wayland/wayland/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ - file://run-ptest \ - file://0001-build-Fix-strndup-detection-on-MinGW.patch \ - " -SRC_URI[sha256sum] = "1540af1ea698a471c2d8e9d288332c7e0fd360c8f1d12936ebb7e7cbc2425842" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -UPSTREAM_CHECK_REGEX = "wayland-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig ptest - -PACKAGECONFIG ??= "dtd-validation" -PACKAGECONFIG[dtd-validation] = "-Ddtd_validation=true,-Ddtd_validation=false,libxml2,," - -EXTRA_OEMESON = "-Ddocumentation=false" -EXTRA_OEMESON:class-native = "-Ddocumentation=false" - -# Wayland installs a M4 macro for other projects to use, which uses the target -# pkg-config to find files. Replace pkg-config with pkg-config-native. -do_install:append:class-native() { - sed -e 's,PKG_CHECK_MODULES(.*),,g' \ - -e 's,$PKG_CONFIG,pkg-config-native,g' \ - -i ${D}/${datadir}/aclocal/wayland-scanner.m4 -} - -do_install_ptest() { - mkdir -p ${D}${PTEST_PATH}/tests/data - cp -rf ${B}/tests/*-test ${B}/tests/*-checker ${D}${PTEST_PATH}/tests - cp -rf ${B}/tests/*-checker ${D}${PTEST_PATH} - cp -rf ${S}/tests/scanner-test.sh ${D}${PTEST_PATH}/tests - cp -rf ${S}/tests/data/* ${D}${PTEST_PATH}/tests/data/ - cp -rf ${S}/egl/wayland-egl-symbols-check ${D}${PTEST_PATH}/tests/ -} - -sysroot_stage_all:append:class-target () { - rm ${SYSROOT_DESTDIR}/${datadir}/aclocal/wayland-scanner.m4 - cp ${STAGING_DATADIR_NATIVE}/aclocal/wayland-scanner.m4 ${SYSROOT_DESTDIR}/${datadir}/aclocal/ -} - -PACKAGES =+ "${PN}-tools" - -FILES:${PN}-tools = "${bindir}/wayland-scanner" -FILES:${PN}-dev += "${datadir}/${BPN}/wayland-scanner.mk" - -BBCLASSEXTEND = "native nativesdk" - -RDEPENDS:${PN}-ptest += "binutils sed ${PN}-tools" diff --git a/meta-gnome/recipes-support/wayland/weston-init.bb b/meta-gnome/recipes-support/wayland/weston-init.bb deleted file mode 100644 index 024e400..0000000 --- a/meta-gnome/recipes-support/wayland/weston-init.bb +++ /dev/null @@ -1,106 +0,0 @@ -SUMMARY = "Startup script and systemd unit file for the Weston Wayland compositor" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" - -PACKAGE_ARCH = "${MACHINE_ARCH}" - -SRC_URI = "file://init \ - file://weston.env \ - file://weston.ini \ - file://weston.service \ - file://weston.socket \ - file://weston-socket.sh \ - file://weston-autologin \ - file://weston-start" - -S = "${WORKDIR}" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'xwayland', '', d)}" -PACKAGECONFIG:append:qemuriscv64 = " use-pixman" -PACKAGECONFIG:append:qemuppc64 = " use-pixman" - -PACKAGECONFIG[xwayland] = ",," -PACKAGECONFIG[no-idle-timeout] = ",," -PACKAGECONFIG[use-pixman] = ",," - -DEFAULTBACKEND ??= "" -DEFAULTBACKEND:qemuall ?= "drm" - -do_install() { - # Install weston-start script - if [ "${VIRTUAL-RUNTIME_init_manager}" != "systemd" ]; then - install -Dm755 ${WORKDIR}/weston-start ${D}${bindir}/weston-start - sed -i 's,@DATADIR@,${datadir},g' ${D}${bindir}/weston-start - sed -i 's,@LOCALSTATEDIR@,${localstatedir},g' ${D}${bindir}/weston-start - install -Dm755 ${WORKDIR}/init ${D}/${sysconfdir}/init.d/weston - sed -i 's#ROOTHOME#${ROOT_HOME}#' ${D}/${sysconfdir}/init.d/weston - fi - - # Install Weston systemd service - if ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then - install -D -p -m0644 ${WORKDIR}/weston.service ${D}${systemd_system_unitdir}/weston.service - install -D -p -m0644 ${WORKDIR}/weston.socket ${D}${systemd_system_unitdir}/weston.socket - install -D -p -m0644 ${WORKDIR}/weston-socket.sh ${D}${sysconfdir}/profile.d/weston-socket.sh - sed -i -e s:/etc:${sysconfdir}:g \ - -e s:/usr/bin:${bindir}:g \ - -e s:/var:${localstatedir}:g \ - ${D}${systemd_system_unitdir}/weston.service - fi - - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" ]; then - install -D -p -m0644 ${WORKDIR}/weston-autologin ${D}${sysconfdir}/pam.d/weston-autologin - fi - - install -D -p -m0644 ${WORKDIR}/weston.ini ${D}${sysconfdir}/xdg/weston/weston.ini - install -Dm644 ${WORKDIR}/weston.env ${D}${sysconfdir}/default/weston - - if [ -n "${DEFAULTBACKEND}" ]; then - sed -i -e "/^\[core\]/a backend=${DEFAULTBACKEND}-backend.so" ${D}${sysconfdir}/xdg/weston/weston.ini - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then - sed -i -e "/^\[core\]/a xwayland=true" ${D}${sysconfdir}/xdg/weston/weston.ini - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'no-idle-timeout', 'yes', 'no', d)}" = "yes" ]; then - sed -i -e "/^\[core\]/a idle-time=0" ${D}${sysconfdir}/xdg/weston/weston.ini - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'use-pixman', 'yes', 'no', d)}" = "yes" ]; then - sed -i -e "/^\[core\]/a use-pixman=true" ${D}${sysconfdir}/xdg/weston/weston.ini - fi - - install -dm 755 -o weston -g weston ${D}/home/weston -} - -INHIBIT_UPDATERCD_BBCLASS = "${@oe.utils.conditional('VIRTUAL-RUNTIME_init_manager', 'systemd', '1', '', d)}" - -inherit update-rc.d systemd useradd - -USERADD_PACKAGES = "${PN}" - -# rdepends on weston which depends on virtual/egl -# -require ${THISDIR}/required-distro-features.inc - -RDEPENDS:${PN} = "weston kbd" - -INITSCRIPT_NAME = "weston" -INITSCRIPT_PARAMS = "start 9 5 2 . stop 20 0 1 6 ." - -FILES:${PN} += "\ - ${sysconfdir}/xdg/weston/weston.ini \ - ${sysconfdir}/profile.d/weston-socket.sh \ - ${systemd_system_unitdir}/weston.service \ - ${systemd_system_unitdir}/weston.socket \ - ${sysconfdir}/default/weston \ - ${sysconfdir}/pam.d/ \ - /home/weston \ - " - -CONFFILES:${PN} += "${sysconfdir}/xdg/weston/weston.ini ${sysconfdir}/default/weston" - -SYSTEMD_SERVICE:${PN} = "weston.service weston.socket" -USERADD_PARAM:${PN} = "--home /home/weston --shell /bin/sh --user-group -G video,input,render,wayland weston" -GROUPADD_PARAM:${PN} = "-r wayland; -r render" - diff --git a/meta-gnome/recipes-support/wayland/weston-init/init b/meta-gnome/recipes-support/wayland/weston-init/init deleted file mode 100644 index a5c54e0..0000000 --- a/meta-gnome/recipes-support/wayland/weston-init/init +++ /dev/null @@ -1,54 +0,0 @@ -#!/bin/sh -# -### BEGIN INIT INFO -# Provides: weston -# Required-Start: $local_fs $remote_fs -# Required-Stop: $local_fs $remote_fs -# Default-Start: 2 3 4 5 -# Default-Stop: 0 1 6 -### END INIT INFO - -if test -e /etc/default/weston ; then - . /etc/default/weston -fi - -killproc() { - pid=`/bin/pidof $1` - [ "$pid" != "" ] && kill $pid -} - -read CMDLINE < /proc/cmdline -for x in $CMDLINE; do - case $x in - weston=false) - echo "Weston disabled" - exit 0; - ;; - esac -done - -case "$1" in - start) - . /etc/profile - export HOME=ROOTHOME - - WESTON_USER=weston weston-start $OPTARGS & - ;; - - stop) - echo "Stopping Weston" - killproc weston - ;; - - restart) - $0 stop - sleep 1 - $0 start - ;; - - *) - echo "usage: $0 { start | stop | restart }" - ;; -esac - -exit 0 diff --git a/meta-gnome/recipes-support/wayland/weston-init/weston-autologin b/meta-gnome/recipes-support/wayland/weston-init/weston-autologin deleted file mode 100644 index f6e6d10..0000000 --- a/meta-gnome/recipes-support/wayland/weston-init/weston-autologin +++ /dev/null @@ -1,11 +0,0 @@ -auth required pam_nologin.so -auth required pam_unix.so try_first_pass nullok - -account required pam_nologin.so -account required pam_unix.so - -session required pam_env.so -session required pam_unix.so --session optional pam_systemd.so type=wayland class=user desktop=weston --session optional pam_loginuid.so - diff --git a/meta-gnome/recipes-support/wayland/weston-init/weston-socket.sh b/meta-gnome/recipes-support/wayland/weston-init/weston-socket.sh deleted file mode 100755 index 86389d6..0000000 --- a/meta-gnome/recipes-support/wayland/weston-init/weston-socket.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/sh - -# set weston variables for use with global weston socket -global_socket="/run/wayland-0" -if [ -e "$global_socket" ]; then - weston_group=$(stat -c "%G" "$global_socket") - if [ "$(id -u)" = "0" ]; then - export WAYLAND_DISPLAY="$global_socket" - else - case "$(groups "$USER")" in - *"$weston_group"*) - export WAYLAND_DISPLAY="$global_socket" - ;; - *) - ;; - esac - fi - unset weston_group -fi -unset global_socket diff --git a/meta-gnome/recipes-support/wayland/weston-init/weston-start b/meta-gnome/recipes-support/wayland/weston-init/weston-start deleted file mode 100755 index 01670cd..0000000 --- a/meta-gnome/recipes-support/wayland/weston-init/weston-start +++ /dev/null @@ -1,71 +0,0 @@ -#!/bin/sh -# Copyright (C) 2016 O.S. Systems Software LTDA. -# Copyright (C) 2016 Freescale Semiconductor - -export PATH="/sbin:/usr/sbin:/bin:/usr/bin" - -usage() { - cat <] -EOF -} - -## Module support -modules_dir=@DATADIR@/weston-start - -# Add weston extra argument -add_weston_argument() { - weston_args="$weston_args $1" -} - -## Add module to --modules argument -add_weston_module() { - if [[ "x${weston_modules}" == "x" ]]; then - weston_modules="--modules " - fi; - weston_modules+="${1}," -} - -if [ -n "$WAYLAND_DISPLAY" ]; then - echo "ERROR: A Wayland compositor is already running, nested Weston instance is not supported yet." - exit 1 -fi - -if [ -n "$WESTON_USER" ]; then - if [ -z "$WESTON_GROUP" ]; then - # no explicit WESTON_GROUP given, therefore use WESTON_USER - export WESTON_GROUP="${WESTON_USER}" - fi -fi - -weston_args=$* - -# Load and run modules -if [ -d "$modules_dir" ]; then - for m in "$modules_dir"/*; do - # Skip backup files - if [ "`echo $m | sed -e 's/\~$//'`" != "$m" ]; then - continue - fi - - # process module - . $m - if [[ x"{$weston_modules}" != "x" ]]; then - add_weston_argument "${weston_modules}" - fi; - done -fi - -if test -z "$XDG_RUNTIME_DIR"; then - export XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` - if ! test -d "$XDG_RUNTIME_DIR"; then - mkdir --parents $XDG_RUNTIME_DIR - chmod 0700 $XDG_RUNTIME_DIR - fi - if [ -n "$WESTON_USER" ] - then - chown $WESTON_USER:$WESTON_GROUP $XDG_RUNTIME_DIR - fi -fi - -su -c "XDG_RUNTIME_DIR=/run/user/`id -u ${WESTON_USER}` weston $weston_args --log=/tmp/weston.log" $WESTON_USER diff --git a/meta-gnome/recipes-support/wayland/weston-init/weston.env b/meta-gnome/recipes-support/wayland/weston-init/weston.env deleted file mode 100644 index e69de29..0000000 diff --git a/meta-gnome/recipes-support/wayland/weston-init/weston.ini b/meta-gnome/recipes-support/wayland/weston-init/weston.ini deleted file mode 100644 index 6bd5aef..0000000 --- a/meta-gnome/recipes-support/wayland/weston-init/weston.ini +++ /dev/null @@ -1,75 +0,0 @@ -# configuration file for Weston - -[core] -#modules=xwayland.so,cms-colord.so -#shell=desktop-shell.so -#gbm-format=xrgb2101010 -require-input=false - -#[shell] -#background-image=/usr/share/backgrounds/gnome/Aqua.jpg -#background-color=0xff002244 -#background-type=tile -#clock-format=minutes -#panel-color=0x90ff0000 -#locking=true -#animation=zoom -#startup-animation=fade -#binding-modifier=ctrl -#num-workspaces=6 -#cursor-theme=whiteglass -#cursor-size=24 - -#lockscreen-icon=/usr/share/icons/gnome/256x256/actions/lock.png -#lockscreen=/usr/share/backgrounds/gnome/Garden.jpg -#homescreen=/usr/share/backgrounds/gnome/Blinds.jpg -#animation=fade - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -#path=/usr/bin/gnome-terminal - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/utilities-terminal.png -#path=/usr/bin/weston-terminal - -#[launcher] -#icon=/usr/share/icons/hicolor/24x24/apps/google-chrome.png -#path=/usr/bin/google-chrome - -#[launcher] -#icon=/usr/share/icons/gnome/24x24/apps/arts.png -#path=/build/weston-0lEgCh/weston-1.11.0/weston-flower - -#[input-method] -#path=/usr/libexec/weston-keyboard - -#[output] -#name=LVDS1 -#mode=1680x1050 -#transform=90 -#icc_profile=/usr/share/color/icc/colord/Bluish.icc - -#[output] -#name=VGA1 -#mode=173.00 1920 2048 2248 2576 1080 1083 1088 1120 -hsync +vsync -#transform=flipped - -#[output] -#name=X1 -#mode=1024x768 -#transform=flipped-90 - -#[libinput] -#enable_tap=true - -#[touchpad] -#constant_accel_factor = 50 -#min_accel_factor = 0.16 -#max_accel_factor = 1.0 - -[screen-share] -command=/usr/bin/weston --backend=rdp-backend.so --shell=fullscreen-shell.so --no-clients-resize - -#[xwayland] -#path=/usr/bin/Xwayland diff --git a/meta-gnome/recipes-support/wayland/weston-init/weston.service b/meta-gnome/recipes-support/wayland/weston-init/weston.service deleted file mode 100644 index 8074599..0000000 --- a/meta-gnome/recipes-support/wayland/weston-init/weston.service +++ /dev/null @@ -1,71 +0,0 @@ -# This is a system unit for launching Weston with auto-login as the -# user configured here. -# -# Weston must be built with systemd support, and your weston.ini must load -# the plugin systemd-notify.so. -[Unit] -Description=Weston, a Wayland compositor, as a system service -Documentation=man:weston(1) man:weston.ini(5) -Documentation=http://wayland.freedesktop.org/ - -# Make sure we are started after logins are permitted. -Requires=systemd-user-sessions.service -After=systemd-user-sessions.service - -# If Plymouth is used, we want to start when it is on its way out. -After=plymouth-quit-wait.service - -# D-Bus is necessary for contacting logind. Logind is required. -Wants=dbus.socket -After=dbus.socket - -# Ensure the socket is present -Requires=weston.socket - -# Since we are part of the graphical session, make sure we are started before -# it is complete. -Before=graphical.target - -# Prevent starting on systems without virtual consoles, Weston requires one -# for now. -ConditionPathExists=/dev/tty0 - -[Service] -# Requires systemd-notify.so Weston plugin. -Type=notify -EnvironmentFile=/etc/default/weston -ExecStart=/usr/bin/weston --modules=systemd-notify.so - -# Optional watchdog setup -#TimeoutStartSec=60 -#WatchdogSec=20 - -# The user to run Weston as. -User=weston -Group=weston - -# Make sure the working directory is the users home directory -WorkingDirectory=/home/weston - -# Set up a full user session for the user, required by Weston. -PAMName=weston-autologin - -# A virtual terminal is needed. -TTYPath=/dev/tty7 -TTYReset=yes -TTYVHangup=yes -TTYVTDisallocate=yes - -# Fail to start if not controlling the tty. -StandardInput=tty-fail -StandardOutput=journal -StandardError=journal - -# Log this user with utmp, letting it show up with commands 'w' and 'who'. -UtmpIdentifier=tty7 -UtmpMode=user - -[Install] -# Note: If you only want weston to start on-demand, remove this line with a -# service drop file -WantedBy=graphical.target diff --git a/meta-gnome/recipes-support/wayland/weston-init/weston.socket b/meta-gnome/recipes-support/wayland/weston-init/weston.socket deleted file mode 100644 index c1bdc83..0000000 --- a/meta-gnome/recipes-support/wayland/weston-init/weston.socket +++ /dev/null @@ -1,14 +0,0 @@ -[Unit] -Description=Weston socket -RequiresMountsFor=/run - -[Socket] -ListenStream=/run/wayland-0 -SocketMode=0775 -SocketUser=weston -SocketGroup=wayland -RemoveOnStop=yes - -[Install] -WantedBy=sockets.target - diff --git a/meta-gnome/recipes-support/wayland/weston/systemd-notify.weston-start b/meta-gnome/recipes-support/wayland/weston/systemd-notify.weston-start deleted file mode 100644 index a97e7b3..0000000 --- a/meta-gnome/recipes-support/wayland/weston/systemd-notify.weston-start +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -# SPDX-FileCopyrightText: Huawei Inc. -# SPDX-License-Identifier: Apache-2.0 - - -if [[ -x "/usr/lib/weston/systemd-notify.so" ]]; then - add_weston_module "systemd-notify.so" -fi diff --git a/meta-gnome/recipes-support/wayland/weston/weston.desktop b/meta-gnome/recipes-support/wayland/weston/weston.desktop deleted file mode 100644 index 1086ae8..0000000 --- a/meta-gnome/recipes-support/wayland/weston/weston.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Encoding=UTF-8 -Type=Application -Name=Weston -Comment=Wayland Compostitor -Exec=weston -Icon=weston -Terminal=false -Categories=Utility; diff --git a/meta-gnome/recipes-support/wayland/weston/weston.png b/meta-gnome/recipes-support/wayland/weston/weston.png deleted file mode 100644 index ea8b7e0..0000000 Binary files a/meta-gnome/recipes-support/wayland/weston/weston.png and /dev/null differ diff --git a/meta-gnome/recipes-support/wayland/weston/xwayland.weston-start b/meta-gnome/recipes-support/wayland/weston/xwayland.weston-start deleted file mode 100644 index 342ac8d..0000000 --- a/meta-gnome/recipes-support/wayland/weston/xwayland.weston-start +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -if type Xwayland >/dev/null 2>/dev/null; then - mkdir -m 775 -p /tmp/.X11-unix - chown root:video /tmp/.X11-unix -fi diff --git a/meta-gnome/recipes-support/wayland/weston_12.0.2.bb b/meta-gnome/recipes-support/wayland/weston_12.0.2.bb deleted file mode 100644 index 5a179e6..0000000 --- a/meta-gnome/recipes-support/wayland/weston_12.0.2.bb +++ /dev/null @@ -1,150 +0,0 @@ -SUMMARY = "Weston, a Wayland compositor" -DESCRIPTION = "Weston is the reference implementation of a Wayland compositor" -HOMEPAGE = "http://wayland.freedesktop.org" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=d79ee9e66bb0f95d3386a7acae780b70 \ - file://libweston/compositor.c;endline=27;md5=eb6d5297798cabe2ddc65e2af519bcf0 \ - " - -SRC_URI = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${PV}/downloads/${BPN}-${PV}.tar.xz \ - file://weston.png \ - file://weston.desktop \ - file://xwayland.weston-start \ - file://systemd-notify.weston-start \ - " - -SRC_URI[sha256sum] = "eb686a7cf00992a23b17f192fca9a887313e92c346ee35d8575196983d656b4a" - -UPSTREAM_CHECK_URI = "https://wayland.freedesktop.org/releases.html" -UPSTREAM_CHECK_REGEX = "weston-(?P\d+\.\d+\.(?!9\d+)\d+)" - -inherit meson pkgconfig useradd - -# depends on virtual/egl -# -require ${THISDIR}/required-distro-features.inc - -DEPENDS = "libxkbcommon gdk-pixbuf pixman cairo glib-2.0" -DEPENDS += "wayland wayland-protocols libinput virtual/egl pango wayland-native" - -LDFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'lto', '-Wl,-z,undefs', '', d)}" - -WESTON_MAJOR_VERSION = "${@'.'.join(d.getVar('PV').split('.')[0:1])}" - -EXTRA_OEMESON += "-Dpipewire=false" - -PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'wayland', 'kms wayland egl clients', '', d)} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'x11 wayland', 'xwayland', '', d)} \ - ${@bb.utils.filter('DISTRO_FEATURES', 'systemd x11', d)} \ - ${@bb.utils.contains_any('DISTRO_FEATURES', 'wayland x11', '', 'headless', d)} \ - launcher-libseat \ - image-jpeg \ - screenshare \ - shell-desktop \ - shell-fullscreen \ - shell-ivi \ - shell-kiosk \ - " - -# Can be 'damage', 'im', 'egl', 'shm', 'touch', 'dmabuf-feedback', 'dmabuf-v4l', 'dmabuf-egl' or 'all' -SIMPLECLIENTS ?= "all" - -# -# Compositor choices -# -# Weston on KMS -PACKAGECONFIG[kms] = "-Dbackend-drm=true,-Dbackend-drm=false,drm udev virtual/egl virtual/libgles2 virtual/libgbm mtdev" -# Weston on Wayland (nested Weston) -PACKAGECONFIG[wayland] = "-Dbackend-wayland=true,-Dbackend-wayland=false,virtual/egl virtual/libgles2" -# Weston on X11 -PACKAGECONFIG[x11] = "-Dbackend-x11=true,-Dbackend-x11=false,virtual/libx11 libxcb libxcursor" -# Headless Weston -PACKAGECONFIG[headless] = "-Dbackend-headless=true,-Dbackend-headless=false" -# Weston on RDP -PACKAGECONFIG[rdp] = "-Dbackend-rdp=true,-Dbackend-rdp=false,freerdp" -# VA-API desktop recorder -PACKAGECONFIG[vaapi] = "-Dbackend-drm-screencast-vaapi=true,-Dbackend-drm-screencast-vaapi=false,libva" -# Weston with EGL support -PACKAGECONFIG[egl] = "-Drenderer-gl=true,-Drenderer-gl=false,virtual/egl" -# Weston with lcms support -PACKAGECONFIG[lcms] = "-Dcolor-management-lcms=true,-Dcolor-management-lcms=false,lcms" -# Weston with webp support -PACKAGECONFIG[webp] = "-Dimage-webp=true,-Dimage-webp=false,libwebp" -# Weston with systemd support -PACKAGECONFIG[systemd] = "-Dsystemd=true,-Dsystemd=false,systemd dbus" -# Weston with Xwayland support (requires X11 and Wayland) -PACKAGECONFIG[xwayland] = "-Dxwayland=true,-Dxwayland=false,libxcb libxcursor xcb-util-cursor xwayland" -# colord CMS support -PACKAGECONFIG[colord] = "-Ddeprecated-color-management-colord=true,-Ddeprecated-color-management-colord=false,colord" -# Clients support -PACKAGECONFIG[clients] = "-Dsimple-clients=${SIMPLECLIENTS} -Ddemo-clients=true,-Dsimple-clients= -Ddemo-clients=false" -# Virtual remote output with GStreamer on DRM backend -PACKAGECONFIG[remoting] = "-Dremoting=true,-Dremoting=false,gstreamer1.0 gstreamer1.0-plugins-base" -# Weston with screen-share support -PACKAGECONFIG[screenshare] = "-Dscreenshare=true,-Dscreenshare=false" -# Traditional desktop shell -PACKAGECONFIG[shell-desktop] = "-Dshell-desktop=true,-Dshell-desktop=false" -# Fullscreen shell -PACKAGECONFIG[shell-fullscreen] = "-Dshell-fullscreen=true,-Dshell-fullscreen=false" -# In-Vehicle Infotainment (IVI) shell -PACKAGECONFIG[shell-ivi] = "-Dshell-ivi=true,-Dshell-ivi=false" -# Kiosk shell -PACKAGECONFIG[shell-kiosk] = "-Dshell-kiosk=true,-Dshell-kiosk=false" -# JPEG image loading support -PACKAGECONFIG[image-jpeg] = "-Dimage-jpeg=true,-Dimage-jpeg=false, jpeg" -# support libseat based launch -PACKAGECONFIG[launcher-libseat] = "-Dlauncher-libseat=true,-Dlauncher-libseat=false,seatd" -# deprecated and superseded by libseat launcher -PACKAGECONFIG[launcher-logind] = "-Ddeprecated-launcher-logind=true,-Ddeprecated-launcher-logind=false," -# screencasting via PipeWire -PACKAGECONFIG[pipewire] = "-Dbackend-pipewire=true,-Dbackend-pipewire=false,pipewire" -# VNC remote screensharing -PACKAGECONFIG[vnc] = "-Dbackend-vnc=true,-Dbackend-vnc=false,neatvnc" - - -do_install:append() { - # Weston doesn't need the .la files to load modules, so wipe them - rm -f ${D}/${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.la - - # If X11, ship a desktop file to launch it - if [ "${@bb.utils.filter('DISTRO_FEATURES', 'x11', d)}" ]; then - install -d ${D}${datadir}/applications - install ${WORKDIR}/weston.desktop ${D}${datadir}/applications - - install -d ${D}${datadir}/icons/hicolor/48x48/apps - install ${WORKDIR}/weston.png ${D}${datadir}/icons/hicolor/48x48/apps - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/xwayland.weston-start ${D}${datadir}/weston-start/xwayland - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'systemd', 'yes', 'no', d)}" = "yes" ]; then - install -Dm 644 ${WORKDIR}/systemd-notify.weston-start ${D}${datadir}/weston-start/systemd-notify - fi - - if [ "${@bb.utils.contains('PACKAGECONFIG', 'launch', 'yes', 'no', d)}" = "yes" ]; then - chmod u+s ${D}${bindir}/weston-launch - fi -} - -PACKAGES += "${@bb.utils.contains('PACKAGECONFIG', 'xwayland', '${PN}-xwayland', '', d)} \ - libweston-${WESTON_MAJOR_VERSION} ${PN}-examples" - -FILES:${PN}-dev += "${libdir}/${BPN}/libexec_weston.so" -FILES:${PN} = "${sysconfdir} ${bindir}/weston ${bindir}/weston-terminal ${bindir}/weston-info ${bindir}/weston-launch ${bindir}/wcap-decode ${libexecdir} ${libdir}/${BPN}/*.so* ${datadir}" - -FILES:libweston-${WESTON_MAJOR_VERSION} = "${libdir}/lib*${SOLIBS} ${libdir}/libweston-${WESTON_MAJOR_VERSION}/*.so" -SUMMARY:libweston-${WESTON_MAJOR_VERSION} = "Helper library for implementing 'wayland window managers'." - -FILES:${PN}-examples = "${bindir}/*" - -FILES:${PN}-xwayland = "${libdir}/libweston-${WESTON_MAJOR_VERSION}/xwayland.so" -RDEPENDS:${PN}-xwayland += "xwayland" - -RDEPENDS:${PN} += "xkeyboard-config" -RRECOMMENDS:${PN} = "weston-init liberation-fonts" -RRECOMMENDS:${PN}-dev += "wayland-protocols" - -USERADD_PACKAGES = "${PN}" -GROUPADD_PARAM:${PN} = "--system weston-launch" diff --git a/meta-gnome/recipes-support/xwayland/xwayland_22.1.4.bb b/meta-gnome/recipes-support/xwayland/xwayland_22.1.4.bb deleted file mode 100644 index 8597d07..0000000 --- a/meta-gnome/recipes-support/xwayland/xwayland_22.1.4.bb +++ /dev/null @@ -1,45 +0,0 @@ -SUMMARY = "XWayland is an X Server that runs under Wayland." -DESCRIPTION = "XWayland is an X Server running as a Wayland client, \ -and thus is capable of displaying native X11 client applications in a \ -Wayland compositor environment. The goal of XWayland is to facilitate \ -the transition from X Window System to Wayland environments, providing \ -a way to run unported applications in the meantime." -HOMEPAGE = "https://fedoraproject.org/wiki/Changes/XwaylandStandalone" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=5df87950af51ac2c5822094553ea1880" - -SRC_URI = "https://www.x.org/archive/individual/xserver/xwayland-${PV}.tar.xz" -SRC_URI[sha256sum] = "5c39bdd77444c3fa7a0e2ef317ae69ddde89a901dc8914dbc8eac39a9313512a" - -UPSTREAM_CHECK_REGEX = "xwayland-(?P\d+(\.(?!90\d)\d+)+)\.tar" - -inherit meson features_check pkgconfig -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -DEPENDS += "xorgproto xtrans pixman libxkbfile libxfont2 wayland wayland-native wayland-protocols libdrm libepoxy libxcvt" - -OPENGL_PKGCONFIGS = "glx glamor dri3" -PACKAGECONFIG ??= "${XORG_CRYPTO} \ - ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', '${OPENGL_PKGCONFIGS}', '', d)} \ -" -PACKAGECONFIG[dri3] = "-Ddri3=true,-Ddri3=false" -PACKAGECONFIG[glx] = "-Dglx=true,-Dglx=false,virtual/libgl virtual/libx11" -PACKAGECONFIG[glamor] = "-Dglamor=true,-Dglamor=false,libepoxy virtual/libgbm,libegl" -PACKAGECONFIG[unwind] = "-Dlibunwind=true,-Dlibunwind=false,libunwind" -PACKAGECONFIG[xinerama] = "-Dxinerama=true,-Dxinerama=false" - -# Xorg requires a SHA1 implementation, pick one -XORG_CRYPTO ??= "openssl" -PACKAGECONFIG[openssl] = "-Dsha1=libcrypto,,openssl" -PACKAGECONFIG[nettle] = "-Dsha1=libnettle,,nettle" -PACKAGECONFIG[gcrypt] = "-Dsha1=libgcrypt,,libgcrypt" - -do_install:append() { - # remove files not needed and clashing with xserver-xorg - rm -rf ${D}/${libdir}/xorg/ -} - -FILES:${PN} += "${libdir}/xorg/protocol.txt" - -RDEPENDS:${PN} += "xkbcomp" diff --git a/meta-intel b/meta-intel index a0ea4e5..11c41c9 160000 --- a/meta-intel +++ b/meta-intel @@ -1 +1 @@ -Subproject commit a0ea4e5d395579e70f1057f1f1222c8a2b55bd96 +Subproject commit 11c41c9a46305e7b57832de92735e53558356a25 diff --git a/poky b/poky index aa63b25..fb91a49 160000 --- a/poky +++ b/poky @@ -1 +1 @@ -Subproject commit aa63b25cbe25d89ab07ca11ee72c17cab68df8de +Subproject commit fb91a49387cfb0c8d48303bb3354325ba2a05587