diff options
Diffstat (limited to 'meta-oe/recipes-graphics')
269 files changed, 4135 insertions, 2384 deletions
diff --git a/meta-oe/recipes-graphics/aml/aml_git.bb b/meta-oe/recipes-graphics/aml/aml_git.bb new file mode 100644 index 0000000000..2633e0d215 --- /dev/null +++ b/meta-oe/recipes-graphics/aml/aml_git.bb @@ -0,0 +1,35 @@ +SUMMARY = "Andri's Main Loop" +DESCRIPTION = "Andri's Main Loop" +HOMEPAGE = "https://github.com/any1/aml" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=e6f3cfaa39204b96e14b68b9d50d3e4e" + +SRC_URI = "git://github.com/any1/aml;branch=master;protocol=https" + +SRCREV = "b83f3576ce4187d9285f06e9066ef43a691464d4" + +PV = "0.3.0+git" + +S = "${WORKDIR}/git" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false" + +PACKAGE_BEFORE_PN += "${PN}-examples" +ALLOW_EMPTY:${PN}-examples = "1" +FILES:${PN}-examples = "${bindir}" + +inherit meson pkgconfig + +AML_EXAMPLES = "ticker nested-ticker reader" + +do_install:append () { + if ${@bb.utils.contains('PACKAGECONFIG', 'examples', 'true', 'false', d)}; then + install -d ${D}${bindir} + for bin in ${AML_EXAMPLES}; do + install -m 0755 ${B}/examples/$bin ${D}${bindir} + done + fi +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.16.1.bb b/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb index 61892d3679..a6872ef0cd 100644 --- a/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.16.1.bb +++ b/meta-oe/recipes-graphics/cairo/cairomm-1.16_1.18.0.bb @@ -3,13 +3,12 @@ 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" SRC_URI = "https://www.cairographics.org/releases/cairomm-${PV}.tar.xz" -SRC_URI[sha256sum] = "6f6060d8e98dd4b8acfee2295fddbdd38cf487c07c26aad8d1a83bb9bff4a2c6" +SRC_URI[sha256sum] = "b81255394e3ea8e8aa887276d22afa8985fc8daef60692eb2407d23049f03cfb" S = "${WORKDIR}/cairomm-${PV}" diff --git a/meta-oe/recipes-graphics/cairo/cairomm_1.14.3.bb b/meta-oe/recipes-graphics/cairo/cairomm_1.14.3.bb index 8123509f40..54a2b07ca5 100644 --- a/meta-oe/recipes-graphics/cairo/cairomm_1.14.3.bb +++ b/meta-oe/recipes-graphics/cairo/cairomm_1.14.3.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++-2.0" diff --git a/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb b/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb new file mode 100644 index 0000000000..6fcc07d92b --- /dev/null +++ b/meta-oe/recipes-graphics/cglm/cglm_0.9.4.bb @@ -0,0 +1,25 @@ +SUMMARY = "OpenGL Mathematics Library for C" +DESCRIPTION = "Highly optimized 2D|3D math library, also known as OpenGL Mathematics (glm) for `C`. \ +cglm provides lot of utils to help math operations to be fast and quick to write. It is community \ +friendly, feel free to bring any issues, bugs you faced." +HOMEPAGE = "https://github.com/recp/cglm" +BUGTRACKER = "https://github.com/recp/cglm/issues" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=8dc95c4110ba741c43832734b51b7de7" + +SRC_URI = "git://github.com/recp/cglm;branch=master;protocol=https" +# Tag v0.9.1 +SRCREV = "1796cc5ce298235b615dc7a4750b8c3ba56a05dd" + +S = "${WORKDIR}/git" + +PACKAGECONFIG[build_tests] = "-Dbuild_tests=true,-Dbuild_tests=false," + +PACKAGECONFIG ?= "" + +inherit meson pkgconfig + +EXTRA_OEMESON += "--buildtype release" + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc b/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc new file mode 100644 index 0000000000..09a3f675a6 --- /dev/null +++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner-crates.inc @@ -0,0 +1,268 @@ +# Autogenerated with 'bitbake -c update_crates deqp-runner' + +# from Cargo.lock +SRC_URI += " \ + crate://crates.io/adler/1.0.2 \ + crate://crates.io/aho-corasick/1.0.5 \ + crate://crates.io/android-tzdata/0.1.1 \ + crate://crates.io/android_system_properties/0.1.5 \ + crate://crates.io/ansi_term/0.12.1 \ + crate://crates.io/anyhow/1.0.75 \ + crate://crates.io/atty/0.2.14 \ + crate://crates.io/autocfg/1.1.0 \ + crate://crates.io/bitflags/1.3.2 \ + crate://crates.io/bitflags/2.4.0 \ + crate://crates.io/bumpalo/3.13.0 \ + crate://crates.io/cast/0.3.0 \ + crate://crates.io/cc/1.0.83 \ + crate://crates.io/cfg-if/1.0.0 \ + crate://crates.io/chrono/0.4.30 \ + crate://crates.io/clap/2.34.0 \ + crate://crates.io/core-foundation-sys/0.8.4 \ + crate://crates.io/crc32fast/1.3.2 \ + crate://crates.io/criterion/0.3.6 \ + crate://crates.io/criterion-plot/0.4.5 \ + crate://crates.io/crossbeam-channel/0.5.8 \ + crate://crates.io/crossbeam-deque/0.8.3 \ + crate://crates.io/crossbeam-epoch/0.9.15 \ + crate://crates.io/crossbeam-utils/0.8.16 \ + crate://crates.io/csv/1.2.2 \ + crate://crates.io/csv-core/0.1.10 \ + crate://crates.io/derive-getters/0.1.1 \ + crate://crates.io/either/1.9.0 \ + crate://crates.io/errno/0.3.3 \ + crate://crates.io/errno-dragonfly/0.1.2 \ + crate://crates.io/fastrand/2.0.0 \ + crate://crates.io/flate2/1.0.27 \ + crate://crates.io/getrandom/0.1.16 \ + crate://crates.io/half/1.8.2 \ + crate://crates.io/hashbrown/0.12.3 \ + crate://crates.io/heck/0.3.3 \ + crate://crates.io/hermit-abi/0.1.19 \ + crate://crates.io/hermit-abi/0.3.2 \ + crate://crates.io/iana-time-zone/0.1.57 \ + crate://crates.io/iana-time-zone-haiku/0.1.2 \ + crate://crates.io/indexmap/1.9.3 \ + crate://crates.io/itertools/0.10.5 \ + crate://crates.io/itoa/1.0.9 \ + crate://crates.io/js-sys/0.3.64 \ + crate://crates.io/junit-report/0.4.0 \ + crate://crates.io/lazy_static/1.4.0 \ + crate://crates.io/libc/0.2.147 \ + crate://crates.io/linux-raw-sys/0.4.7 \ + crate://crates.io/log/0.4.20 \ + crate://crates.io/memchr/2.6.3 \ + crate://crates.io/memoffset/0.9.0 \ + crate://crates.io/miniz_oxide/0.7.1 \ + crate://crates.io/mio/0.8.8 \ + crate://crates.io/num-traits/0.2.16 \ + crate://crates.io/num_cpus/1.16.0 \ + crate://crates.io/once_cell/1.18.0 \ + crate://crates.io/oorandom/11.1.3 \ + crate://crates.io/plotters/0.3.5 \ + crate://crates.io/plotters-backend/0.3.5 \ + crate://crates.io/plotters-svg/0.3.5 \ + crate://crates.io/ppv-lite86/0.2.17 \ + crate://crates.io/proc-macro-error/1.0.4 \ + crate://crates.io/proc-macro-error-attr/1.0.4 \ + crate://crates.io/proc-macro2/1.0.66 \ + crate://crates.io/quote/1.0.33 \ + crate://crates.io/rand/0.7.3 \ + crate://crates.io/rand_chacha/0.2.2 \ + crate://crates.io/rand_core/0.5.1 \ + crate://crates.io/rand_hc/0.2.0 \ + crate://crates.io/rayon/1.7.0 \ + crate://crates.io/rayon-core/1.11.0 \ + crate://crates.io/redox_syscall/0.3.5 \ + crate://crates.io/regex/1.9.5 \ + crate://crates.io/regex-automata/0.3.8 \ + crate://crates.io/regex-syntax/0.7.5 \ + crate://crates.io/roxmltree/0.13.1 \ + crate://crates.io/rustix/0.38.13 \ + crate://crates.io/ryu/1.0.15 \ + crate://crates.io/same-file/1.0.6 \ + crate://crates.io/scopeguard/1.2.0 \ + crate://crates.io/serde/1.0.188 \ + crate://crates.io/serde-tuple-vec-map/1.0.1 \ + crate://crates.io/serde_cbor/0.11.2 \ + crate://crates.io/serde_derive/1.0.188 \ + crate://crates.io/serde_json/1.0.106 \ + crate://crates.io/serde_yaml/0.9.21 \ + crate://crates.io/stderrlog/0.5.4 \ + crate://crates.io/strsim/0.8.0 \ + crate://crates.io/structopt/0.3.26 \ + crate://crates.io/structopt-derive/0.4.18 \ + crate://crates.io/syn/1.0.109 \ + crate://crates.io/syn/2.0.32 \ + crate://crates.io/tempfile/3.8.0 \ + crate://crates.io/termcolor/1.1.3 \ + crate://crates.io/textwrap/0.11.0 \ + crate://crates.io/thiserror/1.0.48 \ + crate://crates.io/thiserror-impl/1.0.48 \ + crate://crates.io/thread_local/1.1.7 \ + crate://crates.io/tinytemplate/1.2.1 \ + crate://crates.io/toml/0.5.11 \ + crate://crates.io/unicode-ident/1.0.11 \ + crate://crates.io/unicode-segmentation/1.10.1 \ + crate://crates.io/unicode-width/0.1.10 \ + crate://crates.io/unsafe-libyaml/0.2.9 \ + crate://crates.io/vec_map/0.8.2 \ + crate://crates.io/version_check/0.9.4 \ + crate://crates.io/walkdir/2.4.0 \ + crate://crates.io/wasi/0.9.0+wasi-snapshot-preview1 \ + crate://crates.io/wasi/0.11.0+wasi-snapshot-preview1 \ + crate://crates.io/wasm-bindgen/0.2.87 \ + crate://crates.io/wasm-bindgen-backend/0.2.87 \ + crate://crates.io/wasm-bindgen-macro/0.2.87 \ + crate://crates.io/wasm-bindgen-macro-support/0.2.87 \ + crate://crates.io/wasm-bindgen-shared/0.2.87 \ + crate://crates.io/web-sys/0.3.64 \ + crate://crates.io/winapi/0.3.9 \ + crate://crates.io/winapi-i686-pc-windows-gnu/0.4.0 \ + crate://crates.io/winapi-util/0.1.5 \ + crate://crates.io/winapi-x86_64-pc-windows-gnu/0.4.0 \ + crate://crates.io/windows/0.48.0 \ + crate://crates.io/windows-sys/0.48.0 \ + crate://crates.io/windows-targets/0.48.5 \ + crate://crates.io/windows_aarch64_gnullvm/0.48.5 \ + crate://crates.io/windows_aarch64_msvc/0.48.5 \ + crate://crates.io/windows_i686_gnu/0.48.5 \ + crate://crates.io/windows_i686_msvc/0.48.5 \ + crate://crates.io/windows_x86_64_gnu/0.48.5 \ + crate://crates.io/windows_x86_64_gnullvm/0.48.5 \ + crate://crates.io/windows_x86_64_msvc/0.48.5 \ + crate://crates.io/xml-rs/0.8.18 \ + crate://crates.io/xmlparser/0.13.5 \ +" + +SRC_URI[adler-1.0.2.sha256sum] = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" +SRC_URI[aho-corasick-1.0.5.sha256sum] = "0c378d78423fdad8089616f827526ee33c19f2fddbd5de1629152c9593ba4783" +SRC_URI[android-tzdata-0.1.1.sha256sum] = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0" +SRC_URI[android_system_properties-0.1.5.sha256sum] = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311" +SRC_URI[ansi_term-0.12.1.sha256sum] = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2" +SRC_URI[anyhow-1.0.75.sha256sum] = "a4668cab20f66d8d020e1fbc0ebe47217433c1b6c8f2040faf858554e394ace6" +SRC_URI[atty-0.2.14.sha256sum] = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" +SRC_URI[autocfg-1.1.0.sha256sum] = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" +SRC_URI[bitflags-1.3.2.sha256sum] = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" +SRC_URI[bitflags-2.4.0.sha256sum] = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635" +SRC_URI[bumpalo-3.13.0.sha256sum] = "a3e2c3daef883ecc1b5d58c15adae93470a91d425f3532ba1695849656af3fc1" +SRC_URI[cast-0.3.0.sha256sum] = "37b2a672a2cb129a2e41c10b1224bb368f9f37a2b16b612598138befd7b37eb5" +SRC_URI[cc-1.0.83.sha256sum] = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" +SRC_URI[cfg-if-1.0.0.sha256sum] = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" +SRC_URI[chrono-0.4.30.sha256sum] = "defd4e7873dbddba6c7c91e199c7fcb946abc4a6a4ac3195400bcfb01b5de877" +SRC_URI[clap-2.34.0.sha256sum] = "a0610544180c38b88101fecf2dd634b174a62eef6946f84dfc6a7127512b381c" +SRC_URI[core-foundation-sys-0.8.4.sha256sum] = "e496a50fda8aacccc86d7529e2c1e0892dbd0f898a6b5645b5561b89c3210efa" +SRC_URI[crc32fast-1.3.2.sha256sum] = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" +SRC_URI[criterion-0.3.6.sha256sum] = "b01d6de93b2b6c65e17c634a26653a29d107b3c98c607c765bf38d041531cd8f" +SRC_URI[criterion-plot-0.4.5.sha256sum] = "2673cc8207403546f45f5fd319a974b1e6983ad1a3ee7e6041650013be041876" +SRC_URI[crossbeam-channel-0.5.8.sha256sum] = "a33c2bf77f2df06183c3aa30d1e96c0695a313d4f9c453cc3762a6db39f99200" +SRC_URI[crossbeam-deque-0.8.3.sha256sum] = "ce6fd6f855243022dcecf8702fef0c297d4338e226845fe067f6341ad9fa0cef" +SRC_URI[crossbeam-epoch-0.9.15.sha256sum] = "ae211234986c545741a7dc064309f67ee1e5ad243d0e48335adc0484d960bcc7" +SRC_URI[crossbeam-utils-0.8.16.sha256sum] = "5a22b2d63d4d1dc0b7f1b6b2747dd0088008a9be28b6ddf0b1e7d335e3037294" +SRC_URI[csv-1.2.2.sha256sum] = "626ae34994d3d8d668f4269922248239db4ae42d538b14c398b74a52208e8086" +SRC_URI[csv-core-0.1.10.sha256sum] = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" +SRC_URI[derive-getters-0.1.1.sha256sum] = "16dc4e2517f08ca167440ccb11023c1308ee19a4022d7b03c0e652f971171869" +SRC_URI[either-1.9.0.sha256sum] = "a26ae43d7bcc3b814de94796a5e736d4029efb0ee900c12e2d54c993ad1a1e07" +SRC_URI[errno-0.3.3.sha256sum] = "136526188508e25c6fef639d7927dfb3e0e3084488bf202267829cf7fc23dbdd" +SRC_URI[errno-dragonfly-0.1.2.sha256sum] = "aa68f1b12764fab894d2755d2518754e71b4fd80ecfb822714a1206c2aab39bf" +SRC_URI[fastrand-2.0.0.sha256sum] = "6999dc1837253364c2ebb0704ba97994bd874e8f195d665c50b7548f6ea92764" +SRC_URI[flate2-1.0.27.sha256sum] = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010" +SRC_URI[getrandom-0.1.16.sha256sum] = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" +SRC_URI[half-1.8.2.sha256sum] = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7" +SRC_URI[hashbrown-0.12.3.sha256sum] = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" +SRC_URI[heck-0.3.3.sha256sum] = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" +SRC_URI[hermit-abi-0.1.19.sha256sum] = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +SRC_URI[hermit-abi-0.3.2.sha256sum] = "443144c8cdadd93ebf52ddb4056d257f5b52c04d3c804e657d19eb73fc33668b" +SRC_URI[iana-time-zone-0.1.57.sha256sum] = "2fad5b825842d2b38bd206f3e81d6957625fd7f0a361e345c30e01a0ae2dd613" +SRC_URI[iana-time-zone-haiku-0.1.2.sha256sum] = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +SRC_URI[indexmap-1.9.3.sha256sum] = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99" +SRC_URI[itertools-0.10.5.sha256sum] = "b0fd2260e829bddf4cb6ea802289de2f86d6a7a690192fbe91b3f46e0f2c8473" +SRC_URI[itoa-1.0.9.sha256sum] = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" +SRC_URI[js-sys-0.3.64.sha256sum] = "c5f195fe497f702db0f318b07fdd68edb16955aed830df8363d837542f8f935a" +SRC_URI[junit-report-0.4.0.sha256sum] = "e4e00ad2de771fc4988af88b02cbd618c08c17920208c35c4bbfe67ccfab31eb" +SRC_URI[lazy_static-1.4.0.sha256sum] = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" +SRC_URI[libc-0.2.147.sha256sum] = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3" +SRC_URI[linux-raw-sys-0.4.7.sha256sum] = "1a9bad9f94746442c783ca431b22403b519cd7fbeed0533fdd6328b2f2212128" +SRC_URI[log-0.4.20.sha256sum] = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f" +SRC_URI[memchr-2.6.3.sha256sum] = "8f232d6ef707e1956a43342693d2a31e72989554d58299d7a88738cc95b0d35c" +SRC_URI[memoffset-0.9.0.sha256sum] = "5a634b1c61a95585bd15607c6ab0c4e5b226e695ff2800ba0cdccddf208c406c" +SRC_URI[miniz_oxide-0.7.1.sha256sum] = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7" +SRC_URI[mio-0.8.8.sha256sum] = "927a765cd3fc26206e66b296465fa9d3e5ab003e651c1b3c060e7956d96b19d2" +SRC_URI[num-traits-0.2.16.sha256sum] = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2" +SRC_URI[num_cpus-1.16.0.sha256sum] = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43" +SRC_URI[once_cell-1.18.0.sha256sum] = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d" +SRC_URI[oorandom-11.1.3.sha256sum] = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" +SRC_URI[plotters-0.3.5.sha256sum] = "d2c224ba00d7cadd4d5c660deaf2098e5e80e07846537c51f9cfa4be50c1fd45" +SRC_URI[plotters-backend-0.3.5.sha256sum] = "9e76628b4d3a7581389a35d5b6e2139607ad7c75b17aed325f210aa91f4a9609" +SRC_URI[plotters-svg-0.3.5.sha256sum] = "38f6d39893cca0701371e3c27294f09797214b86f1fb951b89ade8ec04e2abab" +SRC_URI[ppv-lite86-0.2.17.sha256sum] = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de" +SRC_URI[proc-macro-error-1.0.4.sha256sum] = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" +SRC_URI[proc-macro-error-attr-1.0.4.sha256sum] = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" +SRC_URI[proc-macro2-1.0.66.sha256sum] = "18fb31db3f9bddb2ea821cde30a9f70117e3f119938b5ee630b7403aa6e2ead9" +SRC_URI[quote-1.0.33.sha256sum] = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae" +SRC_URI[rand-0.7.3.sha256sum] = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" +SRC_URI[rand_chacha-0.2.2.sha256sum] = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" +SRC_URI[rand_core-0.5.1.sha256sum] = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" +SRC_URI[rand_hc-0.2.0.sha256sum] = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" +SRC_URI[rayon-1.7.0.sha256sum] = "1d2df5196e37bcc87abebc0053e20787d73847bb33134a69841207dd0a47f03b" +SRC_URI[rayon-core-1.11.0.sha256sum] = "4b8f95bd6966f5c87776639160a66bd8ab9895d9d4ab01ddba9fc60661aebe8d" +SRC_URI[redox_syscall-0.3.5.sha256sum] = "567664f262709473930a4bf9e51bf2ebf3348f2e748ccc50dea20646858f8f29" +SRC_URI[regex-1.9.5.sha256sum] = "697061221ea1b4a94a624f67d0ae2bfe4e22b8a17b6a192afb11046542cc8c47" +SRC_URI[regex-automata-0.3.8.sha256sum] = "c2f401f4955220693b56f8ec66ee9c78abffd8d1c4f23dc41a23839eb88f0795" +SRC_URI[regex-syntax-0.7.5.sha256sum] = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da" +SRC_URI[roxmltree-0.13.1.sha256sum] = "dbf7d7b1ea646d380d0e8153158063a6da7efe30ddbf3184042848e3f8a6f671" +SRC_URI[rustix-0.38.13.sha256sum] = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662" +SRC_URI[ryu-1.0.15.sha256sum] = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741" +SRC_URI[same-file-1.0.6.sha256sum] = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" +SRC_URI[scopeguard-1.2.0.sha256sum] = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49" +SRC_URI[serde-1.0.188.sha256sum] = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e" +SRC_URI[serde-tuple-vec-map-1.0.1.sha256sum] = "a04d0ebe0de77d7d445bb729a895dcb0a288854b267ca85f030ce51cdc578c82" +SRC_URI[serde_cbor-0.11.2.sha256sum] = "2bef2ebfde456fb76bbcf9f59315333decc4fda0b2b44b420243c11e0f5ec1f5" +SRC_URI[serde_derive-1.0.188.sha256sum] = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2" +SRC_URI[serde_json-1.0.106.sha256sum] = "2cc66a619ed80bf7a0f6b17dd063a84b88f6dea1813737cf469aef1d081142c2" +SRC_URI[serde_yaml-0.9.21.sha256sum] = "d9d684e3ec7de3bf5466b32bd75303ac16f0736426e5a4e0d6e489559ce1249c" +SRC_URI[stderrlog-0.5.4.sha256sum] = "69a26bbf6de627d389164afa9783739b56746c6c72c4ed16539f4ff54170327b" +SRC_URI[strsim-0.8.0.sha256sum] = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" +SRC_URI[structopt-0.3.26.sha256sum] = "0c6b5c64445ba8094a6ab0c3cd2ad323e07171012d9c98b0b15651daf1787a10" +SRC_URI[structopt-derive-0.4.18.sha256sum] = "dcb5ae327f9cc13b68763b5749770cb9e048a99bd9dfdfa58d0cf05d5f64afe0" +SRC_URI[syn-1.0.109.sha256sum] = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237" +SRC_URI[syn-2.0.32.sha256sum] = "239814284fd6f1a4ffe4ca893952cdd93c224b6a1571c9a9eadd670295c0c9e2" +SRC_URI[tempfile-3.8.0.sha256sum] = "cb94d2f3cc536af71caac6b6fcebf65860b347e7ce0cc9ebe8f70d3e521054ef" +SRC_URI[termcolor-1.1.3.sha256sum] = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" +SRC_URI[textwrap-0.11.0.sha256sum] = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" +SRC_URI[thiserror-1.0.48.sha256sum] = "9d6d7a740b8a666a7e828dd00da9c0dc290dff53154ea77ac109281de90589b7" +SRC_URI[thiserror-impl-1.0.48.sha256sum] = "49922ecae66cc8a249b77e68d1d0623c1b2c514f0060c27cdc68bd62a1219d35" +SRC_URI[thread_local-1.1.7.sha256sum] = "3fdd6f064ccff2d6567adcb3873ca630700f00b5ad3f060c25b5dcfd9a4ce152" +SRC_URI[tinytemplate-1.2.1.sha256sum] = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" +SRC_URI[toml-0.5.11.sha256sum] = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234" +SRC_URI[unicode-ident-1.0.11.sha256sum] = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c" +SRC_URI[unicode-segmentation-1.10.1.sha256sum] = "1dd624098567895118886609431a7c3b8f516e41d30e0643f03d94592a147e36" +SRC_URI[unicode-width-0.1.10.sha256sum] = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b" +SRC_URI[unsafe-libyaml-0.2.9.sha256sum] = "f28467d3e1d3c6586d8f25fa243f544f5800fec42d97032474e17222c2b75cfa" +SRC_URI[vec_map-0.8.2.sha256sum] = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" +SRC_URI[version_check-0.9.4.sha256sum] = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" +SRC_URI[walkdir-2.4.0.sha256sum] = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee" +SRC_URI[wasi-0.9.0+wasi-snapshot-preview1.sha256sum] = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" +SRC_URI[wasi-0.11.0+wasi-snapshot-preview1.sha256sum] = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" +SRC_URI[wasm-bindgen-0.2.87.sha256sum] = "7706a72ab36d8cb1f80ffbf0e071533974a60d0a308d01a5d0375bf60499a342" +SRC_URI[wasm-bindgen-backend-0.2.87.sha256sum] = "5ef2b6d3c510e9625e5fe6f509ab07d66a760f0885d858736483c32ed7809abd" +SRC_URI[wasm-bindgen-macro-0.2.87.sha256sum] = "dee495e55982a3bd48105a7b947fd2a9b4a8ae3010041b9e0faab3f9cd028f1d" +SRC_URI[wasm-bindgen-macro-support-0.2.87.sha256sum] = "54681b18a46765f095758388f2d0cf16eb8d4169b639ab575a8f5693af210c7b" +SRC_URI[wasm-bindgen-shared-0.2.87.sha256sum] = "ca6ad05a4870b2bf5fe995117d3728437bd27d7cd5f06f13c17443ef369775a1" +SRC_URI[web-sys-0.3.64.sha256sum] = "9b85cbef8c220a6abc02aefd892dfc0fc23afb1c6a426316ec33253a3877249b" +SRC_URI[winapi-0.3.9.sha256sum] = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" +SRC_URI[winapi-i686-pc-windows-gnu-0.4.0.sha256sum] = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" +SRC_URI[winapi-util-0.1.5.sha256sum] = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" +SRC_URI[winapi-x86_64-pc-windows-gnu-0.4.0.sha256sum] = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +SRC_URI[windows-0.48.0.sha256sum] = "e686886bc078bc1b0b600cac0147aadb815089b6e4da64016cbd754b6342700f" +SRC_URI[windows-sys-0.48.0.sha256sum] = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9" +SRC_URI[windows-targets-0.48.5.sha256sum] = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c" +SRC_URI[windows_aarch64_gnullvm-0.48.5.sha256sum] = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8" +SRC_URI[windows_aarch64_msvc-0.48.5.sha256sum] = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc" +SRC_URI[windows_i686_gnu-0.48.5.sha256sum] = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e" +SRC_URI[windows_i686_msvc-0.48.5.sha256sum] = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406" +SRC_URI[windows_x86_64_gnu-0.48.5.sha256sum] = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e" +SRC_URI[windows_x86_64_gnullvm-0.48.5.sha256sum] = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc" +SRC_URI[windows_x86_64_msvc-0.48.5.sha256sum] = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538" +SRC_URI[xml-rs-0.8.18.sha256sum] = "bab77e97b50aee93da431f2cee7cd0f43b4d1da3c408042f2d7d164187774f0a" +SRC_URI[xmlparser-0.13.5.sha256sum] = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch new file mode 100644 index 0000000000..e29b78fde3 --- /dev/null +++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner/0001-deqp-runner-drop-zstd-support.patch @@ -0,0 +1,172 @@ +From f453ec77fa9e6fd961a1f5f0b221260a5a21bba2 Mon Sep 17 00:00:00 2001 +From: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +Date: Tue, 27 Aug 2024 14:08:47 +0300 +Subject: [PATCH] deqp-runner: drop zstd support + +Building zstd-sys results in the "foo contains reference to TMPDIR" QA +error. Revert commit 1adddf3aa89f21b472d8046347ccdfa4612f141b to drop +zstd dependency. + +Upstream-Status: Inappropriate [oe specific] +Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> +--- + Cargo.lock | 45 --------------------------------------------- + Cargo.toml | 3 --- + src/lib.rs | 31 +++++++------------------------ + 3 files changed, 7 insertions(+), 72 deletions(-) + +diff --git a/Cargo.lock b/Cargo.lock +index 8443695e2bd5..50924576a8e3 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -94,7 +94,6 @@ version = "1.0.83" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "f1174fb0b6ec23863f8b971027804a42614e347eafb0a95bf0b12cdae21fc4d0" + dependencies = [ +- "jobserver", + "libc", + ] + +@@ -271,7 +270,6 @@ dependencies = [ + "structopt", + "tempfile", + "toml", +- "zstd", + ] + + [[package]] +@@ -423,15 +421,6 @@ version = "1.0.9" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "af150ab688ff2122fcef229be89cb50dd66af9e01a4ff320cc137eecc9bacc38" + +-[[package]] +-name = "jobserver" +-version = "0.1.31" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e" +-dependencies = [ +- "libc", +-] +- + [[package]] + name = "js-sys" + version = "0.3.64" +@@ -544,12 +533,6 @@ version = "11.1.3" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" + +-[[package]] +-name = "pkg-config" +-version = "0.3.30" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec" +- + [[package]] + name = "plotters" + version = "0.3.5" +@@ -1217,31 +1200,3 @@ name = "xmlparser" + version = "0.13.5" + source = "registry+https://github.com/rust-lang/crates.io-index" + checksum = "4d25c75bf9ea12c4040a97f829154768bbbce366287e2dc044af160cd79a13fd" +- +-[[package]] +-name = "zstd" +-version = "0.13.1" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2d789b1514203a1120ad2429eae43a7bd32b90976a7bb8a05f7ec02fa88cc23a" +-dependencies = [ +- "zstd-safe", +-] +- +-[[package]] +-name = "zstd-safe" +-version = "7.1.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "1cd99b45c6bc03a018c8b8a86025678c87e55526064e38f9df301989dce7ec0a" +-dependencies = [ +- "zstd-sys", +-] +- +-[[package]] +-name = "zstd-sys" +-version = "2.0.11+zstd.1.5.6" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4" +-dependencies = [ +- "cc", +- "pkg-config", +-] +diff --git a/Cargo.toml b/Cargo.toml +index ac6295763e87..1fa1344a3105 100644 +--- a/Cargo.toml ++++ b/Cargo.toml +@@ -120,9 +120,6 @@ version = "3.2" + [dependencies.toml] + version = "0.5" + +-[dependencies.zstd] +-version = "0.13.0" +- + [dev-dependencies.criterion] + version = "0.3.0" + +diff --git a/src/lib.rs b/src/lib.rs +index e7095267f1cd..ff7bc4f5d025 100644 +--- a/src/lib.rs ++++ b/src/lib.rs +@@ -63,7 +63,6 @@ use rayon::prelude::*; + use regex::RegexSet; + use serde::Deserialize; + use std::collections::HashMap; +-use std::ffi::OsStr; + use std::fs::File; + use std::io::prelude::*; + use std::io::BufReader; +@@ -76,7 +75,6 @@ use std::time::Duration; + use std::time::Instant; + use structopt::StructOpt; + use timeout::{TimeoutChildExt, TimeoutChildStdout, Timer}; +-use zstd::stream::read::Decoder; + + fn parse_key_val<T, U>(s: &str) -> Result<(T, U), Box<dyn std::error::Error>> + where +@@ -1082,32 +1080,17 @@ pub fn read_lines<I: IntoIterator<Item = impl AsRef<Path>>>(files: I) -> Result< + let mut lines: Vec<String> = Vec::new(); + + for path in files { +- let mut path: &Path = path.as_ref(); +- let mut path_compressed: PathBuf = path.to_path_buf(); +- +- // always try append zst extension (and keep existing one, e.g. .txt) +- let ext = if let Some(file_ext) = path.extension().and_then(|ext| ext.to_str()) { +- format!("{}.zst", file_ext) +- } else { +- (".zst").to_string() +- }; +- +- path_compressed.set_extension(ext); +- if path_compressed.exists() { +- path = path_compressed.as_ref(); +- } +- let file = File::open(path).with_context(|| format!("opening path: {}", path.display()))?; +- let reader: Box<dyn Read> = match path.extension().and_then(OsStr::to_str) { +- Some("zst") => Box::new(Decoder::new(file).unwrap()), +- _ => Box::new(file), +- }; +- +- for line in BufReader::new(reader).lines() { ++ let path = path.as_ref(); ++ for line in BufReader::new( ++ File::open(path).with_context(|| format!("opening path: {}", path.display()))?, ++ ) ++ .lines() ++ { + let line = line.with_context(|| format!("reading line from {}", path.display()))?; + // In newer dEQP, vk-master.txt just contains a list of .txt + // caselist files relative to its current path, so recursively read + // thoseand append their contents. +- if line.ends_with(".txt") || line.ends_with(".txt.zst") { ++ if line.ends_with(".txt") { + let sub_path = path.parent().context("Getting path parent dir")?.join(line); + + lines.extend_from_slice( diff --git a/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb b/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb new file mode 100644 index 0000000000..04de074d24 --- /dev/null +++ b/meta-oe/recipes-graphics/deqp-runner/deqp-runner_0.20.0.bb @@ -0,0 +1,18 @@ +SUMMARY = "A VK-GL-CTS/dEQP wrapper program to parallelize it across CPUs and report results against a baseline." +HOMEPAGE = "https://gitlab.freedesktop.org/mesa/deqp-runner" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = " \ + file://LICENSE;md5=4f59d6446bf2e004e80df1a0937129fa\ +" + +inherit cargo cargo-update-recipe-crates + +SRC_URI += " \ + crate://crates.io/deqp-runner/0.20.0 \ + file://0001-deqp-runner-drop-zstd-support.patch \ +" + +SRC_URI[deqp-runner-0.20.0.sha256sum] = "a3f4fab1179a01cbbdbe4b93e0a040f74de7b9086498d91976d93844a31439dd" + +require deqp-runner-crates.inc diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch b/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch new file mode 100644 index 0000000000..aa8406e315 --- /dev/null +++ b/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch @@ -0,0 +1,28 @@ +From 272491297564513c4ce49a11bc1ecc523a3afd63 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 15 Mar 2024 11:05:54 -0700 +Subject: [PATCH] Mimic GNU basename() API for non-glibc library e.g. musl + +Upstream-Status: Submitted [https://github.com/lucasdemarchi/dietsplash/pull/7] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/util.h | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/util.h b/src/util.h +index 1f4c3ef..a3ab54a 100644 +--- a/src/util.h ++++ b/src/util.h +@@ -60,6 +60,9 @@ + */ + #define ARRAY_SIZE(arr) (sizeof(arr) / sizeof((arr)[0]) + _array_size_chk(arr)) + ++#if !defined(__GLIBC__) ++#define basename(src) (strrchr(src,'/') ? strrchr(src,'/')+1 : src) ++#endif + + #define DIE_PREFIX "[" PACKAGE_NAME "] ERR: " + #define LOG_SUFFIX "\n" +-- +2.44.0 + diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch b/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch index 87e8637eec..aad393b1d9 100644 --- a/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch +++ b/meta-oe/recipes-graphics/dietsplash/dietsplash/0001-configure.ac-Do-not-demand-linker-hash-style.patch @@ -8,6 +8,8 @@ is not supported Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb index 2c28fde347..1ee2657bd0 100644 --- a/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb +++ b/meta-oe/recipes-graphics/dietsplash/dietsplash_git.bb @@ -4,13 +4,13 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" # Really, no depends besides a C library -PV = "0.3" -PR = "r1" +PV = "0.3+git" -SRCREV = "ef2e1a390e768e21e6a6268977580ee129a96633" +SRCREV = "8bed71d860bbb0c8792fa2a1179c9beeae84d577" SRC_URI = "git://github.com/lucasdemarchi/dietsplash.git;branch=master;protocol=https \ file://0001-configure.ac-Do-not-demand-linker-hash-style.patch \ - " + file://0001-Mimic-GNU-basename-API-for-non-glibc-library-e.g.-mu.patch \ +" inherit autotools diff --git a/meta-oe/recipes-graphics/directfb/directfb-examples/0001-spacedream-Add-typecast-to-pthread_t-in-assignment.patch b/meta-oe/recipes-graphics/directfb/directfb-examples/0001-spacedream-Add-typecast-to-pthread_t-in-assignment.patch new file mode 100644 index 0000000000..f40b7f144d --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb-examples/0001-spacedream-Add-typecast-to-pthread_t-in-assignment.patch @@ -0,0 +1,39 @@ +From 85a30903ea3ba4232379bbbcb54960307d5a2da0 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 18:49:03 -0700 +Subject: [PATCH] spacedream: Add typecast to pthread_t in assignment + +render_loop_thread is of type pthread_t, therefore -1 which is int can +not be assigned to it. Do the needed typecast conversion + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/spacedream/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/src/spacedream/main.c b/src/spacedream/main.c +index 430800f..8e1887c 100644 +--- a/src/spacedream/main.c ++++ b/src/spacedream/main.c +@@ -205,7 +205,7 @@ void unload_stars() + int main( int argc, char *argv[] ) + { + int quit = 0; +- pthread_t render_loop_thread = -1; ++ pthread_t render_loop_thread = (pthread_t)-1; + + IDirectFBSurface *primary; + IDirectFBEventBuffer *buffer; +@@ -344,7 +344,7 @@ int main( int argc, char *argv[] ) + pthread_cancel( render_loop_thread ); + pthread_mutex_unlock( &render_start ); + pthread_join( render_loop_thread, NULL ); +- render_loop_thread = -1; ++ render_loop_thread = (pthread_t)-1; + + + unload_stars(); +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb b/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb index 7907c5c0da..398e339482 100644 --- a/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb +++ b/meta-oe/recipes-graphics/directfb/directfb-examples_1.7.0.bb @@ -9,6 +9,7 @@ LICENSE = "MIT" SRC_URI = " \ http://downloads.yoctoproject.org/mirror/sources/DirectFB-examples-${PV}.tar.gz \ file://configure.in-Fix-string-argument-syntax.patch \ + file://0001-spacedream-Add-typecast-to-pthread_t-in-assignment.patch \ " LIC_FILES_CHKSUM = "file://COPYING;md5=ecf6fd2b19915afc4da56043926ca18f" diff --git a/meta-oe/recipes-graphics/directfb/directfb.inc b/meta-oe/recipes-graphics/directfb/directfb.inc index 07b98648fd..59796cc65f 100644 --- a/meta-oe/recipes-graphics/directfb/directfb.inc +++ b/meta-oe/recipes-graphics/directfb/directfb.inc @@ -9,7 +9,7 @@ LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=dcf3c825659e82539645da41a7908589" HOMEPAGE = "http://directfb.org" -DEPENDS = "jpeg libpng freetype zlib sysfsutils" +DEPENDS = "jpeg libpng sysfsutils" SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.gz \ file://configurefix.patch \ @@ -23,6 +23,9 @@ SRC_URI = "http://downloads.yoctoproject.org/mirror/sources/DirectFB-${PV}.tar.g file://fix-tslib-version-check.patch \ file://0001-Fix-build-on-32bit-arches-with-64bit-time_t.patch \ file://0001-os-linux-Fix-build-when-__NR_futex-is-not-available.patch \ + file://0001-include-libgen.h-for-basename.patch \ + file://0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch \ + file://0001-libdirect-remove-use-of-keyword-register.patch \ " S = "${WORKDIR}/DirectFB-${PV}" @@ -38,21 +41,21 @@ BINCONFIG = "${bindir}/directfb-config" inherit autotools binconfig-disabled pkgconfig -PACKAGECONFIG ??= "linuxinput" -PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" +PACKAGECONFIG ??= "freetype linuxinput zlib" PACKAGECONFIG[drmkms] = "--enable-drmkms,--disable-drmkms,libdrm" -PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" -PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" -PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" +PACKAGECONFIG[freetype] = "--enable-freetype,--disable-freetype,freetype" +PACKAGECONFIG[jpeg2000] = "--enable-jpeg2000,--disable-jpeg2000,jasper" +PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa," PACKAGECONFIG[linuxinput] = "--with-inputdrivers=linuxinput,," PACKAGECONFIG[noinput] = "--with-inputdrivers=none,," -PACKAGECONFIG[mesa] = "--enable-mesa,--disable-mesa,virtual/mesa," +PACKAGECONFIG[tiff] = "--enable-tiff,--disable-tiff,tiff" +PACKAGECONFIG[tslib] = "--with-inputdrivers=tslib,,tslib" +PACKAGECONFIG[webp] = "--enable-webp,--disable-webp,libwebp" PACKAGECONFIG[x11] = "--enable-x11,--disable-x11,xserver-xorg," +PACKAGECONFIG[zlib] = "--enable-zlib,--disable-zlib,zlib" EXTRA_OECONF = "\ --with-gfxdrivers=none \ - --enable-freetype=yes \ - --enable-zlib \ --disable-imlib2 \ --disable-sdl \ --disable-vnc \ diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-include-libgen.h-for-basename.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-include-libgen.h-for-basename.patch new file mode 100644 index 0000000000..abdba18fec --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-include-libgen.h-for-basename.patch @@ -0,0 +1,32 @@ +From c8cf3ffd4fa14cdc6d607a09d51e898dec922348 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 25 Mar 2024 18:17:44 -0700 +Subject: [PATCH] include libgen.h for basename + +basename prototype has been removed from string.h from latest musl [1] +compilers e.g. clang-18 flags the absense of prototype as error. therefore +include libgen.h for providing it. + +[1] https://git.musl-libc.org/cgit/musl/commit/?id=725e17ed6dff4d0cd22487bb64470881e86a92e7 + +Upstream-Status: Inappropriate [Upstream is dead] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + systems/fbdev/fbdev.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/systems/fbdev/fbdev.c b/systems/fbdev/fbdev.c +index 5297358..4e6f178 100644 +--- a/systems/fbdev/fbdev.c ++++ b/systems/fbdev/fbdev.c +@@ -42,6 +42,7 @@ + #include <errno.h> + #include <string.h> + #include <strings.h> ++#include <libgen.h> + #if defined(HAVE_SYSIO) + # include <sys/io.h> + #endif +-- +2.44.0 + diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch new file mode 100644 index 0000000000..574bba0bc7 --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-inputdrivers-Correct-the-signature-of-bind-call-on-m.patch @@ -0,0 +1,36 @@ +From 18f4eca291cabf93d87e7c9051268d9c385b8f37 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 20 May 2024 18:23:06 -0700 +Subject: [PATCH] inputdrivers: Correct the signature of bind() call on musl + systems + +Its flagged with GCC14 + +../../../DirectFB-1.7.7/inputdrivers/linux_input/linux_input.c:1551:27: error: passing argument 2 of 'bind' from incompatible pointer type [-Wincompatible-pointer-types] + 1551 | rt = bind(socket_fd, &sock_addr, + | ^~~~~~~~~~ + | | + | struct sockaddr_un * + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + inputdrivers/linux_input/linux_input.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/inputdrivers/linux_input/linux_input.c b/inputdrivers/linux_input/linux_input.c +index 03deebc..207f5a5 100644 +--- a/inputdrivers/linux_input/linux_input.c ++++ b/inputdrivers/linux_input/linux_input.c +@@ -1548,7 +1548,7 @@ udev_hotplug_EventThread(DirectThread *thread, void * hotplug_data) + "/org/kernel/udev/monitor", + sizeof(sock_addr.sun_path) - 1); + +- rt = bind(socket_fd, &sock_addr, ++ rt = bind(socket_fd, (struct sockaddr *)&sock_addr, + sizeof(sock_addr.sun_family)+1+strlen(&sock_addr.sun_path[1])); + if (rt < 0) { + D_PERROR( "DirectFB/linux_input: bind() failed: %s\n", +-- +2.45.1 + diff --git a/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch b/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch new file mode 100644 index 0000000000..24d977f4dc --- /dev/null +++ b/meta-oe/recipes-graphics/directfb/directfb/0001-libdirect-remove-use-of-keyword-register.patch @@ -0,0 +1,44 @@ +From f6cdb9f1c3dbef8ef695703a2a5fb4e92b2dd8a0 Mon Sep 17 00:00:00 2001 +From: Simon Barth <simon.barth@gmx.de> +Date: Mon, 5 Aug 2024 19:35:16 +0200 +Subject: [PATCH] libdirect: remove use of keyword 'register' + +The 'register' keyword was removed in C++17 and is now unused and +reserved. When compiling code that uses DirecthFB with C++17, +compilation fails. + +Since modern compilers likely don't produce different code whether the +'register' keyword is used or not, there shouldn't be any performance +impact introduced by this change. + +Signed-off-by: Simon Barth <simon.barth@gmx.de> + +Upstream-Status: Submitted [https://github.com/deniskropp/DirectFB/pull/25] +--- + lib/direct/util.h | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/lib/direct/util.h b/lib/direct/util.h +index 2109b6ca1..734645796 100644 +--- a/lib/direct/util.h ++++ b/lib/direct/util.h +@@ -220,7 +220,7 @@ void DIRECT_API direct_md5_sum( void *dst, const void *src, const int len ); + static __inline__ int + direct_util_count_bits( unsigned int mask ) + { +- register int ret = 0; ++ int ret = 0; + + while (mask) { + ret += mask & 1; +@@ -325,7 +325,7 @@ D_ICEIL(float f) + static __inline__ int + direct_log2( int val ) + { +- register int ret = 0; ++ int ret = 0; + + while (val >> ++ret); + +-- +2.25.1 diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch index 6a7b1bf31d..5740f4a819 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch @@ -5,6 +5,8 @@ Subject: [PATCH] Do not set PYTHON_INSTALL_DIR by running python. Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch index bef471189f..2951ee4555 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-To-fix-error-when-do_package.patch @@ -11,6 +11,8 @@ shipped in any package: Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> --- +Upstream-Status: Pending + CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch index c8b105ea35..078f525117 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora/0001-disable-build-manpages.patch @@ -5,6 +5,8 @@ Subject: [PATCH] disable build manpages. Signed-off-by: Zheng Ruoqin <zhengrq.fnst@cn.fujitsu.com> --- +Upstream-Status: Pending + CMakeLists.txt | 1 - 1 file changed, 1 deletion(-) diff --git a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.2.bb b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb index 671b8ca933..50504caf9f 100644 --- a/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.2.bb +++ b/meta-oe/recipes-graphics/dnfdragora/dnfdragora_2.1.6.bb @@ -3,13 +3,13 @@ LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://LICENSE;md5=d32239bcb673463ab874e80d47fae504 \ " -SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=master;protocol=https \ +SRC_URI = "git://github.com/manatools/dnfdragora.git;branch=stable-2.x;protocol=https \ file://0001-disable-build-manpages.patch \ file://0001-Do-not-set-PYTHON_INSTALL_DIR-by-running-python.patch \ file://0001-To-fix-error-when-do_package.patch \ " -SRCREV = "5cbbc07c9d015af284a424a172a379b385f05b6f" +SRCREV = "abbe08b7a487325182758d5285b54437a914207b" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/fbida/fbida_2.14.bb b/meta-oe/recipes-graphics/fbida/fbida_2.14.bb deleted file mode 100644 index 3d65399cd2..0000000000 --- a/meta-oe/recipes-graphics/fbida/fbida_2.14.bb +++ /dev/null @@ -1,80 +0,0 @@ -SUMMARY = "Framebuffer image and doc viewer tools" -DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \ - with the main focus being photos." -HOMEPAGE = "http://linux.bytesex.org/fbida/" -AUTHOR = "Gerd Hoffmann" -SECTION = "utils" - -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" - -DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman poppler libepoxy cairo" - -SRC_URI = "https://www.kraxel.org/releases/fbida/fbida-${PV}.tar.gz \ - file://0001-Avoid-using-host-path.patch \ - file://fix-preprocessor.patch \ - file://support-jpeg-turbo.patch \ - file://cairo-weak-detect.patch \ - file://fbida-gcc10.patch \ - " -SRC_URI[sha256sum] = "95b7c01556cb6ef9819f358b314ddfeb8a4cbe862b521a3ed62f03d163154438" - -inherit pkgconfig features_check - -# Depends on libepoxy -REQUIRED_DISTRO_FEATURES = "opengl" - -EXTRA_OEMAKE = "STRIP= 'srcdir=${S}' -f ${S}/GNUmakefile" - -PACKAGECONFIG ??= "gif png curl" -PACKAGECONFIG[curl] = ",,curl" -PACKAGECONFIG[gif] = ",,giflib" -PACKAGECONFIG[png] = ",,libpng" -PACKAGECONFIG[tiff] = ",,tiff" -PACKAGECONFIG[motif] = ",,libx11 libxext libxpm libxt openmotif" -PACKAGECONFIG[webp] = ",,libwebp" -PACKAGECONFIG[lirc] = ",,lirc" -# This can only be enabled when cairo has egl enabled in its packageconfig support too -PACKAGECONFIG[egl] = ",," - -EXTRA_OEMAKE += ""${@bb.utils.contains('PACKAGECONFIG', 'egl', 'HAVE_CAIRO_GL=yes', 'HAVE_CAIRO_GL=no', d)}"" - -CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" - -do_compile() { - sed -i -e 's# fbgs# \$(srcdir)/fbgs#; s#-Ijpeg#-I\$(srcdir)/jpeg#; s# jpeg/# \$(srcdir)/jpeg/#' ${S}/GNUmakefile - sed -i -e 's:/sbin/ldconfig:echo x:' ${S}/mk/Autoconf.mk - sed -i -e 's: cpp: ${CPP}:' ${S}/GNUmakefile - - # Be sure to respect preferences (force to "no") - # Also avoid issues when ${BUILD_ARCH} == ${HOST_ARCH} - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'curl', d)}" ]; then - sed -i -e '/^HAVE_LIBCURL/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'gif', d)}" ]; then - sed -i -e '/^HAVE_LIBGIF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'png', d)}" ]; then - sed -i -e '/^HAVE_LIBPNG/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'tiff', d)}" ]; then - sed -i -e '/^HAVE_LIBTIFF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'motif', d)}" ]; then - sed -i -e '/^HAVE_MOTIF/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'webp', d)}" ]; then - sed -i -e '/^HAVE_LIBWEBP/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - if [ -z "${@bb.utils.filter('PACKAGECONFIG', 'lirc', d)}" ]; then - sed -i -e '/^HAVE_LIBLIRC/s/:=.*$/:= no/' ${S}/GNUmakefile - fi - - oe_runmake -} - -do_install() { - oe_runmake 'DESTDIR=${D}' install -} - -RDEPENDS:${PN} = "ttf-dejavu-sans-mono" diff --git a/meta-oe/recipes-graphics/fbida/fbida_git.bb b/meta-oe/recipes-graphics/fbida/fbida_git.bb new file mode 100644 index 0000000000..6c06748499 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/fbida_git.bb @@ -0,0 +1,41 @@ +SUMMARY = "Framebuffer image and doc viewer tools" +DESCRIPTION = "The fbida project contains a few applications for viewing and editing images, \ + with the main focus being photos." +HOMEPAGE = "https://www.kraxel.org/blog/linux/fbida/" +SECTION = "utils" + +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=e8feb78a32950a909621bbb51f634b39" + +DEPENDS = "virtual/libiconv jpeg fontconfig freetype libexif libdrm pixman udev libinput cairo" + +PV = "2.14+git" +SRC_URI = "git://github.com/kraxel/fbida;protocol=https;branch=master \ + file://fix-preprocessor.patch \ + file://support-jpeg-turbo.patch \ + file://fbida-gcc10.patch \ + file://0001-meson.build-install-fbgs-shell-script.patch \ + file://0002-meson.build-add-features-options-for-png-gif-tiff-we.patch \ + file://0003-meson.build-do-not-require-xkbcommon.patch \ + file://0001-meson.build-make-fbpdf-build-optional.patch \ + file://0001-fbida-Include-missing-sys-types.h.patch \ +" +SRCREV = "eb769e3d7f4a073d4c37ed524ebd5017c6a578f5" +S = "${WORKDIR}/git" + +inherit meson pkgconfig features_check + +# Depends on libepoxy +REQUIRED_DISTRO_FEATURES = "${@bb.utils.contains('PACKAGECONFIG', 'pdf', 'opengl', '', d)}" + +PACKAGECONFIG ??= "gif png pdf" +PACKAGECONFIG[gif] = "-Dgif=enabled,-Dgif=disabled,giflib" +PACKAGECONFIG[png] = "-Dpng=enabled,-Dpng=disabled,libpng" +PACKAGECONFIG[tiff] = "-Dtiff=enabled,-Dtiff=disabled,tiff" +PACKAGECONFIG[motif] = "-Dmotif=enabled,-Dmotif=disabled,libx11 libxext libxpm libxt openmotif" +PACKAGECONFIG[webp] = "-Dwebp=enabled,-Dwebp=disabled,libwebp" +PACKAGECONFIG[pdf] = "-Dpdf=enabled,-Dpdf=disabled,poppler libepoxy" + +CFLAGS += "${@bb.utils.contains('DISTRO_FEATURES', 'x11', '', '-DEGL_NO_X11=1', d)}" + +RDEPENDS:${PN} = "ttf-dejavu-sans-mono" diff --git a/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch b/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch deleted file mode 100644 index cdf2c25d37..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/0001-Avoid-using-host-path.patch +++ /dev/null @@ -1,34 +0,0 @@ -From 8d8fa9f22d9f6a95523bac63ac3af724faf5ff92 Mon Sep 17 00:00:00 2001 -From: Marek Vasut <marex@denx.de> -Date: Fri, 7 Apr 2017 23:26:09 +0200 -Subject: [PATCH] Avoid using host-path - -Remove the explicit reference to /usr/local/* , this is completely -bogus and causes trouble during cross-compilation. - -Signed-off-by: Marek Vasut <marex@denx.de> -Upstream-Status: Inappropriate [upstream requires this] ---- - mk/Variables.mk | 6 ------ - 1 file changed, 6 deletions(-) - -diff --git a/mk/Variables.mk b/mk/Variables.mk -index 99f787c..3ffd87a 100644 ---- a/mk/Variables.mk -+++ b/mk/Variables.mk -@@ -42,12 +42,6 @@ CFLAGS += -Wall -Wmissing-prototypes -Wstrict-prototypes \ - -Wpointer-arith -Wunused - CXXFLAGS += -Wall -Wpointer-arith -Wunused - --# add /usr/local to the search path if something is in there ... --ifneq ($(wildcard /usr/local/include/*.h),) -- CFLAGS += -I/usr/local/include -- LDFLAGS += -L/usr/local/$(LIB) --endif -- - # fixup include path for $(srcdir) != "." - ifneq ($(srcdir),.) - CFLAGS += -I. -I$(srcdir) --- -2.11.0 - diff --git a/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch b/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch new file mode 100644 index 0000000000..0fb58f80e1 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0001-fbida-Include-missing-sys-types.h.patch @@ -0,0 +1,31 @@ +From 17490e264e627ead81bf5840c8797de968485943 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 3 Jul 2023 11:25:26 -0700 +Subject: [PATCH] fbida: Include missing <sys/types.h> + +Fixes build on musl +../git/gfx.h:43:5: error: unknown type name 'dev_t'; did you mean 'div_t'? + dev_t devnum; + ^~~~~ + div_t +TOPDIR/build/tmp/work/cortexa57-yoe-linux-musl/fbida/2.14+gitAUTOINC+eb769e3d7f-r0/recipe-sysroot/usr/include/stdlib.h:64:35: note: 'div_t' declared here +typedef struct { int quot, rem; } div_t; + ^ +1 error generated + +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/3] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gfx.h | 1 + + 1 file changed, 1 insertion(+) + +--- a/gfx.h ++++ b/gfx.h +@@ -1,5 +1,6 @@ + #include <stdbool.h> + #include <inttypes.h> ++#include <sys/types.h> + + #include <pixman.h> + #include <cairo.h> diff --git a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch new file mode 100644 index 0000000000..4d081258be --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-install-fbgs-shell-script.patch @@ -0,0 +1,28 @@ +From f9c455e81ad4d870c8ae20b9af8598139231ad26 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 9 Sep 2022 09:32:22 +0200 +Subject: [PATCH] meson.build: install fbgs shell script + +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/meson.build b/meson.build +index cbed982..2129896 100644 +--- a/meson.build ++++ b/meson.build +@@ -126,6 +126,9 @@ executable('fbpdf', + sources : fbpdf_srcs, + dependencies : fbpdf_deps, + install : true) ++install_data('fbgs', ++ install_dir : get_option('bindir'), ++ install_mode : 'rwxr--r--') + + # build fbcon + fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ] +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch new file mode 100644 index 0000000000..b872e213aa --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0001-meson.build-make-fbpdf-build-optional.patch @@ -0,0 +1,66 @@ +From c00a155e90a9b22bd6ab5fa5407bb9923ee16ca0 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 18:45:58 +0200 +Subject: [PATCH] meson.build: make fbpdf build optional + +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 22 ++++++++++++---------- + meson_options.txt | 1 + + 2 files changed, 13 insertions(+), 10 deletions(-) + +diff --git a/meson.build b/meson.build +index 6b3daf3..289d1ec 100644 +--- a/meson.build ++++ b/meson.build +@@ -15,11 +15,11 @@ x11resdir = x11resrun.stdout().strip() + + # pkg-config deps + pixman_dep = dependency('pixman-1') +-poppler_dep = dependency('poppler-glib') ++poppler_dep = dependency('poppler-glib', required: get_option('pdf')) + cairo_dep = dependency('cairo') + drm_dep = dependency('libdrm') +-gbm_dep = dependency('gbm') +-epoxy_dep = dependency('epoxy') ++gbm_dep = dependency('gbm', required: get_option('pdf')) ++epoxy_dep = dependency('epoxy', required: get_option('pdf')) + exif_dep = dependency('libexif') + png_dep = dependency('libpng', required: get_option('png')) + tiff_dep = dependency('libtiff-4', required: get_option('tiff')) +@@ -132,13 +132,15 @@ fbpdf_deps = [ drm_dep, gbm_dep, epoxy_dep, + pixman_dep, poppler_dep, cairo_dep, + udev_dep, input_dep ] + +-executable('fbpdf', +- sources : fbpdf_srcs, +- dependencies : fbpdf_deps, +- install : true) +-install_data('fbgs', +- install_dir : get_option('bindir'), +- install_mode : 'rwxr--r--') ++if get_option('pdf').enabled() ++ executable('fbpdf', ++ sources : fbpdf_srcs, ++ dependencies : fbpdf_deps, ++ install : true) ++ install_data('fbgs', ++ install_dir : get_option('bindir'), ++ install_mode : 'rwxr--r--') ++endif + + # build fbcon + fbcon_srcs = [ 'fbcon.c', 'drmtools.c', 'fbtools.c', 'gfx.c', 'vt.c', 'kbd.c' ] +diff --git a/meson_options.txt b/meson_options.txt +index ce37188..74699ab 100644 +--- a/meson_options.txt ++++ b/meson_options.txt +@@ -3,3 +3,4 @@ option('png', type: 'feature', value : 'enabled') + option('tiff', type: 'feature', value : 'enabled') + option('webp', type: 'feature', value : 'disabled') + option('motif', type: 'feature', value : 'disabled') ++option('pdf', type: 'feature', value : 'enabled') +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch b/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch new file mode 100644 index 0000000000..4f54fbfba7 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0002-meson.build-add-features-options-for-png-gif-tiff-we.patch @@ -0,0 +1,124 @@ +From cdcde5c1fd106a69118dff98118600911392762f Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 16:25:38 +0200 +Subject: [PATCH] meson.build: add features options for png, gif, tiff, webp, and motif + +Upstream-Status: Submitted [https://github.com/kraxel/fbida/pull/4] +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 41 +++++++++++++++++++++++++++-------------- + meson_options.txt | 5 +++++ + selections.c | 4 ++++ + 3 files changed, 36 insertions(+), 14 deletions(-) + create mode 100644 meson_options.txt + +diff --git a/meson.build b/meson.build +index cd9cc49..b5e3ffc 100644 +--- a/meson.build ++++ b/meson.build +@@ -23,9 +23,9 @@ drm_dep = dependency('libdrm') + gbm_dep = dependency('gbm') + epoxy_dep = dependency('epoxy') + exif_dep = dependency('libexif') +-png_dep = dependency('libpng') +-tiff_dep = dependency('libtiff-4') +-webp_dep = dependency('libwebp', required : false) ++png_dep = dependency('libpng', required: get_option('png')) ++tiff_dep = dependency('libtiff-4', required: get_option('tiff')) ++webp_dep = dependency('libwebp', required : get_option('webp')) + udev_dep = dependency('libudev') + input_dep = dependency('libinput') + xkb_dep = dependency('xkbcommon') +@@ -36,20 +36,20 @@ jpeg_dep = cc.find_library('jpeg') + util_dep = cc.find_library('util') + math_dep = cc.find_library('m', required : false) + pcd_dep = cc.find_library('pcd', required : false) +-gif_dep = cc.find_library('gif', required : false) ++gif_dep = cc.find_library('gif', required: get_option('gif')) + + # motif + x11 libs +-motif_dep = cc.find_library('Xm', required : false) +-xpm_dep = cc.find_library('Xpm', required : false) +-xt_dep = cc.find_library('Xt', required : false) +-xext_dep = cc.find_library('Xext', required : false) +-x11_dep = cc.find_library('X11', required : false) ++motif_dep = cc.find_library('Xm', required : get_option('motif')) ++xpm_dep = cc.find_library('Xpm', required : get_option('motif')) ++xt_dep = cc.find_library('Xt', required : get_option('motif')) ++xext_dep = cc.find_library('Xext', required : get_option('motif')) ++x11_dep = cc.find_library('X11', required : get_option('motif')) + + # image formats + read_srcs = [ 'readers.c', 'rd/read-ppm.c', 'rd/read-bmp.c', +- 'rd/read-jpeg.c', 'rd/read-png.c', 'rd/read-tiff.c' ] ++ 'rd/read-jpeg.c' ] + write_srcs = [ 'writers.c', 'wr/write-ppm.c', 'wr/write-ps.c', +- 'wr/write-jpeg.c', 'wr/write-png.c', 'wr/write-tiff.c' ] ++ 'wr/write-jpeg.c' ] + image_deps = [ jpeg_dep, png_dep, tiff_dep, + pcd_dep, gif_dep, webp_dep ] + +@@ -57,11 +57,21 @@ if pcd_dep.found() + read_srcs += 'rd/read-pcd.c' + config.set('HAVE_LIBPCD', true) + endif +-if gif_dep.found() ++if get_option('png').enabled() ++ read_srcs += 'rd/read-png.c' ++ write_srcs += 'wr/write-png.c' ++ config.set('HAVE_LIBPNG', true) ++endif ++if get_option('tiff').enabled() ++ read_srcs += 'rd/read-tiff.c' ++ write_srcs += 'wr/write-tiff.c' ++ config.set('HAVE_LIBTIFF', true) ++endif ++if get_option('gif').enabled() + read_srcs += 'rd/read-gif.c' + config.set('HAVE_LIBGIF', true) + endif +-if webp_dep.found() ++if get_option('webp').enabled() + read_srcs += 'rd/read-webp.c' + config.set('HAVE_LIBWEBP', true) + endif +@@ -168,7 +181,7 @@ ida_srcs = [ 'ida.c', 'man.c', 'hex.c', 'x11.c', 'viewer.c', + ida_deps = [ pixman_dep, exif_dep, image_deps, math_dep, + motif_dep, xpm_dep, xt_dep, xext_dep, x11_dep ] + +-if motif_dep.found() ++if get_option('motif').enabled() + executable('ida', + sources : ida_srcs, + dependencies : ida_deps, +diff --git a/meson_options.txt b/meson_options.txt +new file mode 100644 +index 0000000..ce37188 +--- /dev/null ++++ b/meson_options.txt +@@ -0,0 +1,5 @@ ++option('gif', type: 'feature', value : 'enabled') ++option('png', type: 'feature', value : 'enabled') ++option('tiff', type: 'feature', value : 'enabled') ++option('webp', type: 'feature', value : 'disabled') ++option('motif', type: 'feature', value : 'disabled') +diff --git a/selections.c b/selections.c +index 7b16264..ccdc686 100644 +--- a/selections.c ++++ b/selections.c +@@ -609,8 +609,12 @@ void ipc_init() + #ifdef HAVE_LIBGIF + targets[ntargets++] = MIME_IMAGE_GIF; + #endif ++#ifdef HAVE_LIBPNG + targets[ntargets++] = MIME_IMAGE_PNG; ++#endif ++#ifdef HAVE_LIBTIFF + targets[ntargets++] = MIME_IMAGE_TIFF; ++#endif + targets[ntargets++] = XA_PIXMAP; + targets[ntargets++] = XA_STRING; + +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch b/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch new file mode 100644 index 0000000000..e769014131 --- /dev/null +++ b/meta-oe/recipes-graphics/fbida/files/0003-meson.build-do-not-require-xkbcommon.patch @@ -0,0 +1,27 @@ +From ec82a194f3454ac203a134c9a99bac6d63095d25 Mon Sep 17 00:00:00 2001 +From: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +Date: Fri, 16 Sep 2022 18:29:03 +0200 +Subject: [PATCH] meson.build: do not require xkbcommon + +Upstream-Status: Pending +Signed-off-by: "Meyer, Wolfgang" <Wolfgang.Meyer@gossenmetrawatt.com> +--- + meson.build | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/meson.build b/meson.build +index 341939c..b5dab14 100644 +--- a/meson.build ++++ b/meson.build +@@ -26,7 +26,7 @@ tiff_dep = dependency('libtiff-4', required: get_option('tiff')) + webp_dep = dependency('libwebp', required : get_option('webp')) + udev_dep = dependency('libudev') + input_dep = dependency('libinput') +-xkb_dep = dependency('xkbcommon') ++xkb_dep = dependency('xkbcommon', required : false) + tsm_dep = dependency('libtsm', required : false) + + # other library deps +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch b/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch deleted file mode 100644 index c7c579cc41..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/cairo-weak-detect.patch +++ /dev/null @@ -1,17 +0,0 @@ -OE configures cairo to disable EGL support, however fbida expects cairo with egl support -this patch therefore makes it possible to set HAVE_CAIRO_GL via recipe - -Upstream-Status: Inappropriate [OE-Specific] -Signed-off-by: Khem Raj <raj.khem@gmail.com> - ---- a/GNUmakefile -+++ b/GNUmakefile -@@ -67,7 +67,7 @@ define make-config - LIB := $(LIB) - RESDIR := $(call ac_resdir) - HAVE_LINUX_FB_H := $(call ac_header,linux/fb.h) --HAVE_CAIRO_GL := $(call ac_pkg_config,cairo-gl) -+HAVE_CAIRO_GL ?= $(call ac_pkg_config,cairo-gl) - HAVE_LIBPCD := $(call ac_lib,pcd_open,pcd) - HAVE_LIBGIF := $(call ac_lib,DGifOpenFileName,gif) - HAVE_LIBWEBP := $(call ac_pkg_config,libwebp) diff --git a/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch b/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch index cdeac996a1..ef70a070dd 100644 --- a/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch +++ b/meta-oe/recipes-graphics/fbida/files/fix-preprocessor.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + --- a/scripts/jpeg-version.sh +++ b/scripts/jpeg-version.sh @@ -1,2 +1,2 @@ diff --git a/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch b/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch index 05cd74da92..719c096e2b 100644 --- a/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch +++ b/meta-oe/recipes-graphics/fbida/files/support-jpeg-turbo.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Add patch by Ondrej Sury to migrate to libjpeg-turbo (Closes: #763263) Index: fbida-2.10/jpeg/62/jpegcomp.h diff --git a/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch b/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch deleted file mode 100644 index 99639554c2..0000000000 --- a/meta-oe/recipes-graphics/fbida/files/use-jpeg-turbo.patch +++ /dev/null @@ -1,13 +0,0 @@ -Index: fbida-2.10/GNUmakefile -=================================================================== ---- fbida-2.10.orig/GNUmakefile -+++ fbida-2.10/GNUmakefile -@@ -51,7 +51,7 @@ HAVE_LIBSANE := $(call ac_lib,sane_init, - HAVE_LIBCURL := $(call ac_lib,curl_easy_init,curl) - HAVE_LIBLIRC := $(call ac_lib,lirc_init,lirc_client) - HAVE_MOTIF := $(call ac_lib,XmStringGenerate,Xm,-L/usr/X11R6/$(LIB) -lXpm -lXt -lXext -lX11) --JPEG_VER := $(call ac_jpeg_ver) -+JPEG_VER := 62 - endef - - # transposing diff --git a/meta-oe/recipes-graphics/feh/feh_3.9.bb b/meta-oe/recipes-graphics/feh/feh_3.10.3.bb index e4422668f5..5ab333c60d 100644 --- a/meta-oe/recipes-graphics/feh/feh_3.9.bb +++ b/meta-oe/recipes-graphics/feh/feh_3.10.3.bb @@ -1,16 +1,15 @@ SUMMARY = "X11 image viewer aimed mostly at console users" -AUTHOR = "Tom Gilbert & Daniel Friesel" HOMEPAGE = "https://feh.finalrewind.org/" SECTION = "x11/utils" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=f91bd06901085c94bdc50649d98c5059" +LIC_FILES_CHKSUM = "file://COPYING;md5=150e4c518ff8aaecfe35694e47661d9a" DEPENDS = "\ imlib2 \ virtual/libx11 libxt\ " SRC_URI = "https://feh.finalrewind.org/feh-${PV}.tar.bz2" -SRC_URI[sha256sum] = "8649962c41d2c7ec4cc3f438eb327638a1820ad5a66df6a9995964601ae6bca0" +SRC_URI[sha256sum] = "5426e2799770217af1e01c2e8c182d9ca8687d84613321d8ab4a66fe4041e9c8" inherit mime-xdg features_check # depends on virtual/libx11 diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch b/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch new file mode 100644 index 0000000000..6d133254ed --- /dev/null +++ b/meta-oe/recipes-graphics/fontforge/fontforge/0001-Fix-Translations-containing-invalid-directives-hs.patch @@ -0,0 +1,385 @@ +From e6ccc8a8cf1391010a8220836a732da9fab19c69 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 7 Sep 2023 12:35:12 -0700 +Subject: [PATCH] Fix Translations containing invalid directives %hs + +Found with gettext 0.22 +Older versions of msgfmt were more sloppy, thus allowing such mistakes to cause bugs at runtime. + +https://bugs.gentoo.org/908868 +https://savannah.gnu.org/bugs/index.php?64333 +https://github.com/fontforge/fontforge/issues/5251 + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + fontforgeexe/searchview.c | 2 +- + po/ca.po | 4 ++-- + po/de.po | 4 ++-- + po/en_GB.po | 4 ++-- + po/fr.po | 40 +++++++++++++++++++-------------------- + po/hr.po | 4 ++-- + po/it.po | 8 ++++---- + po/ja.po | 4 ++-- + po/ko.po | 4 ++-- + po/pl.po | 4 ++-- + po/uk.po | 4 ++-- + po/vi.po | 4 ++-- + 12 files changed, 43 insertions(+), 43 deletions(-) + +diff --git a/fontforgeexe/searchview.c b/fontforgeexe/searchview.c +index 1cb39a221..7e1c109cb 100644 +--- a/fontforgeexe/searchview.c ++++ b/fontforgeexe/searchview.c +@@ -516,7 +516,7 @@ return( true ); + if ( ask_if_difficult==2 && !searcher->isvisible ) + return( false ); + if ( gwwv_ask(_("Bad Reference"),(const char **) buttons,1,1, +- _("The %1$s in the search dialog contains a reference to %2$.20hs which does not exist in the new font.\nShould I remove the reference?"), ++ _("The %1$s in the search dialog contains a reference to %2$.20s which does not exist in the new font.\nShould I remove the reference?"), + i==0?_("Search Pattern"):_("Replace Pattern"), + r->sc->name)==1 ) + return( false ); +diff --git a/po/ca.po b/po/ca.po +index e2349b6ef..6c920b7c0 100644 +--- a/po/ca.po ++++ b/po/ca.po +@@ -12347,11 +12347,11 @@ msgstr "Tai" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"Al diàleg de cerca, %1$s conté una referència a %2$.20hs\n" ++"Al diàleg de cerca, %1$s conté una referència a %2$.20s\n" + "que no existeix en el nou tipus.\n" + "Voleu eliminar la referència?" + +diff --git a/po/de.po b/po/de.po +index 41430ffae..8a31aeaa2 100644 +--- a/po/de.po ++++ b/po/de.po +@@ -15765,11 +15765,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s im Suchdialog enthält eine Referenz auf %2$.20hs, die in der neuen " ++"%1$s im Suchdialog enthält eine Referenz auf %2$.20s, die in der neuen " + "Schrift nicht existiert.\n" + "Soll der Referenz entfernt werden?" + +diff --git a/po/en_GB.po b/po/en_GB.po +index 9bd2d62bb..fce64c97d 100644 +--- a/po/en_GB.po ++++ b/po/en_GB.po +@@ -728,11 +728,11 @@ msgstr "Template Colour" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"The %1$s in the search dialogue contains a reference to %2$.20hs which does " ++"The %1$s in the search dialogue contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + +diff --git a/po/fr.po b/po/fr.po +index 26e446b38..d130f89bc 100644 +--- a/po/fr.po ++++ b/po/fr.po +@@ -291,7 +291,7 @@ msgstr "chaîne %1$.30s pour %2$.30s" + #. GT: $4 is the changed flag ('*' for the changed items) + #, c-format + msgid "%1$.80s at %2$d from %3$.90s%4$s" +-msgstr "%1$.80s à %2$d de %3$.90hs%4$s" ++msgstr "%1$.80s à %2$d de %3$.90s%4$s" + + #. GT: This is the title for a window showing a bitmap character + #. GT: It will look something like: +@@ -302,7 +302,7 @@ msgstr "%1$.80s à %2$d de %3$.90hs%4$s" + #. GT: $4 is the font name + #, c-format + msgid "%1$.80s at %2$d size %3$d from %4$.80s" +-msgstr "%1$.80s (%2$d) taille %3$d de %4$.80hs" ++msgstr "%1$.80s (%2$d) taille %3$d de %4$.80s" + + #, c-format + msgid "%1$s from lookup subtable %2$.50s" +@@ -7433,7 +7433,7 @@ msgid "" + "Reverting the file will lose those changes.\n" + "Is that what you want?" + msgstr "" +-"La fonte %1$.40s dans le fichier %2$.40hs a été modifiée.\n" ++"La fonte %1$.40s dans le fichier %2$.40s a été modifiée.\n" + "Revenir vous fera perdre toutes les modifications.\n" + "Voulez vous vraiment revenir ?" + +@@ -19077,11 +19077,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20hs qui " ++"Dans %1$s du dialogue de recherche il y a une référence vers %2$.20s qui " + "n'existe pas dans la nouvelle fonte.\n" + "Faut-il supprimer la référence ?" + +@@ -19925,7 +19925,7 @@ msgid "" + "The fonts %1$.30s and %2$.30s have a different number of glyphs or different " + "encodings" + msgstr "" +-"Les fontes %1$.30s et %2$.30hs n'ont pas le même nombre de glyphes ou des " ++"Les fontes %1$.30s et %2$.30s n'ont pas le même nombre de glyphes ou des " + "codages différents" + + #, c-format +@@ -19933,7 +19933,7 @@ msgid "" + "The fonts %1$.30s and %2$.30s use different types of splines (one quadratic, " + "one cubic)" + msgstr "" +-"Les fontes %1$.30s et %2$.30hs utilisent des courbes de Bézier d'ordres " ++"Les fontes %1$.30s et %2$.30s utilisent des courbes de Bézier d'ordres " + "différents (quadratique et cubique)" + + msgid "The generated font won't work with ATM" +@@ -19968,8 +19968,8 @@ msgid "" + "The glyph %1$.30s in font %2$.30s has a different hint mask on its contours " + "than in %3$.30s" + msgstr "" +-"Le glyphe %1$.30s dans la police %2$.30hs a un masque de hints différent que " +-"dans %3$.30hs" ++"Le glyphe %1$.30s dans la police %2$.30s a un masque de hints différent que " ++"dans %3$.30s" + + #, c-format + msgid "" +@@ -19984,8 +19984,8 @@ msgid "" + "The glyph %1$.30s in font %2$.30s has a different number of references than " + "in %3$.30s" + msgstr "" +-"Le glyphe %1$.30s de la fonte %2$.30hs a un nombre de références différent " +-"dans %3$.30hs" ++"Le glyphe %1$.30s de la fonte %2$.30s a un nombre de références différent " ++"dans %3$.30s" + + #, c-format + msgid "" +@@ -20457,7 +20457,7 @@ msgstr "" + #, c-format + msgid "The outlines of glyph %2$.30s were not found in the font %1$.60s" + msgstr "" +-"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60hs" ++"Le contours du glyphe %2$.30s n'ont pas été trouvés dans la police %1$.60s" + + msgid "The paths that make up this glyph intersect one another" + msgstr "Les chemins qui composent ce glyphe se coupent les uns les autres" +@@ -21042,7 +21042,7 @@ msgstr "Il y a déjà une sous-table avec ce nom, changez de nom SVP" + + #, c-format + msgid "There is already an anchor point named %1$.40s in %2$.40s." +-msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40hs." ++msgstr "Il y a déjà une ancre appelée %1$.40s dans %2$.40s." + + msgid "There is another glyph in the font with this name" + msgstr "Il y a un autre glyphe dans la fonte avec ce nom" +@@ -21441,8 +21441,8 @@ msgid "" + "been able to find is %1$.20s-%2$.20s-%4$d.\n" + "Shall I use that or let you search?" + msgstr "" +-"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20hs-%3$d, mais " +-"ce que j'ai trouvé de mieux c'est %1$.20hs-%2$.20hs-%4$d.\n" ++"Cette fonte est basée sur le jeu de caractères %1$.20s-%2$.20s-%3$d, mais " ++"ce que j'ai trouvé de mieux c'est %1$.20s-%2$.20s-%4$d.\n" + "Devrais-je utiliser cette valeur ou préférez vous chercher ?" + + msgid "" +@@ -21770,7 +21770,7 @@ msgid "" + "with a 0 offset for this combination. Would you like to alter this kerning " + "class entry (or create a kerning pair for just these two glyphs)?" + msgstr "" +-"Cette paire de crénage (%.20s et %.20hs) est dans une classe de crénage\n" ++"Cette paire de crénage (%.20s et %.20s) est dans une classe de crénage\n" + "avec un déplacement de 0 pour cette combinaison. Voulez-vous modifier cette " + "partie\n" + "de la classe de crénage (ou créer une nouvelle paire rien que pour ces 2 " +@@ -24551,8 +24551,8 @@ msgid "" + "referred to.\n" + "It will not be copied." + msgstr "" +-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" +-"Mais %1$hs n'existe pas dans cette fonte, et FontForge ne trouve pas le " ++"Vous essayer de coller une référence vers %1$s dans %2$s.\n" ++"Mais %1$s n'existe pas dans cette fonte, et FontForge ne trouve pas le " + "glyphe auquel il se référait.\n" + "Le glyphe ne sera pas copié." + +@@ -24562,8 +24562,8 @@ msgid "" + "But %1$s does not exist in this font.\n" + "Would you like to copy the original splines (or delete the reference)?" + msgstr "" +-"Vous essayer de coller une référence vers %1$s dans %2$hs.\n" +-"Mais %1$hs n'existe pas dans cette fonte.\n" ++"Vous essayer de coller une référence vers %1$s dans %2$s.\n" ++"Mais %1$s n'existe pas dans cette fonte.\n" + "Voulez vous copier le contour d'origine (ou supprimer la référence)?" + + msgid "" +diff --git a/po/hr.po b/po/hr.po +index d261d4ca7..ac41b9250 100644 +--- a/po/hr.po ++++ b/po/hr.po +@@ -20156,11 +20156,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20hs koja ne " ++"%1$s u dijaloškom okviru traženja sadrži referencu na %2$.20s koja ne " + "postoji u fontu.\n" + "Želiš li dozvoliti uklanjanje reference?" + +diff --git a/po/it.po b/po/it.po +index e13711485..d0c3ea987 100644 +--- a/po/it.po ++++ b/po/it.po +@@ -2303,7 +2303,7 @@ msgid "" + "Reverting the file will lose those changes.\n" + "Is that what you want?" + msgstr "" +-"Il font %1$.40s nel file %2$.40hs è stato modificato.\n" ++"Il font %1$.40s nel file %2$.40s è stato modificato.\n" + "Ripristinando il file perderai tutte le modifiche.\n" + "È quello che vuoi fare?" + +@@ -5835,7 +5835,7 @@ msgid "" + "The glyph %1$.30s has a different number of contours in font %2$.30s than in " + "%3$.30s" + msgstr "" +-"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30hs rispetto " ++"Il glifo %1$.30s ha un diverso numero di contorni nel font %2$.30s rispetto " + "a %3$.30s" + + #, c-format +@@ -6235,8 +6235,8 @@ msgid "" + "been able to find is %1$.20s-%2$.20s-%4$d.\n" + "Shall I use that or let you search?" + msgstr "" +-"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20hs-%3$d, ma " +-"il migliore che io abbia trovato è %1$.20hs-%2$.20hs-%4$d.\n" ++"Questo font è basato sulla codifica di caratteri %1$.20s-%2$.20s-%3$d, ma " ++"il migliore che io abbia trovato è %1$.20s-%2$.20s-%4$d.\n" + "Devo usare questo valore o preferisci cercare tu stesso?" + + msgid "" +diff --git a/po/ja.po b/po/ja.po +index ed9f5a645..206ae82d1 100644 +--- a/po/ja.po ++++ b/po/ja.po +@@ -11458,11 +11458,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s には, 新しいフォントには含まれないグリフ %2$.20hs への参照が含まれていま" ++"%1$s には, 新しいフォントには含まれないグリフ %2$.20s への参照が含まれていま" + "す.\n" + "参照を削除しますか?" + +diff --git a/po/ko.po b/po/ko.po +index 971b4db03..4d5c8d40d 100644 +--- a/po/ko.po ++++ b/po/ko.po +@@ -20920,11 +20920,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20hs에 대한 참조가 포함되어 있" ++"검색 대화 상자의 %1$s에는 새 글꼴에 없는 %2$.20s에 대한 참조가 포함되어 있" + "다.\n" + "참조를 제거해야 하는가?" + +diff --git a/po/pl.po b/po/pl.po +index 2bbbf00be..c1fd5a454 100644 +--- a/po/pl.po ++++ b/po/pl.po +@@ -19552,11 +19552,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20hs, który nie " ++"%1$s w okienku wyszukiwania zawiera odwołanie do %2$.20s, który nie " + "istnieje w nowym foncie.\n" + "Czy usunąć to odwołanie?" + +diff --git a/po/uk.po b/po/uk.po +index e3768acc3..3302a1005 100644 +--- a/po/uk.po ++++ b/po/uk.po +@@ -19860,11 +19860,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"%1$s у діалоговому вікні пошуку містить посилання на %2$.20hs, якого не " ++"%1$s у діалоговому вікні пошуку містить посилання на %2$.20s, якого не " + "існує у новому шрифті.\n" + "Вилучити це посилання?" + +diff --git a/po/vi.po b/po/vi.po +index 6aee8bb3f..f5eb739e6 100644 +--- a/po/vi.po ++++ b/po/vi.po +@@ -17109,11 +17109,11 @@ msgstr "" + + #, c-format + msgid "" +-"The %1$s in the search dialog contains a reference to %2$.20hs which does " ++"The %1$s in the search dialog contains a reference to %2$.20s which does " + "not exist in the new font.\n" + "Should I remove the reference?" + msgstr "" +-"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20hs mà không tồn " ++"Trong hộp thoại tìm kiếm, %1$s chứa một tham chiếu đến %2$.20s mà không tồn " + "tại trong phông mới.\n" + "Bạn có muốn gỡ bỏ tham chiếu này không?" + +-- +2.42.0 + diff --git a/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch b/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch index dd799e7485..573866eb15 100644 --- a/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch +++ b/meta-oe/recipes-graphics/fontforge/fontforge/0001-cmake-Use-alternate-way-to-detect-libm.patch @@ -1,4 +1,4 @@ -From 6d3c48d1b01943a467928235c3affbab463c25ab Mon Sep 17 00:00:00 2001 +From 644c3380f75b20a11755e7052aa632887f3eee2b Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Thu, 7 Jul 2022 12:32:47 -0700 Subject: [PATCH] cmake: Use alternate way to detect libm @@ -8,17 +8,20 @@ when libm is folded into libc starting glibc 2.35+ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> + --- CMakeLists.txt | 7 ++++++- contrib/fonttools/CMakeLists.txt | 2 +- fontforge/CMakeLists.txt | 2 +- - fontforgeexe/CMakeLists.txt | 4 ++-- - 4 files changed, 10 insertions(+), 5 deletions(-) + fontforgeexe/CMakeLists.txt | 2 +- + 4 files changed, 9 insertions(+), 4 deletions(-) +diff --git a/CMakeLists.txt b/CMakeLists.txt +index e234cb6e9..284ba2d20 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -111,9 +111,14 @@ find_package_with_target(Intl REQUIRED) - find_package(GLIB 2.6 REQUIRED COMPONENTS gio gobject) +@@ -115,9 +115,14 @@ else() + endif() find_package(Iconv REQUIRED) find_package(LibXml2 REQUIRED) -find_package(MathLib REQUIRED) @@ -33,9 +36,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> check_include_file(pthread.h HAVE_PTHREAD_H) if(HAVE_PTHREAD_H) find_package(Threads) +diff --git a/contrib/fonttools/CMakeLists.txt b/contrib/fonttools/CMakeLists.txt +index d6c698877..1608af152 100644 --- a/contrib/fonttools/CMakeLists.txt +++ b/contrib/fonttools/CMakeLists.txt -@@ -15,6 +15,6 @@ add_executable(woff woff.c) +@@ -15,7 +15,7 @@ add_executable(woff woff.c) target_link_libraries(acorn2sfd PRIVATE fontforge) target_link_libraries(dewoff PRIVATE ZLIB::ZLIB) @@ -43,6 +48,9 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> +target_link_libraries(pcl2ttf PRIVATE ${EXTRA_LIBS}) target_link_libraries(ttf2eps PRIVATE fontforge) target_link_libraries(woff PRIVATE ZLIB::ZLIB) + +diff --git a/fontforge/CMakeLists.txt b/fontforge/CMakeLists.txt +index 9a052f360..067ef40df 100644 --- a/fontforge/CMakeLists.txt +++ b/fontforge/CMakeLists.txt @@ -237,7 +237,7 @@ target_link_libraries(fontforge @@ -54,9 +62,11 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> Iconv::Iconv ZLIB::ZLIB ) +diff --git a/fontforgeexe/CMakeLists.txt b/fontforgeexe/CMakeLists.txt +index e2982c39d..8829993ea 100644 --- a/fontforgeexe/CMakeLists.txt +++ b/fontforgeexe/CMakeLists.txt -@@ -110,7 +110,7 @@ if(ENABLE_PYTHON_SCRIPTING_RESULT) +@@ -121,7 +121,7 @@ if(ENABLE_PYTHON_SCRIPTING_RESULT) target_link_libraries(fontforgeexe PRIVATE Python3::Python) endif() diff --git a/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb index c53f2db01b..31dd495fd7 100644 --- a/meta-oe/recipes-graphics/fontforge/fontforge_20220308.bb +++ b/meta-oe/recipes-graphics/fontforge/fontforge_20230101.bb @@ -9,20 +9,23 @@ LIC_FILES_CHKSUM = " \ DEPENDS = "python3 glib-2.0 pango giflib tiff libxml2 jpeg libtool uthash gettext-native libspiro" DEPENDS:append:class-target = " libxi" -inherit cmake pkgconfig python3native features_check gettext gtk-icon-cache mime mime-xdg +inherit cmake pkgconfig python3native python3targetconfig features_check gettext gtk-icon-cache mime mime-xdg REQUIRED_DISTRO_FEATURES:append:class-target = " x11" # tag 20220308 -SRCREV = "582bd41a9bf04326300fc02a677fe3610d6d3ccd" +SRCREV = "a1dad3e81da03d5d5f3c4c1c1b9b5ca5ebcfcecf" SRC_URI = "git://github.com/${BPN}/${BPN}.git;branch=master;protocol=https \ file://0001-include-sys-select-on-non-glibc-platforms.patch \ file://0001-fontforgeexe-Use-env-to-find-fontforge.patch \ file://0001-cmake-Use-alternate-way-to-detect-libm.patch \ + file://0001-Fix-Translations-containing-invalid-directives-hs.patch \ " S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DENABLE_DOCS=OFF" +PACKAGECONFIG = "readline" +PACKAGECONFIG[readline] = "-DENABLE_READLINE=ON,-DENABLE_READLINE=OFF,readline" CFLAGS += "-fno-strict-aliasing" LDFLAGS += "-lpython${PYTHON_BASEVERSION}${PYTHON_ABI}" diff --git a/meta-oe/recipes-graphics/fontforge/libspiro_20200505.bb b/meta-oe/recipes-graphics/fontforge/libspiro_20240903.bb index c885a00c5b..7e07906e17 100644 --- a/meta-oe/recipes-graphics/fontforge/libspiro_20200505.bb +++ b/meta-oe/recipes-graphics/fontforge/libspiro_20240903.bb @@ -6,8 +6,11 @@ HOMEPAGE = "https://github.com/fontforge/libspiro" LICENSE = "GPL-3.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" -SRC_URI = "https://github.com/fontforge/libspiro/releases/download/20200505/libspiro-dist-20200505.tar.gz" -SRC_URI[sha256sum] = "06c69a1e8dcbcabcf009fd96fd90b1a244d0257246e376c2c4d57c4ea4af0e49" +SRC_URI = "https://github.com/fontforge/libspiro/releases/download/${PV}/libspiro-dist-${PV}.tar.gz" +SRC_URI[sha256sum] = "1412a21b943c6e1db834ee2d74145aad20b3f62b12152d475613b8241d9cde10" + +UPSTREAM_CHECK_URI = "https://github.com/fontforge/libspiro/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+)" inherit autotools diff --git a/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb b/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb deleted file mode 100644 index 6ef9f74c70..0000000000 --- a/meta-oe/recipes-graphics/freeglut/freeglut_3.2.1.bb +++ /dev/null @@ -1,20 +0,0 @@ -DESCRIPTION = "FreeGLUT is a free-software/open-source alternative to the OpenGL \ - Utility Toolkit (GLUT) library" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb" - -SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz" -SRC_URI[md5sum] = "cd5c670c1086358598a6d4a9d166949d" -SRC_URI[sha256sum] = "d4000e02102acaf259998c870e25214739d1f16f67f99cb35e4f46841399da68" - -inherit cmake features_check - -# depends on virtual/libx11, virtual/libgl -REQUIRED_DISTRO_FEATURES = "x11 opengl" - -# Do not use -fno-common, check back when upgrading to new version it might not be needed -CFLAGS += "-fcommon" - -PROVIDES += "mesa-glut" - -DEPENDS = "virtual/libx11 libxmu libxi virtual/libgl libglu libxrandr" diff --git a/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb b/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb new file mode 100644 index 0000000000..2cd00b0349 --- /dev/null +++ b/meta-oe/recipes-graphics/freeglut/freeglut_3.4.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "FreeGLUT is a free-software/open-source alternative to the OpenGL \ + Utility Toolkit (GLUT) library" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=89c0b58a3e01ce3d8254c9f59e78adfb" + +SRC_URI = "https://sourceforge.net/projects/${BPN}/files/${BPN}/${PV}/${BPN}-${PV}.tar.gz" +SRC_URI[sha256sum] = "3c0bcb915d9b180a97edaebd011b7a1de54583a838644dcd42bb0ea0c6f3eaec" + +inherit cmake features_check pkgconfig + +# depends on virtual/libgl and libxi +REQUIRED_DISTRO_FEATURES = "opengl x11" + +PACKAGECONFIG ?= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland x11', d)}" +PACKAGECONFIG[gles] = "-DFREEGLUT_GLES=ON,-DFREEGLUT_GLES=OFF," +PACKAGECONFIG[wayland] = "-DFREEGLUT_WAYLAND=ON,-DFREEGLUT_WAYLAND=OFF,libxkbcommon" +PACKAGECONFIG[demos] = "-DFREEGLUT_BUILD_DEMOS=ON,-DFREEGLUT_BUILD_DEMOS=OFF," +PACKAGECONFIG[x11] = ",,virtual/libx11 libice libxmu libglu libxrandr libxext" +# Add -Wno-implicit-function-declaration since it might be otherwise treated at +# error by clang16+ and this is not really a problem +CFLAGS += "-Wno-implicit-function-declaration" + +PROVIDES += "mesa-glut" + +DEPENDS = "virtual/libgl libxi" + +do_install:append() { + # Remove buildpaths + sed -i "s#${RECIPE_SYSROOT}##g" ${D}${libdir}/cmake/FreeGLUT/FreeGLUTTargets.cmake +} diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch deleted file mode 100644 index 385bff8dd1..0000000000 --- a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch +++ /dev/null @@ -1,38 +0,0 @@ -From e3bce98a60d6db3b719bbf5d71f732f9b86cb566 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 9 Feb 2019 08:28:09 -0800 -Subject: [PATCH] Explicit typecast to avoid implicit double to float - conversion - -fixes compile errors e.g. - -../../ftgl-2.1.3~rc5/demo/simple.cpp:110:27: error: non-constant-expression cannot be narrowed from type 'double' to - 'float' in initializer list [-Wc++11-narrowing] - (t3 + 2.0) / 3, 0.3 }; - ^~~~~~~~~~~~~~ -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - demo/simple.cpp | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/demo/simple.cpp b/demo/simple.cpp -index 532e862..aba55b4 100644 ---- a/demo/simple.cpp -+++ b/demo/simple.cpp -@@ -105,9 +105,9 @@ static void RenderScene(void) - float t2 = sin(n / 50 + 1); - float t3 = sin(n / 30 + 2); - -- float ambient[4] = { (t1 + 2.0) / 3, -- (t2 + 2.0) / 3, -- (t3 + 2.0) / 3, 0.3 }; -+ float ambient[4] = { float(t1 + 2.0) / 3, -+ float(t2 + 2.0) / 3, -+ float(t3 + 2.0) / 3, 0.3 }; - float diffuse[4] = { 1.0, 0.9, 0.9, 1.0 }; - float specular[4] = { 1.0, 0.7, 0.7, 1.0 }; - float position[4] = { 100.0, 100.0, 0.0, 1.0 }; --- -2.20.1 - diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch new file mode 100644 index 0000000000..9c91b5be19 --- /dev/null +++ b/meta-oe/recipes-graphics/ftgl/ftgl/0001-Fix-type-mismatch-with-latest-FreeType.patch @@ -0,0 +1,33 @@ +From d11219b681a080c71e33c51c9404c28b134e1745 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 21 Aug 2024 13:50:34 -0700 +Subject: [PATCH] Fix type mismatch with latest FreeType + +This change is intrumented due to a type change in freetype [1] with release 2.13.3 + +Fixes +| ../../git/src/FTVectoriser.cpp:171:15: error: cannot initialize a variable of type 'char *' with an rvalue of type 'unsigned char *' +| 171 | char* tagList = &outline.tags[startIndex]; +| | ^ ~~~~~~~~~~~~~~~~~~~~~~~~~ + +[1] https://gitlab.freedesktop.org/freetype/freetype/-/commit/044d142be7b6a93b6940367a1bc5847451ff4775 + +Upstream-Status: Submitted [https://github.com/HamzaM3/ftgl/pull/1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/FTVectoriser.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/FTVectoriser.cpp b/src/FTVectoriser.cpp +index 26e7da8..3610215 100644 +--- a/src/FTVectoriser.cpp ++++ b/src/FTVectoriser.cpp +@@ -168,7 +168,7 @@ void FTVectoriser::ProcessContours() + for(int i = 0; i < ftContourCount; ++i) + { + FT_Vector* pointList = &outline.points[startIndex]; +- char* tagList = &outline.tags[startIndex]; ++ char* tagList = (char*)&outline.tags[startIndex]; + + endIndex = outline.contours[i]; + contourLength = (endIndex - startIndex) + 1; diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch deleted file mode 100644 index cf03cd0f29..0000000000 --- a/meta-oe/recipes-graphics/ftgl/ftgl/0001-use-pkg-config-to-find-freetype2.patch +++ /dev/null @@ -1,38 +0,0 @@ -From 8bb183926078b6dd54048fb6820838fe7b6e6163 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 23 Oct 2016 22:46:43 +0200 -Subject: [PATCH] use pkg-config to find freetype2 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: inappropriate [OE specific] - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - configure.ac | 9 +++++++-- - 1 file changed, 7 insertions(+), 2 deletions(-) - -diff --git a/configure.ac b/configure.ac -index 53560ea..b5bb6a3 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -41,8 +41,13 @@ AC_CHECK_FUNCS(strndup) - - AC_PATH_X - --AC_CHECK_FT2([9.0.3],[], -- [AC_MSG_ERROR([FreeType2 is required to compile this library])]) -+PKG_CHECK_MODULES(FT2, freetype2, -+ CFLAGS="$CFLAGS $FT2_CFLAGS" -+ LIBS="$LIBS $FT2_LIBS", -+ AC_MSG_ERROR([FreeType2 is required to compile this library]) -+) -+AC_SUBST([FT2_CFLAGS]) -+AC_SUBST([FT2_LIBS]) - - AC_PATH_XTRA - --- -2.5.5 - diff --git a/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch b/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch deleted file mode 100644 index 830783e204..0000000000 --- a/meta-oe/recipes-graphics/ftgl/ftgl/0002-Makefile.am-remove-useless-and-breaking-code.patch +++ /dev/null @@ -1,38 +0,0 @@ -From daabb4110661c4358ec73293d5c0b2106f567c1f Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@googlemail.com> -Date: Sun, 23 Oct 2016 23:54:14 +0200 -Subject: [PATCH] Makefile.am: remove useless and breaking code -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Pending - -Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> ---- - Makefile.am | 9 --------- - 1 file changed, 9 deletions(-) - -diff --git a/Makefile.am b/Makefile.am -index 89a8a7f..e582a34 100644 ---- a/Makefile.am -+++ b/Makefile.am -@@ -24,15 +24,6 @@ EXTRA_DIST = \ - m4 \ - $(NULL) - --# Print out an informative summary. --all-local: -- @$(ECHO) "Done." -- @$(ECHO) -- @if test "x$(MAKECMDGOALS)" = "xall-am" -o "x$(.TARGETS)" = "xall-am" -o "x$(MAKECMDGOALS)" = "x" -o "x$(.TARGETS)" = "x" ; then \ -- $(ECHO) "---" ;\ -- $(ECHO) "Run 'make install' to begin installation into $(prefix)" ;\ -- fi -- @$(ECHO) - - # Upload documentation - DOC = docs/html docs/latex/ftgl.pdf --- -2.5.5 - diff --git a/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb b/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb deleted file mode 100644 index 65f72747cc..0000000000 --- a/meta-oe/recipes-graphics/ftgl/ftgl_2.1.3-rc5.bb +++ /dev/null @@ -1,27 +0,0 @@ -SUMMARY = "OpenGL frontend to Freetype 2" -HOMEPAGE = "https://sourceforge.net/projects/ftgl/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" - -inherit autotools pkgconfig features_check - -REQUIRED_DISTRO_FEATURES = "opengl x11" - -DEPENDS += " \ - freetype \ - freeglut \ -" - -SRC_URI = " \ - ${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2 \ - file://0001-use-pkg-config-to-find-freetype2.patch \ - file://0002-Makefile.am-remove-useless-and-breaking-code.patch \ - file://0001-Explicit-typecast-to-avoid-implicit-double-to-float-.patch \ -" -SRC_URI[md5sum] = "c7879018cde844059495b3029b0b6503" -SRC_URI[sha256sum] = "521ff7bd62c459ff5372e269c223e2a6107a6a99a36afdc2ae634a973af70c59" - -S = "${WORKDIR}/ftgl-2.1.3~rc5" - -# undefined reference to symbol 'sin@@GLIBC_2.4' -CFLAGS += "-lm" diff --git a/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb b/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb new file mode 100644 index 0000000000..4db453bc66 --- /dev/null +++ b/meta-oe/recipes-graphics/ftgl/ftgl_2.4.0.bb @@ -0,0 +1,20 @@ +SUMMARY = "OpenGL frontend to Freetype 2" +HOMEPAGE = "https://sourceforge.net/projects/ftgl/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=527a83e92c7bf363025380eec05df6e4" + +inherit autotools pkgconfig features_check + +REQUIRED_DISTRO_FEATURES = "opengl x11" + +DEPENDS += " \ + freetype \ + freeglut \ +" +SRCREV = "b787042cc1d1e4861337d5f9a6727e4c6900a4f2" +PV .= "+git" + +SRC_URI = "git://github.com/HamzaM3/ftgl;protocol=https;branch=master \ + file://0001-Fix-type-mismatch-with-latest-FreeType.patch" + +S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch index 50003e3318..4886248233 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0001-Fix-compilation-for-disabled-gnome.patch @@ -10,7 +10,7 @@ COMPAT_OLD_KEYSYMDEF is a check for a legacy system, which our system most definitely is not. It is accomplished by trying to execute a program, which does not work when cross compiling. -Upstream-Status: inappropriate [OE specific] +Upstream-Status: Inappropriate [OE specific] Signed-off-by: Jarmo Jaakkola <jarmo.jaakkola@vincit.fi> Signed-off-by: Riku Hämäläinen <riku.hamalainen@ge.com> Signed-off-by: Sebastian Reichel <sebastian.reichel@collabora.co.uk> diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch new file mode 100644 index 0000000000..356bd73f88 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0001-configure-Do-not-require-support-for-implicit-ints.patch @@ -0,0 +1,45 @@ +From cbba378a23410241176d62f3bb43965c044615e3 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Thu, 24 Nov 2022 13:06:50 +0100 +Subject: [PATCH 1/3] configure: Do not require support for implicit ints + +Implicit ints have not been part of C since 1999, and future +compilers will disable support for them by default. Fortunatenly, +only one configure check needs adjusting. + +Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + acinclude.m4 | 2 +- + configure.ac | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) + +diff --git a/acinclude.m4 b/acinclude.m4 +index 8b74ff1e..b66042f9 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -30,7 +30,7 @@ if test "$ac_cv_func_select" = yes; then + #ifdef HAVE_SYS_SOCKET_H + #include <sys/socket.h> + #endif], +-[extern select ($ac_cv_type_fd_set_size_t, ++[extern int select ($ac_cv_type_fd_set_size_t, + $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, $ac_cv_type_fd_set *, + $ac_type_timeval *);], + [ac_found=yes ; break 3],ac_found=no) +diff --git a/configure.ac b/configure.ac +index 97ab9e7a..c9fcede6 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -220,7 +220,7 @@ AC_MINIX + + # catch -Werror and similar options when running configure + AC_TRY_COMPILE([#include <stdio.h>], +-[int i; static j; int *p; char *c; ++[int i; int *p; char *c; + switch (*p = p = *c) { case 0: printf("%Q", c, p); } + *c = &i; c = p; + while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); +-- +2.45.0 + diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch new file mode 100644 index 0000000000..50ecb20c72 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch @@ -0,0 +1,32 @@ +From 51287fb60263530f61b14df5519e10dabe67d2ad Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Thu, 24 Nov 2022 13:07:56 +0100 +Subject: [PATCH 2/3] acinclude.m4: Add missing <unistd.h> to + AM_SAFETY_CHECK_MKSTEMP + +Otherwise, the check fails on a compiler which does not support +implicit function declarations (a language feature removed in 1999). + +Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + acinclude.m4 | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/acinclude.m4 b/acinclude.m4 +index b66042f9..4dee2abe 100644 +--- a/acinclude.m4 ++++ b/acinclude.m4 +@@ -1154,6 +1154,9 @@ AC_DEFUN([AM_SAFETY_CHECK_MKSTEMP],[ + #include <stdio.h> + #include <stdlib.h> + #include <string.h> ++#ifdef HAVE_UNISTD_H ++#include <unistd.h> ++#endif + int main(void) + { + char template[128]; +-- +2.45.0 + diff --git a/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch b/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch new file mode 100644 index 0000000000..e9d780ddc6 --- /dev/null +++ b/meta-oe/recipes-graphics/fvwm/fvwm/0003-configure-Further-defang-the-Werror-check.patch @@ -0,0 +1,35 @@ +From 542c6f25327587d5a6bffb8a45b457ec85dcf8e1 Mon Sep 17 00:00:00 2001 +From: Florian Weimer <fweimer@redhat.com> +Date: Tue, 19 Dec 2023 13:24:50 +0100 +Subject: [PATCH 3/3] configure: Further defang the -Werror check + +Incompatible pointer types are actually errors (in the sense +that they are invalid C). Compilers have merely tolerated them as +warnings for backwards compatibility. This is changing with Clang 16 +and GCC 14, so relax the check a little. + +Upstream-Status: Submitted [https://github.com/fvwmorg/fvwm/pull/100] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index c9fcede6..2e9615b2 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -220,9 +220,8 @@ AC_MINIX + + # catch -Werror and similar options when running configure + AC_TRY_COMPILE([#include <stdio.h>], +-[int i; int *p; char *c; +- switch (*p = p = *c) { case 0: printf("%Q", c, p); } +- *c = &i; c = p; ++[int unused; int *p; char *c; ++ printf("%Q", c, p); + while (1 || (unsigned int)3 >= 0 || ((int)-1) == ((unsigned int)1)); + ], , AC_MSG_ERROR(" + configure is not able to compile programs with warnings. Please +-- +2.45.0 + diff --git a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb index 75b24bf88b..fcf1bd9cae 100644 --- a/meta-oe/recipes-graphics/fvwm/fvwm_2.6.9.bb +++ b/meta-oe/recipes-graphics/fvwm/fvwm_2.7.0.bb @@ -34,9 +34,12 @@ DEPENDS = " \ SRC_URI = " \ git://github.com/fvwmorg/fvwm.git;protocol=https;branch=master \ file://0001-Fix-compilation-for-disabled-gnome.patch \ + file://0001-configure-Do-not-require-support-for-implicit-ints.patch \ + file://0002-acinclude.m4-Add-missing-unistd.h-to-AM_SAFETY_CHECK.patch \ + file://0003-configure-Further-defang-the-Werror-check.patch \ " -SRCREV = "88eab6dc16da6e5dd25fe97fbb56b96ef0d58657" +SRCREV = "7baf540e56fb1a3e91752acba872a88543529d46" S = "${WORKDIR}/git" @@ -69,12 +72,16 @@ EXTRA_OECONF = " \ --without-xpm-library \ ac_cv_func_mkstemp=no \ has_safety_mkstemp=yes \ + ac_cv_path_FVWM_CPP=cpp \ + ac_cv_path_PERL=perl \ " # show the exact commands in the log file EXTRA_OEMAKE = " \ V=1 \ " +# clang treats them as errors by default now starting with 15.0+ +CFLAGS += "-Wno-error=int-conversion -Wno-error=implicit-int" do_install:append() { install -d -m 0755 ${D}/${sysconfdir}/xdg/fvwm @@ -85,6 +92,7 @@ do_install:append() { sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${bindir}/fvwm-* sed -i -e 's:${STAGING_BINDIR_NATIVE}/perl-native/perl:${USRBINPATH}/env perl:g' ${D}${libexecdir}/fvwm/*/Fvwm* sed -i -e 's:${STAGING_BINDIR_NATIVE}/python3-native/python3:${USRBINPATH}/env python3:g' ${D}${bindir}/fvwm-menu-desktop + sed -i -e 's:${WORKDIR}::g' ${D}${bindir}/fvwm-bug } # the only needed packages (note: locale packages are automatically generated diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch b/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch new file mode 100644 index 0000000000..dee2749898 --- /dev/null +++ b/meta-oe/recipes-graphics/glm/glm/0001-Do-not-use-Werror-with-clang.patch @@ -0,0 +1,32 @@ +From ee405855bca7d6399ff1a1aef952010056c84ff6 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 1 Mar 2023 21:08:09 -0800 +Subject: [PATCH] Do not use -Werror with clang + +Too many warnings to handle for a distro build + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- +Upstream-Status: Pending + + test/CMakeLists.txt | 4 ---- + 1 file changed, 4 deletions(-) + +diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt +index e7f85f19..0b6fd980 100644 +--- a/test/CMakeLists.txt ++++ b/test/CMakeLists.txt +@@ -197,10 +197,6 @@ if(CMAKE_CXX_COMPILER_ID MATCHES "Clang") + message("GLM: Clang - ${CMAKE_CXX_COMPILER_ID} compiler") + endif() + +- add_compile_options(-Werror -Weverything) +- add_compile_options(-Wno-c++98-compat -Wno-c++98-compat-pedantic -Wno-c++11-long-long -Wno-padded -Wno-gnu-anonymous-struct -Wno-nested-anon-types) +- add_compile_options(-Wno-undefined-reinterpret-cast -Wno-sign-conversion -Wno-unused-variable -Wno-missing-prototypes -Wno-unreachable-code -Wno-missing-variable-declarations -Wno-sign-compare -Wno-global-constructors -Wno-unused-macros -Wno-format-nonliteral) +- + elseif(CMAKE_CXX_COMPILER_ID MATCHES "GNU") + if(NOT GLM_QUIET) + message("GLM: GCC - ${CMAKE_CXX_COMPILER_ID} compiler") +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch index 3a62fffe3a..10692dd423 100644 --- a/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch +++ b/meta-oe/recipes-graphics/glm/glm/0001-Silence-clang-warnings.patch @@ -26,8 +26,6 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> test/gtx/gtx_fast_trigonometry.cpp | 30 ++++++++++++------------------ 3 files changed, 14 insertions(+), 20 deletions(-) -diff --git a/glm/ext/quaternion_common.inl b/glm/ext/quaternion_common.inl -index 0e4a3bb2..6f99f52d 100644 --- a/glm/ext/quaternion_common.inl +++ b/glm/ext/quaternion_common.inl @@ -104,7 +104,7 @@ namespace glm @@ -39,21 +37,6 @@ index 0e4a3bb2..6f99f52d 100644 return (sin(angle - a * phi)* x + sin(a * phi) * z) / sin(angle); } } -diff --git a/glm/gtc/random.inl b/glm/gtc/random.inl -index 70485098..a4af2a06 100644 ---- a/glm/gtc/random.inl -+++ b/glm/gtc/random.inl -@@ -22,7 +22,7 @@ namespace detail - GLM_FUNC_QUALIFIER static vec<1, uint8, P> call() - { - return vec<1, uint8, P>( -- std::rand() % std::numeric_limits<uint8>::max()); -+ static_cast<uint8>(std::rand()) % std::numeric_limits<uint8>::max()); - } - }; - -diff --git a/test/gtx/gtx_fast_trigonometry.cpp b/test/gtx/gtx_fast_trigonometry.cpp -index 8bf86ba0..ddaa708b 100644 --- a/test/gtx/gtx_fast_trigonometry.cpp +++ b/test/gtx/gtx_fast_trigonometry.cpp @@ -19,15 +19,14 @@ namespace fastCos @@ -160,6 +143,3 @@ index 8bf86ba0..ddaa708b 100644 const std::clock_t timestamp3 = std::clock(); const std::clock_t time_fast = timestamp2 - timestamp1; const std::clock_t time_default = timestamp3 - timestamp2; --- -2.31.1 - diff --git a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb index 71a005a564..e313d7a192 100644 --- a/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb +++ b/meta-oe/recipes-graphics/glm/glm_0.9.9.8.bb @@ -11,12 +11,14 @@ LIC_FILES_CHKSUM = "file://copying.txt;md5=462e4b97f73ef12f8171c3c546ce4e8d" SRC_URI = " \ git://github.com/g-truc/glm;branch=master;protocol=https \ file://0001-Silence-clang-warnings.patch \ + file://0001-Do-not-use-Werror-with-clang.patch \ file://glmConfig.cmake.in \ file://glmConfigVersion.cmake.in \ file://glm.pc.in \ file://glmTargets.cmake \ " -SRCREV = "bf71a834948186f4097caa076cd2663c69a10e1e" +SRCREV = "efec5db081e3aad807d0731e172ac597f6a39447" +PV .= "+0.9.9.9+git" S = "${WORKDIR}/git" @@ -27,10 +29,10 @@ do_install() { cp -R --no-dereference --preserve=mode,links ${S}/glm ${D}${includedir} cp -R --no-dereference --preserve=mode,links ${S}/doc ${D}${docdir}/glm rm ${D}${includedir}/glm/CMakeLists.txt - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake - sed "s/@VERSION@/${PV}/" ${WORKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc - install -Dm644 ${WORKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glmConfigVersion.cmake.in > ${D}${libdir}/cmake/glm/glmConfigVersion.cmake + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glmConfig.cmake.in > ${D}${libdir}/cmake/glm/glmConfig.cmake + sed "s/@VERSION@/${PV}/" ${UNPACKDIR}/glm.pc.in > ${D}${libdir}/pkgconfig/glm.pc + install -Dm644 ${UNPACKDIR}/glmTargets.cmake ${D}${libdir}/cmake/glm/glmTargets.cmake } diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch new file mode 100644 index 0000000000..abe38e12ce --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-Match-prototypes-of-callbacks-with-libgphoto.patch @@ -0,0 +1,50 @@ +From 366930ccc1a261c3eb883da2bf3c655162ccd75f Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 1 Mar 2023 22:58:37 -0800 +Subject: [PATCH] Match prototypes of callbacks with libgphoto + +In https://github.com/gphoto/gphoto2/pull/535/commits/ccc4c1f092bd21ebc713f4d7b9be85be49f92f1e +we tried to fix by using pthread_t but it also needs to make changes in +libgphoto and these changes can be invasive, therefore lets revert to +older types and to fix musl problem fix it via type casts + +Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/569] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gphoto2/main.c | 8 ++++---- + 1 file changed, 4 insertions(+), 4 deletions(-) + +diff --git a/gphoto2/main.c b/gphoto2/main.c +index 0dac947..cd3c990 100644 +--- a/gphoto2/main.c ++++ b/gphoto2/main.c +@@ -1198,7 +1198,7 @@ thread_func (void *data) + pthread_cleanup_pop (1); + } + +-static pthread_t ++static unsigned int + start_timeout_func (Camera *camera, unsigned int timeout, + CameraTimeoutFunc func, void __unused__ *data) + { +@@ -1215,14 +1215,14 @@ start_timeout_func (Camera *camera, unsigned int timeout, + + pthread_create (&tid, NULL, thread_func, td); + +- return (tid); ++ return (unsigned int)tid; + } + + static void +-stop_timeout_func (Camera __unused__ *camera, pthread_t id, ++stop_timeout_func (Camera __unused__ *camera, unsigned int id, + void __unused__ *data) + { +- pthread_t tid = id; ++ pthread_t tid = (pthread_t)id; + + pthread_cancel (tid); + pthread_join (tid, NULL); +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch index 7800fdd570..14976ffb72 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch @@ -6,21 +6,18 @@ Subject: [PATCH] configure.ac remove AM_PO_SUBDIRS This is done twice together with oe autotools.bbclass. --- +Upstream-Status: Pending + configure.ac | 1 - 1 file changed, 1 deletion(-) -diff --git a/configure.ac b/configure.ac -index bb5b795..93fbaf2 100644 --- a/configure.ac +++ b/configure.ac -@@ -64,7 +64,6 @@ GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) +@@ -46,7 +46,6 @@ dnl i18n support + dnl --------------------------------------------------------------------------- + GP_GETTEXT_HACK([],[Lutz Müller and others],[${MAIL_GPHOTO_TRANSLATION}]) ALL_LINGUAS="az cs da de en_GB es eu fi fr hu id is it ja nl pa pl pt_BR ro ru rw sk sr sv uk vi zh_CN zh_TW" +-AM_PO_SUBDIRS() AM_GNU_GETTEXT_VERSION([0.14.1]) AM_GNU_GETTEXT([external]) --AM_PO_SUBDIRS() AM_ICONV() - GP_GETTEXT_FLAGS() - --- -1.9.1 - diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch new file mode 100644 index 0000000000..a27c02cefc --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2/0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch @@ -0,0 +1,39 @@ +From 23c67e93e51f700d0aeecfc08277e39f51201fc3 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 12:59:46 -0700 +Subject: [PATCH] gphoto2: Use pthread_t abstract type for thead IDs + +This is not a plain old datatype in every libc, e.g. with musl this +would fail in type conversion + +Upstream-Status: Submitted [https://github.com/gphoto/gphoto2/pull/535] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + gphoto2/main.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/gphoto2/main.c b/gphoto2/main.c +index 2bf5964..9a6b05d 100644 +--- a/gphoto2/main.c ++++ b/gphoto2/main.c +@@ -1198,7 +1198,7 @@ thread_func (void *data) + pthread_cleanup_pop (1); + } + +-static unsigned int ++static pthread_t + start_timeout_func (Camera *camera, unsigned int timeout, + CameraTimeoutFunc func, void __unused__ *data) + { +@@ -1219,7 +1219,7 @@ start_timeout_func (Camera *camera, unsigned int timeout, + } + + static void +-stop_timeout_func (Camera __unused__ *camera, unsigned int id, ++stop_timeout_func (Camera __unused__ *camera, pthread_t id, + void __unused__ *data) + { + pthread_t tid = id; +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch b/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch deleted file mode 100644 index e6c7dd6675..0000000000 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2/0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch +++ /dev/null @@ -1,32 +0,0 @@ -From 884d4c9bbd2dc147d614a5fabc25dbea7a71cd48 Mon Sep 17 00:00:00 2001 -From: Andreas Baak <andreas.baak@gmail.com> -Date: Sun, 12 Jul 2015 02:13:58 -0700 -Subject: [PATCH] Look for popt with GP_CHECK_LIBRARY function - -The previously used proprietary function GP_CHECK_POPT -defined in /.m4m/gp-check-opt.m4 is not ready for cross -compilation since it looks for the library and headers -in the host system. Yocto reports the following error: -"QA Issue: gphoto2: The compile log indicates that host -include and/or library paths were used." -Using the GP_CHECK_LIBRARY function fixes this problem ---- - configure.ac | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/configure.ac b/configure.ac -index 93fbaf2..6d661f0 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -285,7 +285,7 @@ GP_CONFIG_MSG([Text preview support],[$aa_msg]) - dnl --------------------------------------------------------------------------- - dnl popt.h: Simplifies handling of command-line options enormously. - dnl --------------------------------------------------------------------------- --GP_CHECK_POPT([mandatory]) -+GP_CHECK_LIBRARY([POPT], [popt], [], [popt.h], [], [], [mandatory]) - - - dnl --------------------------------------------------------------------------- --- -1.9.1 - diff --git a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.27.bb b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb index 84ff677238..aba590aa02 100644 --- a/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.27.bb +++ b/meta-oe/recipes-graphics/gphoto2/gphoto2_2.5.28.bb @@ -8,11 +8,10 @@ RDEPENDS:gphoto2 = "libgphoto2" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/gphoto2-${PV}.tar.bz2;name=gphoto2 \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ - file://0002-Look-for-popt-with-GP_CHECK_LIBRARY-function.patch \ + file://0001-gphoto2-Use-pthread_t-abstract-type-for-thead-IDs.patch \ + file://0001-Match-prototypes-of-callbacks-with-libgphoto.patch \ " - -SRC_URI[gphoto2.md5sum] = "92d39b383c0e0354b4d3af1af7b8b416" -SRC_URI[gphoto2.sha256sum] = "30054e93a1bb59f501aabd5018713177ea04ce0cb28935319bd6ca80061e8d38" +SRC_URI[gphoto2.sha256sum] = "2a648dcdf12da19e208255df4ebed3e7d2a02f905be4165f2443c984cf887375" inherit autotools pkgconfig gettext @@ -20,3 +19,8 @@ EXTRA_OECONF += "--with-jpeg-prefix=${STAGING_INCDIR} \ --without-cdk \ " +INSANE_SKIP:${PN} = "already-stripped" + +do_install:append() { + sed -i -e 's#${RECIPE_SYSROOT}##g' ${D}${bindir}/gphoto2 +} diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch new file mode 100644 index 0000000000..570bb3e4c1 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure-Filter-out-buildpaths-from-CC.patch @@ -0,0 +1,48 @@ +From 06be633b8f4e2241bd37d4faf62b49606ad778e7 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 25 May 2023 19:01:36 -0700 +Subject: [PATCH] configure: Filter out buildpaths from CC + +Upstream-Status: Inappropriate [Cross-compile specific] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + configure.ac | 4 +++- + libgphoto2_port/configure.ac | 6 ++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 17216b1..39c8cc4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -261,7 +261,9 @@ GP_CONFIG_MSG([Compiler],[${CC}]) + GP_CONFIG_MSG([libltdl includes],[$LTDLINCL]) + GP_CONFIG_MSG([libltdl library],[$LIBLTDL]) + +-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"], ++CC_NO_SYSROOT=`echo $CC | sed -e \ ++ 's|--sysroot=.*\b||g'` ++AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], + [The C compiler we are using]) + + +diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac +index 1086b8e..59f3c34 100644 +--- a/libgphoto2_port/configure.ac ++++ b/libgphoto2_port/configure.ac +@@ -103,8 +103,10 @@ GP_CONFIG_MSG([Compiler],[${CC}]) + GP_CONFIG_MSG([libltdl includes],[$LTDLINCL]) + GP_CONFIG_MSG([libltdl library],[$LIBLTDL]) + +-AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC"], +- [The C compiler we're using]) ++CC_NO_SYSROOT=`echo $CC | sed -e \ ++ 's|--sysroot=.*\b||g'` ++AC_DEFINE_UNQUOTED([HAVE_CC], ["$CC_NO_SYSROOT"], ++ [The C compiler we are using]) + + AM_CPPFLAGS="" + +-- +2.40.1 + diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch index 8093676adc..fd647b7386 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/0001-configure.ac-remove-AM_PO_SUBDIRS.patch @@ -11,7 +11,7 @@ together with oe autotools.bbclass this is done twice and causes: | autoreconf: running: aclocal --system-acdir=/home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/aclocal-copy/ --automake-acdir=/home/Superandy/tmp/oe-core-eglibc/sysroots/x86_64-linux/usr/share/aclocal-1.12 -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/auto-m4/ -I /home/Superandy/tmp/oe-core-eglibc/work/armv7a-vfp-neon-angstrom-linux-gnueabi/libgphoto2-2.4.11-r2/libgphoto2-2.4.11/m4m/ --force -I auto-m4 -I m4m | configure.ac:230: error: `po-directories' is already registered with AC_CONFIG_COMMANDS. -Upstream-Status: Inapropriate [configuration] +Upstream-Status: Inappropriate [configuration] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- @@ -19,30 +19,23 @@ Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> libgphoto2_port/configure.ac | 1 - 2 files changed, 0 insertions(+), 2 deletions(-) -diff --git a/configure.ac b/configure.ac -index 2f8e1b8..2e90acf 100644 --- a/configure.ac +++ b/configure.ac -@@ -209,7 +209,6 @@ ALL_LINGUAS="cs da de es eu fr hu it ja nl pl ru sv uk vi zh_CN" - GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}],[The gPhoto Team],[${MAIL_GPHOTO_TRANSLATION}]) - AM_GNU_GETTEXT_VERSION([0.14.1]) - AM_GNU_GETTEXT([external]) +@@ -282,7 +282,6 @@ dnl ------------------------------------ + GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2], + [${PACKAGE}-${LIBGPHOTO2_CURRENT_MIN}], + [po]) -AM_PO_SUBDIRS() + AM_GNU_GETTEXT_VERSION([0.19.1]) + AM_GNU_GETTEXT([external]) AM_ICONV() - GP_GETTEXT_FLAGS() - -diff --git a/libgphoto2_port/configure.ac b/libgphoto2_port/configure.ac -index 0b66d58..df47357 100644 --- a/libgphoto2_port/configure.ac +++ b/libgphoto2_port/configure.ac -@@ -124,7 +124,6 @@ GP_GETTEXT_HACK([${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}],[Lutz Mueller and ot - ALL_LINGUAS="cs da de es eu fi fr it ja nl pl pt_BR ru sk sr sv uk vi zh_CN zh_TW" - AM_GNU_GETTEXT_VERSION([0.14.1]) - AM_GNU_GETTEXT([external]) +@@ -122,7 +122,6 @@ dnl ------------------------------------ + GP_GETTEXT_SETUP([GETTEXT_PACKAGE_LIBGPHOTO2_PORT], + [${PACKAGE}-${LIBGPHOTO2_PORT_CURRENT_MIN}], + [po]) -AM_PO_SUBDIRS() + AM_GNU_GETTEXT_VERSION([0.19.1]) + AM_GNU_GETTEXT([external]) AM_ICONV() - GP_GETTEXT_FLAGS() - --- -1.7.4.4 - diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch new file mode 100644 index 0000000000..0c2a8d4bd0 --- /dev/null +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2/fix-build-with-gcc-14.patch @@ -0,0 +1,36 @@ +From 721f7f8c3ec8058d504607873e4c317aac0c99c5 Mon Sep 17 00:00:00 2001 +From: Marcus Meissner <marcus@jet.franken.de> +Date: Mon, 4 Dec 2023 13:26:08 +0100 +Subject: [PATCH] align outlen length with jpeg jeaders. fixes + https://github.com/gphoto/libgphoto2/issues/941 + +--- +Upstream-Status: Backport [https://github.com/gphoto/libgphoto2/commit/721f7f8c3ec8058d504607873e4c317aac0c99c5] + + camlibs/ptp2/chdk.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/camlibs/ptp2/chdk.c b/camlibs/ptp2/chdk.c +index e1d898f378..e775ea1d4b 100644 +--- a/camlibs/ptp2/chdk.c ++++ b/camlibs/ptp2/chdk.c +@@ -1150,7 +1150,7 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, + struct jpeg_error_mgr jerr; + JSAMPROW row_ptr[1]; + uint8_t *outbuf = NULL, *tmprowbuf = NULL; +- uint64_t outlen = 0; ++ unsigned long outlen = 0; + unsigned int row_inc; + int sshift, dshift, xshift, skip; + +@@ -1161,8 +1161,8 @@ static void yuv_live_to_jpeg(unsigned char *p_yuv, + sshift = 6; + dshift = (width/height > 2) ? 6 : 12; + xshift = 4; +- /* Digic 6 cameras: 8 bit per element UYVY, +- * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ ++ /* Digic 6 cameras: 8 bit per element UYVY, ++ * 4 bytes used to encode 2 pixels, need 6 bytes raw YUV data for jpeg encoding */ + } else { + row_inc = buf_width*2; + sshift = 4; diff --git a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.27.bb b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb index 41600be2e1..57c9d199eb 100644 --- a/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.27.bb +++ b/meta-oe/recipes-graphics/gphoto2/libgphoto2_2.5.31.bb @@ -1,7 +1,7 @@ SUMMARY = "libgphoto2 allows you to access digital cameras" SECTION = "libs" LICENSE = "LGPL-2.1-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=0448d3676bc0de00406af227d341a4d1" +LIC_FILES_CHKSUM = "file://COPYING;md5=477378d78dfeeaa93826ee4ec7c643fb" DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2" @@ -12,10 +12,10 @@ DEPENDS = "libtool jpeg virtual/libusb0 libexif zlib libxml2" SRC_URI = "${SOURCEFORGE_MIRROR}/gphoto/libgphoto2-${PV}.tar.bz2;name=libgphoto2 \ file://40-libgphoto2.rules \ file://0001-configure.ac-remove-AM_PO_SUBDIRS.patch \ + file://0001-configure-Filter-out-buildpaths-from-CC.patch \ + file://fix-build-with-gcc-14.patch \ " - -SRC_URI[libgphoto2.md5sum] = "83a2f96dade72e95dffb8e5fa9628d7e" -SRC_URI[libgphoto2.sha256sum] = "f8b85478c44948a0b0b52c4d4dfda2de1d7bcb7b262c76bd1ae306d9c63240d7" +SRC_URI[libgphoto2.sha256sum] = "4f81c34c0b812bee67afd5f144940fbcbe01a2055586a6a1fa2d0626024a545b" inherit autotools pkgconfig gettext lib_package @@ -34,18 +34,12 @@ do_configure:append() { cp ${STAGING_DATADIR_NATIVE}/gettext/po/Makefile.in.in ${S}/libgphoto2_port/po/ cd ${S}/libgphoto2_port/ autoreconf -Wcross --verbose --install --force ${EXTRA_AUTORECONF} $acpaths - - # remove WORKDIR information from config to improve reproducibility - # libgphoto2_port recheck config will set the WORKDIR info again, so dont do that - sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h - sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/libgphoto2_port/config.status - sed -i '/config\.status/ s/\-\-recheck//' ${B}/libgphoto2_port/Makefile cd ${S} } do_install:append() { install -d ${D}${sysconfdir}/udev/rules.d/ - install -m 0644 ${WORKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/*.rules ${D}${sysconfdir}/udev/rules.d/ } PACKAGES =+ "libgphotoport libgphoto2-camlibs" @@ -57,4 +51,4 @@ FILES:libgphotoport = "${libdir}/libgphoto2_port.so.*" FILES:${PN} += "${nonarch_base_libdir}/udev/*" FILES:${PN}-dbg += "${libdir}/*/*/.debug" FILES:${PN}-dev += "${libdir}/*/*/*.la" -FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.0/vcamera/README.txt" +FILES:${PN}-doc += "${datadir}/libgphoto2_port/0.12.?/vcamera/README.txt" diff --git a/meta-oe/recipes-graphics/graphene/graphene_1.10.8.bb b/meta-oe/recipes-graphics/graphene/graphene_1.10.8.bb deleted file mode 100644 index 813ff74adf..0000000000 --- a/meta-oe/recipes-graphics/graphene/graphene_1.10.8.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "A thin layer of graphic data types" -HOMEPAGE = "http://ebassi.github.io/graphene/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a7d871d9e23c450c421a85bb2819f648" - -GNOMEBASEBUILDCLASS = "meson" - -inherit gnomebase gobject-introspection gtk-doc - -SRC_URI[archive.sha256sum] = "a37bb0e78a419dcbeaa9c7027bcff52f5ec2367c25ec859da31dfde2928f279a" - -# gtk4 & mutter 41.0 requires graphene build with introspection -PACKAGECONFIG ?= "introspection" -PACKAGECONFIG[introspection] = "-Dintrospection=enabled,-Dintrospection=disabled," - -GTKDOC_MESON_OPTION = "gtk_doc" - -EXTRA_OEMESON = "-Dinstalled_tests=false" - -FILES:${PN} += "${libdir}/graphene-1.0" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch new file mode 100644 index 0000000000..0d3f412706 --- /dev/null +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch @@ -0,0 +1,58 @@ +From 671e0d091b40ef7deb4a9d43e0dbed2a44edbec8 Mon Sep 17 00:00:00 2001 +From: Matthew Fernandez <matthew.fernandez@gmail.com> +Date: Sat, 9 Sep 2023 01:03:04 -0700 +Subject: [PATCH] Autotools: fix: do not put '$prefix' based paths in + compilation flags + +This was causing problems with cross-compilation with a dedicated sysroot, +because compilation would incorrectly use headers and libraries from the +`--prefix` path. The `--prefix` path is meant to indicate a target path to +install to, not a path from which to source dependent libraries. + +Gitlab: fixes #2442 +Reported-by: Daniel Klauer +Suggested-by: Daniel Klauer + +Upstream-Status: Backport [https://gitlab.com/graphviz/graphviz/-/commit/012d250a903e13114bce3ba40995fb957fed7848] +Signed-off-by: Daniel Klauer <daniel.klauer@gin.de> +--- + CHANGELOG.md | 3 +++ + configure.ac | 8 -------- + 2 files changed, 3 insertions(+), 8 deletions(-) + +diff --git a/CHANGELOG.md b/CHANGELOG.md +index b9b7e8e08..3a15fd256 100644 +--- a/CHANGELOG.md ++++ b/CHANGELOG.md +@@ -39,6 +39,9 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 + longer fails due to missing PHP files. #2388 + - Syntax for a loop in `gvmap.sh` has been corrected. This was a regression in + Graphviz 2.50.0. #2404 ++- The Autotools build system no longer uses headers and libraries from the ++ `--prefix` path given on the command line. This previously caused ++ cross-compilation to incorrectly pick up host headers and libraries. #2442 + + ## [8.0.5] – 2023-04-30 + +diff --git a/configure.ac b/configure.ac +index 573a3ee5d..7d53346de 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -190,14 +190,6 @@ if test "x${prefix}" = "xNONE"; then + AC_SUBST([prefix]) + fi + +-# automatically check for other dependencies in $prefix first +-if test "x${prefix}" != "x/usr"; then +- CPPFLAGS="$CPPFLAGS -I${prefix}/include" +- LDFLAGS="$LDFLAGS -L${prefix}/lib" +- PKG_CONFIG_PATH="$prefix/lib/pkgconfig$PATHSEPARATOR$PKG_CONFIG_PATH" +- export PKG_CONFIG_PATH +-fi +- + dnl ----------------------------------- + # Static/Shared binaries + +-- +2.34.1 + diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch index 6d1d441c57..99b53e2e12 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch +++ b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Set-use_tcl-to-be-empty-string-if-tcl-is-disabled.patch @@ -11,7 +11,7 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> --- a/configure.ac +++ b/configure.ac -@@ -1540,7 +1540,7 @@ AC_ARG_ENABLE(tcl, +@@ -1225,7 +1225,7 @@ AC_ARG_ENABLE(tcl, [], [enable_tcl=yes]) if test "x$enable_tcl" != "xyes"; then @@ -22,12 +22,12 @@ Signed-off-by: Khem Raj <raj.khem@gmail.com> if test "x$use_tcl" = "x"; then --- a/Makefile.am +++ b/Makefile.am -@@ -19,7 +19,7 @@ pkginclude_HEADERS = $(top_builddir)/gra - man_MANS = graphviz.7 +@@ -11,7 +11,7 @@ pkginclude_HEADERS = $(top_builddir)/gra + dist_man_MANS = graphviz.7 # $(subdirs) contains the list from: AC_CONFIG_SUBDIRS --SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs rtest tests -+SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs rtest tests +-SUBDIRS = $(subdirs) lib plugin cmd tclpkg doc contrib share graphs tests ++SUBDIRS = $(subdirs) lib plugin cmd doc contrib share graphs tests .PHONY: doxygen doxygen: diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch deleted file mode 100644 index 76ff08f63c..0000000000 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-Use-native-mkdefs.patch +++ /dev/null @@ -1,26 +0,0 @@ -From 5e53b643615fd53f3ff960521bbe9d95641e5f68 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> -Date: Sun, 20 Jan 2019 23:58:29 +0100 -Subject: [PATCH] Use native mkdefs -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Upstream-Status: Inappropriate [embedded specific] - -Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> ---- - lib/gvpr/Makefile.am | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - ---- a/lib/gvpr/Makefile.am -+++ b/lib/gvpr/Makefile.am -@@ -59,7 +59,7 @@ mkdefs$(EXEEXT): - $(HOSTCC) $(srcdir)/mkdefs.c -o mkdefs$(EXEEXT) - - gdefs.h: $(top_srcdir)/lib/gvpr/gprdata mkdefs$(EXEEXT) -- ./mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata -+ mkdefs$(EXEEXT) gdefs.h < $(top_srcdir)/lib/gvpr/gprdata - - EXTRA_DIST = $(man_MANS) $(pdf_DATA) gprdata mkdefs.c gdefs.h trie.c gvprlib.vcxproj* - diff --git a/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch b/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch deleted file mode 100644 index dd79510560..0000000000 --- a/meta-oe/recipes-graphics/graphviz/graphviz/0001-plugin-pango-Include-freetype-headers-explicitly.patch +++ /dev/null @@ -1,33 +0,0 @@ -From 926d9285f3367ae1bdb9ce1dce95f7de73b3a980 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 6 Aug 2019 12:42:19 -0700 -Subject: [PATCH] plugin/pango: Include freetype headers explicitly -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Do not depend on pango automatically adding these headers -Fixes -| gvtextlayout_pango.c:140:10: error: unknown type name ‘FT_Face’ -| FT_Face face; -| ^~~~~~~ - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - plugin/pango/gvtextlayout_pango.c | 4 ++++ - 1 file changed, 4 insertions(+) - ---- a/plugin/pango/gvtextlayout_pango.c -+++ b/plugin/pango/gvtextlayout_pango.c -@@ -15,6 +15,10 @@ - - #include <stdlib.h> - #include <string.h> -+ -+#include <ft2build.h> -+#include FT_FREETYPE_H -+ - #include "gvplugin_render.h" - #include "agxbuf.h" - #include "utils.h" diff --git a/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb index 4c51af669c..7548e976f1 100644 --- a/meta-oe/recipes-graphics/graphviz/graphviz_2.50.0.bb +++ b/meta-oe/recipes-graphics/graphviz/graphviz_8.1.0.bb @@ -4,7 +4,6 @@ LICENSE = "EPL-1.0" LIC_FILES_CHKSUM = "file://COPYING;md5=9109f5fc16cf963fb3cdd32781b3ce04" DEPENDS = " \ - intltool-native \ bison-native \ groff-native \ libtool \ @@ -20,6 +19,7 @@ DEPENDS:append:class-nativesdk = " ${BPN}-native" inherit autotools-brokensep pkgconfig gettext qemu SRC_URI = "https://gitlab.com/api/v4/projects/4207231/packages/generic/${BPN}-releases/${PV}/${BP}.tar.xz \ + file://0001-Autotools-fix-do-not-put-prefix-based-paths-in-compi.patch \ " # Use native mkdefs SRC_URI:append:class-target = "\ @@ -28,17 +28,15 @@ SRC_URI:append:class-target = "\ SRC_URI:append:class-nativesdk = "\ file://graphviz-setup.sh \ " +SRC_URI[sha256sum] = "d593695fdaa8a19297523b679ad13d3ef2027b0b7f14cc2bc23e77969ed81565" -SRC_URI[sha256sum] = "6b16bf990df114195be669773a1dae975dbbffada45e1de2849ddeb5851bb9a8" - -CVE_CHECK_IGNORE += "\ - CVE-2014-9157 \ -" +UPSTREAM_CHECK_URI = "https://graphviz.org/download/" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" PACKAGECONFIG ??= "librsvg" PACKAGECONFIG[librsvg] = "--with-librsvg,--without-librsvg,librsvg" -EXTRA_OECONF:append = " PS2PDF=/bin/echo" +EXTRA_OECONF:append = " PS2PDF=/bin/echo --disable-man-pdfs" EXTRA_OECONF:class-target = "\ --with-expatincludedir=${STAGING_INCDIR} \ @@ -58,6 +56,9 @@ EXTRA_OECONF:class-nativesdk = "\ --disable-r \ --disable-sharp \ " +EXTRA_OECONF:class-native = "\ + --disable-tcl \ + " CFLAGS:append:class-target = " -D_typ_ssize_t=1 -D_long_double=1" CFLAGS:append:class-nativesdk = " -D_typ_ssize_t=1 -D_long_double=1" do_configure:prepend() { @@ -69,7 +70,7 @@ do_configure:prepend() { do_install:append:class-nativesdk() { # graphviz-setup.sh must be executed at SDK installation install -d ${D}${SDKPATHNATIVE}/post-relocate-setup.d - install -m 0755 ${WORKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d + install -m 0755 ${UNPACKDIR}/graphviz-setup.sh ${D}${SDKPATHNATIVE}/post-relocate-setup.d } FILES:${PN}:class-nativesdk += "${SDKPATHNATIVE}" @@ -103,7 +104,7 @@ PACKAGE_WRITE_DEPS += "qemu-native" PACKAGES =+ "${PN}-python ${PN}-perl ${PN}-demo" -FILES:${PN}-python += "${libdir}/python*/site-packages/ ${libdir}/graphviz/python/" +FILES:${PN}-python += "${PYTHON_SITEPACKAGES_DIR}/ ${libdir}/graphviz/python/" FILES:${PN}-perl += "${libdir}/perl5/*/vendor_perl/ ${libdir}/graphviz/perl/" FILES:${PN}-demo += "${datadir}/graphviz/demo/" diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch b/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch index d529ddd234..949151a827 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-Include-stdlib.h-for-exit-API.patch @@ -14,6 +14,8 @@ http://sources.debian.net/src/gtkperf/0.40%2Bds-2/debian/patches/01-include_stdl Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/main.c | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-main.c-Define-prototype-for-setup_appdata.patch b/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-main.c-Define-prototype-for-setup_appdata.patch new file mode 100644 index 0000000000..08e899b9a6 --- /dev/null +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf/0001-main.c-Define-prototype-for-setup_appdata.patch @@ -0,0 +1,27 @@ +From 6b5f695cb206cd8b3cbcbcd7713e52772e89306b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 20:47:32 -0700 +Subject: [PATCH] main.c: Define prototype for setup_appdata + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/main.c | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/main.c b/src/main.c +index c226799..b4ce6d1 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -18,6 +18,8 @@ + #include "callbacks.h" + #include "appdata.h" + ++void setup_appdata(AppData * appdata_in); ++ + int + main (int argc, char **argv) + { +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch b/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch index 0548040af7..f975acabad 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf/0002-timing.c-Fix-format-security-errors.patch @@ -5,6 +5,8 @@ Subject: [PATCH 2/2] timing.c: Fix format-security errors Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + src/timing.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb index 0c4f819892..a5c8de8f61 100644 --- a/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb +++ b/meta-oe/recipes-graphics/gtkperf/gtkperf_0.40.bb @@ -8,11 +8,15 @@ SRC_URI = "http://prdownloads.sourceforge.net/${BPN}/${BPN}_${PV}.tar.gz \ file://0001-Include-stdlib.h-for-exit-API.patch \ file://0002-timing.c-Fix-format-security-errors.patch \ file://gettext.patch \ + file://0001-main.c-Define-prototype-for-setup_appdata.patch \ " SRC_URI[md5sum] = "4331dde4bb83865e15482885fcb0cc53" SRC_URI[sha256sum] = "9704344e732038eecbd007dd996a56293a6b027b5b76f3f036273a3fae1ab27b" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/gtkperf/files/gtkperf/" +UPSTREAM_CHECK_REGEX = "${BPN}_(?P<pver>\d+(\.\d+)+)" + DEPENDS = "gtk+" S = "${WORKDIR}/${BPN}" @@ -23,7 +27,7 @@ REQUIRED_DISTRO_FEATURES = "x11" do_configure:prepend () { rm -f ${S}/m4/init.m4 - cp -f ${WORKDIR}/Makevars ${S}/po/ + cp -f ${UNPACKDIR}/Makevars ${S}/po/ } do_install:append () { diff --git a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.111.bb b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.120.bb index eee9de7497..b7807c8853 100644 --- a/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.111.bb +++ b/meta-oe/recipes-graphics/gtkwave/gtkwave_3.3.120.bb @@ -6,7 +6,7 @@ LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=75859989545e37968a99b631ef42722e" SRC_URI = "http://gtkwave.sourceforge.net/gtkwave-gtk3-${PV}.tar.gz" -SRC_URI[sha256sum] = "b4e1c2f718fb3c4b4f412a220876b9da599fe11745fb6f7eb4aed107b1106233" +SRC_URI[sha256sum] = "5da94863fb2e5d88cc019e2bfdc676022398113894b585d864e11ca8341b24d8" S = "${WORKDIR}/${BPN}-gtk3-${PV}" DEPENDS = " \ diff --git a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb index 869f8123db..8e5febd7a1 100644 --- a/meta-oe/recipes-graphics/imlib2/imlib2_git.bb +++ b/meta-oe/recipes-graphics/imlib2/imlib2_git.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=344895f253c32f38e182dcaf30fe8a35" DEPENDS = "freetype " PROVIDES = "virtual/imlib2" -PV = "1.7.1" -SRCREV = "01424487e360383a039dc123bc2a345fe7ea2535" +PV = "1.12.3" +SRCREV = "143c60194c0948aac484d37bb23c59edea2ccf19" inherit autotools pkgconfig lib_package @@ -28,7 +28,6 @@ PACKAGECONFIG[png] = "--with-png,--without-png,libpng" PACKAGECONFIG[tiff] = "--with-tiff,--without-tiff,tiff" PACKAGECONFIG[webp] = "--with-webp,--without-webp,libwebp" -PACKAGECONFIG[bzip2] = "--with-bzip2,--without-bzip2,bzip2" PACKAGECONFIG[zlib] = "--with-zlib,--without-zlib,zlib" PACKAGECONFIG[id3] = "--with-id3,--without-id3,libid3tag" diff --git a/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb b/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb deleted file mode 100644 index 27dff82df5..0000000000 --- a/meta-oe/recipes-graphics/jasper/jasper_2.0.33.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "Jpeg 2000 implementation" -HOMEPAGE = "https://jasper-software.github.io/jasper/" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a80440d1d8f17d041c71c7271d6e06eb" - -SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master" -SRCREV = "fe00207dc10db1d7cc6f2757961c5c6bdfd10973" - -CVE_CHECK_IGNORE += "\ - CVE-2015-8751 \ -" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ??= "" -PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=true, -DJAS_ENABLE_LIBJPEG=false, jpeg" -PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=true, -DJAS_ENABLE_OPENGL=false, freeglut" - -EXTRA_OECMAKE:append = " -DJAS_ENABLE_SHARED=true" - -do_install:append() { - chrpath -d ${D}${bindir}/jasper - chrpath -d ${D}${bindir}/imginfo - chrpath -d ${D}${bindir}/imgcmp - chrpath -d ${D}${libdir}/libjasper.so.* -} diff --git a/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb b/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb new file mode 100644 index 0000000000..5281980ecb --- /dev/null +++ b/meta-oe/recipes-graphics/jasper/jasper_4.1.1.bb @@ -0,0 +1,34 @@ +SUMMARY = "Jpeg 2000 implementation" +HOMEPAGE = "https://jasper-software.github.io/jasper/" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a80440d1d8f17d041c71c7271d6e06eb" + +SRC_URI = "git://github.com/jasper-software/jasper.git;protocol=https;branch=master" +SRCREV = "917f7708b755d8434f70618108c1a76f1b6a0a82" + +CVE_STATUS[CVE-2015-8751] = "fixed-version: The CPE in the NVD database doesn't reflect correctly the vulnerable versions." + +S = "${WORKDIR}/git" + +inherit cmake multilib_header + +do_configure:prepend() { + JAS_STDC_VERSION="$(echo __STDC_VERSION__ | ${CPP} -E -P -)" +} + +EXTRA_OECMAKE:append = " -DJAS_STDC_VERSION=${JAS_STDC_VERSION}" + +PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'opengl', '', d)} \ + jpeg" + +PACKAGECONFIG[jpeg] = "-DJAS_ENABLE_LIBJPEG=ON,-DJAS_ENABLE_LIBJPEG=OFF,jpeg," +PACKAGECONFIG[opengl] = "-DJAS_ENABLE_OPENGL=ON,-DJAS_ENABLE_OPENGL=OFF,freeglut," + +do_install:append() { + chrpath -d ${D}${bindir}/jasper + chrpath -d ${D}${bindir}/imginfo + chrpath -d ${D}${bindir}/imgcmp + chrpath -d ${D}${libdir}/libjasper.so.* + oe_multilib_header jasper/jas_config.h +} + diff --git a/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb b/meta-oe/recipes-graphics/leptonica/leptonica_1.84.1.bb index c0a2b45a48..89a35116c3 100644 --- a/meta-oe/recipes-graphics/leptonica/leptonica_1.82.0.bb +++ b/meta-oe/recipes-graphics/leptonica/leptonica_1.84.1.bb @@ -4,9 +4,10 @@ LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://leptonica-license.txt;md5=809b282cea2df68975fbe0ffe02b560f" UPSTREAM_CHECK_URI = "https://github.com/DanBloomberg/leptonica/releases" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" SRC_URI = "http://www.leptonica.org/source/leptonica-${PV}.tar.gz" -SRC_URI[sha256sum] = "155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6" +SRC_URI[sha256sum] = "2b3e1254b1cca381e77c819b59ca99774ff43530209b9aeb511e1d46588a64f6" EXTRA_OECONF += " \ --without-libwebp \ diff --git a/meta-oe/recipes-graphics/libdecor/libdecor_0.2.2.bb b/meta-oe/recipes-graphics/libdecor/libdecor_0.2.2.bb new file mode 100644 index 0000000000..6621389b5a --- /dev/null +++ b/meta-oe/recipes-graphics/libdecor/libdecor_0.2.2.bb @@ -0,0 +1,31 @@ +SUMMARY = "libdecor - A client-side decorations library for Wayland clients" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=7ae2be7fb1637141840314b51970a9f7" + +SRC_URI = " \ + git://gitlab.freedesktop.org/libdecor/libdecor.git;protocol=https;branch=master \ +" + +DEPENDS = " \ + cairo \ + pango \ + wayland \ + wayland-native \ + wayland-protocols \ +" + +S = "${WORKDIR}/git" +SRCREV = "7807ae3480f5c6a37c5e8505d94af1e764aaf704" + +PACKAGECONFIG ?= "dbus ${@bb.utils.filter('DISTRO_FEATURES', 'gtk+3', d)}" + +PACKAGECONFIG[dbus] = "-Ddbus=enabled,-Ddbus=disabled,dbus" +PACKAGECONFIG[demo] = "-Ddemo=true,-Ddemo=false,virtual/libegl libxkbcommon" +PACKAGECONFIG[install_demo] = "-Dinstall_demo=true,-Dinstall_demo=false" +PACKAGECONFIG[gtk+3] = "-Dgtk=enabled,-Dgtk=disabled,gtk+3" + +inherit meson pkgconfig + +EXTRA_OEMESON += "--buildtype release" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch b/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch index 619bad6d02..16689f64b9 100644 --- a/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch +++ b/meta-oe/recipes-graphics/libforms/files/0001-Make-extern-declarations-in-header-file.patch @@ -10,8 +10,7 @@ Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> --- fdesign/sp_spinner.c | 2 +- - lib/flinternal.h | 4 ++-- - 2 files changed, 3 insertions(+), 3 deletions(-) + 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/fdesign/sp_spinner.c b/fdesign/sp_spinner.c index 04f2c19..6206daa 100644 @@ -26,20 +25,6 @@ index 04f2c19..6206daa 100644 /*************************************** -diff --git a/lib/flinternal.h b/lib/flinternal.h -index 06d847e..577bd10 100644 ---- a/lib/flinternal.h -+++ b/lib/flinternal.h -@@ -138,8 +138,8 @@ enum { - - /* events.c or event related */ - --FL_OBJECT * fli_handled_obj; --FL_OBJECT * fli_handled_parent; -+extern FL_OBJECT * fli_handled_obj; -+extern FL_OBJECT * fli_handled_parent; - - void fli_obj_queue_delete( void ); -- 2.28.0 diff --git a/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch b/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch new file mode 100644 index 0000000000..0b7c063804 --- /dev/null +++ b/meta-oe/recipes-graphics/libforms/files/0001-Modify-include-dir.patch @@ -0,0 +1,33 @@ +From d2d05928342f7f9f687ffea5e0b77f97f0ae5aad Mon Sep 17 00:00:00 2001 +From: Wang Mingyu <wangmy@fujitsu.com> +Date: Wed, 7 Sep 2022 14:29:13 +0900 +Subject: [PATCH] Modify include dir + +error messagge: +../../xforms-1.2.4/lib/fd/cmdbr.h:28:10: fatal error: ../include/forms.h: No such file or directory + +../include/forms.h specified in the header file cmdbr.h is not exist. + +Upstream-Status: Pending + +Signed-off-by: Wang Mingyu <wangmy@fujitsu.com> +--- + lib/fd/cmdbr.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/fd/cmdbr.h b/lib/fd/cmdbr.h +index 8495e05..2ddeced 100644 +--- a/lib/fd/cmdbr.h ++++ b/lib/fd/cmdbr.h +@@ -25,7 +25,7 @@ + #ifndef FD_cmd_h_ + #define FD_cmd_h_ + +-#include "../include/forms.h" ++#include "include/forms.h" + + /* Callbacks, globals and object handlers */ + +-- +2.25.1 + diff --git a/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch b/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch index db400f7022..4836b46b11 100644 --- a/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch +++ b/meta-oe/recipes-graphics/libforms/files/add-absolute-path-for-include-dir.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am --- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 12:58:51.968645873 +0000 +++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:00:48.500635163 +0000 diff --git a/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch b/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch index c95bd18da8..9ab67b35ac 100644 --- a/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch +++ b/meta-oe/recipes-graphics/libforms/files/fix-link-to-xforms-man.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/lib/Makefile.am xforms-1.2.3/lib/Makefile.am --- xforms-1.2.3.orig/lib/Makefile.am 2019-02-24 12:53:58.340678373 +0000 +++ xforms-1.2.3/lib/Makefile.am 2019-02-24 12:54:33.096674102 +0000 diff --git a/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch b/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch index 73956dee9f..dc494281b2 100644 --- a/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch +++ b/meta-oe/recipes-graphics/libforms/files/fix-path-fdesign_LDADD.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Naur xforms-1.2.3.orig/fdesign/Makefile.am xforms-1.2.3/fdesign/Makefile.am --- xforms-1.2.3.orig/fdesign/Makefile.am 2019-02-24 13:08:48.412603250 +0000 +++ xforms-1.2.3/fdesign/Makefile.am 2019-02-24 13:09:18.412601874 +0000 diff --git a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb index 838c1d5173..db648ec8c2 100644 --- a/meta-oe/recipes-graphics/libforms/libforms_1.2.3.bb +++ b/meta-oe/recipes-graphics/libforms/libforms_1.2.5pre1.bb @@ -1,6 +1,5 @@ DESCRIPTION = "The XForms graphical interface widget library " HOMEPAGE = "http://savannah.nongnu.org/projects/xforms/" -PR = "r0" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://COPYING.LIB;md5=ade9a053df81f5b9408d2f4f5546df86" @@ -10,10 +9,10 @@ SRC_URI = "http://download.savannah.nongnu.org/releases/xforms/xforms-${PV}.tar. file://add-absolute-path-for-include-dir.patch \ file://fix-path-fdesign_LDADD.patch \ file://0001-Make-extern-declarations-in-header-file.patch \ + file://0001-Modify-include-dir.patch \ " -SRC_URI[md5sum] = "235720a758a8b8d9e6e452dc67190e9b" -SRC_URI[sha256sum] = "7989b39598c769820ad451ad91e5cb0de29946940c8240aac94ca8238c2def61" +SRC_URI[sha256sum] = "92b5e6466ea2dffca7332aec12734e65b3e961825eb3100b7d889c0d1abb4697" inherit autotools features_check @@ -21,7 +20,12 @@ REQUIRED_DISTRO_FEATURES = "opengl x11" S = "${WORKDIR}/xforms-${PV}" -DEPENDS = "libxpm jpeg libx11 mesa" +DEPENDS = "libxpm jpeg libx11 virtual/libgl" RDEPENDS:${PN} = "bash" EXTRA_OECONF = "--with-extra-inc=${S}/lib" + +do_compile:append() { + sed -i -e 's|${B}|.|' ${B}/fd2ps/fd2ps + sed -i -e 's|${B}|.|' ${B}/fdesign/fdesign +} diff --git a/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb b/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb new file mode 100644 index 0000000000..4094aa4fc6 --- /dev/null +++ b/meta-oe/recipes-graphics/libglvnd/libglvnd_1.7.0.bb @@ -0,0 +1,30 @@ +DESCRIPTION = "libglvnd is a vendor-neutral dispatch layer for arbitrating \ +OpenGL API calls between multiple vendors." +HOMEPAGE = "https://gitlab.freedesktop.org/glvnd/libglvnd" +LICENSE = "MIT & BSD-1-Clause & BSD-3-Clause & GPL-3.0-with-autoconf-exception" +LIC_FILES_CHKSUM = "file://README.md;beginline=323;md5=7ac5f0111f648b92fe5427efeb08e8c4" + +SRC_URI = "git://git@gitlab.freedesktop.org/glvnd/libglvnd.git;protocol=https;branch=master" + +# v1.5.0 tag +SRCREV = "faa23f21fc677af5792825dc30cb1ccef4bf33a6" + +REQUIRED_DISTRO_FEATURES = "opengl" + +inherit meson pkgconfig features_check + +S = "${WORKDIR}/git" + +PACKAGECONFIG ?= "\ + ${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'egl gles1 gles2', '', d)} \ + ${@bb.utils.contains('DISTRO_FEATURES', 'opengl x11', 'glx', '', d)} \ + " + +PACKAGECONFIG[x11] = "-Dx11=enabled,-Dx11=disabled,libx11 libxext xorgproto" +PACKAGECONFIG[glx] = "-Dglx=enabled,-Dglx=disabled,libx11 libxext xorgproto" +PACKAGECONFIG[egl] = "-Degl=true,-Degl=false," +PACKAGECONFIG[gles1] = "-Dgles1=true,-Dgles1=false," +PACKAGECONFIG[gles2] = "-Dgles2=true,-Dgles2=false," + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb b/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb index ba928d281d..f9d3496d90 100644 --- a/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb +++ b/meta-oe/recipes-graphics/libmng/libmng_2.0.3.bb @@ -13,6 +13,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BP}.tar.gz" SRC_URI[md5sum] = "7e9a12ba2a99dff7e736902ea07383d4" SRC_URI[sha256sum] = "cf112a1fb02f5b1c0fce5cab11ea8243852c139e669c44014125874b14b7dfaa" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/libmng/files/libmng-devel/" +UPSTREAM_CHECK_REGEX = "libmng-devel/(?P<pver>\d+(\.\d+)+)" + inherit autotools-brokensep pkgconfig PACKAGECONFIG ??= "jpeg" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch new file mode 100644 index 0000000000..2007766f74 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch @@ -0,0 +1,52 @@ +From 6c35fc94ca30a4d0662479f7ef8a704d97aa7352 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 18 May 2024 18:13:30 -0700 +Subject: [PATCH] stdlib: Make iconv use portable across glibc/musl + +This is a backport from libsdl2 + +Upstream-Status: Backport [https://github.com/libsdl-org/SDL/blob/main/src/stdlib/SDL_iconv.c#L49C1-L51C1] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/stdlib/SDL_iconv.c | 19 ++++--------------- + 1 file changed, 4 insertions(+), 15 deletions(-) + +diff --git a/src/stdlib/SDL_iconv.c b/src/stdlib/SDL_iconv.c +index fa56a99..087b6ec 100644 +--- a/src/stdlib/SDL_iconv.c ++++ b/src/stdlib/SDL_iconv.c +@@ -28,27 +28,16 @@ + + #ifdef HAVE_ICONV + +-/* Depending on which standard the iconv() was implemented with, +- iconv() may or may not use const char ** for the inbuf param. +- If we get this wrong, it's just a warning, so no big deal. +-*/ +-#if defined(_XGP6) || \ +- defined(__GLIBC__) && ((__GLIBC__ > 2) || (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 2)) +-#define ICONV_INBUF_NONCONST +-#endif +- + #include <errno.h> + + size_t SDL_iconv(SDL_iconv_t cd, + const char **inbuf, size_t *inbytesleft, + char **outbuf, size_t *outbytesleft) + { +- size_t retCode; +-#ifdef ICONV_INBUF_NONCONST +- retCode = iconv(cd, (char **)inbuf, inbytesleft, outbuf, outbytesleft); +-#else +- retCode = iconv(cd, inbuf, inbytesleft, outbuf, outbytesleft); +-#endif ++ /* iconv's second parameter may or may not be `const char const *` depending on the ++ C runtime's whims. Casting to void * seems to make everyone happy, though. */ ++ ++ const size_t retCode = iconv((iconv_t)((uintptr_t)cd), (void *)inbuf, inbytesleft, outbuf, outbytesleft); + if ( retCode == (size_t)-1 ) { + switch(errno) { + case E2BIG: +-- +2.45.1 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch index 2db67966cf..d4166a16ab 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2019-13616.patch @@ -3,6 +3,8 @@ From: Sam Lantinga <slouken@libsdl.org> Date: Tue, 30 Jul 2019 11:00:00 -0700 Subject: [PATCH] Fixed bug 4538 - validate image size when loading BMP files --- +Upstream-Status: Pending + src/video/SDL_bmp.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2022-34568.patch b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2022-34568.patch new file mode 100644 index 0000000000..7561300cb3 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-1.2.15/CVE-2022-34568.patch @@ -0,0 +1,28 @@ +CVE: CVE-2022-34568 +Upstream-Status: Backport [https://github.com/libsdl-org/SDL-1.2/commit/d7e00208738a0bc6af302723fe64908ac35b777b ] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> + +From d7e00208738a0bc6af302723fe64908ac35b777b Mon Sep 17 00:00:00 2001 +From: Ozkan Sezer <sezeroz@gmail.com> +Date: Sat, 18 Jun 2022 14:55:00 +0300 +Subject: [PATCH] SDL_x11yuv.c: fix possible use-after-free + +Fixes: https://github.com/libsdl-org/SDL-1.2/issues/863 +--- + src/video/x11/SDL_x11yuv.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/video/x11/SDL_x11yuv.c b/src/video/x11/SDL_x11yuv.c +index 62698dfd9..0d5754e3e 100644 +--- a/src/video/x11/SDL_x11yuv.c ++++ b/src/video/x11/SDL_x11yuv.c +@@ -374,8 +374,8 @@ SDL_Overlay *X11_CreateYUVOverlay(_THIS, int width, int height, Uint32 format, S + #ifdef PITCH_WORKAROUND + if ( hwdata->image != NULL && hwdata->image->pitches[0] != (width*bpp) ) { + /* Ajust overlay width according to pitch */ +- XFree(hwdata->image); + width = hwdata->image->pitches[0] / bpp; ++ XFree(hwdata->image); + hwdata->image = SDL_NAME(XvCreateImage)(GFX_Display, xv_port, format, + 0, width, height); + } diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb index 666442fba2..4f702029d9 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.25.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl-gfx_2.0.27.bb @@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=5d1de21f0b70830e299905eac3419084" DEPENDS = "libsdl" SRC_URI = "http://www.ferzkopp.net/Software/SDL_gfx-2.0/SDL_gfx-${PV}.tar.gz" -SRC_URI[md5sum] = "ea24ed4b82ff1304809c363494fa8e16" -SRC_URI[sha256sum] = "556eedc06b6cf29eb495b6d27f2dcc51bf909ad82389ba2fa7bdc4dec89059c0" +SRC_URI[sha256sum] = "dfb15ac5f8ce7a4952dc12d2aed9747518c5e6b335c0e31636d23f93c630f419" + +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/sdlgfx/files/" S = "${WORKDIR}/SDL_gfx-${PV}" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch b/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch new file mode 100644 index 0000000000..1bbfa99210 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl-image/0001-png-img-Fix-prototypes-of-callbacks.patch @@ -0,0 +1,52 @@ +From 41791738221fdb7574fc8e23f84214910cdce098 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 1 Mar 2023 21:51:40 -0800 +Subject: [PATCH] png-img: Fix prototypes of callbacks + +Clang-16 is flagging function pointer mismatches + +Upstream-Status: Inappropriate [No upstream] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + IMG_png.c | 16 ++++++++-------- + 1 file changed, 8 insertions(+), 8 deletions(-) + +diff --git a/IMG_png.c b/IMG_png.c +index 5f91f15..4d5bdb6 100644 +--- a/IMG_png.c ++++ b/IMG_png.c +@@ -78,15 +78,15 @@ + static struct { + int loaded; + void *handle; +- png_infop (*png_create_info_struct) (png_structp png_ptr); ++ png_infop (*png_create_info_struct) (png_const_structp png_ptr); + png_structp (*png_create_read_struct) (png_const_charp user_png_ver, png_voidp error_ptr, png_error_ptr error_fn, png_error_ptr warn_fn); + void (*png_destroy_read_struct) (png_structpp png_ptr_ptr, png_infopp info_ptr_ptr, png_infopp end_info_ptr_ptr); +- png_uint_32 (*png_get_IHDR) (png_structp png_ptr, png_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); +- png_voidp (*png_get_io_ptr) (png_structp png_ptr); +- png_byte (*png_get_channels) (png_structp png_ptr, png_infop info_ptr); +- png_uint_32 (*png_get_PLTE) (png_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); +- png_uint_32 (*png_get_tRNS) (png_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); +- png_uint_32 (*png_get_valid) (png_structp png_ptr, png_infop info_ptr, png_uint_32 flag); ++ png_uint_32 (*png_get_IHDR) (png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 *width, png_uint_32 *height, int *bit_depth, int *color_type, int *interlace_method, int *compression_method, int *filter_method); ++ png_voidp (*png_get_io_ptr) (png_const_structp png_ptr); ++ png_byte (*png_get_channels) (png_const_structp png_ptr, png_const_infop info_ptr); ++ png_uint_32 (*png_get_PLTE) (png_const_structp png_ptr, png_infop info_ptr, png_colorp *palette, int *num_palette); ++ png_uint_32 (*png_get_tRNS) (png_const_structp png_ptr, png_infop info_ptr, png_bytep *trans, int *num_trans, png_color_16p *trans_values); ++ png_uint_32 (*png_get_valid) (png_const_structp png_ptr, png_const_infop info_ptr, png_uint_32 flag); + void (*png_read_image) (png_structp png_ptr, png_bytepp image); + void (*png_read_info) (png_structp png_ptr, png_infop info_ptr); + void (*png_read_update_info) (png_structp png_ptr, png_infop info_ptr); +@@ -95,7 +95,7 @@ static struct { + void (*png_set_packing) (png_structp png_ptr); + void (*png_set_read_fn) (png_structp png_ptr, png_voidp io_ptr, png_rw_ptr read_data_fn); + void (*png_set_strip_16) (png_structp png_ptr); +- int (*png_sig_cmp) (png_bytep sig, png_size_t start, png_size_t num_to_check); ++ int (*png_sig_cmp) (png_const_bytep sig, png_size_t start, png_size_t num_to_check); + #ifndef LIBPNG_VERSION_12 + jmp_buf* (*png_set_longjmp_fn) (png_structp, png_longjmp_ptr, size_t); + #endif +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch b/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch index 5299d378eb..102cec7288 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-image/configure.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + Index: SDL_image-1.2.12/configure.in =================================================================== --- SDL_image-1.2.12.orig/configure.in 2012-01-21 01:51:33.000000000 +0000 diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb index 5a93dc19a8..01137bb0ca 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl-image_1.2.12.bb @@ -7,8 +7,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=613734b7586e1580ef944961c6d62227" DEPENDS = "tiff zlib libpng jpeg libsdl" SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL_image-${PV}.tar.gz \ + file://0001-png-img-Fix-prototypes-of-callbacks.patch \ file://configure.patch" -SRC_URI[md5sum] = "a0f9098ebe5400f0bdc9b62e60797ecb" SRC_URI[sha256sum] = "0b90722984561004de84847744d566809dbb9daf732a9e503b91a1b5a84e5699" S = "${WORKDIR}/SDL_image-${PV}" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch b/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch index 4c9e8d094c..7330ef61aa 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-mixer/configure.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurd SDL_mixer-1.2.12/configure.in SDL_mixer-1.2.12/configure.in --- SDL_mixer-1.2.12/configure.in 2012-01-16 00:01:05.000000000 +0200 +++ SDL_mixer-1.2.12/configure.in 2012-12-15 04:08:04.627871456 +0200 diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch b/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch index fb3ff7e689..7911a2aa75 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-net/am_foreign.patch @@ -1,3 +1,5 @@ +Upstream-Status: Pending + diff -Nurd SDL_net-1.2.8/Makefile.am SDL_net-1.2.8/Makefile.am --- SDL_net-1.2.8/Makefile.am 2012-01-15 18:20:10.000000000 +0200 +++ SDL_net-1.2.8/Makefile.am 2014-08-01 21:18:52.720815807 +0300 diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch b/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch index 9718a3b94a..e491c1abce 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-net/libtool2.patch @@ -3,6 +3,8 @@ From: Denis 'GNUtoo' Carikli <GNUtoo@no-log.org> Date: Wed, 17 Oct 2012 20:51:51 +0200 --- +Upstream-Status: Pending + configure.in | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch b/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch index 1116c34d07..d174d7ab5c 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl-ttf/use.pkg-config.for.freetype2.patch @@ -8,6 +8,8 @@ commit 5870bd272b0b077d0826fb900b251884c1c05061 binconfig-disabled: Add class and use --- +Upstream-Status: Pending + configure.in | 38 +++++--------------------------------- 1 file changed, 5 insertions(+), 33 deletions(-) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb index 57f0f99794..267311853a 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.0.5.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-image_2.8.2.bb @@ -2,13 +2,12 @@ SUMMARY = "Simple DirectMedia Layer image library v2" SECTION = "libs" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://COPYING.txt;md5=822edb694b20ff16ceef85b27f61c11f" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=2f6d9e01c97958aa851954ed5acf82ee" DEPENDS = "tiff zlib libpng jpeg libsdl2 libwebp" SRC_URI = "http://www.libsdl.org/projects/SDL_image/release/SDL2_image-${PV}.tar.gz" -SRC_URI[md5sum] = "f26f3a153360a8f09ed5220ef7b07aea" -SRC_URI[sha256sum] = "bdd5f6e026682f7d7e1be0b6051b209da2f402a2dd8bd1c4bd9c25ad263108d0" +SRC_URI[sha256sum] = "8f486bbfbcf8464dd58c9e5d93394ab0255ce68b51c5a966a918244820a76ddc" S = "${WORKDIR}/SDL2_image-${PV}" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch new file mode 100644 index 0000000000..8cb76c35d6 --- /dev/null +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/0001-freetype-Fix-function-signatures-to-match-without-ca.patch @@ -0,0 +1,69 @@ +From 6c52693d264ca3dc8e15a92f56cf3a636639bb6c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Martin=20Storsj=C3=B6?= <martin@martin.st> +Date: Fri, 28 Oct 2022 22:17:15 +0300 +Subject: [PATCH] freetype: Fix function signatures to match without casts + +Clang 16 has got a new stricter warning for casts of function types +(see https://github.com/llvm/llvm-project/commit/1aad641c793090b4d036c03e737df2ebe2c32c57). + +This new warning gets included as part of the existing error +diagnostic setting of -Wcast-function-type. + +This fixes errors like these: + +../src/hb-ft.cc:1011:34: error: cast from 'void (*)(FT_Face)' (aka 'void (*)(FT_FaceRec_ *)') to 'FT_Generic_Finalizer' (aka 'void (*)(void *)') converts to incompatible function type [-Werror,-Wcast-function-type-strict] + ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Upstream-Status: Backport [https://github.com/harfbuzz/harfbuzz/commit/d88269c827895b38f99f7cf741fa60210d4d5169] +--- + src/hb-ft.cc | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/hb-ft.cc b/src/hb-ft.cc +index a6beb9f0f..a35e75b18 100644 +--- a/src/hb-ft.cc ++++ b/src/hb-ft.cc +@@ -729,8 +729,9 @@ hb_ft_face_create_referenced (FT_Face ft_face) + } + + static void +-hb_ft_face_finalize (FT_Face ft_face) ++hb_ft_face_finalize (void *arg) + { ++ FT_Face ft_face = (FT_Face) arg; + hb_face_destroy ((hb_face_t *) ft_face->generic.data); + } + +@@ -762,7 +763,7 @@ hb_ft_face_create_cached (FT_Face ft_face) + ft_face->generic.finalizer (ft_face); + + ft_face->generic.data = hb_ft_face_create (ft_face, nullptr); +- ft_face->generic.finalizer = (FT_Generic_Finalizer) hb_ft_face_finalize; ++ ft_face->generic.finalizer = hb_ft_face_finalize; + } + + return hb_face_reference ((hb_face_t *) ft_face->generic.data); +@@ -949,8 +950,9 @@ get_ft_library () + } + + static void +-_release_blob (FT_Face ft_face) ++_release_blob (void *arg) + { ++ FT_Face ft_face = (FT_Face) arg; + hb_blob_destroy ((hb_blob_t *) ft_face->generic.data); + } + +@@ -1032,7 +1034,7 @@ hb_ft_font_set_funcs (hb_font_t *font) + #endif + + ft_face->generic.data = blob; +- ft_face->generic.finalizer = (FT_Generic_Finalizer) _release_blob; ++ ft_face->generic.finalizer = _release_blob; + + _hb_ft_font_set_funcs (font, ft_face, true); + hb_ft_font_set_load_flags (font, FT_LOAD_DEFAULT | FT_LOAD_NO_HINTING); +-- +2.39.2 + diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch index 962c119791..bc9371553f 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf/automake_foreign.patch @@ -3,6 +3,8 @@ From: Khem Raj <raj.khem@gmail.com> Date: Tue, 9 May 2017 00:57:10 -0700 --- +Upstream-Status: Pending + Makefile.am | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.0.bb b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb index 4728022a27..6cd4a48aa8 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.0.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl2-ttf_2.20.2.bb @@ -2,17 +2,20 @@ SUMMARY = "Simple DirectMedia Layer truetype font library" SECTION = "libs" DEPENDS = "libsdl2 freetype virtual/egl" LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=771dca8728b18d39b130e19b36514371" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=a41cbf59bdea749fe34c1af6d3615f68" SRC_URI = " \ - git://github.com/libsdl-org/SDL_ttf.git;branch=main;protocol=https \ + git://github.com/libsdl-org/SDL_ttf.git;branch=release-2.20.x;protocol=https \ git://github.com/libsdl-org/freetype.git;branch=VER-2-12-1-SDL;destsuffix=git/external/freetype;name=freetype;protocol=https \ git://github.com/libsdl-org/harfbuzz.git;branch=2.9.1-SDL;destsuffix=git/external/harfbuzz;name=harfbuzz;protocol=https \ + file://0001-freetype-Fix-function-signatures-to-match-without-ca.patch;patchdir=external/harfbuzz \ file://automake_foreign.patch \ " -SRCREV = "f5e4828ffc9d3a84f00011fede4446aecb4a685f" +SRCREV = "89d1692fd8fe91a679bb943d377bfbd709b52c23" SRCREV_freetype = "6fc77cee03e078e97afcee0c0e06a2d3274b9a29" -SRCREV_harfbuzz = "6022fe2f68d028ee178284f297b3902ffdf65b03" +SRCREV_harfbuzz = "43931e3e596c04044861770b831c8f9452e2d3b0" + +SRCREV_FORMAT .= "_freetype_harfbuzz" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb index e2992b5dd9..1f436c6d7f 100644 --- a/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb +++ b/meta-oe/recipes-graphics/libsdl/libsdl_1.2.15.bb @@ -10,12 +10,12 @@ SECTION = "libs" LICENSE = "LGPL-2.1-only" LIC_FILES_CHKSUM = "file://COPYING;md5=27818cd7fd83877a8e3ef82b82798ef4" -PR = "r3" SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://libsdl-1.2.15-xdata32.patch \ file://pkgconfig.patch \ file://0001-build-Pass-tag-CC-explictly-when-using-libtool.patch \ + file://0001-stdlib-Make-iconv-use-portable-across-glibc-musl.patch \ file://CVE-2019-7577.patch \ file://CVE-2019-7574.patch \ file://CVE-2019-7572.patch \ @@ -26,6 +26,7 @@ SRC_URI = "http://www.libsdl.org/release/SDL-${PV}.tar.gz \ file://CVE-2019-7638.patch \ file://CVE-2019-7576.patch \ file://CVE-2019-13616.patch \ + file://CVE-2022-34568.patch \ " UPSTREAM_CHECK_REGEX = "SDL-(?P<pver>\d+(\.\d+)+)\.tar" @@ -80,3 +81,5 @@ do_configure:prepend() { } BBCLASSEXTEND = "native nativesdk" + +CVE_STATUS[CVE-2019-14906] = "not-applicable-platform: Applies on RHEL only" diff --git a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb index 93f6951739..ce01593b8b 100644 --- a/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.13.bb +++ b/meta-oe/recipes-graphics/libvncserver/libvncserver_0.9.14.bb @@ -45,8 +45,12 @@ FILES:libvncclient = "${libdir}/libvncclient.*" inherit cmake SRC_URI = "git://github.com/LibVNC/libvncserver;branch=master;protocol=https" -SRCREV = "2aa20dad4c23c18948d3f63b33f9dfec1f837729" +SRCREV = "10e9eb75f73e973725dc75c373de5d89807af028" S = "${WORKDIR}/git" EXTRA_OECMAKE = "-DMAKE_INSTALL_LIBDIR=${libdir}" + +do_install:append() { + sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${libdir}/cmake/LibVNCServer/LibVNCServerTargets.cmake +} diff --git a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb index 8eb77291ab..4196449f3a 100644 --- a/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.1.1.bb +++ b/meta-oe/recipes-graphics/libyui/libyui-ncurses_4.6.2.bb @@ -4,11 +4,12 @@ LIC_FILES_CHKSUM = "file://../COPYING.lgpl-3;md5=e6a600fd5e1d9cbde2d983680233ad0 file://../COPYING.lgpl-2.1;md5=4fbd65380cdd255951079008b364516c \ " -SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https" +SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ + " SRC_URI:append:class-target = " file://0001-Fix-the-error-of-can-t-find-header-file.patch" -SRCREV = "718ac672374a2b0f50cbc7d637d90e6471babc3d" +SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516" S = "${WORKDIR}/git/libyui-ncurses" @@ -18,9 +19,16 @@ DEPENDS += "boost libyui ncurses" BBCLASSEXTEND = "nativesdk" -EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" +EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=Release -DWERROR=OFF -DCMAKE_SKIP_RPATH=1" + +# TODO: Check with newer GCC, it works ok with GCC +# GCC-14 causes buildpaths QA error +# WARNING: libyui-ncurses-4.6.2-r0 do_package_qa: QA Issue: File /usr/lib/yui/.debug/libyui-ncurses.so.16.0.0 in package libyui-ncurses-dbg contains reference to TMPDIR [buildpaths + +DEBUG_LEVELFLAG = "" CXXFLAGS += "-DNCURSES_WIDECHAR" +LDFLAGS += "-L${B}/src" do_configure:prepend () { cd ${S} diff --git a/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb b/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb index 4778561662..419a9522a4 100644 --- a/meta-oe/recipes-graphics/libyui/libyui_4.1.1.bb +++ b/meta-oe/recipes-graphics/libyui/libyui_4.6.2.bb @@ -10,7 +10,7 @@ SRC_URI = "git://github.com/libyui/libyui.git;branch=master;protocol=https \ file://0001-Use-relative-install-paths-for-CMake.patch \ " -SRCREV = "718ac672374a2b0f50cbc7d637d90e6471babc3d" +SRCREV = "e691b563262306a40a61bbf228839fa06e4f0516" S = "${WORKDIR}/git/libyui" @@ -20,6 +20,7 @@ DEPENDS += "boost" EXTRA_OECMAKE += "-DCMAKE_BUILD_TYPE=RELWITHDEBINFO -DWERROR=OFF" +LDFLAGS += "-L${B}/src" BBCLASSEXTEND = "native nativesdk" do_install:append () { diff --git a/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch b/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch new file mode 100644 index 0000000000..0bfc3f3e79 --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/files/0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch @@ -0,0 +1,63 @@ +From 5b7f657e8ad656e0854f2252b3bd482b966d650c Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Wed, 13 Mar 2024 02:12:30 +0100 +Subject: [PATCH 2/2] fix(sdl): handle both LV_IMAGE_SRC_FILE and + LV_IMAGE_SRC_VARIABLE + +The SDL image draw code currently assumes that the image source is a +filename and attempts to open that filename. This is not necessarily +the case, e.g. the lv_demo_fb uses encoded images which are of type +LV_IMAGE_SRC_VARIABLE and instead of filename, come with a buffer of +pixels. Handle the later using SDL_CreateRGBSurfaceFrom(). + +Upstream-Status: Backport [b339e67581864b2fb6bb8897735a1e110c324ddc] +Signed-off-by: Marek Vasut <marex@denx.de> +--- + src/draw/sdl/lv_draw_sdl.c | 30 +++++++++++++++++++++++++++--- + 1 file changed, 27 insertions(+), 3 deletions(-) + +diff --git a/src/draw/sdl/lv_draw_sdl.c b/src/draw/sdl/lv_draw_sdl.c +index cbb555d94..5eee5b725 100644 +--- a/src/draw/sdl/lv_draw_sdl.c ++++ b/src/draw/sdl/lv_draw_sdl.c +@@ -224,10 +224,34 @@ static bool draw_to_texture(lv_draw_sdl_unit_t * u, cache_data_t * data) + break; + case LV_DRAW_TASK_TYPE_IMAGE: { + lv_draw_image_dsc_t * image_dsc = task->draw_dsc; +- const char * path = image_dsc->src; +- SDL_Surface * surface = IMG_Load(&path[2]); ++ lv_image_src_t type = lv_image_src_get_type(image_dsc->src); ++ SDL_Surface * surface = NULL; ++ if(type == LV_IMAGE_SRC_FILE) { ++ const char * path = image_dsc->src; ++ surface = IMG_Load(&path[2]); ++ } ++ else if(type == LV_IMAGE_SRC_VARIABLE) { ++ lv_image_dsc_t * lvd = image_dsc->src; ++ surface = SDL_CreateRGBSurfaceFrom(lvd->data, ++ lvd->header.w, lvd->header.h, ++ LV_COLOR_FORMAT_GET_BPP(lvd->header.cf), ++ lvd->header.stride, ++#if SDL_BYTEORDER == SDL_LIL_ENDIAN ++ 0x00FF0000, ++ 0x0000FF00, ++ 0x000000FF, ++ 0xFF000000 ++#else ++ 0x0000FF00, ++ 0x00FF0000, ++ 0xFF000000, ++ 0x000000FF ++#endif ++ ); ++ } ++ + if(surface == NULL) { +- fprintf(stderr, "could not load image: %s\n", IMG_GetError()); ++ fprintf(stderr, "could not load image\n"); + return false; + } + +-- +2.43.0 + diff --git a/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch b/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch new file mode 100644 index 0000000000..7e542bcfbc --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/files/0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch @@ -0,0 +1,45 @@ +From 85d90749a10b5f91741d37b75825935bf7cc4fb3 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 12 Mar 2024 03:00:37 +0100 +Subject: [PATCH 3/6] Make fbdev device node runtime configurable via + environment variable + +Test whether $LV_VIDEO_CARD environment variable is non-NULL and in +case it is, use it as the video card file in lv_linux_fbdev_set_file(). +Otherwise fall back to /dev/fb0, i.e. the current behavior. This way, +it is possible to test LVGL on systems with multiple fbdev devices. + +Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] +Signed-off-by: Marek Vasut <marex@denx.de> +--- + main.c | 8 +++++++- + 1 file changed, 7 insertions(+), 1 deletion(-) + +diff --git a/main.c b/main.c +index 9775b9c..b64a098 100644 +--- a/main.c ++++ b/main.c +@@ -4,13 +4,19 @@ + #include <pthread.h> + #include <time.h> + ++static const char *lv_linux_get_video_card_node(const char *videocard_default) ++{ ++ return getenv("LV_VIDEO_CARD") ? : videocard_default; ++} ++ + int main(void) + { ++ const char *videocard = lv_linux_get_video_card_node("/dev/fb0"); + lv_init(); + + /*Linux frame buffer device init*/ + lv_display_t * disp = lv_linux_fbdev_create(); +- lv_linux_fbdev_set_file(disp, "/dev/fb0"); ++ lv_linux_fbdev_set_file(disp, videocard); + + /*Create a Demo*/ + lv_demo_widgets(); +-- +2.43.0 + diff --git a/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch b/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch new file mode 100644 index 0000000000..6843af0aab --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/files/0004-Factor-out-fbdev-initialization-code.patch @@ -0,0 +1,52 @@ +From 593da8e11cc5029773ad330b5d7633ee9f2fba95 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 12 Mar 2024 18:09:42 +0100 +Subject: [PATCH 4/6] Factor out fbdev initialization code + +Pull fbdev initialization code into separate function and add ifdef +around it, so it can be conditionally compiled in. This is done in +preparation for addition of other backend initialization example +code. + +Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] +Signed-off-by: Marek Vasut <marex@denx.de> +--- + main.c | 18 ++++++++++++++---- + 1 file changed, 14 insertions(+), 4 deletions(-) + +diff --git a/main.c b/main.c +index b64a098..288519c 100644 +--- a/main.c ++++ b/main.c +@@ -9,14 +9,24 @@ static const char *lv_linux_get_video_card_node(const char *videocard_default) + return getenv("LV_VIDEO_CARD") ? : videocard_default; + } + +-int main(void) ++#if LV_USE_LINUX_FBDEV ++static void lv_linux_disp_init(void) + { + const char *videocard = lv_linux_get_video_card_node("/dev/fb0"); +- lv_init(); +- +- /*Linux frame buffer device init*/ + lv_display_t * disp = lv_linux_fbdev_create(); ++ + lv_linux_fbdev_set_file(disp, videocard); ++} ++#else ++#error Unsupported configuration ++#endif ++ ++int main(void) ++{ ++ lv_init(); ++ ++ /*Linux display device init*/ ++ lv_linux_disp_init(); + + /*Create a Demo*/ + lv_demo_widgets(); +-- +2.43.0 + diff --git a/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch b/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch new file mode 100644 index 0000000000..2d2c4c60f1 --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/files/0005-Add-DRM-KMS-example-support.patch @@ -0,0 +1,59 @@ +From dabf40559428733413432afa29598bc145aa6636 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 12 Mar 2024 03:08:13 +0100 +Subject: [PATCH 5/6] Add DRM/KMS example support + +Extend the main.c to support both legacy fbdev and DRM/KMS initialization. + +To use legacy fbdev support, adjust lv_conf.h as follows: +LV_USE_LINUX_FBDEV=1 +LV_USE_LINUX_DRM=0 + +To use DRM/KMS support, adjust lv_conf.h as follows: +LV_USE_LINUX_FBDEV=0 +LV_USE_LINUX_DRM=1 + +Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] +Signed-off-by: Marek Vasut <marex@denx.de> +--- + CMakeLists.txt | 5 ++++- + main.c | 8 ++++++++ + 2 files changed, 12 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index d91b196..c1cfb7f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -12,6 +12,9 @@ target_include_directories(lvgl PUBLIC ${PROJECT_SOURCE_DIR}) + + add_executable(main main.c mouse_cursor_icon.c) + +-target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} m pthread) ++include(${CMAKE_CURRENT_LIST_DIR}/lvgl/tests/FindLibDRM.cmake) ++include_directories(${Libdrm_INCLUDE_DIRS}) ++ ++target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} ${Libdrm_LIBRARIES} m pthread) + add_custom_target (run COMMAND ${EXECUTABLE_OUTPUT_PATH}/main DEPENDS main) + +diff --git a/main.c b/main.c +index 288519c..ab4e936 100644 +--- a/main.c ++++ b/main.c +@@ -17,6 +17,14 @@ static void lv_linux_disp_init(void) + + lv_linux_fbdev_set_file(disp, videocard); + } ++#elif LV_USE_LINUX_DRM ++static void lv_linux_disp_init(void) ++{ ++ const char *videocard = lv_linux_get_video_card_node("/dev/dri/card0"); ++ lv_display_t * disp = lv_linux_drm_create(); ++ ++ lv_linux_drm_set_file(disp, videocard, -1); ++} + #else + #error Unsupported configuration + #endif +-- +2.43.0 + diff --git a/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch b/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch new file mode 100644 index 0000000000..cfb6c6e817 --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/files/0006-Add-SDL2-example-support.patch @@ -0,0 +1,69 @@ +From b202ce51f7b68c460fcd1b6d9c3ffa8aaf2baaf6 Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Tue, 12 Mar 2024 19:05:38 +0100 +Subject: [PATCH 6/6] Add SDL2 example support + +Extend the main.c to support both legacy fbdev, DRM/KMS, SDL2 initialization. +The SDL2 window resolution can be configured using environment variables +LV_VIDEO_WIDTH and LV_VIDEO_HEIGHT and defaults to 800 x 480 . + +To use legacy fbdev support, adjust lv_conf.h as follows: +LV_USE_LINUX_FBDEV=1 +LV_USE_LINUX_DRM=0 +LV_USE_SDL=0 + +To use DRM/KMS support, adjust lv_conf.h as follows: +LV_USE_LINUX_FBDEV=0 +LV_USE_LINUX_DRM=1 +LV_USE_SDL=0 + +To use SDL2 support, adjust lv_conf.h as follows: +LV_USE_LINUX_FBDEV=0 +LV_USE_LINUX_DRM=0 +LV_USE_SDL=1 + +Upstream-Status: Backport [a0f03515bd7417a0d100058b133c3e8d69be9451] +Signed-off-by: Marek Vasut <marex@denx.de> +--- + CMakeLists.txt | 6 +++++- + main.c | 8 ++++++++ + 2 files changed, 13 insertions(+), 1 deletion(-) + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index c1cfb7f..658193f 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -15,6 +15,10 @@ add_executable(main main.c mouse_cursor_icon.c) + include(${CMAKE_CURRENT_LIST_DIR}/lvgl/tests/FindLibDRM.cmake) + include_directories(${Libdrm_INCLUDE_DIRS}) + +-target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} ${Libdrm_LIBRARIES} m pthread) ++find_package(SDL2) ++find_package(SDL2_image) ++include_directories(${SDL2_INCLUDE_DIRS} ${SDL2_IMAGE_INCLUDE_DIRS}) ++ ++target_link_libraries(main lvgl lvgl::examples lvgl::demos lvgl::thorvg ${SDL2_LIBRARIES} ${SDL2_IMAGE_LIBRARIES} ${Libdrm_LIBRARIES} m pthread) + add_custom_target (run COMMAND ${EXECUTABLE_OUTPUT_PATH}/main DEPENDS main) + +diff --git a/main.c b/main.c +index ab4e936..4b66ebc 100644 +--- a/main.c ++++ b/main.c +@@ -25,6 +25,14 @@ static void lv_linux_disp_init(void) + + lv_linux_drm_set_file(disp, videocard, -1); + } ++#elif LV_USE_SDL ++static void lv_linux_disp_init(void) ++{ ++ const int width = atoi(getenv("LV_VIDEO_WIDTH") ? : "800"); ++ const int height = atoi(getenv("LV_VIDEO_HEIGHT") ? : "480"); ++ ++ lv_sdl_window_create(width, height); ++} + #else + #error Unsupported configuration + #endif +-- +2.43.0 + diff --git a/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch b/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch new file mode 100644 index 0000000000..f5d39396fc --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/files/0007-fix-cmake-generate-versioned-shared-libraries.patch @@ -0,0 +1,68 @@ +From 40657a770baadfff30abfecf7638e7b1c340db4d Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marex@denx.de> +Date: Thu, 14 Mar 2024 03:23:10 +0100 +Subject: [PATCH] fix(cmake): generate versioned shared libraries + +Add missing version suffix to shared libraries. Currently the filename of +generated shared libraries is only liblvgl.so, which prevents coexistence +of different versions of LVGL on the same system. Set VERSION and SOVERSION +to make cmake add the version suffix to generated shared libraries. That +changes the filename to liblvgl.so.9.1.0 and includes symlink with major +ABI version, i.e. liblvgl.so.9 . + +Upstream-Status: Backport [2c469279f53f9dee63d71295c6058749bc87ce73] +Signed-off-by: Marek Vasut <marex@denx.de> +--- + env_support/cmake/custom.cmake | 11 +++++++++++ + 1 file changed, 11 insertions(+) + +diff --git a/env_support/cmake/custom.cmake b/env_support/cmake/custom.cmake +index 9800468eb..6f33f1cc8 100644 +--- a/env_support/cmake/custom.cmake ++++ b/env_support/cmake/custom.cmake +@@ -1,3 +1,6 @@ ++set(LVGL_VERSION "9.1.0") ++set(LVGL_SOVERSION "9") ++ + # Option to define LV_LVGL_H_INCLUDE_SIMPLE, default: ON + option(LV_LVGL_H_INCLUDE_SIMPLE + "Use #include \"lvgl.h\" instead of #include \"../../lvgl.h\"" ON) +@@ -119,6 +122,8 @@ install( + set_target_properties( + lvgl + PROPERTIES OUTPUT_NAME lvgl ++ VERSION ${LVGL_VERSION} ++ SOVERSION ${LVGL_SOVERSION} + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" +@@ -137,6 +142,8 @@ if(NOT LV_CONF_BUILD_DISABLE_THORVG_INTERNAL) + set_target_properties( + lvgl_thorvg + PROPERTIES OUTPUT_NAME lvgl_thorvg ++ VERSION ${LVGL_VERSION} ++ SOVERSION ${LVGL_SOVERSION} + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" +@@ -155,6 +162,8 @@ if(NOT LV_CONF_BUILD_DISABLE_DEMOS) + set_target_properties( + lvgl_demos + PROPERTIES OUTPUT_NAME lvgl_demos ++ VERSION ${LVGL_VERSION} ++ SOVERSION ${LVGL_SOVERSION} + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" +@@ -173,6 +182,8 @@ if(NOT LV_CONF_BUILD_DISABLE_EXAMPLES) + set_target_properties( + lvgl_examples + PROPERTIES OUTPUT_NAME lvgl_examples ++ VERSION ${LVGL_VERSION} ++ SOVERSION ${LVGL_SOVERSION} + ARCHIVE_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + LIBRARY_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/lib" + RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin" +-- +2.43.0 + diff --git a/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch b/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch new file mode 100644 index 0000000000..5cafb41d56 --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/files/0008-fix-fbdev-set-resolution-prior-to-buffer.patch @@ -0,0 +1,29 @@ +From a6f822f75b3ba01b00c028608c93160d09a6ffd1 Mon Sep 17 00:00:00 2001 +From: Jaeyoon Jung <jaeyoon.jung@lge.com> +Date: Mon, 1 Apr 2024 18:00:39 +0900 +Subject: [PATCH] fix(fbdev): set resolution prior to buffer + +Otherwise it ends up with using the default value 800x480 and may fail +at lv_display_set_buffers due to incorrect resolution. + +Upstream-Status: Backport [29662d1c357c15135d076a2a924b9ef056c82120] +Signed-off-by: Jaeyoon Jung <jaeyoon.jung@lge.com> +--- + + src/drivers/display/fb/lv_linux_fbdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/drivers/display/fb/lv_linux_fbdev.c b/src/drivers/display/fb/lv_linux_fbdev.c +index b3cc89199..5fb4c5c9f 100644 +--- a/src/drivers/display/fb/lv_linux_fbdev.c ++++ b/src/drivers/display/fb/lv_linux_fbdev.c +@@ -233,8 +233,8 @@ void lv_linux_fbdev_set_file(lv_display_t * disp, const char * file) + draw_buf_2 = malloc(draw_buf_size); + } + +- lv_display_set_buffers(disp, draw_buf, draw_buf_2, draw_buf_size, LV_LINUX_FBDEV_RENDER_MODE); + lv_display_set_resolution(disp, hor_res, ver_res); ++ lv_display_set_buffers(disp, draw_buf, draw_buf_2, draw_buf_size, LV_LINUX_FBDEV_RENDER_MODE); + + if(width > 0) { + lv_display_set_dpi(disp, DIV_ROUND_UP(hor_res * 254, width * 10)); diff --git a/meta-oe/recipes-graphics/lvgl/lv-conf.inc b/meta-oe/recipes-graphics/lvgl/lv-conf.inc new file mode 100644 index 0000000000..9186015537 --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/lv-conf.inc @@ -0,0 +1,81 @@ +PACKAGECONFIG ??= "drm" + +PACKAGECONFIG[drm] = ",,libdrm" +PACKAGECONFIG[fbdev] = ",," +PACKAGECONFIG[gridnav] = ",," +PACKAGECONFIG[sdl] = ",,virtual/libsdl2 libsdl2-image" + +# Add libdrm include if drm is selected in PACKAGECONFIG +TARGET_CFLAGS += "${@bb.utils.contains('PACKAGECONFIG', 'drm', '-I${STAGING_INCDIR}/libdrm', '', d)}" + +LVGL_CONFIG_USE_DRM = "${@bb.utils.contains('PACKAGECONFIG', 'drm', '1', '0', d)}" + +LVGL_CONFIG_USE_EVDEV = "${@bb.utils.contains_any('PACKAGECONFIG', 'drm fbdev', '1', '0', d)}" + +LVGL_CONFIG_USE_FBDEV = "${@bb.utils.contains('PACKAGECONFIG', 'fbdev', '1', '0', d)}" + +LVGL_CONFIG_USE_SDL = "${@bb.utils.contains('PACKAGECONFIG', 'sdl', '1', '0', d)}" + +LVGL_CONFIG_SDL_FULLSCREEN ?= "0" + +LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" +LVGL_CONFIG_LV_MEM_SIZE ?= "(64 * 1024U)" +LVGL_CONFIG_LV_COLOR_DEPTH ?= "32" + +LVGL_CONFIG_LV_USE_LOG ?= "0" +LVGL_CONFIG_LV_LOG_LEVEL ?= "LV_LOG_LEVEL_WARN" +LVGL_CONFIG_LV_LOG_PRINTF ?= "0" + +LVGL_CONFIG_LV_USE_FONT_COMPRESSED ?= "0" + +LVGL_CONFIG_LV_USE_GRIDNAV = "${@bb.utils.contains('PACKAGECONFIG', 'gridnav', '1', '0', d)}" + +LVGL_CONFIG_LV_THEME_DEFAULT_DARK ?= "0" + +DEBUG_BUILD ??= "0" + +ALLOW_EMPTY:${PN} = "1" + +EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${baselib}" + +do_configure:append() { + # If there is a configuration template, start from that + [ -r "${S}/lv_conf_template.h" ] && cp -Lv "${S}/lv_conf_template.h" "${S}/lv_conf.h" + + sed -r -e "s|#if 0 .*Set it to \"1\" to enable content.*|#if 1 // Enabled by ${PN}|" \ + \ + -e "s|^([[:space:]]*#define LV_USE_LINUX_DRM[[:space:]]).*|\1${LVGL_CONFIG_USE_DRM}|" \ + \ + -e "s|^([[:space:]]*#define LV_USE_LINUX_FBDEV[[:space:]]).*|\1${LVGL_CONFIG_USE_FBDEV}|" \ + \ + -e "s|^([[:space:]]*#define LV_USE_SDL[[:space:]]).*|\1${LVGL_CONFIG_USE_SDL}|" \ + -e "s|^([[:space:]]*#define LV_USE_DRAW_SDL[[:space:]]).*|\1${LVGL_CONFIG_USE_SDL}|" \ + -e "s|^([[:space:]]*#define LV_SDL_BUF_COUNT[[:space:]]).*|\1 2|" \ + -e "s|^([[:space:]]*#define LV_SDL_FULLSCREEN[[:space:]]).*|\1${LVGL_CONFIG_SDL_FULLSCREEN}|" \ + \ + -e "s|^([[:space:]]*#define LV_COLOR_DEPTH[[:space:]]).*|\1${LVGL_CONFIG_LV_COLOR_DEPTH}|" \ + -e "s|^([[:space:]]*#define LV_MEM_CUSTOM[[:space:]]).*|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|" \ + -e "s|^([[:space:]]*#define LV_MEM_SIZE[[:space:]]).*|\1${LVGL_CONFIG_LV_MEM_SIZE}|" \ + \ + -e "s|^([[:space:]]*#define LV_TICK_CUSTOM[[:space:]]).*|\1 1|" \ + -e "s|^([[:space:]]*#define LV_TICK_CUSTOM_INCLUDE[[:space:]]).*|\1 <stdint.h>|" \ + -e "s|^([[:space:]]*#define LV_TICK_CUSTOM_SYS_TIME_EXPR[[:space:]]).*|extern uint32_t custom_tick_get(void);\n\1 (custom_tick_get())|" \ + \ + -e "s|^([[:space:]]*#define LV_USE_EVDEV[[:space:]]).*|\1${LVGL_CONFIG_USE_EVDEV}|" \ + \ + -e "s|^([[:space:]]*#define LV_USE_ASSERT_NULL[[:space:]]).*|\1${DEBUG_BUILD}|" \ + -e "s|^([[:space:]]*#define LV_USE_ASSERT_MALLOC[[:space:]]).*|\1${DEBUG_BUILD}|" \ + -e "s|^([[:space:]]*#define LV_USE_ASSERT_STYLE[[:space:]]).*|\1${DEBUG_BUILD}|" \ + -e "s|^([[:space:]]*#define LV_USE_ASSERT_MEM_INTEGRITY[[:space:]]).*|\1${DEBUG_BUILD}|" \ + -e "s|^([[:space:]]*#define LV_USE_ASSERT_OBJ[[:space:]]).*|\1${DEBUG_BUILD}|" \ + \ + -e "s|^([[:space:]]*#define LV_USE_LOG[[:space:]]).*|\1${LVGL_CONFIG_LV_USE_LOG}|" \ + -e "s|^([[:space:]]*#define LV_LOG_LEVEL[[:space:]]).*|\1${LVGL_CONFIG_LV_LOG_LEVEL}|" \ + -e "s|^([[:space:]]*#define LV_LOG_PRINTF[[:space:]]).*|\1${LVGL_CONFIG_LV_LOG_PRINTF}|" \ + \ + -e "s|^([[:space:]]*#define LV_USE_FONT_COMPRESSED[[:space:]]).*|\1${LVGL_CONFIG_LV_USE_FONT_COMPRESSED}|" \ + -e "s|^([[:space:]]*#define LV_USE_GRIDNAV[[:space:]]).*|\1${LVGL_CONFIG_LV_USE_GRIDNAV}|" \ + -e "s|^([[:space:]]*#define LV_THEME_DEFAULT_DARK[[:space:]]).*|\1${LVGL_CONFIG_LV_THEME_DEFAULT_DARK}|" \ + \ + -i "${S}/lv_conf.h" +} diff --git a/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb b/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb deleted file mode 100644 index 1a94215839..0000000000 --- a/meta-oe/recipes-graphics/lvgl/lv-drivers_7.11.0.bb +++ /dev/null @@ -1,46 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: MIT - -HOMEPAGE = "https://docs.lvgl.io/latest/en/html/porting/index.html" -SUMMARY = "LVGL's Display and Touch pad drivers" -DESCRIPTION = "Collection of drivers: SDL, framebuffer, wayland and more..." -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" - -# TODO: Pin upstream release (current v7.11.0-80-g419a757) -SRC_URI = "git://github.com/lvgl/lv_drivers;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "419a757c23aaa67c676fe3a2196d64808fcf2254" - -DEPENDS = "libxkbcommon lvgl wayland" - -REQUIRED_DISTRO_FEATURES = "wayland" - -inherit cmake -inherit features_check - -S = "${WORKDIR}/${PN}-${PV}" - -LVGL_CONFIG_WAYLAND_HOR_RES ?= "480" -LVGL_CONFIG_WAYLAND_VER_RES ?= "320" - -EXTRA_OECMAKE += "-Dinstall:BOOL=ON -DLIB_INSTALL_DIR=${BASELIB}" - -TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" - -# Upstream does not support a default configuration -# but propose a default "disabled" template, which is used as reference -# More configuration can be done using external configuration variables -do_configure:append() { - [ -r "${S}/lv_drv_conf.h" ] \ - || sed -e "s|#if 0 .*Set it to \"1\" to enable the content.*|#if 1 // Enabled by ${PN}|g" \ - -e "s|# define USE_WAYLAND 0|# define USE_WAYLAND 1|g" \ - -e "s|\(^ *# *define *WAYLAND_HOR_RES *\).*|\1${LVGL_CONFIG_WAYLAND_HOR_RES}|g" \ - -e "s|\(^ *# *define *WAYLAND_VER_RES *\).*|\1${LVGL_CONFIG_WAYLAND_VER_RES}|g" \ - < "${S}/lv_drv_conf_template.h" > "${S}/lv_drv_conf.h" -} - -FILES:${PN}-dev += "\ - ${includedir}/lvgl/lv_drivers/ \ - " diff --git a/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb b/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb deleted file mode 100644 index 032e85f522..0000000000 --- a/meta-oe/recipes-graphics/lvgl/lv-lib-png_8.0.2.bb +++ /dev/null @@ -1,29 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: MIT - -HOMEPAGE = "https://docs.lvgl.io" -SUMMARY = "PNG decoder for LVGL" -DESCRIPTION = "Allow the use of PNG images in LVGL. This implementation uses lodepng" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=d6fc0df890c5270ef045981b516bb8f2" - -SRC_URI = "git://github.com/lvgl/lv_lib_png;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "bf1531afe07c9f861107559e29ab8a2d83e4715a" - -# because of lvgl dependency -REQUIRED_DISTRO_FEATURES = "wayland" - -DEPENDS += "lvgl" - -EXTRA_OECMAKE += "-DLIB_INSTALL_DIR=${BASELIB}" - -inherit cmake -inherit features_check - -TARGET_CFLAGS += "-DLV_CONF_INCLUDE_SIMPLE=1" -TARGET_CFLAGS += "-I${RECIPE_SYSROOT}/${includedir}/lvgl" - -FILES:${PN}-dev = "\ - ${includedir}/lvgl/lv_lib_png/ \ - " diff --git a/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb new file mode 100644 index 0000000000..6e8371baad --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/lvgl-demo-fb_9.1.0.bb @@ -0,0 +1,45 @@ +SUMMARY = "LVGL Demo Application for Framebuffer" +HOMEPAGE = "https://github.com/lvgl/lv_port_linux_frame_buffer" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE;md5=802d3d83ae80ef5f343050bf96cce3a4 \ + file://lvgl/LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" + +SRC_URI = "\ + git://github.com/lvgl/lv_port_linux_frame_buffer.git;protocol=https;branch=master;name=demo \ + git://github.com/lvgl/lvgl;protocol=https;branch=master;name=lvgl;subdir=git/lvgl \ + file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch;patchdir=lvgl \ + file://0003-Make-fbdev-device-node-runtime-configurable-via-envi.patch \ + file://0004-Factor-out-fbdev-initialization-code.patch \ + file://0005-Add-DRM-KMS-example-support.patch \ + file://0006-Add-SDL2-example-support.patch \ + file://0007-fix-cmake-generate-versioned-shared-libraries.patch;patchdir=lvgl \ + file://0008-fix-fbdev-set-resolution-prior-to-buffer.patch;patchdir=lvgl \ + " +SRCREV_demo = "dccc6a1ca48372aa993dbea7a8e17dec6f42df6a" +SRCREV_lvgl = "e1c0b21b2723d391b885de4b2ee5cc997eccca91" +SRCREV_FORMAT = "demo_lvgl" + +EXTRA_OEMAKE = "DESTDIR=${D}" + +LVGL_CONFIG_DRM_CARD ?= "/dev/dri/card0" +LVGL_CONFIG_LV_USE_LOG = "1" +LVGL_CONFIG_LV_LOG_PRINTF = "1" +LVGL_CONFIG_LV_MEM_SIZE = "(256 * 1024U)" +LVGL_CONFIG_LV_USE_FONT_COMPRESSED = "1" +require lv-conf.inc + +inherit cmake + +S = "${WORKDIR}/git" + +do_configure:prepend() { + if [ "${LVGL_CONFIG_USE_SDL}" -eq 1 ] ; then + # Add libsdl build dependency, SDL2_image has no cmake file + sed -i '/^target_link_libraries/ s@pthread@& SDL2_image@' "${S}/CMakeLists.txt" + fi +} + +do_install:append() { + install -d ${D}${bindir} + install -m 0755 ${S}/bin/main ${D}${bindir}/lvgl +} diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb deleted file mode 100644 index 2005afa2fd..0000000000 --- a/meta-oe/recipes-graphics/lvgl/lvgl_8.1.0.bb +++ /dev/null @@ -1,37 +0,0 @@ -# SPDX-FileCopyrightText: Huawei Inc. -# -# SPDX-License-Identifier: MIT - -HOMEPAGE = "https://lvgl.io/" -DESCRIPTION = "LVGL is an OSS graphics library to create embedded GUI" -SUMMARY = "Light and Versatile Graphics Library" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" - -SRC_URI = "gitsm://github.com/lvgl/lvgl;destsuffix=${S};protocol=https;nobranch=1" -SRCREV = "d38eb1e689fa5a64c25e677275172d9c8a4ab2f0" - -REQUIRED_DISTRO_FEATURES = "wayland" - -inherit cmake -inherit features_check - -EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${BASELIB}" -S = "${WORKDIR}/${PN}-${PV}" - -LVGL_CONFIG_LV_MEM_CUSTOM ?= "0" - -# Upstream does not support a default configuration -# but propose a default "disabled" template, which is used as reference -# More configuration can be done using external configuration variables -do_configure:prepend() { - [ -r "${S}/lv_conf.h" ] \ - || sed -e 's|#if 0 .*Set it to "1" to enable .*|#if 1 // Enabled|g' \ - -e "s|\(#define LV_MEM_CUSTOM .*\)0|\1${LVGL_CONFIG_LV_MEM_CUSTOM}|g" \ - < "${S}/lv_conf_template.h" > "${S}/lv_conf.h" -} - -FILES:${PN}-dev += "\ - ${includedir}/${PN}/ \ - ${includedir}/${PN}/lvgl/ \ - " diff --git a/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb new file mode 100644 index 0000000000..63c810d74d --- /dev/null +++ b/meta-oe/recipes-graphics/lvgl/lvgl_9.1.0.bb @@ -0,0 +1,28 @@ +# SPDX-FileCopyrightText: Huawei Inc. +# +# SPDX-License-Identifier: MIT + +HOMEPAGE = "https://lvgl.io/" +DESCRIPTION = "LVGL is an OSS graphics library to create embedded GUI" +SUMMARY = "Light and Versatile Graphics Library" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=bf1198c89ae87f043108cea62460b03a" + +SRC_URI = "\ + git://github.com/lvgl/lvgl;protocol=https;branch=master \ + file://0002-fix-sdl-handle-both-LV_IMAGE_SRC_FILE-and-LV_IMAGE_S.patch \ + file://0007-fix-cmake-generate-versioned-shared-libraries.patch \ + file://0008-fix-fbdev-set-resolution-prior-to-buffer.patch \ + " +SRCREV = "e1c0b21b2723d391b885de4b2ee5cc997eccca91" + +inherit cmake + +EXTRA_OECMAKE = "-DLIB_INSTALL_DIR=${baselib} -DBUILD_SHARED_LIBS=ON" +S = "${WORKDIR}/git" + +require lv-conf.inc + +do_install:append() { + install -m 0644 "${S}/lv_conf.h" "${D}${includedir}/${BPN}/lv_conf.h" +} diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0001-Initialize-msghdr-struct-in-a-portable-way.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0001-Initialize-msghdr-struct-in-a-portable-way.patch new file mode 100644 index 0000000000..d4779505d8 --- /dev/null +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0001-Initialize-msghdr-struct-in-a-portable-way.patch @@ -0,0 +1,40 @@ +From 7c370576b4fb7c7d3b6dbf33125136a4ae70a330 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 31 Aug 2022 21:52:16 -0700 +Subject: [PATCH] Initialize msghdr struct in a portable way + +Initializing the structure assuming glibc layout results in +compile errors on musl, therefore do partial intialization and then +assigning the members individually. + +Upstream-Status: Submitted [https://sourceforge.net/p/lxdm/code/merge-requests/4/] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/lxcom.c | 9 +++++++-- + 2 files changed, 10 insertions(+), 5 deletions(-) + +diff --git a/src/lxcom.c b/src/lxcom.c +index 397d1b5..517c775 100644 +--- a/src/lxcom.c ++++ b/src/lxcom.c +@@ -117,10 +117,15 @@ static gboolean lxcom_dispatch (GSource *source,GSourceFunc callback,gpointer us + char ctrl[/*CMSG_SPACE(sizeof(LXDM_CRED))*/1024]; + struct sockaddr_un peer; + struct iovec v={buf,sizeof(buf)}; +- struct msghdr h={&peer,sizeof(peer),&v,1,ctrl,sizeof(ctrl),0}; ++ struct msghdr h={0}; + struct cmsghdr *cmptr; + int ret; +- ++ h.msg_name = &peer; ++ h.msg_namelen = sizeof(peer); ++ h.msg_iov = &v; ++ h.msg_iovlen = 1; ++ h.msg_control = ctrl; ++ h.msg_controllen = sizeof(ctrl); + while(1) + { + peer.sun_family=0; +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch index 75dc10c979..5af4e5233c 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0002-let-autotools-create-lxdm.conf.patch @@ -8,9 +8,7 @@ Content-Transfer-Encoding: 8bit in out of tree builds lxdm.conf is empty -Upstream-Status: submitted [1] - -[1] http://sourceforge.net/p/lxde/mailman/message/32901417/ +Upstream-Status: Submitted [http://sourceforge.net/p/lxde/mailman/message/32901417/] Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com> --- diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch index f9fd4970fb..31b12f8078 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0003-check-for-libexecinfo-providing-backtrace-APIs.patch @@ -8,6 +8,8 @@ unlike glibc where it is bundled in Signed-off-by: Khem Raj <raj.khem@gmail.com> --- +Upstream-Status: Pending + configure.ac | 2 ++ 1 file changed, 2 insertions(+) diff --git a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch index afe11f3536..d232f6913e 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch +++ b/meta-oe/recipes-graphics/lxdm/lxdm/0004-fix-css-under-gtk-3.20.patch @@ -3,9 +3,7 @@ From: dgod <dgod.osa@gmail.com> Date: Mon, 21 Mar 2016 19:25:25 +0800 Subject: [PATCH] fix css under gtk 3.20 -Upstream-Status: Applied [1] - -[1] https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771 +Upstream-Status: Backport [https://git.lxde.org/gitweb/?p=lxde/lxdm.git;a=patch;h=72812894cfd9454d70e4b0753531e46580416771] --- data/themes/Industrial/gtk.css | 1 + 1 file changed, 1 insertion(+) diff --git a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb index 83b15ce8e5..ae45258297 100644 --- a/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb +++ b/meta-oe/recipes-graphics/lxdm/lxdm_0.5.3.bb @@ -19,6 +19,7 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/project/${BPN}/${BPN}%20${PV}/${BPN}-${PV}.tar. file://0008-greeter.c-show-information-on-gtk-label-info.patch \ file://0009-greeter.c-disallow-empty-new-password.patch \ file://0001-systemd-lxdm.service-remove-plymouth-quit-conflicts.patch \ + file://0001-Initialize-msghdr-struct-in-a-portable-way.patch \ " SRC_URI[md5sum] = "061caae432634e6db38bbdc84bc6ffa0" SRC_URI[sha256sum] = "4891efee81c72a400cc6703e40aa76f3f3853833d048b72ec805da0f93567f2f" @@ -60,12 +61,12 @@ do_compile:append() { do_install:append() { install -d ${D}${localstatedir}/lib/lxdm - install -m 644 ${WORKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm + install -m 644 ${UNPACKDIR}/lxdm.conf ${D}${localstatedir}/lib/lxdm if ${@bb.utils.contains('DISTRO_FEATURES', 'pam', 'true', 'false', d)}; then # ArchLinux version of pam config has the following advantages: # * simple setup of passwordless login # * in XFCE powerdown/restart enabled in logoff dialog - install -m 644 ${WORKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm + install -m 644 ${UNPACKDIR}/${@bb.utils.contains("DISTRO_TYPE", "debug", "lxdm-pam-debug", "lxdm-pam",d)} ${D}${sysconfdir}/pam.d/lxdm fi } diff --git a/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb new file mode 100644 index 0000000000..9065050c62 --- /dev/null +++ b/meta-oe/recipes-graphics/neatvnc/neatvnc_0.8.1.bb @@ -0,0 +1,38 @@ +SUMMARY = "A liberally licensed VNC server library" +DESCRIPTION = "This is a liberally licensed VNC server library that's intended to be fast and neat." +HOMEPAGE = "https://github.com/any1/neatvnc" +LICENSE = "ISC" +LIC_FILES_CHKSUM = "file://COPYING;md5=94fc374e7174f41e3afe0f027ee59ff7" + +SRC_URI = "git://github.com/any1/neatvnc;branch=v0.8;protocol=https" + +SRCREV = "07081567ab21a2b099ceb41ae8cab872a31cbb9a" + +S = "${WORKDIR}/git" + +DEPENDS = "libdrm pixman aml zlib" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[tls] = "-Dtls=enabled,-Dtls=disabled,gnutls" +PACKAGECONFIG[jpeg] = "-Djpeg=enabled,-Djpeg=disabled,libjpeg-turbo" +PACKAGECONFIG[examples] = "-Dexamples=true,-Dexamples=false,libpng" +PACKAGECONFIG[benchmarks] = "-Dbenchmarks=true,-Dbenchmarks=false,libpng" + +PACKAGE_BEFORE_PN += "${PN}-examples" +ALLOW_EMPTY:${PN}-examples = "1" +FILES:${PN}-examples = "${bindir}" + +NEATVNC_EXAMPLES = "draw png-server" + +inherit meson pkgconfig + +do_install:append () { + if ${@bb.utils.contains('PACKAGECONFIG', 'examples', 'true', 'false', d)}; then + install -d ${D}${bindir} + for bin in ${NEATVNC_EXAMPLES}; do + install -m 0755 ${B}/examples/$bin ${D}${bindir} + done + fi +} + +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/openbox/files/0001-Fix-function-protype-visibility.patch b/meta-oe/recipes-graphics/openbox/files/0001-Fix-function-protype-visibility.patch new file mode 100644 index 0000000000..344c5d149b --- /dev/null +++ b/meta-oe/recipes-graphics/openbox/files/0001-Fix-function-protype-visibility.patch @@ -0,0 +1,94 @@ +From 941d5ff3426e68cb9bcb4ae86066124cb2535b69 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Fri, 2 Sep 2022 12:32:20 -0700 +Subject: [PATCH] Fix function protype visibility + +Include ctye.h for toupper + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + src/appearance.c | 1 + + src/desktops.c | 2 +- + src/desktops.h | 2 +- + src/main.c | 1 + + src/moveresize.c | 2 +- + src/moveresize.h | 2 +- + 6 files changed, 6 insertions(+), 4 deletions(-) + +diff --git a/src/appearance.c b/src/appearance.c +index 4fb3f0c..ee55661 100644 +--- a/src/appearance.c ++++ b/src/appearance.c +@@ -20,6 +20,7 @@ + #include "main.h" + #include "tree.h" + #include "preview_update.h" ++#include <ctype.h> /* for toupper */ + + static gboolean mapping = FALSE; + +diff --git a/src/desktops.c b/src/desktops.c +index 8297f00..27ca514 100644 +--- a/src/desktops.c ++++ b/src/desktops.c +@@ -38,7 +38,7 @@ static void on_desktop_names_cell_edited(GtkCellRendererText *cell, + gpointer data); + static void enable_stuff(); + +-void desktops_setup_tab() ++void desktops_setup_tab(void) + { + GtkWidget *w; + GtkCellRenderer *render; +diff --git a/src/desktops.h b/src/desktops.h +index 1ba3e36..446bfbb 100644 +--- a/src/desktops.h ++++ b/src/desktops.h +@@ -24,5 +24,5 @@ + + void desktops_setup_num(GtkWidget *w); + void desktops_setup_names(GtkWidget *w); +- ++void desktops_setup_tab(void); + #endif +diff --git a/src/main.c b/src/main.c +index d7e3446..0176035 100644 +--- a/src/main.c ++++ b/src/main.c +@@ -28,6 +28,7 @@ + #include "dock.h" + #include "preview_update.h" + #include "gettext.h" ++#include "moveresize.h" + + #include <gdk/gdkx.h> + #define SN_API_NOT_YET_FROZEN +diff --git a/src/moveresize.c b/src/moveresize.c +index c6fb3dd..bb52729 100644 +--- a/src/moveresize.c ++++ b/src/moveresize.c +@@ -37,7 +37,7 @@ static gboolean mapping = FALSE; + static void enable_stuff(); + static void write_fixed_position(const gchar *coord); + +-void moveresize_setup_tab() ++void moveresize_setup_tab(void) + { + GtkWidget *w, *w1, *w2, *w3; + GtkSizeGroup *group; +diff --git a/src/moveresize.h b/src/moveresize.h +index 82ecc96..8faf526 100644 +--- a/src/moveresize.h ++++ b/src/moveresize.h +@@ -20,6 +20,6 @@ + #ifndef obconf__moveresize_h + #define obconf__moveresize_h + +-void moveresize_setup_tab(); ++void moveresize_setup_tab(void); + + #endif +-- +2.37.3 + diff --git a/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch b/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch new file mode 100644 index 0000000000..8bc2b80f68 --- /dev/null +++ b/meta-oe/recipes-graphics/openbox/files/0001-Fix-list-traversal-issue-in-client_calc_layer.patch @@ -0,0 +1,56 @@ +From d41128e5a1002af41c976c8860f8299cfcd3cd72 Mon Sep 17 00:00:00 2001 +From: pldubouilh <pldubouilh@gmail.com> +Date: Fri, 17 Mar 2023 18:23:47 +0100 +Subject: [PATCH] Fix list traversal issue in client_calc_layer + +The calls to client_calc_layer_internal can modify stacking_list, which +can cause us to follow dangling ->next pointers (either by the pointer +itself already being freed, or it pointing to a freed area). Avoid this +by copying the list first, the goal is to visit every client in the list +once so this should be fine. + +Upstream-Status: Backport [http://git.openbox.org/?p=mikachu/openbox.git;a=commit;h=d41128e5a1002af41c976c8860f8299cfcd3cd72] +Signed-off-by: Alexandre Videgrain <alexandre.videgrain@smile.fr> +--- + openbox/client.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/openbox/client.c b/openbox/client.c +index 7168b240..b8264587 100644 +--- a/openbox/client.c ++++ b/openbox/client.c +@@ -2742,9 +2742,12 @@ static void client_calc_layer_internal(ObClient *self) + void client_calc_layer(ObClient *self) + { + GList *it; ++ /* the client_calc_layer_internal calls below modify stacking_list, ++ so we have to make a copy to iterate over */ ++ GList *list = g_list_copy(stacking_list); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* find the windows in the fullscreen layer, and mark them not-visited */ +@@ -2757,7 +2760,7 @@ void client_calc_layer(ObClient *self) + client_calc_layer_internal(self); + + /* skip over stuff above fullscreen layer */ +- for (it = stacking_list; it; it = g_list_next(it)) ++ for (it = list; it; it = g_list_next(it)) + if (window_layer(it->data) <= OB_STACKING_LAYER_FULLSCREEN) break; + + /* now recalc any windows in the fullscreen layer which have not +@@ -2768,6 +2771,8 @@ void client_calc_layer(ObClient *self) + !WINDOW_AS_CLIENT(it->data)->visited) + client_calc_layer_internal(it->data); + } ++ ++ g_list_free(it); + } + + gboolean client_should_show(ObClient *self) +-- +2.34.1 + diff --git a/meta-oe/recipes-graphics/openbox/obconf_git.bb b/meta-oe/recipes-graphics/openbox/obconf_git.bb index 772347190d..1210af70ea 100644 --- a/meta-oe/recipes-graphics/openbox/obconf_git.bb +++ b/meta-oe/recipes-graphics/openbox/obconf_git.bb @@ -1,5 +1,4 @@ SUMMARY = "Openbox configuration tool" -AUTHOR = "Dana Jansens & Tim Riley & Javeed Shaikh" HOMEPAGE = "http://openbox.org/wiki/ObConf:About" SECTION = "x11/wm" LICENSE = "GPL-2.0-or-later" @@ -9,11 +8,12 @@ DEPENDS = " \ startup-notification \ gtk+3 \ " -PV = "2.0.4+git${SRCPV}" +PV = "2.0.4+git" SRCREV = "63ec47c5e295ad4f09d1df6d92afb7e10c3fec39" SRC_URI = " \ git://git.openbox.org/dana/obconf;branch=master \ + file://0001-Fix-function-protype-visibility.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb index 4c97c03978..50231602dc 100644 --- a/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb +++ b/meta-oe/recipes-graphics/openbox/openbox_3.6.1.bb @@ -1,6 +1,6 @@ SUMMARY = "openbox Window Manager" SECTION = "x11/wm" -DEPENDS = "glib-2.0 pango libxml2 virtual/libx11 libcroco librsvg gdk-pixbuf" +DEPENDS = "glib-2.0 pango libxml2 virtual/libx11 librsvg gdk-pixbuf" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" @@ -8,11 +8,15 @@ SRC_URI = " \ http://icculus.org/openbox/releases/openbox-${PV}.tar.gz \ file://0001-Makefile.am-avoid-race-when-creating-autostart-direc.patch \ file://0001-openbox-xdg-autostart-convert-to-python3.patch \ + file://0001-Fix-list-traversal-issue-in-client_calc_layer.patch \ " SRC_URI[md5sum] = "b72794996c6a3ad94634727b95f9d204" SRC_URI[sha256sum] = "8b4ac0760018c77c0044fab06a4f0c510ba87eae934d9983b10878483bde7ef7" +UPSTREAM_CHECK_URI = "https://github.com/Mikachu/openbox/tags" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)" + inherit autotools gettext update-alternatives pkgconfig features_check # depends on virtual/libx11 REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch index 0ba13cf88f..2e25ecc7ef 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg/0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg/0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch @@ -1,4 +1,4 @@ -From 4681de07e21f17aa28710d3a51fabe7da60463f9 Mon Sep 17 00:00:00 2001 +From 805ce4d40c5aaae12aa73452ff07babe8eb43a62 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com> Date: Fri, 28 Sep 2018 00:38:50 +0200 Subject: [PATCH] Do not ask cmake to export binaries - they don't make it @@ -15,17 +15,17 @@ Signed-off-by: Andreas Müller <schnitzeltony@gmail.com> 1 file changed, 1 deletion(-) diff --git a/src/bin/jp2/CMakeLists.txt b/src/bin/jp2/CMakeLists.txt -index 4324c36d..2c11fe02 100644 +index 26156bcb..9eff04aa 100644 --- a/src/bin/jp2/CMakeLists.txt +++ b/src/bin/jp2/CMakeLists.txt -@@ -66,7 +66,6 @@ foreach(exe opj_decompress opj_compress opj_dump) +@@ -64,7 +64,6 @@ foreach(exe opj_decompress opj_compress opj_dump) endif() # Install exe install(TARGETS ${exe} - EXPORT OpenJPEGTargets - DESTINATION ${OPENJPEG_INSTALL_BIN_DIR} COMPONENT Applications + DESTINATION ${CMAKE_INSTALL_BINDIR} COMPONENT Applications ) if(OPJ_USE_DSYMUTIL) -- -2.14.4 +2.25.1 diff --git a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb index c71e535649..45f1b5ef42 100644 --- a/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.0.bb +++ b/meta-oe/recipes-graphics/openjpeg/openjpeg_2.5.2.bb @@ -6,9 +6,9 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=c648878b4840d7babaade1303e7f108c" DEPENDS = "libpng tiff lcms zlib" SRC_URI = "git://github.com/uclouvain/openjpeg.git;branch=master;protocol=https \ - file://0002-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ + file://0001-Do-not-ask-cmake-to-export-binaries-they-don-t-make-.patch \ " -SRCREV = "a5891555eb49ed7cc26b2901ea680acda136d811" +SRCREV = "39e8c50a2f9bdcf36810ee3d41bcbf1cc78968ae" S = "${WORKDIR}/git" inherit cmake @@ -18,4 +18,4 @@ EXTRA_OECMAKE += "-DOPENJPEG_INSTALL_LIB_DIR=${@d.getVar('baselib').replace('/', FILES:${PN} += "${libdir}/openjpeg*" -BBCLASSEXTEND = "native nativesdk" +BBCLASSEXTEND = "native" diff --git a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb index 0af6ac006e..1cc2cdf76b 100644 --- a/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb +++ b/meta-oe/recipes-graphics/packagegroups/packagegroup-fonts-truetype.bb @@ -3,7 +3,6 @@ SECTION = "fonts" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://${COREBASE}/meta/COPYING.MIT;md5=3da9cfbcb788c80a0384361b4de20420" PV = "1.0" -PR = "r2" inherit packagegroup diff --git a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.50.0.bb b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.52.0.bb index 84aedba21b..3b0fbd3e76 100644 --- a/meta-oe/recipes-graphics/pango/pangomm-2.48_2.50.0.bb +++ b/meta-oe/recipes-graphics/pango/pangomm-2.48_2.52.0.bb @@ -6,11 +6,10 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ DEPENDS = "mm-common cairomm-1.16 glibmm-2.68 pango" -GNOMEBASEBUILDCLASS = "meson" GNOMEBN = "pangomm" inherit gnomebase features_check -SRC_URI[archive.sha256sum] = "a27aa77e017b9afce9e751d85bd1cf890abbb3a58bf59d0fac917eef82db3b5b" +SRC_URI[archive.sha256sum] = "34a134126a6484ff12f774358c36ecc44d0e9df094e1b83796d9774bb7d24947" REQUIRED_DISTRO_FEATURES = "x11" S = "${WORKDIR}/${GNOMEBN}-${PV}" diff --git a/meta-oe/recipes-graphics/pango/pangomm_2.46.2.bb b/meta-oe/recipes-graphics/pango/pangomm_2.46.2.bb index 42074c14a1..da822f3243 100644 --- a/meta-oe/recipes-graphics/pango/pangomm_2.46.2.bb +++ b/meta-oe/recipes-graphics/pango/pangomm_2.46.2.bb @@ -6,7 +6,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d8045f3b8f929c1cb29a1e3fd737b499 \ DEPENDS = "mm-common cairomm glibmm pango" -GNOMEBASEBUILDCLASS = "meson" inherit gnomebase features_check diff --git a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch index 0fedfad132..02ef3cce76 100644 --- a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch +++ b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner/0001-meson.build-WORKAROUND-Remove-vulkan-dependency.patch @@ -11,6 +11,8 @@ contains vulkan. Signed-off-by: Aníbal Limón <anibal.limon@linaro.org> --- +Upstream-Status: Pending + meson.build | 6 ------ 1 file changed, 6 deletions(-) diff --git a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb index eff6ad8f83..2ec89bc05b 100644 --- a/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb +++ b/meta-oe/recipes-graphics/parallel-deqp-runner/parallel-deqp-runner_git.bb @@ -7,7 +7,7 @@ SRC_URI = "git://gitlab.freedesktop.org/mesa/parallel-deqp-runner.git;protocol=h " # Modify these as desired -PV = "2020.06.15+git${SRCPV}" +PV = "2020.06.15+git" SRCREV = "e1642fb691d29b1462504b58916f7f514a963e80" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb index 143ab6a0be..039816e4a0 100644 --- a/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb +++ b/meta-oe/recipes-graphics/qrencode/qrencode_4.1.1.bb @@ -1,5 +1,4 @@ SUMMARY = "C library for encoding data in a QR Code symbol" -AUTHOR = "Kentaro Fukuchi" HOMEPAGE = "http://fukuchi.org/works/qrencode/" SECTION = "libs" LICENSE = "LGPL-2.1-only" @@ -12,4 +11,9 @@ S = "${WORKDIR}/git" inherit autotools pkgconfig -EXTRA_OECONF += "--without-tools --without-tests" +BBCLASSEXTEND = "native" + +EXTRA_OECONF += "--without-tests" + +PACKAGECONFIG ??= "" +PACKAGECONFIG[tools] = "--with-tools,--without-tools,libpng" diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch new file mode 100644 index 0000000000..1c714f84dc --- /dev/null +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-jpeg-compressor-Reorder-stdio.h-include-location.patch @@ -0,0 +1,43 @@ +From 4eb26927eebebfc4df8789ba69f60f3c28b8ba33 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 2 Jul 2024 23:36:23 -0700 +Subject: [PATCH] jpeg-compressor: Reorder stdio.h include location + +Current, location ends up with compile errors with clang and glibc 2.40 +fortified headers + +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:13: error: use of undeclared identifier '__builtin___vfprintf_chk'; did you mean '__builtin___sprintf_chk'? +| 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, +| | ^ +| /mnt/b/yoe/master/build/tmp/work/core2-64-yoe-linux/renderdoc/1.33/recipe-sysroot/usr/include/bits/stdio2.h:128:39: error: cannot initialize a parameter of type 'char *' with an lvalue of type 'FILE *const __restrict' (aka 'jpge::_IO_FILE *const __restrict') +| 128 | int __r = __builtin___vfprintf_chk (__stream, __USE_FORTIFY_LEVEL - 1, +| | ^~~~~~~~ + +This re-ordering ensures that fortified function prototypes are used correctly. + +Upstream-Status: Submitted [https://github.com/baldurk/renderdoc/pull/3369] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + renderdoc/3rdparty/jpeg-compressor/jpge.cpp | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp +index 74d9d1006..d58e41664 100644 +--- a/renderdoc/3rdparty/jpeg-compressor/jpge.cpp ++++ b/renderdoc/3rdparty/jpeg-compressor/jpge.cpp +@@ -10,6 +10,7 @@ + + #include "jpge.h" + ++#include <stdio.h> + #include <stdlib.h> + #include <string.h> + +@@ -897,7 +898,6 @@ bool jpeg_encoder::process_scanline(const void* pScanline) + } + + // Higher level wrappers/examples (optional). +-#include <stdio.h> + + class cfile_stream : public output_stream + { diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch b/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch deleted file mode 100644 index e96dedfc39..0000000000 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc/0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch +++ /dev/null @@ -1,57 +0,0 @@ -From 41a8c9b5ac13066770baee476ebf9828371f4dad Mon Sep 17 00:00:00 2001 -From: Adrian Ratiu <adrian.ratiu@collabora.com> -Date: Tue, 24 Sep 2019 16:07:18 +0300 -Subject: [PATCH] renderdoc: use xxd instead of cross-compiling shim binary - -Renderdoc's attempt to cross compile an xxd replacement by directly -calling a host cross-compiler breaks under OE's recipe specific -sysroots protection because this is not a native recipe, so we just -use xxd-native instead. - -Upstream-Status: Inappropriate [embedded-specific] - ---- - renderdoc/CMakeLists.txt | 23 +---------------------- - 1 file changed, 1 insertion(+), 22 deletions(-) - -diff --git a/renderdoc/CMakeLists.txt b/renderdoc/CMakeLists.txt -index 5cb7440a4..453a034ba 100644 ---- a/renderdoc/CMakeLists.txt -+++ b/renderdoc/CMakeLists.txt -@@ -370,26 +370,6 @@ set(data - set(data_objects) - - if(UNIX) -- # If we're cross-compiling, include-bin will get built for the target and we -- # then can't execute it. Instead, we force calling c++ (which we can safely -- # assume is present) directly to build the binary -- -- if(CMAKE_CROSSCOMPILING) -- set(HOST_NATIVE_CPP_COMPILER c++ CACHE STRING "Command to run to compile a .cpp into an executable. Default is just c++") -- -- add_custom_command(OUTPUT ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin -- WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -- COMMAND ${CMAKE_COMMAND} -E make_directory ${CMAKE_RUNTIME_OUTPUT_DIRECTORY} -- COMMAND ${HOST_NATIVE_CPP_COMPILER} 3rdparty/include-bin/main.cpp -o ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin -- DEPENDS 3rdparty/include-bin/main.cpp) -- set(INCLUDE_BIN_EXE "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") -- set(INCLUDE_BIN_DEP "${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/include-bin") -- else() -- add_executable(include-bin 3rdparty/include-bin/main.cpp) -- set(INCLUDE_BIN_EXE $<TARGET_FILE:include-bin>) -- set(INCLUDE_BIN_DEP include-bin) -- endif() -- - foreach(res ${data}) - set(in ${res}) - set(working_dir ${CMAKE_CURRENT_SOURCE_DIR}) -@@ -399,8 +379,7 @@ if(UNIX) - add_custom_command(OUTPUT ${out_src} - WORKING_DIRECTORY ${working_dir} - COMMAND ${CMAKE_COMMAND} -E make_directory ${out_src_dir} -- COMMAND ${INCLUDE_BIN_EXE} ${in} ${out_src} -- DEPENDS ${INCLUDE_BIN_DEP} -+ COMMAND xxd -i ${in} ${out_src} - DEPENDS ${res}) - - list(APPEND data_objects ${out_src}) diff --git a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb index 0bc03941fa..833845b5a3 100644 --- a/meta-oe/recipes-graphics/renderdoc/renderdoc_1.13.bb +++ b/meta-oe/recipes-graphics/renderdoc/renderdoc_1.33.bb @@ -2,16 +2,16 @@ SUMMARY = "RenderDoc recipe providing renderdoccmd" DESCRIPTION = "RenderDoc is a frame-capture based graphics debugger" HOMEPAGE = "https://github.com/baldurk/renderdoc" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5486c0df458c74c85828e0cdbffd499e" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=5536c2b72eeed14bafaf4d2a6c032b87" -SRCREV = "cc05b288b6d1660ab04c6cf01173f1bb62e6f5dd" +SRCREV = "cae289323847ce0a84a0deca4958183567eee17e" SRC_URI = " \ - git://github.com/baldurk/${BPN}.git;protocol=http;branch=v1.x;protocol=https \ - file://0001-renderdoc-use-xxd-instead-of-cross-compiling-shim-bi.patch \ + git://github.com/baldurk/${BPN}.git;protocol=https;branch=v1.x \ + file://0001-jpeg-compressor-Reorder-stdio.h-include-location.patch \ " S = "${WORKDIR}/git" -DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms vim-native" +DEPENDS += "virtual/libx11 virtual/libgl libxcb xcb-util-keysyms" RDEPENDS:${PN} = "libxcb xcb-util-keysyms" @@ -32,6 +32,7 @@ EXTRA_OECMAKE += "\ -DENABLE_PYRENDERDOC=OFF \ -DENABLE_RENDERDOCCMD=ON \ -DCMAKE_BUILD_TYPE=Release \ + -DHOST_NATIVE_CPP_COMPILER="${BUILD_CXX}" \ " FILES:${PN} += "${libdir}" diff --git a/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch b/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch deleted file mode 100644 index 78598ea1ea..0000000000 --- a/meta-oe/recipes-graphics/spir/files/0001-Add-install-PHONY-target-in-Makefile.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 8d9870b66c3cfcf12ce7e8e013946e2a215bb722 Mon Sep 17 00:00:00 2001 -From: Ankit Navik <ankit.tarot@gmail.com> -Date: Sat, 22 Dec 2018 19:16:02 +0530 -Subject: [PATCH] Add install PHONY target in Makefile - ---- - Makefile | 8 +++++++- - 1 file changed, 7 insertions(+), 1 deletion(-) - -diff --git a/Makefile b/Makefile -index 0564b65..0993372 100644 ---- a/Makefile -+++ b/Makefile -@@ -35,7 +35,13 @@ $(STATIC_LIB): $(OBJECTS) - %.o: %.cpp - $(CXX) -c -o $@ $< $(CXXFLAGS) -MMD - -+install: -+ mkdir -p $(TARGET_DIR_BIN) -+ mkdir -p $(TARGET_DIR_LIB) -+ cp $(TARGET) $(TARGET_DIR_BIN)/ -+ cp $(STATIC_LIB) $(TARGET_DIR_LIB)/ -+ - clean: - rm -f $(TARGET) $(OBJECTS) $(CLI_OBJECTS) $(STATIC_LIB) $(DEPS) - --.PHONY: clean -+.PHONY: all install clean --- -2.7.4 - diff --git a/meta-oe/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch b/meta-oe/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch deleted file mode 100644 index 9b48cdcd09..0000000000 --- a/meta-oe/recipes-graphics/spir/files/0001-Avoid-pessimizing-std-move-3124.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 4fffcd275b50d08b54b0411679ead98970651bad Mon Sep 17 00:00:00 2001 -From: David Neto <dneto@google.com> -Date: Fri, 27 Dec 2019 12:05:58 -0500 -Subject: [PATCH] Avoid pessimizing std::move (#3124) - -Should fix a warning - -Upstream-Status: Backport [https://github.com/KhronosGroup/SPIRV-Tools/commit/8aa423930db37e37086665efcc55944d577c06e5] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - test/opt/pass_fixture.h | 9 +++------ - 1 file changed, 3 insertions(+), 6 deletions(-) - -diff --git a/test/opt/pass_fixture.h b/test/opt/pass_fixture.h -index 53fb206f..64c089d8 100644 ---- a/test/opt/pass_fixture.h -+++ b/test/opt/pass_fixture.h -@@ -60,8 +60,7 @@ class PassTest : public TestT { - // from pass Process() function. - std::tuple<std::vector<uint32_t>, Pass::Status> OptimizeToBinary( - Pass* pass, const std::string& original, bool skip_nop) { -- context_ = -- std::move(BuildModule(env_, consumer_, original, assemble_options_)); -+ context_ = BuildModule(env_, consumer_, original, assemble_options_); - EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n" - << original << std::endl; - if (!context()) { -@@ -197,8 +196,7 @@ class PassTest : public TestT { - // messages. - template <typename PassT, typename... Args> - void SinglePassRunAndFail(const std::string& original, Args&&... args) { -- context_ = -- std::move(BuildModule(env_, consumer_, original, assemble_options_)); -+ context_ = BuildModule(env_, consumer_, original, assemble_options_); - EXPECT_NE(nullptr, context()) << "Assembling failed for shader:\n" - << original << std::endl; - std::ostringstream errs; -@@ -235,8 +233,7 @@ class PassTest : public TestT { - void RunAndCheck(const std::string& original, const std::string& expected) { - assert(manager_->NumPasses()); - -- context_ = -- std::move(BuildModule(env_, nullptr, original, assemble_options_)); -+ context_ = BuildModule(env_, nullptr, original, assemble_options_); - ASSERT_NE(nullptr, context()); - - context()->set_preserve_bindings(OptimizerOptions()->preserve_bindings_); --- -2.24.1 - diff --git a/meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch b/meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch deleted file mode 100644 index 5d37da8fe0..0000000000 --- a/meta-oe/recipes-graphics/spir/files/0001-Respect-CMAKE_INSTALL_LIBDIR-in-installed-CMake-file.patch +++ /dev/null @@ -1,35 +0,0 @@ -From caf59c46ea5dc49e4dbf756c642b03e52c1b5468 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 20 Dec 2019 07:02:24 -0800 -Subject: [PATCH] Respect CMAKE_INSTALL_LIBDIR in installed CMake files - -Upstream-Status: Submitted [https://github.com/google/effcee/pull/36] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - CMakeLists.txt | 1 + - effcee/CMakeLists.txt | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - ---- a/external/effcee/CMakeLists.txt -+++ b/external/effcee/CMakeLists.txt -@@ -27,6 +27,7 @@ endif() - - include(cmake/setup_build.cmake) - include(cmake/utils.cmake) -+include(GNUInstallDirs) - - add_subdirectory(third_party) - add_subdirectory(effcee) ---- a/external/effcee/effcee/CMakeLists.txt -+++ b/external/effcee/effcee/CMakeLists.txt -@@ -14,8 +14,8 @@ install( - DESTINATION - include/effcee) - install(TARGETS effcee -- LIBRARY DESTINATION lib -- ARCHIVE DESTINATION lib) -+ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} -+ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) - - if(EFFCEE_BUILD_TESTING) - add_executable(effcee-test diff --git a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb index bf0a5947b0..bf3070701f 100644 --- a/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb +++ b/meta-oe/recipes-graphics/spir/spirv-shader-generator_git.bb @@ -5,18 +5,10 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SECTION = "graphics" S = "${WORKDIR}/git" -SRCREV = "ed16b3e69985feaf565efbecea70a1cc2fca2a58" -SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https \ - file://0001-Add-install-PHONY-target-in-Makefile.patch \ -" +SRCREV = "f09ba2777714871bddb70d049878af34b94fa54d" +SRC_URI = "git://github.com/KhronosGroup/SPIRV-Cross.git;branch=master;protocol=https" +inherit cmake pkgconfig -EXTRA_OEMAKE += 'TARGET_DIR_LIB="${D}${libdir}"' -EXTRA_OEMAKE += 'TARGET_DIR_BIN="${D}${bindir}"' +EXTRA_OECMAKE = "-DSPIRV_CROSS_SHARED=ON" -do_compile () { - cd ${S} && oe_runmake -} - -do_install () { - cd ${S} && oe_runmake install -} +FILES:${PN} += "${datadir}" diff --git a/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb b/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb index 161650f75d..f2ffee64fe 100644 --- a/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb +++ b/meta-oe/recipes-graphics/stalonetray/stalonetray_0.8.3.bb @@ -11,6 +11,8 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.bz2" SRC_URI[md5sum] = "ae95dbbacc2620e032acea8abab8c9ef" SRC_URI[sha256sum] = "36548a588b2d466913423245dda6ffb6313132cd0cec635a117d37b3dab5fd4c" +UPSTREAM_CHECK_REGEX = "files/v(?P<pver>\d+(\.\d+)+)" + inherit autotools features_check REQUIRED_DISTRO_FEATURES = "x11" diff --git a/meta-oe/recipes-graphics/suckless/st_0.8.5.bb b/meta-oe/recipes-graphics/suckless/st_0.9.2.bb index e88c2c0f09..22ad0211b6 100644 --- a/meta-oe/recipes-graphics/suckless/st_0.8.5.bb +++ b/meta-oe/recipes-graphics/suckless/st_0.9.2.bb @@ -1,13 +1,13 @@ SECTION = "shadow" LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE;md5=04c3ca13a702147c62db90f556c5b3ca" +LIC_FILES_CHKSUM = "file://LICENSE;md5=703e9835709f45ee7b81082277f1daec" SRC_URI = "http://dl.suckless.org/${BPN}/${BP}.tar.gz" inherit pkgconfig features_check REQUIRED_DISTRO_FEATURES = "x11" -SRC_URI[sha256sum] = "ea6832203ed02ff74182bcb8adaa9ec454c8f989e79232cb859665e2f544ab37" +SRC_URI[sha256sum] = "6b215d4f472b21d6232f30f221117a777e24bcfee68955ddefb7426467f9494b" DEPENDS += "libx11 libxft fontconfig ncurses-native" @@ -33,3 +33,5 @@ ALTERNATIVE:${PN} = "st st-256color" ALTERNATIVE_LINK_NAME[st] = "${datadir}/terminfo/s/st" ALTERNATIVE_LINK_NAME[st-256color] = "${datadir}/terminfo/s/st-256color" + +CVE_STATUS[CVE-2017-16224] = "cpe-incorrect: The recipe used in the meta-openembedded is a different st package compared to the one which has the CVE issue." diff --git a/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch b/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch index 93f1a9f42e..6011f4e3ac 100644 --- a/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch +++ b/meta-oe/recipes-graphics/surf/surf/0001-config.mk-Fix-compiler-and-linker.patch @@ -7,6 +7,8 @@ Fix LIBS Signed-off-by: Leon Anavi <leon.anavi@konsulko.com> --- +Upstream-Status: Pending + config.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch index 2fb44eb0e7..d273d1459f 100644 --- a/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch +++ b/meta-oe/recipes-graphics/surf/surf/0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch @@ -5,28 +5,38 @@ Subject: [PATCH] config.ml: make compatible with webkitgtk 2.34.0 Signed-off-by: Alexander Kanavin <alex@linutronix.de> --- +Upstream-Status: Pending + config.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) -diff --git a/config.mk b/config.mk -index 032bf9f..850afbf 100644 --- a/config.mk +++ b/config.mk -@@ -12,10 +12,10 @@ LIBDIR = $(LIBPREFIX)/surf - X11INC = `pkg-config --cflags x11` - X11LIB = `pkg-config --libs x11` +@@ -2,6 +2,7 @@ + VERSION = 2.1 + + # Customize below to fit your system ++PKG_CONFIG ?= pkg-config + + # paths + PREFIX = /usr/local +@@ -9,13 +10,13 @@ MANPREFIX = $(PREFIX)/share/man + LIBPREFIX = $(PREFIX)/lib + LIBDIR = $(LIBPREFIX)/surf + +-X11INC = `pkg-config --cflags x11` +-X11LIB = `pkg-config --libs x11` ++X11INC = $(shell $(PKG_CONFIG) --cflags x11) ++X11LIB = $(shell $(PKG_CONFIG) --libs x11) -GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.0` -GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.0` -WEBEXTINC = `pkg-config --cflags webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.0 webkit2gtk-web-extension-4.0 gio-2.0` -+GTKINC = `pkg-config --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1` -+GTKLIB = `pkg-config --libs gtk+-3.0 gcr-3 webkit2gtk-4.1` -+WEBEXTINC = `pkg-config --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` -+WEBEXTLIBS = `pkg-config --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0` ++GTKINC = $(shell $(PKG_CONFIG) --cflags gtk+-3.0 gcr-3 webkit2gtk-4.1) ++GTKLIB = $(shell $(PKG_CONFIG) --libs gtk+-3.0 gcr-3 webkit2gtk-4.1) ++WEBEXTINC = $(shell $(PKG_CONFIG) --cflags webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) ++WEBEXTLIBS = $(shell $(PKG_CONFIG) --libs webkit2gtk-4.1 webkit2gtk-web-extension-4.1 gio-2.0) # includes and libs INCS = $(X11INC) $(GTKINC) --- -2.20.1 - diff --git a/meta-oe/recipes-graphics/surf/surf_2.1.bb b/meta-oe/recipes-graphics/surf/surf_2.1.bb index 51c14624af..4d9d4d3dd0 100644 --- a/meta-oe/recipes-graphics/surf/surf_2.1.bb +++ b/meta-oe/recipes-graphics/surf/surf_2.1.bb @@ -5,22 +5,23 @@ SECTION = "x11/graphics" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=2a6f86d002ae9ae1eb1ccc466289f146" -DEPENDS = "webkitgtk gtk+3 glib-2.0 gcr" +DEPENDS = "webkitgtk3 gtk+3 glib-2.0 gcr3" REQUIRED_DISTRO_FEATURES = "x11 opengl" -SRCREV = "bcd7d74e613fb8af11b40c351f0a6c1a771b2d2b" +SRCREV = "665a709b522a6fa18c671f1fc41297603292d0e8" SRC_URI = "git://git.suckless.org/surf;branch=surf-webkit2 \ " -SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linke,ig.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" +SRC_URI += "${@bb.utils.contains('PACKAGECONFIG', 'soup3', 'file://0001-config.mk-Fix-compiler-and-linker.patch file://0001-config.ml-make-compatible-with-webkitgtk-2.34.0.patch', '', d)}" S = "${WORKDIR}/git" inherit pkgconfig features_check -PACKAGECONFIG ?= "" +PACKAGECONFIG_SOUP ?= "soup3" +PACKAGECONFIG ??= "${PACKAGECONFIG_SOUP}" -# Enable if soup3 is enabled in webkit recipe +PACKAGECONFIG[soup2] = ",,," PACKAGECONFIG[soup3] = ",,," TARGET_CC_ARCH += "${LDFLAGS}" diff --git a/meta-oe/recipes-graphics/terminus-font/terminus-font/use-no-name-option-for-gzip.patch b/meta-oe/recipes-graphics/terminus-font/terminus-font/use-no-name-option-for-gzip.patch new file mode 100644 index 0000000000..97213c07da --- /dev/null +++ b/meta-oe/recipes-graphics/terminus-font/terminus-font/use-no-name-option-for-gzip.patch @@ -0,0 +1,66 @@ +Build compressed archives with -n + +The compressed archives contain a header with the field MTIME +(Modification Time) which is initialized from the built date. +As a consequence, two separate builds generate compressed archives +whose checksum differs. Such behavior prevents reproducible builds. + +Adding the -n option to gzip while compressing the archive does +not save the original time stamp by default hence making +reproducible build. + +Upstream-Status: Inappropriate + +Signed-off-by: Jean-Marc BOUCHE <jean-marc.bouche@foss.st.com> +Index: terminus-font-4.49.1/Makefile +=================================================================== +--- terminus-font-4.49.1.orig/Makefile ++++ terminus-font-4.49.1/Makefile +@@ -92,9 +92,9 @@ otbdir = $(prefix)/share/fonts/terminus + + install: $(PSF) $(PCF) + mkdir -p $(DESTDIR)$(psfdir) +- for i in $(PSF) ; do gzip -c $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done ++ for i in $(PSF) ; do gzip -c -n $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done + mkdir -p $(DESTDIR)$(x11dir) +- for i in $(PCF) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done ++ for i in $(PCF) ; do gzip -c -n $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done + + uninstall: + for i in $(PSF) ; do rm -f $(DESTDIR)$(psfdir)/$$i.gz ; done +@@ -193,7 +193,7 @@ psf: $(PSF) + + install-psf: $(PSF) + mkdir -p $(DESTDIR)$(psfdir) +- for i in $(PSF) ; do gzip -c $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done ++ for i in $(PSF) ; do gzip -c -n $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done + + uninstall-psf: + for i in $(PSF) ; do rm -f $(DESTDIR)$(psfdir)/$$i.gz ; done +@@ -202,7 +202,7 @@ psf-vgaw: $(PSF_VGAW) + + install-psf-vgaw: $(PSF_VGAW) + mkdir -p $(DESTDIR)$(psfdir) +- for i in $(PSF_VGAW) ; do gzip -c $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done ++ for i in $(PSF_VGAW) ; do gzip -c -n $$i > $(DESTDIR)$(psfdir)/$$i.gz ; done + + uninstall-psf-vgaw: + for i in $(PSF_VGAW) ; do rm -f $(DESTDIR)$(psfdir)/$$i.gz ; done +@@ -279,7 +279,7 @@ pcf: $(PCF) + + install-pcf: $(PCF) + mkdir -p $(DESTDIR)$(x11dir) +- for i in $(PCF) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done ++ for i in $(PCF) ; do gzip -c -n $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done + + uninstall-pcf: + for i in $(PCF) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done +@@ -288,7 +288,7 @@ pcf-8bit: $(PCF_8BIT) + + install-pcf-8bit: $(PCF_8BIT) + mkdir -p $(DESTDIR)$(x11dir) +- for i in $(PCF_8BIT) ; do gzip -c $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done ++ for i in $(PCF_8BIT) ; do gzip -c -n $$i > $(DESTDIR)$(x11dir)/$$i.gz ; done + + uninstall-pcf-8bit: + for i in $(PCF_8BIT) ; do rm -f $(DESTDIR)$(x11dir)/$$i.gz ; done diff --git a/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb b/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb index 7eddf1da41..1fabe2e29e 100644 --- a/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb +++ b/meta-oe/recipes-graphics/terminus-font/terminus-font_4.49.1.bb @@ -2,7 +2,6 @@ SUMMARY = "Terminus fonts packages (console and X11)" DESCRIPTION = "Terminus Font is a clean, fixed width bitmap font, designed for \ long (8 and more hours per day) work with computers." HOMEPAGE = "http://terminus-font.sourceforge.net/" -AUTHOR = "Dimitar Zhekov" SECTION = "fonts" LICENSE = "OFL-1.1" @@ -10,7 +9,9 @@ LIC_FILES_CHKSUM = "file://OFL.TXT;md5=f57e6cca943dbc6ef83dc14f1855bdcc" DEPENDS = "hostperl-runtime-native gzip-native bdftopcf-native" -SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/${BPN}-${PV}.tar.gz \ + file://use-no-name-option-for-gzip.patch \ + " SRC_URI[md5sum] = "1b6acbd221957e33c8a792ebfaf3a659" SRC_URI[sha256sum] = "d961c1b781627bf417f9b340693d64fc219e0113ad3a3af1a3424c7aa373ef79" diff --git a/meta-oe/recipes-graphics/tesseract/tesseract/0001-include-sys-time.h.patch b/meta-oe/recipes-graphics/tesseract/tesseract/0001-include-sys-time.h.patch deleted file mode 100644 index de1fa75b7c..0000000000 --- a/meta-oe/recipes-graphics/tesseract/tesseract/0001-include-sys-time.h.patch +++ /dev/null @@ -1,34 +0,0 @@ -From b47fa9532a7090d76521603dbc818bdec100085f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Tue, 15 Sep 2020 17:04:27 -0700 -Subject: [PATCH] include sys/time.h - -This provides missing definitions of timeval stuct - -Fixes -| ../../../git/src/ccutil/ocrclass.h:154:7: error: member access into -incomplete type 'struct timeval' -| tv->tv_usec = (millisecs.count() % 1000) * 1000; - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/ccutil/ocrclass.h | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/src/ccutil/ocrclass.h b/src/ccutil/ocrclass.h -index d39a6dd6..96395c9b 100644 ---- a/src/ccutil/ocrclass.h -+++ b/src/ccutil/ocrclass.h -@@ -28,6 +28,8 @@ - - #include <chrono> - #include <ctime> -+#include <sys/time.h> -+ - #ifdef _WIN32 - #include <winsock2.h> // for timeval - #endif --- -2.28.0 - diff --git a/meta-oe/recipes-graphics/tesseract/tesseract_4.1.3.bb b/meta-oe/recipes-graphics/tesseract/tesseract_5.4.1.bb index 6f92679682..1177e34cdf 100644 --- a/meta-oe/recipes-graphics/tesseract/tesseract_4.1.3.bb +++ b/meta-oe/recipes-graphics/tesseract/tesseract_5.4.1.bb @@ -5,11 +5,8 @@ BUGTRACKER = "https://github.com/tesseract-ocr/tesseract/issues" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" -BRANCH = "4.1" -SRCREV = "f38e7a7ba850b668d4505dd4c712238d7ec63ca8" -SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=${BRANCH};protocol=https \ - file://0001-include-sys-time.h.patch \ - " +SRCREV = "b5f279ec7582dc57f6464557ed938558791f200d" +SRC_URI = "git://github.com/${BPN}-ocr/${BPN}.git;branch=main;protocol=https" S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch b/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch deleted file mode 100644 index f0056d6561..0000000000 --- a/meta-oe/recipes-graphics/tigervnc/files/0001-tigervnc-remove-includedir.patch +++ /dev/null @@ -1,50 +0,0 @@ -From 47f175618a0b0817714ea557c9e93f22f327421e Mon Sep 17 00:00:00 2001 -From: Hongxu Jia <hongxu.jia@windriver.com> -Date: Tue, 31 Jul 2018 16:39:52 +0800 -Subject: [PATCH 1/4] tigervnc: remove includedir - -Upstream-Status: Pending - -Signed-off-by: Chong Lu <Chong.Lu@windriver.com> - -It fixes host contamination - -Signed-off-by: Hongxu Jia <hongxu.jia@windriver.com> ---- - unix/xserver/hw/vnc/Makefile.am | 6 +++--- - 1 file changed, 3 insertions(+), 3 deletions(-) - -diff --git a/unix/xserver/hw/vnc/Makefile.am b/unix/xserver/hw/vnc/Makefile.am -index 470424b..ee18bf9 100644 ---- a/unix/xserver/hw/vnc/Makefile.am -+++ b/unix/xserver/hw/vnc/Makefile.am -@@ -23,7 +23,7 @@ libvnccommon_la_SOURCES = $(HDRS) \ - - libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" -I$(TIGERVNC_SRCDIR)/unix/common \ - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ -- -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} -I$(includedir) \ -+ -I$(TIGERVNC_SRCDIR)/unix/vncconfig $(XVNC_CPPFLAGS) ${XSERVERLIBS_CFLAGS} \ - -I$(top_srcdir)/include - - bin_PROGRAMS = Xvnc -@@ -43,7 +43,7 @@ Xvnc_CPPFLAGS = $(XVNC_CPPFLAGS) -DTIGERVNC -DNO_MODULE_EXTS \ - -UHAVE_CONFIG_H \ - -DXFree86Server -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ - -DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -I$(TIGERVNC_SRCDIR)/unix/common \ -- -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} -I$(includedir) -+ -I$(top_srcdir)/include ${XSERVERLIBS_CFLAGS} - - Xvnc_LDADD = $(XVNC_LIBS) libvnccommon.la $(COMMON_LIBS) \ - $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) $(XVNC_SYS_LIBS) -lX11 -@@ -64,7 +64,7 @@ libvnc_la_CPPFLAGS = $(XVNC_CPPFLAGS) -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_ - -I$(top_srcdir)/hw/xfree86/os-support \ - -I$(top_srcdir)/hw/xfree86/os-support/bus \ - -I$(top_srcdir)/include \ -- ${XSERVERLIBS_CFLAGS} -I$(includedir) -+ ${XSERVERLIBS_CFLAGS} - - libvnc_la_LDFLAGS = -module -avoid-version -Wl,-z,now - --- -2.7.4 - diff --git a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb index 5cde7c9fb4..668ca79ddd 100644 --- a/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb +++ b/meta-oe/recipes-graphics/tigervnc/tigervnc_1.11.0.bb @@ -27,7 +27,7 @@ SRC_URI = "git://github.com/TigerVNC/tigervnc.git;branch=1.11-branch;protocol=ht XORG_PN ?= "xorg-server" XORG_PV ?= "1.20.6" SRC_URI += "${XORG_MIRROR}/individual/xserver/${XORG_PN}-${XORG_PV}.tar.bz2;name=xorg" -XORG_S = "${WORKDIR}/${XORG_PN}-${XORG_PV}" +XORG_S = "${UNPACKDIR}/${XORG_PN}-${XORG_PV}" SRC_URI[xorg.md5sum] = "a98170084f2c8fed480d2ff601f8a14b" SRC_URI[xorg.sha256sum] = "6316146304e6e8a36d5904987ae2917b5d5b195dc9fc63d67f7aca137e5a51d1" diff --git a/meta-oe/recipes-graphics/tslib/tslib_1.22.bb b/meta-oe/recipes-graphics/tslib/tslib_1.23.bb index c2000b264b..299aa2a273 100644 --- a/meta-oe/recipes-graphics/tslib/tslib_1.22.bb +++ b/meta-oe/recipes-graphics/tslib/tslib_1.23.bb @@ -5,7 +5,6 @@ Tslib is generally used on embedded devices to provide a common user \ space interface to touchscreen functionality." HOMEPAGE = "http://tslib.org/" -AUTHOR = "Martin Kepplinger <martink@posteo.de>" SECTION = "base" LICENSE = "LGPL-2.0-or-later & GPL-2.0-or-later" LIC_FILES_CHKSUM = "\ @@ -17,7 +16,7 @@ SRC_URI = "https://github.com/kergoth/tslib/releases/download/${PV}/tslib-${PV}. file://ts.conf \ file://tslib.sh \ " -SRC_URI[sha256sum] = "aaf0aed410a268d7b51385d07fe4d9d64312038e87c447ec8a24c8db0a15617a" +SRC_URI[sha256sum] = "9b489a54d48006201f2fe955a88c3f857535ac93b6cf8e5a16c7b166c8991dac" UPSTREAM_CHECK_URI = "https://github.com/kergoth/tslib/releases" @@ -54,12 +53,12 @@ PACKAGECONFIG[one-wire-ts-input] = "--enable-one-wire-ts-input,--disable-one-wir PACKAGECONFIG[debug] = "--enable-debug,--disable-debug" do_install:prepend() { - install -m 0644 ${WORKDIR}/ts.conf ${S}/etc/ts.conf + install -m 0644 ${UNPACKDIR}/ts.conf ${S}/etc/ts.conf } do_install:append() { install -d ${D}${sysconfdir}/profile.d/ - install -m 0755 ${WORKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ + install -m 0755 ${UNPACKDIR}/tslib.sh ${D}${sysconfdir}/profile.d/ } RPROVIDES:tslib-conf = "libts-0.0-conf" @@ -81,3 +80,5 @@ FILES:tslib-uinput += "${bindir}/ts_uinput" FILES:tslib-tests = "${bindir}/ts_harvest ${bindir}/ts_print ${bindir}/ts_print_raw ${bindir}/ts_print_mt \ ${bindir}/ts_test ${bindir}/ts_test_mt ${bindir}/ts_verify ${bindir}/ts_finddev ${bindir}/ts_conf" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb index 3402d0d46a..15449b216a 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-code-pro-fonts_2.030_1.050.bb @@ -14,9 +14,12 @@ SRC_URI = " \ SRC_URI[sha256sum] = "da2ac159497d31b0c6d9daa8fc390fb8252e75b4a9805ace6a2c9cccaed4932e" S = "${WORKDIR}/source-code-pro-2.030R-ro-1.050R-it" +UPSTREAM_CHECK_URI = "https://github.com/adobe-fonts/source-code-pro/tags" +UPSTREAM_CHECK_REGEX = "releases/tag/(?P<pver>\d+\.\d+)R" + do_install() { install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${UNPACKDIR}/44-source-code-pro-fonts-fontconfig.conf ${D}${sysconfdir}/fonts/conf.d/ install -d ${D}${datadir}/fonts/truetype/ find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn-fonts.conf index 6855791b43..6855791b43 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts/44-source-han-sans-cn-fonts.conf diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb index b4a598527e..c46952cce0 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-cn-fonts_2.004.bb @@ -1,34 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Simplified Chinese" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" - -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/CN;protocol=http;rev=82 \ - file://44-source-han-sans-cn.conf \ -" -SRC_URI[md5sum] = "d16abc21f6575bb08894efedbed484a2" -SRC_URI[sha256sum] = "0a0e1d8e52833bc352d454d8242da03b82c0efc41323fb66f7435e5b39734a4f" - -S = "${WORKDIR}/SourceHanSansCN" - -do_install() { - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-han-sans-cn.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${datadir}/fonts/truetype/ - find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ - ${sysconfdir}/fonts \ - ${datadir}/fonts \ -" +ZIPNAME = "SourceHanSansCN" +SRC_URI[sha256sum] = "6841fc13f1c0d255cfeb33d2a2c68d24bbebd94ae2c070347a2b2b200a1db4d6" diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc new file mode 100644 index 0000000000..03ca4c0902 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-fonts.inc @@ -0,0 +1,26 @@ +require ttf.inc + +HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" + +inherit allarch fontcache + +SRC_URI = " \ + https://github.com/adobe-fonts/source-han-sans/releases/download/${PV}R/${ZIPNAME}.zip;subdir=${BP};downloadfilename=${BP}.zip \ + file://44-${BPN}.conf \ +" + +do_install() { + install -d ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${UNPACKDIR}/44-${BPN}.conf ${D}${sysconfdir}/fonts/conf.d/ + + install -d ${D}${datadir}/fonts/truetype/ + find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; +} + +FILES:${PN} = " \ + ${sysconfdir}/fonts \ + ${datadir}/fonts \ +" + diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp-fonts.conf index a7a93feeae..a7a93feeae 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts/44-source-han-sans-jp-fonts.conf diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb index 6a4509048f..40128f97d3 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-jp-fonts_2.004.bb @@ -1,34 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Japanese" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" - -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/JP;protocol=http;rev=82 \ - file://44-source-han-sans-jp.conf \ -" -SRC_URI[md5sum] = "908fbf97f3df04a6838708c093f1e900" -SRC_URI[sha256sum] = "dc6dbae3fba35f220bac88ba7130b826c7efe1282f472788fae3628b79be3f54" - -S = "${WORKDIR}/SourceHanSansJP" - -do_install() { - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-han-sans-jp.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${datadir}/fonts/truetype/ - find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ - ${sysconfdir}/fonts \ - ${datadir}/fonts \ -" +ZIPNAME = "SourceHanSansJP" +SRC_URI[sha256sum] = "1ae9f62ad620d686c4a049ce25cf54e3afd8fefc954a678c644cf9802750c17e" diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr-fonts.conf index dee73ae77f..dee73ae77f 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts/44-source-han-sans-kr-fonts.conf diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb index 5ab5057d86..8b32ab82d2 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-kr-fonts_2.004.bb @@ -1,34 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Korean" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" - -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \ - file://44-source-han-sans-kr.conf \ -" -SRC_URI[md5sum] = "f8d1bd6c87d8575afdb25e2f46bd81d4" -SRC_URI[sha256sum] = "38fd15c80f9980492faaa1af39ff873d8a38e45027023fb17d5b10d4b4b0e6af" - -S = "${WORKDIR}/SourceHanSansKR" - -do_install() { - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-han-sans-kr.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${datadir}/fonts/truetype/ - find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ - ${sysconfdir}/fonts \ - ${datadir}/fonts \ -" +ZIPNAME = "SourceHanSansKR" +SRC_URI[sha256sum] = "02fe28a48c6381c49d61c27a1b173c77f0e6f2b9f2b68e79f076f10a6a8f4bfe" diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw-fonts.conf index ae289401bb..ae289401bb 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw.conf +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts/44-source-han-sans-tw-fonts.conf diff --git a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb index a2b3fff079..b841660efd 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/source-han-sans-tw-fonts_2.004.bb @@ -1,34 +1,6 @@ -require ttf.inc +require source-han-sans-fonts.inc SUMMARY = "Adobe OpenType Pan-CJK font family for Traditional Chinese" -HOMEPAGE = "https://github.com/adobe-fonts/source-han-sans" -LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://${COMMON_LICENSE_DIR}/${LICENSE};md5=fac3a519e5e9eb96316656e0ca4f2b90" - -inherit allarch fontcache - -# Download tends to break - so - or not? -#EXCLUDE_FROM_WORLD = "1" - -SRC_URI = " \ - svn://github.com/adobe-fonts/source-han-sans;module=branches/release/SubsetOTF/TW;protocol=http;rev=82 \ - file://44-source-han-sans-tw.conf \ -" -SRC_URI[md5sum] = "6533b71b31c19e548768f0fc963202f3" -SRC_URI[sha256sum] = "92ba161921c5cdec5a8f8d5711676f0865b50cee071c25eb4bd4125b5af59fd0" - -S = "${WORKDIR}/SourceHanSansTW" - -do_install() { - install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/44-source-han-sans-tw.conf ${D}${sysconfdir}/fonts/conf.d/ - - install -d ${D}${datadir}/fonts/truetype/ - find ./ -name '*.otf' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/ \; -} - -FILES:${PN} = " \ - ${sysconfdir}/fonts \ - ${datadir}/fonts \ -" +ZIPNAME = "SourceHanSansTW" +SRC_URI[sha256sum] = "11d78c8fbc1a4bb04a453cdd65c99db8d41ec5cd6ba6d68c8638e6ba170de806" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.100.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.201.bb index bce37a2e05..1253cf8834 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.100.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-abyssinica_2.201.bb @@ -3,13 +3,15 @@ require ttf.inc SUMMARY = "Ethiopia and Eritrea (Amharic) font - TTF Edition" HOMEPAGE = "http://software.sil.org/abyssinica/" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://OFL.txt;md5=fd664aaab50445c3c1c97544554a6bda" +LIC_FILES_CHKSUM = "file://OFL.txt;md5=347eaa34fdf555aaf6b2144a5ccca45b" SRCNAME = "AbyssinicaSIL" SRC_URI = "http://software.sil.org/downloads/r/abyssinica/${SRCNAME}-${PV}.zip" S = "${WORKDIR}/${SRCNAME}-${PV}" -SRC_URI[sha256sum] = "1a1fc8e82f0c0f2e824f42bff05c1f4a0356330a89dc7ba798c1a20bc3e333e0" +UPSTREAM_CHECK_URI = "https://software.sil.org/abyssinica/download/" + +SRC_URI[sha256sum] = "961259a1d9ace083f737eb1e55cec40c9a56f4855866d7474bf212d2a4366ab8" FONT_PACKAGES = "${PN}" FILES:${PN} = "${datadir}" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb index 73c8eb41a1..ea734182de 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-arphic-uming_20080216.bb @@ -2,18 +2,16 @@ SUMMARY = "Unicode Mingti (printed) TrueType Font" HOMEPAGE = "http://www.freedesktop.org/wiki/Software/CJKUnifonts" LICENSE = "Arphic-Public-License" LIC_FILES_CHKSUM = "file://license/english/ARPHICPL.TXT;md5=4555ed88e9a72fc9562af379d07c3350" -SRC_DISTRIBUTE_LICENSES += "${PN}" + RPROVIDES:${PN} = "virtual-chinese-font" -PR = "r6" FONT_PACKAGES = "${PN}" -SRC_URI = "http://archive.ubuntu.com/ubuntu/pool/main/t/ttf-arphic-uming/ttf-arphic-uming_0.2.${PV}.1.orig.tar.gz" -S = "${WORKDIR}" +SRC_URI = "https://deb.debian.org/debian/pool/main/f/fonts-arphic-uming/fonts-arphic-uming_0.2.${PV}.2.orig.tar.bz2" +S = "${WORKDIR}/ttf-arphic-uming-0.2.20080216.2" require ttf.inc FILES:${PN} = "${datadir}" -SRC_URI[md5sum] = "d219fcaf953f3eb1889399955a00379f" -SRC_URI[sha256sum] = "8038a6db9e832456d5da5559aff8d15130243be1091bf24f3243503a6f1bda98" +SRC_URI[sha256sum] = "e3c19e04ea7a565b4acff6f1e4248084d2e10752e305bf7dd6c76e80860dc1db" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb index 919dad82e7..54aeb318a4 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-dejavu_2.37.bb @@ -13,7 +13,6 @@ RDEPENDS:${PN}-serif = "${PN}-common" RDEPENDS:${PN}-serif-condensed = "${PN}-common" RDEPENDS:${PN}-mathtexgyre = "${PN}-common" RDEPENDS:${PN}-common = "" -PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/dejavu/dejavu-fonts-ttf-${PV}.tar.bz2 \ file://30-dejavu-aliases.conf" @@ -24,7 +23,7 @@ UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/dejavu/files/dejavu/" do_install:append () { install -d ${D}${sysconfdir}/fonts/conf.d/ - install -m 0644 ${WORKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ + install -m 0644 ${UNPACKDIR}/30-dejavu-aliases.conf ${D}${sysconfdir}/fonts/conf.d/ } PACKAGES = "\ diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb index 7fa155a22f..cc9213ec5b 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-droid_git.bb @@ -5,8 +5,7 @@ HOMEPAGE = "http://www.droidfonts.com/" LICENSE = "Apache-2.0" LIC_FILES_CHKSUM = "file://README.txt;md5=83544262a86f1f1ec761e75897df92bc" SRCREV = "21e6e2de1f0062f949fcc52d0b4559dfa3246e0e" -PV = "0.1+gitr${SRCPV}" -PR = "r3" +PV = "0.1+git" SRC_URI = "git://github.com/android/platform_frameworks_base.git;branch=master;protocol=https" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb index 5e355eefa7..2439766ad5 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-gentium_1.02.bb @@ -6,9 +6,8 @@ LICENSE = "OFL-1.0" LICENSE_URL = "http://scripts.sil.org/cms/scripts/page.php?site_id=nrsi&item_id=OFL" LIC_FILES_CHKSUM = "file://OFL;md5=33a5bf7b98a9c0ae87430760ba762295 \ " -PR = "r8" -SRC_URI = "${DEBIAN_MIRROR}/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz " +SRC_URI = "https://archive.debian.org/debian/pool/main/t/ttf-gentium/ttf-gentium_${PV}.orig.tar.gz " S = "${WORKDIR}/ttf-sil-gentium-${PV}" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb new file mode 100644 index 0000000000..c142f1dd02 --- /dev/null +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-google-fira.bb @@ -0,0 +1,62 @@ +SUMMARY = "Google Fira Fonts- TTF Edition" +HOMEPAGE = "https://fonts.google.com/?query=fira" +LICENSE = "OFL-1.1" +LIC_FILES_CHKSUM = " \ + file://${S}/firamono/OFL.txt;md5=0373cf792d4b95c61399b94c02702892 \ + file://${S}/firacode/OFL.txt;md5=c75ca55aa0a5809a854d87db2a8ebf23 \ + file://${S}/firasans/OFL.txt;md5=de28deb2f8c1f23fd4d6918113ac3ddd \ + file://${S}/firasanscondensed/OFL.txt;md5=de28deb2f8c1f23fd4d6918113ac3ddd \ + file://${S}/firasansextracondensed/OFL.txt;md5=de28deb2f8c1f23fd4d6918113ac3ddd \ +" + +SRCREV_FORMAT = "firamono_firacode_firasans_firasanscondensed_firasansextracondensed" + +SRCREV_firamono = "701bd391b1a4b3238de193a8523009ecef1be42c" +SRCREV_firacode = "701bd391b1a4b3238de193a8523009ecef1be42c" +SRCREV_firasans = "701bd391b1a4b3238de193a8523009ecef1be42c" +SRCREV_firasanscondensed = "701bd391b1a4b3238de193a8523009ecef1be42c" +SRCREV_firasansextracondensed = "701bd391b1a4b3238de193a8523009ecef1be42c" + +SRC_URI = "git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firamono;name=firamono \ + git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firacode;name=firacode \ + git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasans;name=firasans \ + git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasanscondensed;name=firasanscondensed \ + git://github.com/google/fonts.git;protocol=https;branch=main;subpath=ofl/firasansextracondensed;name=firasansextracondensed" + +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" + +do_install:append() { + install -d ${D}${datadir}/fonts/truetype/ + find ${S} -path 'fira*/*.tt[cf]' -exec install -m 0644 {} ${D}${datadir}/fonts/truetype/{} \; + install -D -m 0644 ${S}/firamono/OFL.txt ${D}${datadir}/licenses/${PN}mono/OFL.txt + install -D -m 0644 ${S}/firacode/OFL.txt ${D}${datadir}/licenses/${PN}code/OFL.txt + install -D -m 0644 ${S}/firasans/OFL.txt ${D}${datadir}/licenses/${PN}sans/OFL.txt + install -D -m 0644 ${S}/firasanscondensed/OFL.txt ${D}${datadir}/licenses/${PN}sanscondensed/OFL.txt + install -D -m 0644 ${S}/firasansextracondensed/OFL.txt ${D}${datadir}/licenses/${PN}sansextracondensed/OFL.txt +} + +PACKAGES =+ "${PN}-mono ${PN}-code ${PN}-sans ${PN}-sanscondensed ${PN}-sansextracondensed" + +FILES:${PN}-mono += " \ + ${datadir}/fonts/truetype/FiraMono* \ + ${datadir}/licenses/${PN}mono/OFL.txt \ + " +FILES:${PN}-code += " \ + ${datadir}/fonts/truetype/FiraCode* \ + ${datadir}/licenses/${PN}code/OFL.txt \ + " +FILES:${PN}-sans += " \ + ${datadir}/fonts/truetype/FiraSans-* \ + ${datadir}/licenses/${PN}sans/OFL.txt \ + " +FILES:${PN}-sanscondensed += " \ + ${datadir}/fonts/truetype/FiraSansCondensed-* \ + ${datadir}/licenses/${PN}sanscondensed/OFL.txt \ + " +FILES:${PN}-sansextracondensed += " \ + ${datadir}/fonts/truetype/FiraSansExtraCondensed-* \ + ${datadir}/licenses/${PN}sansextracondensed/OFL.txt \ + " + +require ttf.inc diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb index e361ce9f64..8a75fe38bd 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-hunkyfonts_0.3.1.bb @@ -4,7 +4,6 @@ SUMMARY = "Hunky fonts - TTF Version" HOMEPAGE = "http://sourceforge.net/projects/hunkyfonts" LICENSE = "LGPL-2.1-or-later" LIC_FILES_CHKSUM = "file://../COPYRIGHT.TXT;md5=70d34478e38b1ad9995079f9921f9ef7" -PR = "r7" SRC_URI = "${SOURCEFORGE_MIRROR}/hunkyfonts/hunkyfonts-${PV}.tar.bz2" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb index 2ae1d619c0..43b4614f0b 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-inconsolata_20100526.bb @@ -3,23 +3,24 @@ require ttf.inc SUMMARY = "Inconsolata font - TTF Version" HOMEPAGE = "http://www.levien.com/type/myfonts/inconsolata.html" LICENSE = "OFL-1.1" -LIC_FILES_CHKSUM = "file://../OFL.txt;md5=969851e3a70122069a4d9ee61dd5a2ed" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/OFL.txt;md5=969851e3a70122069a4d9ee61dd5a2ed" SRC_URI = "http://levien.com/type/myfonts/Inconsolata.otf \ file://OFL.txt" -S = "${WORKDIR}/ttf-inconsolata-${PV}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" FILES:${PN} = "${datadir}/fonts/truetype/Inconsolata.ttf \ ${datadir}/doc/ttf-inconsolata/*" do_configure() { - cp -fr ${WORKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf + cp -fr ${UNPACKDIR}/Inconsolata.otf ${S}/Inconsolata.ttf } do_install:append() { install -d ${D}${datadir}/doc/ttf-inconsolata/ - install -m 0644 ${WORKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ + install -m 0644 ${UNPACKDIR}/OFL.txt ${D}${datadir}/doc/ttf-inconsolata/ } SRC_URI[md5sum] = "0fbe014c1f0fb5e3c71140ff0dc63edf" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb index f386d6ec58..a0fb7b6a79 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation-sans-narrow_1.07.4.bb @@ -22,7 +22,7 @@ do_install:append () { install -d ${D}${datadir}/fonts/TTF/ install -d ${D}${sysconfdir}/fonts/conf.d/ install -m 0644 LiberationSansNarrow*.ttf ${D}${datadir}/fonts/TTF/ - install -D -m 0644 ${WORKDIR}/30-0-liberation-sans-narrow.conf ${D}${sysconfdir}/conf.avail/30-${PN}-sans.conf + install -D -m 0644 ${UNPACKDIR}/30-0-liberation-sans-narrow.conf ${D}${sysconfdir}/conf.avail/30-${PN}-sans.conf install -D -m 0644 ${S}/License.txt ${D}${datadir}/licenses/${PN}/LICENSE # normal liberation fonts come from ttf-liberation recipe so delete here rm -rf ${D}${datadir}/fonts/truetype diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb index fdcfe0421b..6d7ba11e73 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-liberation_0.2.bb @@ -7,7 +7,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f \ file://License.txt;md5=5b171c5100029d884fcea21d9a2b7543 \ " -PR = "r7" SRC_URI = "http://fedorahosted.org/liberation-fonts/export/807b6dfd069b998cd9b4d3158da98817ef23c79d/F-9/liberation-fonts-ttf-3.tar.gz" S = "${WORKDIR}/liberation-fonts-${PV}" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb index 8a7c1f333b..65d0f0bb35 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-lklug_0.6-14.20090803cvs.fc24.bb @@ -5,13 +5,13 @@ HOMEPAGE = "http://rpms.famillecollet.com/rpmphp/zoom.php?rpm=lklug-fonts" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -SRC_URI = "http://dl.fedoraproject.org/pub/fedora/linux/releases/24/Everything/source/tree/Packages/l/lklug-fonts-0.6-14.20090803cvs.fc24.src.rpm;extract=lklug-20090803.tar.gz" -SRC_URI[md5sum] = "3341dfb997043d234ab3f6e5a965e759" -SRC_URI[sha256sum] = "f54c1f3b4df08995982657fed290b562556191fee2a0386afd9e8bf228f72b1a" +SRC_URI = "https://src.fedoraproject.org/repo/pkgs/lklug-fonts/lklug-20090803.tar.gz/b6e0daaf8cf41208fd2a7bc04fb23f84/lklug-20090803.tar.gz" +SRC_URI[sha256sum] = "de5750f7048973f851961050f76b8b58e9bda400d5007c3078d9317fbe2ff5fd" DEPENDS = "fontforge-native" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" FONT_PACKAGES = "${PN}" FILES:${PN} = "${datadir}" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb index d8236ce434..a3babe90a5 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-mplus_027.bb @@ -6,9 +6,7 @@ LICENSE = "${BPN}" LIC_FILES_CHKSUM = "file://LICENSE_E;md5=ac161e96eda00db9a3aec7870b5d9658 \ file://LICENSE_J;md5=a120ca8d7c8e4a475d5277c9aeb95221 \ " -PR = "r4" - -SRC_URI = "http://osdn.dl.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV}.tar.gz" +SRC_URI = "http://downloads.sourceforge.jp/mplus-fonts/6650/mplus-TESTFLIGHT-${PV}.tar.gz" S = "${WORKDIR}/mplus-TESTFLIGHT-${PV}" PACKAGESPLITFUNCS:prepend = "split_ttf_mplus_packages " diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb index e9aa5721f7..fce76418f9 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-pt-sans_1.1.bb @@ -5,7 +5,7 @@ HOMEPAGE = "http://www.paratype.com/public/" SECTION = "x11/fonts" LICENSE = "ParaTypeFFL-1.3" -LIC_FILES_CHKSUM = "file://../PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/PT%20Free%20Font%20License_eng.txt;md5=d720f3a281ed81c3f4cfc465e11b1d0d" inherit allarch fontcache @@ -16,9 +16,10 @@ SRC_URI = "http://pkgs.fedoraproject.org/repo/pkgs/paratype-pt-sans-fonts/PTSans SRC_URI[md5sum] = "c3f5a0e20a75cf628387510a720924a7" SRC_URI[sha256sum] = "0164f824e03c32c99e8a225853ec168893a04a09ade132e93a674e85ae033b2e" +S = "${UNPACKDIR}" + do_install () { install -d ${D}${datadir}/fonts/X11/TTF/ - cd .. for i in *.ttf; do install -m 0644 $i ${D}${prefix}/share/fonts/X11/TTF/${i} done diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb index 1870c78f99..3752ec39bc 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-roboto_2.138.bb @@ -9,6 +9,7 @@ SRC_URI = "https://github.com/google/roboto/releases/download/v${PV}/roboto-andr SRC_URI[md5sum] = "3b43a5cb33196ec25e44d5fcb40219e1" SRC_URI[sha256sum] = "c825453253f590cfe62557733e7173f9a421fff103b00f57d33c4ad28ae53baf" -S = "${WORKDIR}" +S = "${WORKDIR}/sources" +UNPACKDIR = "${S}" FILES:${PN} = "${datadir}/fonts/truetype/*.ttf" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb index 945a5f3a85..a4ad91fc77 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-sazanami_20040629.bb @@ -3,13 +3,11 @@ require ttf.inc SUMMARY = "Sazanami Gothic/Mincho Japanese TrueType fonts" SUMMARY:ttf-sazanami-gothic = "Sazanami Gothic Japanese TrueType font" SUMMARY:ttf-sazanami-mincho = "Sazanami Mincho Japanese TrueType font" -AUTHOR = "Electronic Font Open Laboratory (/efont/)" HOMEPAGE = "http://sourceforge.jp/projects/efont/" LICENSE = "PD" LIC_FILES_CHKSUM = "file://README;md5=97d739900be6e852830f55aa3c07d4a0" -SRC_DISTRIBUTE_LICENSES += "${PN}" + RPROVIDES:${PN} = "virtual-japanese-font" -PR = "r9" SRC_URI = "http://osdn.dl.sourceforge.jp/efont/10087/sazanami-20040629.tar.bz2" S = "${WORKDIR}/sazanami-20040629" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb index 3dad368408..0131a62eef 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-tlwg_0.6.1.bb @@ -1,10 +1,9 @@ require ttf.inc SUMMARY = "Thai Linux Working Group Fonts" -AUTHOR = "Thai Linux Working Group" HOMEPAGE = "http://linux.thai.net/projects/fonts-tlwg" LICENSE = "GPL-2.0-only & TLWG" -LIC_FILES_CHKSUM = "file://../fonts-tlwg-${PV}/COPYING;md5=3d20cd7eadf4afd5460c0adb32e387fd" +LIC_FILES_CHKSUM = "file://${UNPACKDIR}/fonts-tlwg-${PV}/COPYING;md5=3d20cd7eadf4afd5460c0adb32e387fd" SRC_URI = "http://linux.thai.net/pub/ThaiLinux/software/fonts-tlwg/fonts-tlwg-${PV}.tar.xz;name=source \ http://linux.thai.net/pub/ThaiLinux/software/ttf-tlwg/ttf-tlwg-${PV}.tar.xz;name=ttf" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb index e81515f85e..0c29a20cdd 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-ubuntu-font-family_0.83.bb @@ -4,7 +4,6 @@ SUMMARY = "Ubuntu Font Family - TTF Version" HOMEPAGE = "http://font.ubuntu.com" LICENSE = "UFL" LIC_FILES_CHKSUM = "file://LICENCE.txt;md5=325a1a9029112a2405e743c7f816427b" -PR = "r1" SHA1SUM = "0cef8205" @@ -14,6 +13,9 @@ SRC_URI = "https://assets.ubuntu.com/v1/${SHA1SUM}-ubuntu-font-family-${PV}.zip" SRC_URI[md5sum] = "c5a5059d6856b4ddf79d824dcaf5ad32" SRC_URI[sha256sum] = "61a2b342526fd552f19fef438bb9211a8212de19ad96e32a1209c039f1d68ecf" +UPSTREAM_CHECK_URI = "https://repology.org/project/fonts:ubuntu/packages" +UPSTREAM_CHECK_REGEX = "${BPN}-(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/ubuntu-font-family-${PV}" PACKAGES = "ttf-ubuntu-mono ttf-ubuntu-sans" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb index 6b79eb9197..4cc5afd4a7 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-vlgothic_20200720.bb @@ -1,7 +1,6 @@ require ttf.inc SUMMARY = "Japanese TrueType fonts from Vine Linux" -AUTHOR = "Contributor: noonov <noonov@gmail.com>" HOMEPAGE = "http://vlgothic.dicey.org/" LICENSE = "ttf-mplus & BSD-3-Clause" diff --git a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb index bc14febadb..e2925b6c95 100644 --- a/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb +++ b/meta-oe/recipes-graphics/ttf-fonts/ttf-wqy-zenhei_0.9.45.bb @@ -1,7 +1,6 @@ require ttf.inc SUMMARY = "WenQuanYi Zen Hei - A Hei-Ti Style Chinese font" -AUTHOR = "Qianqian Fang and The WenQuanYi Project Contributors" HOMEPAGE = "http://wenq.org/" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=cf540fc7d35b5777e36051280b3a911c" @@ -10,6 +9,9 @@ SRC_URI = "${SOURCEFORGE_MIRROR}/wqy/wqy-zenhei-${PV}.tar.gz" SRC_URI[md5sum] = "4c6c3f4e902dd5ee0a121e8c41d040bd" SRC_URI[sha256sum] = "e4b7e306475bf9427d1757578f0e4528930c84c44eaa3f167d4c42f110ee75d6" +UPSTREAM_CHECK_URI = "https://sourceforge.net/projects/wqy/files/wqy-zenhei/" +UPSTREAM_CHECK_REGEX = "wqy-zenhei/(?P<pver>\d+(\.\d+)+)" + S = "${WORKDIR}/wqy-zenhei" do_install:append () { diff --git a/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb b/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb index f3602f1947..e80aebc89b 100644 --- a/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb +++ b/meta-oe/recipes-graphics/unclutter-xfixes/unclutter-xfixes_1.6.bb @@ -1,6 +1,5 @@ SUMMARY = "Remove idle cursor image from screen." DESCRIPTION = "This is a rewrite of the popular tool unclutter, but using the x11-xfixes extension." -AUTHOR = "Ingo Bürk" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=b25d2c4cca175f44120d1b8e67cb358d" diff --git a/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb new file mode 100644 index 0000000000..3f44e537a4 --- /dev/null +++ b/meta-oe/recipes-graphics/vdpau/vdpauinfo_1.5.bb @@ -0,0 +1,20 @@ +DESCRIPTION = "Tool to query the capabilities of a VDPAU implementation" +HOMEPAGE = "https://gitlab.freedesktop.org/vdpau/vdpauinfo" + +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=5b6e110c362fe46168199f3490e52c3c" + +DEPENDS = "libvdpau" + +# libvdpau is available only with x11 +inherit features_check +REQUIRED_DISTRO_FEATURES = "x11" + +RDEPENDS:${PN} = "libvdpau" + +SRCREV = "d3c5bd63bf8878d59b22d618d2bb5116db392d28" +SRC_URI = "git://anongit.freedesktop.org/vdpau/vdpauinfo;branch=master" + +S = "${WORKDIR}/git" + +inherit autotools pkgconfig diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch deleted file mode 100644 index 746497d047..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Include-limits-header-for-numeric_limits.patch +++ /dev/null @@ -1,88 +0,0 @@ -From aec0be857ed3faef8802c7fd61f3d7798a565108 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 29 Apr 2021 16:03:42 -0700 -Subject: [PATCH] Include <limits> header for numeric_limits - -Fixes -vulkancts/framework/vulkan/vkRayTracingUtil.hpp:116:32: error: 'numeric_limits' is not a member of 'std' - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - framework/vulkan/vkRayTracingUtil.hpp | 1 + - modules/vulkan/api/vktApiBufferTests.cpp | 1 + - modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp | 2 ++ - 3 files changed, 4 insertions(+) - ---- a/framework/vulkan/vkRayTracingUtil.hpp -+++ b/framework/vulkan/vkRayTracingUtil.hpp -@@ -33,6 +33,7 @@ - #include "tcuVector.hpp" - #include "tcuVectorType.hpp" - -+#include <limits> - #include <vector> - - namespace vk ---- a/modules/vulkan/api/vktApiBufferTests.cpp -+++ b/modules/vulkan/api/vktApiBufferTests.cpp -@@ -35,6 +35,7 @@ - #include "tcuPlatform.hpp" - - #include <algorithm> -+#include <limits> - - namespace vkt - { ---- a/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp -+++ b/modules/vulkan/spirv_assembly/vktSpvAsmNonSemanticInfoTests.cpp -@@ -28,6 +28,8 @@ - #include "vktSpvAsmComputeShaderCase.hpp" - #include "vktSpvAsmGraphicsShaderTestUtil.hpp" - -+#include <limits> -+ - namespace vkt - { - namespace SpirVAssembly ---- a/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp -+++ b/modules/vulkan/memory/vktMemoryDeviceMemoryReportTests.cpp -@@ -40,6 +40,7 @@ - - #include "deSharedPtr.hpp" - -+#include <limits> - #include <set> - #include <vector> - ---- a/modules/vulkan/draw/vktDrawDepthClampTests.cpp -+++ b/modules/vulkan/draw/vktDrawDepthClampTests.cpp -@@ -38,6 +38,7 @@ - #include "vkQueryUtil.hpp" - #include "tcuTextureUtil.hpp" - -+#include <limits> - #include <cmath> - - namespace vkt ---- a/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp -+++ b/modules/vulkan/wsi/vktWsiFullScreenExclusiveTests.cpp -@@ -39,6 +39,8 @@ - #include "tcuPlatform.hpp" - #include "tcuCommandLine.hpp" - -+#include <limits> -+ - #if ( DE_OS == DE_OS_WIN32 ) - #define NOMINMAX - #define WIN32_LEAN_AND_MEAN ---- a/modules/vulkan/synchronization/vktSynchronizationUtil.cpp -+++ b/modules/vulkan/synchronization/vktSynchronizationUtil.cpp -@@ -21,6 +21,7 @@ - * \brief Synchronization tests utilities - *//*--------------------------------------------------------------------*/ - -+#include <limits> - #include "vktSynchronizationUtil.hpp" - #include "vkTypeUtil.hpp" - #include "vkCmdUtil.hpp" diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch deleted file mode 100644 index 6c87cad0a6..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch +++ /dev/null @@ -1,73 +0,0 @@ -From 9cd614dd5481a4fdf552effac4820f51a10092c7 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Mika=20V=C3=A4in=C3=B6l=C3=A4?= - <33728696+mvainola@users.noreply.github.com> -Date: Wed, 7 Apr 2021 13:12:17 +0300 -Subject: [PATCH] Workaround for GCC 11 uninit variable warnings (#946) - -Building Amber with GCC 11.0.1 produces some uninitialized variable -warnings. This commit works around them by replacing -reinterpret_cast with memcpy when type punning unsigned integers to -floats. - -Upstream-Status: Backport [https://github.com/google/amber/commit/aa69a0ac23ea7f68dd32bbef210546a5d84c1734] ---- - src/float16_helper.cc | 22 ++++++++++++++++------ - 1 file changed, 16 insertions(+), 6 deletions(-) - -diff --git a/src/float16_helper.cc b/src/float16_helper.cc -index 617bd72..5cb35e7 100644 ---- a/src/float16_helper.cc -+++ b/src/float16_helper.cc -@@ -15,6 +15,7 @@ - #include "src/float16_helper.h" - - #include <cassert> -+#include <cstring> - - // Float10 - // | 9 8 7 6 5 | 4 3 2 1 0 | -@@ -75,8 +76,11 @@ float HexFloat16ToFloat(const uint8_t* value) { - } - - uint32_t hex = sign | exponent | mantissa; -- float* hex_float = reinterpret_cast<float*>(&hex); -- return *hex_float; -+ float hex_float; -+ static_assert((sizeof(uint32_t) == sizeof(float)), -+ "sizeof(uint32_t) != sizeof(float)"); -+ memcpy(&hex_float, &hex, sizeof(float)); -+ return hex_float; - } - - // Convert float |value| whose size is 11 bits to 32 bits float -@@ -89,8 +93,11 @@ float HexFloat11ToFloat(const uint8_t* value) { - uint32_t mantissa = (static_cast<uint32_t>(value[0]) & 0x3f) << 17U; - - uint32_t hex = exponent | mantissa; -- float* hex_float = reinterpret_cast<float*>(&hex); -- return *hex_float; -+ float hex_float; -+ static_assert((sizeof(uint32_t) == sizeof(float)), -+ "sizeof(uint32_t) != sizeof(float)"); -+ memcpy(&hex_float, &hex, sizeof(float)); -+ return hex_float; - } - - // Convert float |value| whose size is 10 bits to 32 bits float -@@ -103,8 +110,11 @@ float HexFloat10ToFloat(const uint8_t* value) { - uint32_t mantissa = (static_cast<uint32_t>(value[0]) & 0x1f) << 18U; - - uint32_t hex = exponent | mantissa; -- float* hex_float = reinterpret_cast<float*>(&hex); -- return *hex_float; -+ float hex_float; -+ static_assert((sizeof(uint32_t) == sizeof(float)), -+ "sizeof(uint32_t) != sizeof(float)"); -+ memcpy(&hex_float, &hex, sizeof(float)); -+ return hex_float; - } - - } // namespace --- -2.31.1 - diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch new file mode 100644 index 0000000000..9eef9a702e --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch @@ -0,0 +1,29 @@ +From ec12bb7bda60cdf2c848e13df67452a7d30a42be Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 3 Sep 2022 18:52:42 -0700 +Subject: [PATCH] cmake: Define WAYLAND_SCANNER and WAYLAND_PROTOCOLS_DIR if + not already defined + +This helps with cross compiling and providing these knobs from cmake +cmdline + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + framework/platform/CMakeLists.txt | 8 ++++++-- + 1 file changed, 6 insertions(+), 2 deletions(-) + +--- a/framework/platform/CMakeLists.txt ++++ b/framework/platform/CMakeLists.txt +@@ -83,8 +83,9 @@ if (NOT DEFINED TCUTIL_PLATFORM_SRCS) + configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.c ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.c COPYONLY) + configure_file(${WAYLAND_XDG_SHELL_SRC_DIR}/xdg-shell.h ${DEQP_XDG_SHELL_GEN_OUTPUTS_DIR}/xdg-shell.h COPYONLY) + else () +- pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) +- ++ if (NOT WAYLAND_PROTOCOL_DIR) ++ pkg_get_variable(WAYLAND_PROTOCOLS_DIR wayland-protocols pkgdatadir) ++ endif() + if (NOT WAYLAND_SCANNER) + pkg_get_variable(WAYLAND_SCANNER wayland-scanner wayland_scanner) + endif() diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch index cb396c37d7..774b7aefee 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-use-library-sonames-for-linking.patch @@ -8,7 +8,7 @@ sonames (e.g. libGL.so.1) instead of library names (e.g. libGL.so). This ensures that applications don't try to use libraries if an incompatible ABI change occurs. -Upstream-Status: Submitted [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] +Upstream-Status: Denied [https://github.com/KhronosGroup/VK-GL-CTS/pull/288] Signed-off-by: Trevor Woerner <twoerner@gmail.com> --- framework/egl/egluGLContextFactory.cpp | 4 ++-- @@ -19,90 +19,87 @@ Signed-off-by: Trevor Woerner <twoerner@gmail.com> framework/platform/surfaceless/tcuSurfacelessPlatform.cpp | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) -diff --git a/framework/egl/egluGLContextFactory.cpp b/framework/egl/egluGLContextFactory.cpp -index 8fbea2af1..8d42f19eb 100644 --- a/framework/egl/egluGLContextFactory.cpp +++ b/framework/egl/egluGLContextFactory.cpp @@ -63,7 +63,7 @@ using std::vector; - # if (DE_OS == DE_OS_WIN32) - # define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" - # else --# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" -+# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" - # endif + #if (DE_OS == DE_OS_WIN32) + #define DEQP_GLES2_LIBRARY_PATH "libGLESv2.dll" + #else +-#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" + #endif #endif @@ -75,7 +75,7 @@ using std::vector; - # if (DE_OS == DE_OS_WIN32) - # define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" - # else --# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" -+# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" - # endif + #if (DE_OS == DE_OS_WIN32) + #define DEQP_OPENGL_LIBRARY_PATH "opengl32.dll" + #else +-#define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" + #endif #endif -diff --git a/framework/egl/wrapper/eglwLibrary.cpp b/framework/egl/wrapper/eglwLibrary.cpp -index d7e07fe18..ebdf68b14 100644 --- a/framework/egl/wrapper/eglwLibrary.cpp +++ b/framework/egl/wrapper/eglwLibrary.cpp -@@ -148,7 +148,7 @@ DefaultLibrary::~DefaultLibrary (void) - const char* DefaultLibrary::getLibraryFileName (void) +@@ -145,7 +145,7 @@ DefaultLibrary::~DefaultLibrary(void) + const char *DefaultLibrary::getLibraryFileName(void) { #if (DE_OS == DE_OS_ANDROID) || (DE_OS == DE_OS_UNIX) -- return "libEGL.so"; -+ return "libEGL.so.1"; +- return "libEGL.so"; ++ return "libEGL.so.1"; #elif (DE_OS == DE_OS_WIN32) - return "libEGL.dll"; + return "libEGL.dll"; #else -diff --git a/framework/platform/android/tcuAndroidPlatform.cpp b/framework/platform/android/tcuAndroidPlatform.cpp -index b9a4c716f..05cec0b49 100644 --- a/framework/platform/android/tcuAndroidPlatform.cpp +++ b/framework/platform/android/tcuAndroidPlatform.cpp -@@ -57,7 +57,7 @@ static const eglu::NativeWindow::Capability WINDOW_CAPABILITIES = (eglu::Nativ +@@ -56,7 +56,7 @@ static const eglu::NativeWindow::Capabil class NativeDisplay : public eglu::NativeDisplay { public: -- NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") {} -+ NativeDisplay (void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") {} - virtual ~NativeDisplay (void) {} - - virtual EGLNativeDisplayType getLegacyNative (void) { return EGL_DEFAULT_DISPLAY; } -diff --git a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp -index 009c05e18..237c5e16f 100644 +- NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so") ++ NativeDisplay(void) : eglu::NativeDisplay(DISPLAY_CAPABILITIES), m_library("libEGL.so.1") + { + } + virtual ~NativeDisplay(void) +@@ -223,7 +223,7 @@ class VulkanLibrary : public vk::Library + { + public: + VulkanLibrary(const char *libraryPath) +- : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so") ++ : m_library(libraryPath != DE_NULL ? libraryPath : "libvulkan.so.1") + , m_driver(m_library) + { + } --- a/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp +++ b/framework/platform/lnx/X11/tcuLnxX11EglDisplayFactory.cpp -@@ -75,7 +75,7 @@ class Library : public eglw::DefaultLibrary +@@ -77,7 +77,7 @@ using tcu::TextureLevel; + class Library : public eglw::DefaultLibrary { public: - Library (void) -- : eglw::DefaultLibrary("libEGL.so") -+ : eglw::DefaultLibrary("libEGL.so.1") - { - } +- Library(void) : eglw::DefaultLibrary("libEGL.so") ++ Library(void) : eglw::DefaultLibrary("libEGL.so.1") + { + } -diff --git a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp -index 97bc3a0ed..3a20d63d3 100644 --- a/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp +++ b/framework/platform/lnx/wayland/tcuLnxWaylandEglDisplayFactory.cpp -@@ -66,7 +66,7 @@ public: - EGL_PLATFORM_WAYLAND_KHR, - "EGL_KHR_platform_wayland") - , m_display (waylandDisplay) -- , m_library ("libEGL.so") {} -+ , m_library ("libEGL.so.1") {} +@@ -64,7 +64,7 @@ public: + Display(MovePtr<wayland::Display> waylandDisplay) + : NativeDisplay(CAPABILITIES, EGL_PLATFORM_WAYLAND_KHR, "EGL_KHR_platform_wayland") + , m_display(waylandDisplay) +- , m_library("libEGL.so") ++ , m_library("libEGL.so.1") + { + } - ~Display(void) {} - wayland::Display& getWaylandDisplay (void) { return *m_display; } -diff --git a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp -index 9783eaeab..a1d8ac667 100644 --- a/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp +++ b/framework/platform/surfaceless/tcuSurfacelessPlatform.cpp @@ -69,7 +69,7 @@ using std::vector; // Default library names #if !defined(DEQP_GLES2_LIBRARY_PATH) --# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" -+# define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" +-#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so" ++#define DEQP_GLES2_LIBRARY_PATH "libGLESv2.so.2" #endif #if !defined(DEQP_GLES3_LIBRARY_PATH) @@ -110,17 +107,17 @@ index 9783eaeab..a1d8ac667 100644 #endif #if !defined(DEQP_OPENGL_LIBRARY_PATH) --# define DEQP_OPENGL_LIBRARY_PATH "libGL.so" -+# define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" +-#define DEQP_OPENGL_LIBRARY_PATH "libGL.so" ++#define DEQP_OPENGL_LIBRARY_PATH "libGL.so.1" #endif - namespace tcu -@@ -238,7 +238,7 @@ glu::RenderContext* ContextFactory::createContext(const glu::RenderConfig& confi - } + #if !defined(DEQP_VULKAN_LIBRARY_PATH) +@@ -258,7 +258,7 @@ glu::RenderContext *ContextFactory::crea - EglRenderContext::EglRenderContext(const glu::RenderConfig& config, const tcu::CommandLine& cmdLine) -- : m_egl("libEGL.so") -+ : m_egl("libEGL.so.1") - , m_contextType(config.type) - , m_eglDisplay(EGL_NO_DISPLAY) - , m_eglContext(EGL_NO_CONTEXT) + EglRenderContext::EglRenderContext(const glu::RenderConfig &config, const tcu::CommandLine &cmdLine, + const glu::RenderContext *sharedContext) +- : m_egl("libEGL.so") ++ : m_egl("libEGL.so.1") + , m_contextType(config.type) + , m_eglDisplay(EGL_NO_DISPLAY) + , m_eglContext(EGL_NO_CONTEXT) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch deleted file mode 100644 index 2fd1d7123a..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/0001-vulkancts.patch +++ /dev/null @@ -1,40 +0,0 @@ -From 273df2423d9226093310cbcaa8b924bb6b5d6586 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 31 May 2021 17:31:33 -0700 -Subject: [PATCH] vulkancts: - -O_TRUNC value in OperationId enum collides with the macro O_TRUNC -defined in the POSIX header fnctl.h. To avoid the collision undefine -O_TRUNC in this particular sourcefile before its is used in enums -down below. - -This is fixed upstream differently -https://github.com/KhronosGroup/VK-GL-CTS/commit/564c6062f72fe7ecd92b4aea1558c441e651c76b - -But until we get this module uprev'ed to that, lets use a simpler -workaround - -Upstream-Status: Inappropriate [Fixed Differently] -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - .../vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp | 4 ++++ - 1 file changed, 4 insertions(+) - -diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -index 22e6c75fa..db7f4b54a 100644 ---- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmFloatControlsTests.cpp -@@ -38,6 +38,10 @@ - #include <limits> - #include <fenv.h> - -+#ifdef O_TRUNC -+#undef O_TRUNC -+#endif -+ - namespace vkt - { - namespace SpirVAssembly --- -2.31.1 - diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch index ea7659c698..af59dd3e61 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-clang-private-operator.patch @@ -1,6 +1,8 @@ +Upstream-Status: Pending + --- a/external/glslang/src/glslang/Include/PoolAlloc.h +++ b/external/glslang/src/glslang/Include/PoolAlloc.h -@@ -240,8 +240,9 @@ protected: +@@ -245,8 +245,9 @@ protected: int numCalls; // just an interesting statistic size_t totalBytes; // just an interesting statistic diff --git a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch index 99cb87b301..717d489786 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch +++ b/meta-oe/recipes-graphics/vk-gl-cts/files/fix-musl.patch @@ -1,8 +1,10 @@ +Upstream-Status: Pending + --- a/framework/delibs/dethread/CMakeLists.txt +++ b/framework/delibs/dethread/CMakeLists.txt -@@ -42,6 +42,7 @@ if (DE_OS_IS_UNIX) +@@ -41,6 +41,7 @@ if (DE_OS_IS_UNIX) + if (${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") add_definitions(-D__BSD_VISIBLE) - add_definitions(-D_XOPEN_SOURCE=600) endif () + add_definitions(-D_XOPEN_SOURCE=600) add_definitions(-D_GNU_SOURCE) diff --git a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc index 7d73bfbf31..0322ef453a 100644 --- a/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc +++ b/meta-oe/recipes-graphics/vk-gl-cts/khronos-cts.inc @@ -3,28 +3,30 @@ LIC_FILES_CHKSUM = "file://LICENSE;md5=3b83ef96387f14655fc854ddc3c6bd57" SRC_URI = "\ git://github.com/KhronosGroup/VK-GL-CTS.git;protocol=https;name=vk-gl-cts;nobranch=1 \ - git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;branch=main \ - git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;branch=master \ - git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;branch=master \ - git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;branch=master \ + git://github.com/google/amber;protocol=https;destsuffix=git/external/amber/src;name=amber;nobranch=1 \ + git://github.com/KhronosGroup/glslang.git;protocol=https;destsuffix=git/external/glslang/src;name=glslang;nobranch=1 \ + git://github.com/KhronosGroup/SPIRV-Headers.git;protocol=https;destsuffix=git/external/spirv-headers/src;name=spirv-headers;nobranch=1 \ + git://github.com/KhronosGroup/SPIRV-Tools.git;protocol=https;destsuffix=git/external/spirv-tools/src;name=spirv-tools;nobranch=1 \ + git://github.com/open-source-parsers/jsoncpp.git;protocol=https;destsuffix=git/external/jsoncpp/src;name=jsoncpp;nobranch=1 \ + git://github.com/KhronosGroup/Vulkan-Docs.git;protocol=https;destsuffix=git/external/vulkan-docs/src;name=vulkan-docs;nobranch=1 \ + git://github.com/KhronosGroup/Vulkan-ValidationLayers.git;protocol=https;destsuffix=git/external/vulkan-validationlayers/src;name=vulkan-validationlayers;nobranch=1 \ + git://github.com/Igalia/ESExtractor.git;protocol=https;destsuffix=git/external/ESExtractor/src;name=ESExtractor;nobranch=1 \ + git://github.com/Igalia/vk_video_samples.git;protocol=https;destsuffix=git/external/nvidia-video-samples/src;name=video-parser;nobranch=1 \ https://raw.githubusercontent.com/baldurk/renderdoc/v1.1/renderdoc/api/app/renderdoc_app.h;subdir=git/external/renderdoc/src;name=renderdoc \ " -S = "${WORKDIR}/git" - -SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools" +SRCREV_FORMAT = "vk-gl-cts_amber_glslang_spirv-headers_spirv-tools_jsoncpp_video-parser_vulkan-docs_vulkan-validationlayers" S = "${WORKDIR}/git" -inherit pkgconfig cmake features_check +inherit pkgconfig cmake features_check python3native qemu -ANY_OF_DISTRO_FEATURES += "opengl wayland" +ANY_OF_DISTRO_FEATURES += "opengl vulkan" -DEPENDS += "libpng zlib virtual/libgles2" +DEPENDS += "python3-lxml-native libpng zlib virtual/libgles2 qemu-native" -SRC_URI += "file://0001-Workaround-for-GCC-11-uninit-variable-warnings-946.patch;patchdir=external/amber/src \ - file://0001-Include-limits-header-for-numeric_limits.patch;patchdir=external/vulkancts \ - file://0001-vulkancts.patch \ +SRC_URI += " \ + file://0001-cmake-Define-WAYLAND_SCANNER-and-WAYLAND_PROTOCOLS_D.patch \ file://0001-use-library-sonames-for-linking.patch \ " @@ -36,6 +38,8 @@ DEPENDS:append:libc-musl = " libexecinfo" SRC_URI:append:toolchain-clang = "\ file://fix-clang-private-operator.patch \ " +EXTRA_OECMAKE += "-DUPDATE_DEPS=OFF" +EXTRA_OECMAKE:prepend:class-target = "-DCMAKE_CROSSCOMPILING_EMULATOR=${WORKDIR}/qemuwrapper -DWAYLAND_SCANNER=${STAGING_BINDIR_NATIVE}/wayland-scanner -DWAYLAND_PROTOCOLS_DIR=${STAGING_DATADIR}/wayland-protocols -DAMBER_DISABLE_WERROR=ON" # The best thing for the user to do is to not specify any of the following # PACKAGECONFIGs (i.e. leave it blank) which tells the project to do its own @@ -44,11 +48,22 @@ SRC_URI:append:toolchain-clang = "\ # to override this behaviour. PACKAGECONFIG ??= "" PACKAGECONFIG[surfaceless] = "-DDEQP_TARGET=surfaceless,,,,,wayland x11_egl x11_glx x11_egl_glx" -PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland,,,surfaceless x11_egl x11_glx x11_egl_glx" +PACKAGECONFIG[wayland] = "-DDEQP_TARGET=wayland,,wayland-native wayland wayland-protocols,,,surfaceless x11_egl x11_glx x11_egl_glx" PACKAGECONFIG[x11_egl] = "-DDEQP_TARGET=x11_egl,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_glx x11_egl_glx" PACKAGECONFIG[x11_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11,,,surfaceless wayland x11_egl x11_egl_glx" PACKAGECONFIG[x11_egl_glx] = "-DDEQP_TARGET=x11_glx,,virtual/libx11 virtual/egl,,,surfaceless wayland x11_egl x11_glx" +do_configure:append() { + # Write out a qemu wrapper that will be used by cmake + # so that it can run target helper binaries through that. + qemu_binary="${@qemu_wrapper_cmdline(d, d.getVar('STAGING_DIR_HOST'), [d.expand('${STAGING_DIR_HOST}${libdir}'),d.expand('${STAGING_DIR_HOST}${base_libdir}')])}" + cat > ${WORKDIR}/qemuwrapper << EOF +#!/bin/sh +$qemu_binary "\$@" +EOF + chmod +x ${WORKDIR}/qemuwrapper +} + python __anonymous() { # if the user doesn't specify any PACKAGECONFIG then the cts build system # is going to probe the sysroot to try to figure out what to build @@ -57,11 +72,19 @@ python __anonymous() { distrofeatures = (d.getVar("DISTRO_FEATURES") or "") if not bb.utils.contains_any("PACKAGECONFIG", ["surfaceless", "wayland", "x11_egl", "x11_glx", "x11_egl_glx"], True, False, d): if "wayland" in distrofeatures: - d.appendVar("DEPENDS", " wayland ") + d.appendVar("DEPENDS", " wayland-native ${MLPREFIX}wayland ${MLPREFIX}wayland-protocols") if "x11" in distrofeatures: - d.appendVar("DEPENDS", " virtual/libx11 virtual/egl ") + d.appendVar("DEPENDS", " virtual/${MLPREFIX}libx11 virtual/${MLPREFIX}egl ") } CTSDIR = "/usr/lib/${BPN}" FILES:${PN} += "${CTSDIR}" + +# does not work with libc++-19 due +# error: implicit instantiation of undefined template 'std::char_traits<unsigned int>' +TOOLCHAIN = "gcc" + +# Validation-layers requires access during configure as it fetches validation-headers +# and bunch of other packages from khronos github +do_configure[network] = "1" diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb new file mode 100644 index 0000000000..7dd60dffd8 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.11.0.bb @@ -0,0 +1,34 @@ +DESCRIPTION = "OpenGL CTS" + +require khronos-cts.inc +# opengl-es-cts-3.2.11.0 +SRCREV_vk-gl-cts = "66956d195169596472e956e3aebf2df8e3bd960d" +SRCREV_amber = "0f003c2785489f59cd01bb2440fcf303149100f2" +SRCREV_glslang = "4da479aa6afa43e5a2ce4c4148c572a03123faf3" +SRCREV_spirv-headers = "ff2afc3afc48dff4eec2a10f0212402a80708e38" +SRCREV_spirv-tools = "148c97f6876e427efd76d2328122c3075eab4b8f" +SRCREV_ESExtractor = "ce5d7ebcf0ebb0d78385ee4cc34653eb6764bfc4" +# Not yet needed +SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" +SRCREV_vulkan-docs = "ed4ba0242beb89a1795d6084709fa9e713559c94" +SRCREV_vulkan-validationlayers = "a92629196a4fed15e59c74aa965dd47bd5ece3b7" +SRCREV_video-parser = "6821adf11eb4f84a2168264b954c170d03237699" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} + + install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR} + install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR} + + rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles + rm -rf ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles +} + +SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" +LTO = "" diff --git a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb deleted file mode 100644 index 1c1371b032..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/opengl-es-cts_3.2.7.0.bb +++ /dev/null @@ -1,31 +0,0 @@ -DESCRIPTION = "OpenGL CTS" - -require khronos-cts.inc -# opengl-es-cts-3.2.7.0 -SRCREV_vk-gl-cts = "7cba7113c40f2ff03573c8c2c90661b2249e04fa" -SRCREV_amber = "4d0115cccfcb3b73d20b6513b1c40748e6403c50" -SRCREV_glslang = "ffccefddfd9a02ec0c0b6dd04ef5e1042279c97f" -SRCREV_spirv-headers = "104ecc356c1bea4476320faca64440cd1df655a3" -SRCREV_spirv-tools = "cd590fa3341284cd6d1ee82366155786cfd44c96" -SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" - -S = "${WORKDIR}/git" - -do_install() { - install -d ${D}/${CTSDIR} - cp -r ${B}/external/openglcts/modules/* ${D}/${CTSDIR} - - install -m 0755 ${B}/modules/egl/deqp-egl ${D}/${CTSDIR} - install -m 0755 ${B}/modules/gles2/deqp-gles2 ${D}/${CTSDIR} - install -m 0755 ${B}/modules/gles3/deqp-gles3 ${D}/${CTSDIR} - install -m 0755 ${B}/modules/gles31/deqp-gles31 ${D}/${CTSDIR} - install -m 0755 ${B}/modules/internal/de-internal-tests ${D}/${CTSDIR} - - rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles - rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles - rm -r ${D}/${CTSDIR}/common/subgroups/*.a ${D}/${CTSDIR}/common/subgroups/cmake_install.cmake ${D}/${CTSDIR}/common/subgroups/CMakeFiles -} - -SECURITY_CFLAGS:riscv64 = "${SECURITY_NOPIE_CFLAGS}" -LTO = "" - diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb deleted file mode 100644 index f816c1bd17..0000000000 --- a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.2.6.0.bb +++ /dev/null @@ -1,24 +0,0 @@ -DESCRIPTION = "Vulkan CTS" - -require khronos-cts.inc -# vulkan-cts-1.2.6.0 -SRCREV_vk-gl-cts = "2cab49df5ad25a2d0061152367a21c6da83ed097" -SRCREV_amber = "dabae26164714abf951c6815a2b4513260f7c6a4" -SRCREV_glslang = "5c4f421121c4d24aad23a507e630dc5dc6c92c7c" -SRCREV_spirv-headers = "faa570afbc91ac73d594d787486bcf8f2df1ace0" -SRCREV_spirv-tools = "f11f7434815838bbad349124767b258ce7df41f0" -SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" - -S = "${WORKDIR}/git" - -REQUIRED_DISTRO_FEATURES = "vulkan" -inherit features_check - -DEPENDS += " vulkan-loader" - -do_install() { - install -d ${D}/${CTSDIR} - cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ - rm -r ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles - rm -r ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles -} diff --git a/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb new file mode 100644 index 0000000000..4ba761b676 --- /dev/null +++ b/meta-oe/recipes-graphics/vk-gl-cts/vulkan-cts_1.3.9.2.bb @@ -0,0 +1,32 @@ +DESCRIPTION = "Vulkan CTS" + +require khronos-cts.inc + +# vulkan-cts-1.3.9.2 +SRCREV_vk-gl-cts = "24c1b1498ba4f05777f47541968ffe686265c645" +SRCREV_amber = "0f003c2785489f59cd01bb2440fcf303149100f2" +SRCREV_glslang = "2b19bf7e1bc0b60cf2fe9d33e5ba6b37dfc1cc83" +SRCREV_spirv-headers = "db5a00f8cebe81146cafabf89019674a3c4bf03d" +SRCREV_spirv-tools = "4c7e1fa5c3d988cca0e626d359d30b117b9c2822" +SRCREV_jsoncpp = "9059f5cad030ba11d37818847443a53918c327b1" +SRCREV_vulkan-docs = "7bb606eb87cde1d34f65f36f4d4c6f2c78f072c8" +SRCREV_vulkan-validationlayers = "a92629196a4fed15e59c74aa965dd47bd5ece3b7" +SRC_URI[renderdoc.sha256sum] = "e7b5f0aa5b1b0eadc63a1c624c0ca7f5af133aa857d6a4271b0ef3d0bdb6868e" +# Not yet needed +SRCREV_ESExtractor = "75ffcaf55bb069f7a23764194742d2fb78c7f71f" +SRCREV_video-parser = "6821adf11eb4f84a2168264b954c170d03237699" + +# Workaround an optimization bug that breaks createMeshShaderMiscTestsEXT +OECMAKE_CXX_FLAGS:remove:toolchain-gcc = "-O2" + +REQUIRED_DISTRO_FEATURES = "vulkan" +inherit features_check + +DEPENDS += " vulkan-loader" + +do_install() { + install -d ${D}/${CTSDIR} + cp -r ${B}/external/vulkancts/modules/vulkan/* ${D}/${CTSDIR}/ + rm -rf ${D}/${CTSDIR}/*.a ${D}/${CTSDIR}/cmake_install.cmake ${D}/${CTSDIR}/CMakeFiles + rm -rf ${D}/${CTSDIR}/*/*.a ${D}/${CTSDIR}/*/cmake_install.cmake ${D}/${CTSDIR}/*/CMakeFiles +} diff --git a/meta-oe/recipes-graphics/wayland/libei_1.3.0.bb b/meta-oe/recipes-graphics/wayland/libei_1.3.0.bb new file mode 100644 index 0000000000..ee3ee01c7d --- /dev/null +++ b/meta-oe/recipes-graphics/wayland/libei_1.3.0.bb @@ -0,0 +1,25 @@ +SUMMARY = "libei is a library for Emulated Input, primarily aimed at the Wayland stack." +HOMEPAGE = "https://gitlab.freedesktop.org/libinput/libei" +SECTION = "graphics" +LICENSE = "MIT" + +LIC_FILES_CHKSUM = "file://COPYING;md5=a98fa76460f96f41696611d6f07e8d49" + +DEPENDS = " \ + libxkbcommon \ + libevdev \ + libxslt-native \ + python3-attrs-native \ + python3-jinja2-native \ + ${@bb.utils.contains('DISTRO_FEATURES', 'systemd', 'systemd', 'basu', d)} \ +" + +SRC_URI = "git://gitlab.freedesktop.org/libinput/libei.git;protocol=https;branch=main" + +S = "${WORKDIR}/git" +SRCREV = "997b7c0f37faea4f8bae59613c8f27370925d5b0" + +inherit meson pkgconfig + +EXTRA_OEMESON = "-Dtests=disabled" + diff --git a/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch b/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch new file mode 100644 index 0000000000..f2169c43c9 --- /dev/null +++ b/meta-oe/recipes-graphics/wayland/waylandpp/0001-include-missing-cstdint.patch @@ -0,0 +1,59 @@ +From 5e3243b163aa5d50083b4036c21f84c1204f2023 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 26 Jan 2023 23:25:05 -0800 +Subject: [PATCH] include missing <cstdint> + +gcc 13 moved some includes around and as a result <cstdint> is no longer transitively included [1]. Explicitly include it for uint{32,64}_t. + +[1] https://gcc.gnu.org/gcc-13/porting_to.html#header-dep-changes + +Upstream-Status: Submitted [https://github.com/NilsBrause/waylandpp/pull/75] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + include/wayland-client.hpp | 1 + + scanner/scanner.cpp | 3 +++ + 2 files changed, 4 insertions(+) + +diff --git a/include/wayland-client.hpp b/include/wayland-client.hpp +index a3f782b..4598a0e 100644 +--- a/include/wayland-client.hpp ++++ b/include/wayland-client.hpp +@@ -29,6 +29,7 @@ + /** \file */ + + #include <atomic> ++#include <cstdint> + #include <functional> + #include <memory> + #include <string> +diff --git a/scanner/scanner.cpp b/scanner/scanner.cpp +index bebd71e..c25746a 100644 +--- a/scanner/scanner.cpp ++++ b/scanner/scanner.cpp +@@ -15,6 +15,7 @@ + * along with this program. If not, see <http://www.gnu.org/licenses/>. + */ + ++#include <cstdint> + #include <fstream> + #include <iostream> + #include <list> +@@ -1106,6 +1107,7 @@ int main(int argc, char *argv[]) + wayland_hpp << "#pragma once" << std::endl + << std::endl + << "#include <array>" << std::endl ++ << "#include <cstdint>" << std::endl + << "#include <functional>" << std::endl + << "#include <memory>" << std::endl + << "#include <string>" << std::endl +@@ -1125,6 +1127,7 @@ int main(int argc, char *argv[]) + wayland_server_hpp << "#pragma once" << std::endl + << std::endl + << "#include <array>" << std::endl ++ << "#include <cstdint>" << std::endl + << "#include <functional>" << std::endl + << "#include <memory>" << std::endl + << "#include <string>" << std::endl +-- +2.39.1 + diff --git a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb index f075f2a3ae..c1f5f4ed8e 100644 --- a/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb +++ b/meta-oe/recipes-graphics/wayland/waylandpp_1.0.0.bb @@ -2,7 +2,8 @@ SUMMARY = " C++ binding for Wayland using the most modern C++ technology" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://LICENSE;md5=3aae28cc66d61975114c2b14df215407" -SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master" +SRC_URI = "git://github.com/NilsBrause/waylandpp.git;protocol=https;branch=master \ + file://0001-include-missing-cstdint.patch" DEPENDS = "pugixml" DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/libgles2" @@ -10,7 +11,9 @@ DEPENDS:append:class-target = " waylandpp-native wayland virtual/egl virtual/lib S = "${WORKDIR}/git" SRCREV = "4321ed5c7b4bffa41b8a2a13dc7f3ece1191f4f3" -inherit cmake pkgconfig +inherit cmake pkgconfig features_check + +REQUIRED_DISTRO_FEATURES:class-target = "opengl" EXTRA_OECMAKE:class-native = " \ -DBUILD_SCANNER=ON \ @@ -34,4 +37,9 @@ EXTRA_OECMAKE:class-target = " \ -DCMAKE_EXE_LINKER_FLAGS="-Wl,--enable-new-dtags" \ " +do_install:append:class-target() { + sed -i -e 's|${S}||g' ${D}${libdir}/cmake/waylandpp/waylandpp-targets.cmake + sed -i -e 's|${STAGING_DIR_HOST}||g' ${D}${libdir}/cmake/waylandpp/waylandpp-targets.cmake +} + BBCLASSEXTEND += "native nativesdk" diff --git a/meta-oe/recipes-graphics/x11vnc/files/CVE-2020-29074.patch b/meta-oe/recipes-graphics/x11vnc/files/CVE-2020-29074.patch new file mode 100644 index 0000000000..fbdb9123cc --- /dev/null +++ b/meta-oe/recipes-graphics/x11vnc/files/CVE-2020-29074.patch @@ -0,0 +1,27 @@ +CVE: CVE-2020-29074 +Upstream-Status: Backport [https://github.com/LibVNC/x11vnc/commit/69eeb9f7baa14ca03b16c9de821f9876def7a36a ] +Signed-off-by: Lee Chee Yang <chee.yang.lee@intel.com> + + +From 69eeb9f7baa14ca03b16c9de821f9876def7a36a Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Gu=C3=A9nal=20DAVALAN?= <guenal.davalan@uca.fr> +Date: Wed, 18 Nov 2020 08:40:45 +0100 +Subject: [PATCH] scan: limit access to shared memory segments to current user + +--- + src/scan.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/src/scan.c b/src/scan.c +index 43e00d20..12994d52 100644 +--- a/src/scan.c ++++ b/src/scan.c +@@ -320,7 +320,7 @@ static int shm_create(XShmSegmentInfo *shm, XImage **ximg_ptr, int w, int h, + + #if HAVE_XSHM + shm->shmid = shmget(IPC_PRIVATE, +- xim->bytes_per_line * xim->height, IPC_CREAT | 0777); ++ xim->bytes_per_line * xim->height, IPC_CREAT | 0600); + + if (shm->shmid == -1) { + rfbErr("shmget(%s) failed.\n", name); diff --git a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb index 5f7c0beb66..74f80e1844 100644 --- a/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb +++ b/meta-oe/recipes-graphics/x11vnc/x11vnc_0.9.16.bb @@ -2,16 +2,16 @@ SUMMARY = "Exports your X session or FrameBuffer(fbdev) on-the-fly via VNC" HOMEPAGE = "http://www.karlrunge.com/x11vnc/" SECTION = "x11/utils" -AUTHOR = "Karl Runge" LICENSE = "GPL-2.0-or-later" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263 \ file://src/x11vnc.h;endline=31;md5=e871a2ad004776794b616822dcab6314" SRCREV = "87cd0530f438372dda3c70bb491a6fd19f09acc2" -PV .= "+git${SRCPV}" +PV .= "+git" SRC_URI = "git://github.com/LibVNC/x11vnc;branch=master;protocol=https \ file://starting-fix.patch \ + file://CVE-2020-29074.patch \ " S = "${WORKDIR}/git" diff --git a/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb b/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.8.bb index 936d71b101..3770babe80 100644 --- a/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.7.bb +++ b/meta-oe/recipes-graphics/xcursorgen/xcursorgen_1.0.8.bb @@ -3,9 +3,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=bd1fb9ee90eead85f7b171807b3ab4f2" DEPENDS = "libpng libxcursor" -SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.bz2" -SRC_URI[md5sum] = "25cc7ca1ce5dcbb61c2b471c55e686b5" -SRC_URI[sha256sum] = "35b6f844b24f1776e9006c880a745728800764dbe3b327a128772b4610d8eb3d" +SRC_URI = "http://xorg.freedesktop.org/archive/individual/app/${BPN}-${PV}.tar.xz" +SRC_URI[sha256sum] = "32b33ce27b4e285e64ff375731806bb7988cc626ff10915c65f1dc4da640cc9b" inherit features_check autotools pkgconfig diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb b/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb deleted file mode 100644 index 259c640523..0000000000 --- a/meta-oe/recipes-graphics/xdotool/xdotool_1.20100416.2809.bb +++ /dev/null @@ -1,23 +0,0 @@ -SUMMARY = "xdotool - command-line X11 automation tool - utilising X11 XTEST interface" -HOMEPAGE = "http://www.semicomplete.com/projects/xdotool" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2f9cbf7e9401cec8a38666a08851ce6b" -SECTION = "x11" -DEPENDS = "virtual/libx11 libxtst" - -PR = "r1" - -inherit features_check pkgconfig perlnative -# depends on virtual/libx11 -REQUIRED_DISTRO_FEATURES = "x11" - -SRC_URI = "http://semicomplete.googlecode.com/files/xdotool-${PV}.tar.gz" -SRC_URI[md5sum] = "1d5be641e512c343abfe5f78b39e6f19" -SRC_URI[sha256sum] = "42d7271fbc796e53db71bb221f311b9ff3c51d90a71c9487a9bd3101ca39894f" - -EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir}" - -do_install() { - oe_runmake -e install DESTDIR=${D} PREFIX=${prefix} -} - diff --git a/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb new file mode 100644 index 0000000000..33e4e0998f --- /dev/null +++ b/meta-oe/recipes-graphics/xdotool/xdotool_3.20211022.1.bb @@ -0,0 +1,22 @@ +SUMMARY = "xdotool - command-line X11 automation tool - utilising X11 XTEST interface" +HOMEPAGE = "https://github.com/jordansissel/xdotool" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=2f9cbf7e9401cec8a38666a08851ce6b" +SECTION = "x11" +DEPENDS = "virtual/libx11 libxtst libxinerama libxkbcommon" + +inherit features_check pkgconfig perlnative +# depends on virtual/libx11 +REQUIRED_DISTRO_FEATURES = "x11" + +SRC_URI = "https://github.com/jordansissel/${BPN}/releases/download/v${PV}/${BP}.tar.gz" +SRC_URI[sha256sum] = "96f0facfde6d78eacad35b91b0f46fecd0b35e474c03e00e30da3fdd345f9ada" + +EXTRA_OEMAKE = "PREFIX=${prefix} INSTALLLIB=${libdir} INSTALLMAN=${mandir}" + +UPSTREAM_CHECK_URI="https://github.com/jordansissel/xdotool/tags" +UPSTREAM_CHECK_REGEX = "v(?P<pver>\d+\.\d{8}\.\d+)" + +do_install() { + oe_runmake install DESTDIR=${D} PREFIX=${prefix} +} diff --git a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.10.bb index 62296b5be9..7d025de4c4 100644 --- a/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.8.bb +++ b/meta-oe/recipes-graphics/xorg-app/iceauth_1.0.10.bb @@ -11,6 +11,6 @@ BBCLASSEXTEND = "native" DEPENDS += "libice" -SRC_URI[md5sum] = "3b9b79fa0f9928161f4bad94273de7ae" -SRC_URI[sha256sum] = "e6ee213a217265cc76050e4293ea70b98c32dce6505c6421227efbda62ab60c6" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "3deefb7da26af9dc799b5628d929d91c9af68c78575639944db3b955f29aa029" diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch index c5a70f5d08..bfda2dfe71 100644 --- a/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch +++ b/meta-oe/recipes-graphics/xorg-app/sessreg/0001-Makefile.am-Error-Fix.patch @@ -8,7 +8,7 @@ Do not compile man dir since error always occur. | make[2]: *** [sessreg.1] Error 1 It is not a good way.But can remove it from SKIP_RECIPE. -Upstream-Status: pending +Upstream-Status: Pending Signed-off-by: Li Xin <lixin.fnst@cn.fujitsu.com> --- diff --git a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.2.bb b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb index d4e9597bdf..33ab22cde4 100644 --- a/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.2.bb +++ b/meta-oe/recipes-graphics/xorg-app/sessreg_1.1.3.bb @@ -4,8 +4,8 @@ SUMMARY = "a simple program for managing utmp/wtmp entries" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=d938a70c8280c265a1ccd2954365d185" SRC_URI += "file://0001-Makefile.am-Error-Fix.patch" -SRC_URI[md5sum] = "92be564d4be7d8aa7b5024057b715210" -SRC_URI[sha256sum] = "dfcb9e954273ace63879aec053c7880466f8755752a35aa9ced3fa5f04fd2c33" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "022acd5de8077dddc4f919961f79e102ecd5f3228a333681af5cd0e7344facc2" CFLAGS:append:libc-musl = " -D_WTMPX_FILE=WTMP_FILE -D_PATH_WTMPX=_PATH_WTMP -D_UTMPX_FILE=UTMP_FILE -D_PATH_UTMPX=_PATH_UTMP " diff --git a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.2.bb b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb index 30fbd1b8de..9c522d6ae1 100644 --- a/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.2.bb +++ b/meta-oe/recipes-graphics/xorg-app/setxkbmap_1.3.4.bb @@ -11,9 +11,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=5feafdbe6dfe9e2bd32325be0cfc86f8" PE = "1" -DEPENDS += "libxkbfile" +DEPENDS += "libxkbfile xrandr" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "93e736c98fb75856ee8227a0c49a128d" -SRC_URI[sha256sum] = "8ff27486442725e50b02d7049152f51d125ecad71b7ce503cfa09d5d8ceeb9f5" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "be8d8554d40e981d1b93b5ff82497c9ad2259f59f675b38f1b5e84624c07fade" diff --git a/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb b/meta-oe/recipes-graphics/xorg-app/xclock_1.1.1.bb index 31c553eee0..a7360b6496 100644 --- a/meta-oe/recipes-graphics/xorg-app/xclock_1.0.9.bb +++ b/meta-oe/recipes-graphics/xorg-app/xclock_1.1.1.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=857759ade8f2ddde5c7b32ef7356ea36" DEPENDS += " libxaw libxrender libxft libxkbfile libxt" -SRC_URI[md5sum] = "437522a96f424f68fc64ed34ece9b211" -SRC_URI[sha256sum] = "cf461fb2c6f2ac42c54d8429ee2010fdb9a1442a370adfbfe8a7bfaf33c123bb" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "df7ceabf8f07044a2fde4924d794554996811640a45de40cb12c2cf1f90f742c" diff --git a/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.7.bb index 4949616ddc..dc9cbadb4c 100644 --- a/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xgamma_1.0.7.bb @@ -11,5 +11,5 @@ DEPENDS += "libxxf86vm" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "90b4305157c2b966d5180e2ee61262be" -SRC_URI[sha256sum] = "0ef1c35b5c18b1b22317f455c8df13c0a471a8efad63c89c98ae3ce8c2b222d3" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "1c79dae85a8953a15f4fe5c2895a033307b43b8613456c87ec47b374b113bc8f" diff --git a/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb b/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb index b42c1b9506..afc1fe17d5 100644 --- a/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xkbevd_1.1.5.bb @@ -9,5 +9,5 @@ DEPENDS += "libxkbfile bison-native" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "c747faf1f78f5a5962419f8bdd066501" -SRC_URI[sha256sum] = "2430a2e5302a4cb4a5530c1df8cb3721a149bbf8eb377a2898921a145197f96a" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "38357b702de9d3457c4ff75053390f457b84c4accc7f088101255c37c684926b" diff --git a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb index 7b6ef96825..e866bed016 100644 --- a/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xkbprint_1.0.6.bb @@ -9,5 +9,5 @@ DEPENDS += "libxkbfile" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "9c34da77363dc3d0f616980da87244bf" -SRC_URI[sha256sum] = "5b58fe834f0822f06d63d283fac404098c6d3f6acce61888b81016f1c41023fa" +SRC_URI[sha256sum] = "99cc9404f7b90289ae04944c0d98a208cc8b158492ad6481386e31d4d09aa7b0" +SRC_URI_EXT = "xz" diff --git a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb index 6a05e98e32..0274608d05 100644 --- a/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xkbutils_1.0.6.bb @@ -9,11 +9,9 @@ It includes: \ xkbvleds - display the state of LEDs on an XKB keyboard in a window \ xkbwatch - reports changes in the XKB keyboard state \ " -LIC_FILES_CHKSUM = "file://COPYING;md5=64322fab5239f5c8d97cf6e0e14f1c62" +LIC_FILES_CHKSUM = "file://COPYING;md5=6767a97a97e21260134637b657b922ae" DEPENDS += "libxaw libxkbfile" -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "502b14843f610af977dffc6cbf2102d5" -SRC_URI[sha256sum] = "d2a18ab90275e8bca028773c44264d2266dab70853db4321bdbc18da75148130" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "31a2bbee1e09ccba01de92897b8f540b545de812f318d31de07bd3a5a75ee25e" diff --git a/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.3.bb b/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.4.bb index 288bcfc8fe..ad06612d5e 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.3.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsatoms_1.1.4.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b08d9e2e718ac83e6fe2b974d4b5fd8" DEPENDS += "libxmu" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "61671fee12535347db24ec3a715032a7" -SRC_URI[sha256sum] = "57868f958c263976727881f3078e55b86b4a109dc578d2b92f5c6d690850a382" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "f4bfa15f56c066d326a5d5b292646708f25b9247506840b9047cd2687dcc71b7" diff --git a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.5.bb index 42bda7ea35..d73a27f971 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsclients_1.1.5.bb @@ -10,5 +10,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=350e1b718a56df39cfe8ca9345ea4575" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "4fa92377e0ddc137cd226a7a87b6b29a" -SRC_URI[sha256sum] = "773f2af49c7ea2c44fba4213bee64325875c1b3c9bc4bbcd8dac9261751809c1" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "68baee57e70250ac4a7759fb78221831f97d88bc8e51dcc2e64eb3f8ca56bae3" diff --git a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb index 76b76e4b37..4ddb1b9887 100644 --- a/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xlsfonts_1.0.8.bb @@ -6,5 +6,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=5ec74dd7ea4d10c4715a7c44f159a40b" -SRC_URI[md5sum] = "5774fd4f518b3f338f2b28f270e04bfc" -SRC_URI[sha256sum] = "89b80b3a030006ab6cef717be286c12f2477894b227158b1e6133274f6ebd368" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "807f909eace684b866fc63b3e962729c120822a6c96e051ff51cf350b3ffb6cd" diff --git a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb index ab74f5bd67..f3dac53451 100644 --- a/meta-oe/recipes-graphics/xorg-app/xmag_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xmag_1.0.7.bb @@ -7,5 +7,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=3413fe6832380b44b69b172d2d1b2387" DEPENDS += " libxaw libxt" -SRC_URI[md5sum] = "8aaa41374935d697ee55d7dc9de70781" -SRC_URI[sha256sum] = "87a2bc23b251e2d8f8370d3283a4d6c8dac98a30cb5749a04336cdb55c14e161" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "009936cc5a2706084079127b26cf55c713767650a34cb69e5682d60e33ce7461" diff --git a/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.6.bb b/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.7.bb index cb123837d0..6682784fbf 100644 --- a/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.6.bb +++ b/meta-oe/recipes-graphics/xorg-app/xmessage_1.0.7.bb @@ -6,5 +6,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=73c7f696a728de728d7446cbca814cc5" DEPENDS += "libxaw" -SRC_URI[sha256sum] = "d2eac545f137156b960877e052fcc8e29795ed735c02f7690fd7b439e6846a12" +SRC_URI[sha256sum] = "703fccb7a0b772d61d7e603c189b9739866aa97ba985c727275420f829a30356" SRC_URI_EXT = "xz" diff --git a/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.1.bb b/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb index a8c5b3d0a4..53214c8fe8 100644 --- a/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.1.bb +++ b/meta-oe/recipes-graphics/xorg-app/xrdb_1.2.2.bb @@ -5,4 +5,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d1167c4f586bd41f0c62166db4384a69" DEPENDS += "libxmu" -SRC_URI[sha256sum] = "4f5d031c214ffb88a42ae7528492abde1178f5146351ceb3c05f3b8d5abee8b4" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "31f5fcab231b38f255b00b066cf7ea3b496df712c9eb2d0d50c670b63e5033f4" + +EXTRA_OECONF += "--with-cpp=${bindir}/cpp" diff --git a/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.7.bb b/meta-oe/recipes-graphics/xorg-app/xrefresh_1.1.0.bb index 6f6ad73e63..12d05b1307 100644 --- a/meta-oe/recipes-graphics/xorg-app/xrefresh_1.0.7.bb +++ b/meta-oe/recipes-graphics/xorg-app/xrefresh_1.1.0.bb @@ -9,5 +9,5 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=dad633bce9c3cd0e3abf72a16e0057cf" BBCLASSEXTEND = "native" -SRC_URI[sha256sum] = "a9f1d635f2f42283d0174e94d09ab69190c227faa5ab542bfe15ed9607771b1e" +SRC_URI[sha256sum] = "29ed592d5ece35a3029004d8c46f3002f92970870a96c11e38baf7f1122b8b5f" SRC_URI_EXT = "xz" diff --git a/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb b/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb deleted file mode 100644 index b757329d94..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/xsetmode_1.0.0.bb +++ /dev/null @@ -1,15 +0,0 @@ -require recipes-graphics/xorg-app/xorg-app-common.inc - -SUMMARY = "X.Org X11 X client utilities" -HOMEPAGE = "http://cgit.freedesktop.org/xorg/app/xsetmode/" -DESCRIPTION = "xsetmode sets the mode of an XInput device to either absolute \ -or relative." -SECTION = "x11/app" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=9b37e00e7793b667cbc64f9df7b6d733" - -DEPENDS += "libxi" -BBCLASSEXTEND = "native" - -SRC_URI[md5sum] = "d074e79d380b031d2f60e4cd56538c93" -SRC_URI[sha256sum] = "988b47cd922991c6e6adbce15dc386ac75690b61744b526c3af5a4eaa9afa0aa" diff --git a/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb b/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.3.bb index 30a1e089e3..7e909f90cf 100644 --- a/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.2.bb +++ b/meta-oe/recipes-graphics/xorg-app/xsetroot_1.1.3.bb @@ -7,8 +7,7 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=6ea29dbee22324787c061f039e0529de" -DEPENDS += "xbitmaps libxcursor" -BBCLASSEXTEND = "native" +DEPENDS += "xbitmaps libxcursor libxmu" -SRC_URI[md5sum] = "5fe769c8777a6e873ed1305e4ce2c353" -SRC_URI[sha256sum] = "10c442ba23591fb5470cea477a0aa5f679371f4f879c8387a1d9d05637ae417c" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "6081b45a9eb4426e045d259d1e144b32417fb635e5b96aa90647365ac96638d1" diff --git a/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.4.bb b/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.5.bb index 9d523bd7b1..7d3aab501c 100644 --- a/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.4.bb +++ b/meta-oe/recipes-graphics/xorg-app/xstdcmap_1.0.5.bb @@ -11,6 +11,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=2b08d9e2e718ac83e6fe2b974d4b5fd8" DEPENDS += "libxmu" BBCLASSEXTEND = "native" -SRC_URI[md5sum] = "da67142c128d18386ff145882e0afc66" -SRC_URI[sha256sum] = "06898b3f1eaad0b205ff3c75bdefa3207868b889d4cb37b32b8267b2bbfe6f8b" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "365847e379398499ec9ad9a299cc47a0d6e7feba9546dfd4e5b422204b5ac180" diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch deleted file mode 100644 index 92ecdac224..0000000000 --- a/meta-oe/recipes-graphics/xorg-app/xterm/0001-Add-configure-time-check-for-setsid.patch +++ /dev/null @@ -1,77 +0,0 @@ -From 3730a38efad969fb6f8227df07eb4461a078f5a3 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Fri, 13 Dec 2019 12:59:26 -0800 -Subject: [PATCH] Add configure time check for setsid - -Do not assume glibc == linux - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - configure | 1 + - configure.in | 1 + - main.c | 4 ++-- - xtermcfg.hin | 1 + - 5 files changed, 6 insertions(+), 2 deletions(-) - -diff --git a/configure b/configure -index 0aafefc..03e8df0 100755 ---- a/configure -+++ b/configure -@@ -5605,6 +5605,7 @@ for ac_func in \ - unsetenv \ - sched_yield \ - setpgid \ -+ setsid \ - strftime \ - tcgetattr \ - waitpid \ -diff --git a/configure.in b/configure.in -index d2fee88..74d65df 100644 ---- a/configure.in -+++ b/configure.in -@@ -99,6 +99,7 @@ AC_CHECK_FUNCS( \ - unsetenv \ - sched_yield \ - setpgid \ -+ setsid \ - strftime \ - tcgetattr \ - waitpid \ -diff --git a/main.c b/main.c -index 5e60589..b81d2be 100644 ---- a/main.c -+++ b/main.c -@@ -2903,7 +2903,7 @@ main(int argc, char *argv[]ENVP_ARG) - } - } - --#if defined(__osf__) || (defined(__GLIBC__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) -+#if defined(__osf__) || (defined(__linux__) && !defined(USE_USG_PTYS)) || defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__APPLE__) - #define USE_OPENPTY 1 - static int opened_tty = -1; - #endif -@@ -4074,7 +4074,7 @@ spawnXTerm(XtermWidget xw, unsigned line_speed) - /* - * now in child process - */ --#if defined(_POSIX_SOURCE) || defined(SVR4) || defined(__convex__) || defined(__SCO__) || defined(__QNX__) -+#if HAVE_SETSID - int pgrp = setsid(); /* variable may not be used... */ - #else - int pgrp = getpid(); -diff --git a/xtermcfg.hin b/xtermcfg.hin -index 1dbc3b8..4f3ff5b 100644 ---- a/xtermcfg.hin -+++ b/xtermcfg.hin -@@ -95,6 +95,7 @@ - #undef HAVE_PUTENV /* AC_CHECK_FUNCS(putenv) */ - #undef HAVE_SCHED_YIELD /* AC_CHECK_FUNCS(sched_yield) */ - #undef HAVE_SETPGID /* AC_CHECK_FUNCS(setpgid) */ -+#undef HAVE_SETSID /* AC_CHECK_FUNCS(setsid) */ - #undef HAVE_STDINT_H /* AC_PROG_CC_STDC */ - #undef HAVE_STDLIB_H /* AC_CHECK_HEADERS(stdlib.h) */ - #undef HAVE_STDNORETURN_H /* CF_C11_NORETURN */ --- -2.24.1 - diff --git a/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch new file mode 100644 index 0000000000..0c9d64c82c --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-app/xterm/0001-include-missing-pty.h-header-for-openpty.patch @@ -0,0 +1,30 @@ +From e30ab2d73a21bc55511cbedbb9ae603246dbfcd1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Thu, 16 May 2024 23:10:00 -0700 +Subject: [PATCH] include missing pty.h header for openpty() + +On musl this problem is unearthed + +Fix +./main.c: In function 'get_pty': +./main.c:3123:14: error: implicit declaration of function 'openpty'; did you mean 'openat'? [-Wimplicit-function-declaration] + 3123 | result = openpty(pty, &opened_tty, ttydev, NULL, NULL); + | ^~~~~~~ + | openat + +Upstream-Status: Submitted [sent to dickey@invisible-island.net] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + main.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/main.c ++++ b/main.c +@@ -89,6 +89,7 @@ + + #define RES_OFFSET(field) XtOffsetOf(XTERM_RESOURCE, field) + ++#include <pty.h> + #include <xterm.h> + #include <version.h> + #include <graphics.h> diff --git a/meta-oe/recipes-graphics/xorg-app/xterm_372.bb b/meta-oe/recipes-graphics/xorg-app/xterm_394.bb index 3e1e9d7042..94953b288e 100644 --- a/meta-oe/recipes-graphics/xorg-app/xterm_372.bb +++ b/meta-oe/recipes-graphics/xorg-app/xterm_394.bb @@ -2,13 +2,12 @@ require recipes-graphics/xorg-app/xorg-app-common.inc SUMMARY = "xterm is the standard terminal emulator for the X Window System" DEPENDS = "libxaw xorgproto libxext libxau libxinerama libxpm ncurses desktop-file-utils-native" -LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=5ec6748ed90e588caa9318b780a0d498" +LIC_FILES_CHKSUM = "file://xterm.h;beginline=3;endline=31;md5=1a3032aa728f8fda9d686948940ca58d" SRC_URI = "http://invisible-mirror.net/archives/${BPN}/${BP}.tgz \ - file://0001-Add-configure-time-check-for-setsid.patch \ + file://0001-include-missing-pty.h-header-for-openpty.patch \ " - -SRC_URI[sha256sum] = "c6d08127cb2409c3a04bcae559b7025196ed770bb7bf26630abcb45d95f60ab1" +SRC_URI[sha256sum] = "a2a0cb206eb0423dedc34794f5c2d38c83390d2dd1106b66aba0960c3a976c7a" PACKAGECONFIG ?= "" PACKAGECONFIG[xft] = "--enable-freetype,--disable-freetype,libxft fontconfig freetype-native" @@ -27,6 +26,8 @@ EXTRA_OECONF = " --x-includes=${STAGING_INCDIR} \ B = "${S}" +CFLAGS += "-D_GNU_SOURCE" + do_configure() { gnu-configize --force sed -e "s%/usr/contrib/X11R6%${STAGING_LIBDIR}%g" -i configure @@ -46,3 +47,5 @@ ALTERNATIVE:${PN} = "resize x-terminal-emulator" ALTERNATIVE_TARGET[x-terminal-emulator] = "${bindir}/xterm" # rxvt-unicode defaults to priority 10. Let's be one point lower to let it override xterm. ALTERNATIVE_PRIORITY[x-terminal-emulator] = "9" + +CVE_STATUS[CVE-1999-0965] = "cpe-incorrect: Current version (392) not affected. This was fixed in version X11R5-fix-26 (R11R6 from 1994)" diff --git a/meta-oe/recipes-graphics/xorg-app/xwd_1.0.8.bb b/meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb index 44b9c80d73..4a05a4437a 100644 --- a/meta-oe/recipes-graphics/xorg-app/xwd_1.0.8.bb +++ b/meta-oe/recipes-graphics/xorg-app/xwd_1.0.9.bb @@ -7,4 +7,5 @@ LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=c0cdb783e9a0198237371fdaa26a18bf" DEPENDS = "libxmu libxkbfile" -SRC_URI[sha256sum] = "fbaa2b34163714fe7be22b60920ea4683f63b355babb1781aec2e452a033031b" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "dc121b84947eb4a3d1131bff1e9844cfa2124d95b47b35f9932340fa931fbd3f" diff --git a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb index 7cb550d276..1be0b5cd77 100644 --- a/meta-oe/recipes-graphics/xorg-app/xwud_1.0.5.bb +++ b/meta-oe/recipes-graphics/xorg-app/xwud_1.0.6.bb @@ -8,5 +8,5 @@ SECTION = "x11/app" LICENSE = "MIT" LIC_FILES_CHKSUM = "file://COPYING;md5=31e8892c80b7a0c1c5f37c8e8ae6d794" -SRC_URI[md5sum] = "79972093bb0766fcd0223b2bd6d11932" -SRC_URI[sha256sum] = "99997051f8a892313f22edf41dab45864e86e7062ee9012d5dbb6a40fc6b10a9" +SRC_URI_EXT = "xz" +SRC_URI[sha256sum] = "64048cd15eba3cd9a3d2e3280650391259ebf6b529f2101d1a20f441038c1afe" diff --git a/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.2.bb b/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.2.bb deleted file mode 100644 index 37183b12b7..0000000000 --- a/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.2.bb +++ /dev/null @@ -1,11 +0,0 @@ -require xorg-data-common.inc - -SUMMARY = "Common X11 Bitmaps" -LICENSE = "MIT" -DEPENDS += "libxmu" -RDEPENDS:${PN}-dev = "" - -LIC_FILES_CHKSUM = "file://COPYING;md5=dbd075aaffa4a60a8d00696f2e4b9a8f" - -SRC_URI[md5sum] = "cedeef095918aca86da79a2934e03daf" -SRC_URI[sha256sum] = "b9f0c71563125937776c8f1f25174ae9685314cbd130fb4c2efce811981e07ee" diff --git a/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.3.bb b/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.3.bb new file mode 100644 index 0000000000..5f49152972 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-data/xbitmaps_1.1.3.bb @@ -0,0 +1,7 @@ +require xorg-data-common.inc + +SUMMARY = "Common X11 Bitmaps" + +LIC_FILES_CHKSUM = "file://COPYING;md5=dbd075aaffa4a60a8d00696f2e4b9a8f" + +SRC_URI[sha256sum] = "ad6cad54887832a17d86c2ccfc5e52a1dfab090f8307b152c78b0e1529cd0f7a" diff --git a/meta-oe/recipes-graphics/xorg-data/xcursor-themes_1.0.7.bb b/meta-oe/recipes-graphics/xorg-data/xcursor-themes_1.0.7.bb new file mode 100644 index 0000000000..9ebd2d12fd --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-data/xcursor-themes_1.0.7.bb @@ -0,0 +1,11 @@ +require xorg-data-common.inc + +SUMMARY = "Default set of cursor themes for use with libXcursor" + +DEPENDS:append = " libxcursor xcursorgen-native" + +LIC_FILES_CHKSUM = "file://COPYING;md5=d8cbd99fff773f92e844948f74ef0df8" + +SRC_URI[sha256sum] = "95bae8f48823d894a05bf42dfbf453674ab7dbdeb11e2bc079e8525ad47378c8" + +FILES:${PN} += "${datadir}/icons" diff --git a/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc b/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc index 1c6408d0d8..17fe00a9b8 100644 --- a/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc +++ b/meta-oe/recipes-graphics/xorg-data/xorg-data-common.inc @@ -2,10 +2,10 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/data" LICENSE = "MIT" -XORG_PN = "${BPN}" +DEPENDS = "util-macros-native virtual/libx11" -SRC_URI = "${XORG_MIRROR}/individual/data/${BP}.tar.bz2" -S = "${WORKDIR}/${XORG_PN}-${PV}" +SRC_URI_EXT = "xz" +SRC_URI = "${XORG_MIRROR}/individual/data/${BP}.tar.${SRC_URI_EXT}" inherit features_check autotools pkgconfig diff --git a/meta-oe/recipes-graphics/xorg-doc/xorg-doc-common.inc b/meta-oe/recipes-graphics/xorg-doc/xorg-doc-common.inc index aa4795edc2..042db48acb 100644 --- a/meta-oe/recipes-graphics/xorg-doc/xorg-doc-common.inc +++ b/meta-oe/recipes-graphics/xorg-doc/xorg-doc-common.inc @@ -3,10 +3,11 @@ HOMEPAGE = "http://www.x.org" SECTION = "x11/docs" LICENSE = "MIT" -SRC_URI = "${XORG_MIRROR}/individual/doc/${BPN}-${PV}.tar.bz2" +DEPENDS = "util-macros-native" -S = "${WORKDIR}/${BPN}-${PV}" - -INC_PR = "r1" +SRC_URI_EXT = "bz2" +SRC_URI = "${XORG_MIRROR}/individual/doc/${BPN}-${PV}.tar.${SRC_URI_EXT}" inherit autotools pkgconfig + + diff --git a/meta-oe/recipes-graphics/xorg-doc/xorg-docs_1.7.2.bb b/meta-oe/recipes-graphics/xorg-doc/xorg-docs_1.7.2.bb new file mode 100644 index 0000000000..4cef981bc8 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-doc/xorg-docs_1.7.2.bb @@ -0,0 +1,7 @@ +require xorg-doc-common.inc + +SUMMARY = "Documentation for the X Window System" + +LIC_FILES_CHKSUM = "file://general/License.xml;md5=f2677c20a4066714e233e9bbd8659aa2" + +SRC_URI[sha256sum] = "2391b8af472626c12d3c3814b5e7a0ea43c3a96eda94255b7ed8bdff0fbf08e3" diff --git a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb index 050cb29824..21a0ed74fa 100644 --- a/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb +++ b/meta-oe/recipes-graphics/xorg-doc/xorg-sgml-doctools_1.12.bb @@ -1,10 +1,11 @@ require xorg-doc-common.inc + PE = "1" -DEPENDS += "util-macros" +SUMMARY = "SGML entities and XML/CSS stylesheets used in X.Org docs" LIC_FILES_CHKSUM = "file://COPYING;md5=c8c6c808cd3c797a07b24e443af1c449" SRC_URI[sha256sum] = "65a9fdddedc17bd5e9c0b00d904960f03f047c3a62de5458989d493c29fec806" -FILES:${PN} += " /usr/share/sgml/X11" +FILES:${PN} += "${datadir}/sgml/X11" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb index 9f445ff265..171b2dec7b 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-tslib_1.1.1.bb @@ -9,12 +9,14 @@ RRECOMMENDS:${PN} += "tslib-calibrate" SRC_URI = "https://github.com/merge/xf86-input-tslib/releases/download/${PV}/xf86-input-tslib-${PV}.tar.xz \ file://99-xf86-input-tslib.rules \ " +UPSTREAM_CHECK_URI="https://github.com/merge/xf86-input-tslib/tags" +UPSTREAM_CHECK_REGEX = "(?P<pver>\d+(\.\d+)+)$" SRC_URI[sha256sum] = "b596168c4ed2f1023212dc828ce49cbe82a0bbd1aac3c5e2958154d78870ca88" do_install:append() { install -d ${D}${nonarch_base_libdir}/udev/rules.d - install -m 0644 ${WORKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/ + install -m 0644 ${UNPACKDIR}/99-xf86-input-tslib.rules ${D}${nonarch_base_libdir}/udev/rules.d/ } FILES:${PN} += "${nonarch_base_libdir}/udev" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.1.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.2.bb index 88fb4b99a1..7a12272491 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.1.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-input-void_1.4.2.bb @@ -1,8 +1,7 @@ require recipes-graphics/xorg-driver/xorg-driver-input.inc SUMMARY = "X.Org X server -- void input driver" -PR = "r22" LIC_FILES_CHKSUM = "file://COPYING;md5=4be6a915bfbf111cd88706fc6a6f141b" -SRC_URI[md5sum] = "5227013b52b3ca85d6b7ec8adea988d4" -SRC_URI[sha256sum] = "f96e4f0a622821bf43a74bd419f2a18423343996c9d243c7e1430ba2d142339c" +XORG_DRIVER_COMPRESSOR = ".tar.xz" +SRC_URI[sha256sum] = "a211d8e21ce0e2ed8af5b8a2e8d4409d70c9c7e5ee528f5e6002ad279bf07885" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-amdgpu_23.0.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-amdgpu_23.0.0.bb new file mode 100644 index 0000000000..c417e95d0a --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-amdgpu_23.0.0.bb @@ -0,0 +1,23 @@ +require recipes-graphics/xorg-driver/xorg-driver-video.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=aabff1606551f9461ccf567739af63dc" + +SUMMARY = "X.Org X server -- AMD Radeon GPU display driver" + +DESCRIPTION = "Xorg driver for AMD Radeon GPUs using the amdgpu kernel driver" + +SRC_URI[sha256sum] = "08c38287d39b999fd61ecb6e7b23d5079762e2b4b2179b3567973ed9aaf71222" + +XORG_DRIVER_COMPRESSOR = ".tar.gz" +DEPENDS += "virtual/libx11 libdrm virtual/libgbm xorgproto" + +REQUIRED_DISTRO_FEATURES += "opengl" + +PACKAGECONFIG ??= "udev glamor" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" +PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor" + +RRECOMMENDS:${PN} += "linux-firmware-amdgpu" + +FILES:${PN}-config = "${datadir}/X11/xorg.conf.d" +FILES:${PN} += "${datadir}/X11" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch deleted file mode 100644 index 7dfa233423..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-Fix-link-failure-with-gcc-10.patch +++ /dev/null @@ -1,34 +0,0 @@ -From cebbeaa9d0bdc18377faef27ea9ffd38e509d180 Mon Sep 17 00:00:00 2001 -From: Adam Jackson <ajax@redhat.com> -Date: Tue, 4 Feb 2020 16:38:06 -0500 -Subject: [PATCH] Fix link failure with gcc 10 -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Without the 'extern' this looks like a definition not just a -declaration, in every file that includes the header. gcc 10 is stricter -about this kind of multiple definition. - -Upstream-Status: Backport [https://cgit.freedesktop.org/xorg/driver/xf86-video-ati/commit/?id=f223035f4ffcff2a9296d1e907a5193f8e8845a3] -Reviewed-by: Michel Dänzer <mdaenzer@redhat.com> ---- - src/drmmode_display.h | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/drmmode_display.h b/src/drmmode_display.h -index 96eaef0..8cd8a0a 100644 ---- a/src/drmmode_display.h -+++ b/src/drmmode_display.h -@@ -262,7 +262,7 @@ Bool drmmode_wait_vblank(xf86CrtcPtr crtc, drmVBlankSeqType type, - uint64_t *ust, uint32_t *result_seq); - - --miPointerSpriteFuncRec drmmode_sprite_funcs; -+extern miPointerSpriteFuncRec drmmode_sprite_funcs; - - - #endif --- -2.28.0 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch deleted file mode 100644 index cda2c2f146..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati/0001-ati-cleanup-terminology-to-use-primary-secondary.patch +++ /dev/null @@ -1,369 +0,0 @@ -From 6e035c007876ffe972a497681dd3debdc806e979 Mon Sep 17 00:00:00 2001 -From: Dave Airlie <airlied@redhat.com> -Date: Mon, 13 Jul 2020 09:11:28 +1000 -Subject: [PATCH] ati: cleanup terminology to use primary/secondary - -The X server changed some API/ABIs here. - -Based on amdgpu patch by Michel ---- -Upstream-Status: Backport [https://gitlab.freedesktop.org/xorg/driver/xf86-video-ati/-/commit/8da3e4561ef82bb78c9a17b8cd8bf139b9cfd680.patch] -man/radeon.man | 2 +- - src/compat-api.h | 6 ++++ - src/drmmode_display.c | 4 +-- - src/evergreen_state.h | 2 +- - src/r600_state.h | 2 +- - src/radeon.h | 10 +++--- - src/radeon_exa.c | 2 +- - src/radeon_glamor.c | 2 +- - src/radeon_kms.c | 74 +++++++++++++++++++++---------------------- - 9 files changed, 55 insertions(+), 49 deletions(-) - -diff --git a/man/radeon.man b/man/radeon.man -index dcebf53..247dcdb 100644 ---- a/man/radeon.man -+++ b/man/radeon.man -@@ -290,7 +290,7 @@ on. If this option is set, the default value of the property is 'on' or 'off' - accordingly. If this option isn't set, the default value of the property is - .B auto, - which means that TearFree is on for rotated outputs, outputs with RandR --transforms applied and for RandR 1.4 slave outputs, otherwise off. -+transforms applied and for RandR 1.4 secondary outputs, otherwise off. - .TP - .BI "Option \*qAccelMethod\*q \*q" "string" \*q - Chooses between available acceleration architectures. Valid values are -diff --git a/src/compat-api.h b/src/compat-api.h -index f4e7524..def6d3e 100644 ---- a/src/compat-api.h -+++ b/src/compat-api.h -@@ -34,4 +34,10 @@ - #define BLOCKHANDLER_ARGS pScreen, pTimeout, pReadmask - #endif - -+#if ABI_VIDEODRV_VERSION < SET_ABI_VERSION(25, 2) -+#define current_primary current_master -+#define primary_pixmap master_pixmap -+#define secondary_dst slave_dst -+#endif -+ - #endif -diff --git a/src/drmmode_display.c b/src/drmmode_display.c -index 0e9e247..3dec91e 100644 ---- a/src/drmmode_display.c -+++ b/src/drmmode_display.c -@@ -720,7 +720,7 @@ drmmode_crtc_prime_scanout_update(xf86CrtcPtr crtc, DisplayModePtr mode, - xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, - ent) { - if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { -- dirty->slave_dst = -+ dirty->secondary_dst = - drmmode_crtc->scanout[scanout_id].pixmap; - break; - } -@@ -1356,7 +1356,7 @@ drmmode_set_scanout_pixmap(xf86CrtcPtr crtc, PixmapPtr ppix) - - xorg_list_for_each_entry(dirty, &screen->pixmap_dirty_list, ent) { - if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { -- PixmapStopDirtyTracking(dirty->src, dirty->slave_dst); -+ PixmapStopDirtyTracking(dirty->src, dirty->secondary_dst); - break; - } - } -diff --git a/src/evergreen_state.h b/src/evergreen_state.h -index 7e54e1c..34ba87b 100644 ---- a/src/evergreen_state.h -+++ b/src/evergreen_state.h -@@ -350,7 +350,7 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, - int *new_pitch); - extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); - extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); --extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); -+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p); - extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); - - #endif -diff --git a/src/r600_state.h b/src/r600_state.h -index 3434599..567c3ca 100644 ---- a/src/r600_state.h -+++ b/src/r600_state.h -@@ -321,6 +321,6 @@ extern void *RADEONEXACreatePixmap2(ScreenPtr pScreen, int width, int height, - int *new_pitch); - extern void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv); - extern Bool RADEONEXAPixmapIsOffscreen(PixmapPtr pPix); --extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **handle_p); -+extern Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr secondary, void **handle_p); - extern Bool RADEONEXASetSharedPixmapBacking(PixmapPtr ppix, void *handle); - #endif -diff --git a/src/radeon.h b/src/radeon.h -index 2c91346..85fd021 100644 ---- a/src/radeon.h -+++ b/src/radeon.h -@@ -182,18 +182,18 @@ typedef enum { - - - static inline ScreenPtr --radeon_master_screen(ScreenPtr screen) -+radeon_primary_screen(ScreenPtr screen) - { -- if (screen->current_master) -- return screen->current_master; -+ if (screen->current_primary) -+ return screen->current_primary; - - return screen; - } - - static inline ScreenPtr --radeon_dirty_master(PixmapDirtyUpdatePtr dirty) -+radeon_dirty_primary(PixmapDirtyUpdatePtr dirty) - { -- return radeon_master_screen(dirty->slave_dst->drawable.pScreen); -+ return radeon_primary_screen(dirty->secondary_dst->drawable.pScreen); - } - - static inline DrawablePtr -diff --git a/src/radeon_exa.c b/src/radeon_exa.c -index 268155e..320ff99 100644 ---- a/src/radeon_exa.c -+++ b/src/radeon_exa.c -@@ -282,7 +282,7 @@ void RADEONEXADestroyPixmap(ScreenPtr pScreen, void *driverPriv) - free(driverPriv); - } - --Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr slave, void **fd_handle) -+Bool RADEONEXASharePixmapBacking(PixmapPtr ppix, ScreenPtr seconndary, void **fd_handle) - { - struct radeon_exa_pixmap_priv *driver_priv = exaGetPixmapDriverPrivate(ppix); - -diff --git a/src/radeon_glamor.c b/src/radeon_glamor.c -index f109838..ccf9994 100644 ---- a/src/radeon_glamor.c -+++ b/src/radeon_glamor.c -@@ -366,7 +366,7 @@ radeon_glamor_set_pixmap_bo(DrawablePtr drawable, PixmapPtr pixmap) - - - static Bool --radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr slave, -+radeon_glamor_share_pixmap_backing(PixmapPtr pixmap, ScreenPtr secondary, - void **handle_p) - { - ScreenPtr screen = pixmap->drawable.pScreen; -diff --git a/src/radeon_kms.c b/src/radeon_kms.c -index b3db7c4..62962d6 100644 ---- a/src/radeon_kms.c -+++ b/src/radeon_kms.c -@@ -559,8 +559,8 @@ dirty_region(PixmapDirtyUpdatePtr dirty) - if (dirty->rotation != RR_Rotate_0) { - dstregion = transform_region(damageregion, - &dirty->f_inverse, -- dirty->slave_dst->drawable.width, -- dirty->slave_dst->drawable.height); -+ dirty->secondary_dst->drawable.width, -+ dirty->secondary_dst->drawable.height); - } else - #endif - { -@@ -568,7 +568,7 @@ dirty_region(PixmapDirtyUpdatePtr dirty) - - dstregion = RegionDuplicate(damageregion); - RegionTranslate(dstregion, -dirty->x, -dirty->y); -- PixmapRegionInit(&pixregion, dirty->slave_dst); -+ PixmapRegionInit(&pixregion, dirty->secondary_dst); - RegionIntersect(dstregion, dstregion, &pixregion); - RegionUninit(&pixregion); - } -@@ -585,8 +585,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) - if (RegionNil(region)) - goto out; - -- if (dirty->slave_dst->master_pixmap) -- DamageRegionAppend(&dirty->slave_dst->drawable, region); -+ if (dirty->secondary_dst->primary_pixmap) -+ DamageRegionAppend(&dirty->secondary_dst->drawable, region); - - #ifdef HAS_DIRTYTRACKING_ROTATION - PixmapSyncDirtyHelper(dirty); -@@ -595,8 +595,8 @@ redisplay_dirty(PixmapDirtyUpdatePtr dirty, RegionPtr region) - #endif - - radeon_cs_flush_indirect(src_scrn); -- if (dirty->slave_dst->master_pixmap) -- DamageRegionProcessPending(&dirty->slave_dst->drawable); -+ if (dirty->secondary_dst->primary_pixmap) -+ DamageRegionProcessPending(&dirty->secondary_dst->drawable); - - out: - DamageEmpty(dirty->damage); -@@ -613,12 +613,12 @@ radeon_prime_scanout_update_abort(xf86CrtcPtr crtc, void *event_data) - void - radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr master_screen = radeon_dirty_master(dirty); -+ ScreenPtr primary_screen = radeon_dirty_primary(dirty); - PixmapDirtyUpdatePtr ent; - RegionPtr region; - -- xorg_list_for_each_entry(ent, &master_screen->pixmap_dirty_list, ent) { -- if (!radeon_dirty_src_equals(dirty, ent->slave_dst)) -+ xorg_list_for_each_entry(ent, &primary_screen->pixmap_dirty_list, ent) { -+ if (!radeon_dirty_src_equals(dirty, ent->secondary_dst)) - continue; - - region = dirty_region(ent); -@@ -631,45 +631,45 @@ radeon_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) - #if HAS_SYNC_SHARED_PIXMAP - - static Bool --master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) -+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr master_screen = radeon_dirty_master(dirty); -+ ScreenPtr primary_screen = radeon_dirty_primary(dirty); - -- return !!master_screen->SyncSharedPixmap; -+ return !!primary_screen->SyncSharedPixmap; - } - - static Bool --slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) -+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr slave_screen = dirty->slave_dst->drawable.pScreen; -+ ScreenPtr secondary_screen = dirty->secondary_dst->drawable.pScreen; - -- return !!slave_screen->SyncSharedPixmap; -+ return !!secondary_screen->SyncSharedPixmap; - } - - static void - call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr master_screen = radeon_dirty_master(dirty); -+ ScreenPtr primary_screen = radeon_dirty_primary(dirty); - -- master_screen->SyncSharedPixmap(dirty); -+ primary_screen->SyncSharedPixmap(dirty); - } - - #else /* !HAS_SYNC_SHARED_PIXMAP */ - - static Bool --master_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) -+primary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) - { -- ScrnInfoPtr master_scrn = xf86ScreenToScrn(radeon_dirty_master(dirty)); -+ ScrnInfoPtr primary_scrn = xf86ScreenToScrn(radeon_dirty_primary(dirty)); - -- return master_scrn->driverName == scrn->driverName; -+ return primary_scrn->driverName == scrn->driverName; - } - - static Bool --slave_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) -+secondary_has_sync_shared_pixmap(ScrnInfoPtr scrn, PixmapDirtyUpdatePtr dirty) - { -- ScrnInfoPtr slave_scrn = xf86ScreenToScrn(dirty->slave_dst->drawable.pScreen); -+ ScrnInfoPtr secondary_scrn = xf86ScreenToScrn(dirty->secondary_dst->drawable.pScreen); - -- return slave_scrn->driverName == scrn->driverName; -+ return secondary_scrn->driverName == scrn->driverName; - } - - static void -@@ -684,12 +684,12 @@ call_sync_shared_pixmap(PixmapDirtyUpdatePtr dirty) - static xf86CrtcPtr - radeon_prime_dirty_to_crtc(PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr screen = dirty->slave_dst->drawable.pScreen; -+ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - int c; - -- /* Find the CRTC which is scanning out from this slave pixmap */ -+ /* Find the CRTC which is scanning out from this secondary pixmap */ - for (c = 0; c < xf86_config->num_crtc; c++) { - xf86CrtcPtr xf86_crtc = xf86_config->crtc[c]; - drmmode_crtc_private_ptr drmmode_crtc = xf86_crtc->driver_private; -@@ -714,7 +714,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) - if (radeon_dirty_src_equals(dirty, drmmode_crtc->prime_scanout_pixmap)) { - RegionPtr region; - -- if (master_has_sync_shared_pixmap(scrn, dirty)) -+ if (primary_has_sync_shared_pixmap(scrn, dirty)) - call_sync_shared_pixmap(dirty); - - region = dirty_region(dirty); -@@ -727,7 +727,7 @@ radeon_prime_scanout_do_update(xf86CrtcPtr crtc, unsigned scanout_id) - radeon_cs_flush_indirect(scrn); - RegionCopy(&drmmode_crtc->scanout_last_region, region); - RegionTranslate(region, -crtc->x, -crtc->y); -- dirty->slave_dst = drmmode_crtc->scanout[scanout_id].pixmap; -+ dirty->secondary_dst = drmmode_crtc->scanout[scanout_id].pixmap; - } - - redisplay_dirty(dirty, region); -@@ -754,7 +754,7 @@ radeon_prime_scanout_update_handler(xf86CrtcPtr crtc, uint32_t frame, uint64_t u - static void - radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) - { -- ScreenPtr screen = dirty->slave_dst->drawable.pScreen; -+ ScreenPtr screen = dirty->secondary_dst->drawable.pScreen; - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); - xf86CrtcPtr xf86_crtc = radeon_prime_dirty_to_crtc(dirty); -@@ -818,7 +818,7 @@ radeon_prime_scanout_update(PixmapDirtyUpdatePtr dirty) - static void - radeon_prime_scanout_flip(PixmapDirtyUpdatePtr ent) - { -- ScreenPtr screen = ent->slave_dst->drawable.pScreen; -+ ScreenPtr screen = ent->secondary_dst->drawable.pScreen; - ScrnInfoPtr scrn = xf86ScreenToScrn(screen); - RADEONEntPtr pRADEONEnt = RADEONEntPriv(scrn); - xf86CrtcPtr crtc = radeon_prime_dirty_to_crtc(ent); -@@ -893,11 +893,11 @@ radeon_dirty_update(ScrnInfoPtr scrn) - if (screen->isGPU) { - PixmapDirtyUpdatePtr region_ent = ent; - -- if (master_has_sync_shared_pixmap(scrn, ent)) { -- ScreenPtr master_screen = radeon_dirty_master(ent); -+ if (primary_has_sync_shared_pixmap(scrn, ent)) { -+ ScreenPtr primary_screen = radeon_dirty_primary(ent); - -- xorg_list_for_each_entry(region_ent, &master_screen->pixmap_dirty_list, ent) { -- if (radeon_dirty_src_equals(ent, region_ent->slave_dst)) -+ xorg_list_for_each_entry(region_ent, &primary_screen->pixmap_dirty_list, ent) { -+ if (radeon_dirty_src_equals(ent, region_ent->secondary_dst)) - break; - } - } -@@ -921,7 +921,7 @@ radeon_dirty_update(ScrnInfoPtr scrn) - - RegionDestroy(region); - } else { -- if (slave_has_sync_shared_pixmap(scrn, ent)) -+ if (secondary_has_sync_shared_pixmap(scrn, ent)) - continue; - - region = dirty_region(ent); -@@ -1216,7 +1216,7 @@ static void RADEONBlockHandler_KMS(BLOCKHANDLER_ARGS_DECL) - (*pScreen->BlockHandler) (BLOCKHANDLER_ARGS); - pScreen->BlockHandler = RADEONBlockHandler_KMS; - -- if (!xf86ScreenToScrn(radeon_master_screen(pScreen))->vtSema) -+ if (!xf86ScreenToScrn(radeon_primary_screen(pScreen))->vtSema) - return; - - if (!pScreen->isGPU) -@@ -2584,7 +2584,7 @@ CARD32 cleanup_black_fb(OsTimerPtr timer, CARD32 now, pointer data) - xf86CrtcConfigPtr xf86_config = XF86_CRTC_CONFIG_PTR(scrn); - int c; - -- if (xf86ScreenToScrn(radeon_master_screen(screen))->vtSema) -+ if (xf86ScreenToScrn(radeon_primary_screen(screen))->vtSema) - return 0; - - /* Unreference the all-black FB created by RADEONLeaveVT_KMS. After --- -2.33.1 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb deleted file mode 100644 index c8ce77ab88..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_19.1.0.bb +++ /dev/null @@ -1,25 +0,0 @@ -require recipes-graphics/xorg-driver/xorg-driver-video.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=aabff1606551f9461ccf567739af63dc" - -SUMMARY = "X.Org X server -- ATI Radeon video driver" - -DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics" - -DEPENDS += "virtual/libx11 libxvmc drm \ - virtual/libgl xorgproto libpciaccess" - -inherit features_check -REQUIRED_DISTRO_FEATURES += "opengl" - -SRC_URI += "file://0001-Fix-link-failure-with-gcc-10.patch \ - file://0001-ati-cleanup-terminology-to-use-primary-secondary.patch \ - " -SRC_URI[sha256sum] = "659f5a1629eea5f5334d9b39b18e6807a63aa1efa33c1236d9cc53acbb223c49" - -#EXTRA_OECONF += "--disable-glamor" - -RDEPENDS:${PN} += "xserver-xorg-module-exa" -RRECOMMENDS:${PN} += "linux-firmware-radeon" - -FILES:${PN} += "${datadir}/X11" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_22.0.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_22.0.0.bb new file mode 100644 index 0000000000..57ea9d2d32 --- /dev/null +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-ati_22.0.0.bb @@ -0,0 +1,33 @@ +require recipes-graphics/xorg-driver/xorg-driver-video.inc + +LIC_FILES_CHKSUM = "file://COPYING;md5=aabff1606551f9461ccf567739af63dc" + +SUMMARY = "X.Org X server -- ATI Radeon video driver" + +DESCRIPTION = "Open-source X.org graphics driver for ATI Radeon graphics" + +DEPENDS += "virtual/libx11 libxvmc drm \ + virtual/libgl xorgproto libpciaccess" + +REQUIRED_DISTRO_FEATURES += "opengl" + +XORG_DRIVER_COMPRESSOR = ".tar.xz" +SRC_URI[sha256sum] = "c8c8bb56d3f6227c97e59c3a3c85a25133584ceb82ab5bc05a902a743ab7bf6d" + +PACKAGECONFIG ??= "udev" +PACKAGECONFIG[udev] = "--enable-udev,--disable-udev,udev" +PACKAGECONFIG[glamor] = "--enable-glamor,--disable-glamor" + +RDEPENDS:${PN}:append = "\ + ${@bb.utils.contains('PACKAGECONFIG', 'glamor', 'libegl', '', d)} \ + mesa-megadriver \ + xserver-xorg-extension-glx \ + xserver-xorg-module-exa \ +" + +RRECOMMENDS:${PN} += "linux-firmware-radeon" + +PACKAGES =+ "${PN}-config" + +FILES:${PN}-config = "${datadir}/X11/xorg.conf.d" +FILES:${PN} += "${datadir}/X11" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch deleted file mode 100644 index ceae6dfba2..0000000000 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga/checkfile.patch +++ /dev/null @@ -1,68 +0,0 @@ -Upstream-Status: Submitted [https://bugs.freedesktop.org/show_bug.cgi?id=57606] -Signed-off-by: Ross Burton <ross.burton@intel.com> - -From c9014a8f3c9b691b5aa7b1f3ec66cf7c84b8211b Mon Sep 17 00:00:00 2001 -From: Ross Burton <ross.burton@intel.com> -Date: Thu, 29 Nov 2012 11:00:43 +0000 -Subject: [PATCH] build: dont use AC_CHECK_FILE when enabling DRI - -Automatically enabling or disabling a feature based on installed files isn't -deterministic, and AC_CHECK_FILE returns an error when cross-compiling. - -Fix this by enabling DRI by default, and removing the explicit file checks as -pkg-config is good enough. - -(#57606) - -Signed-off-by: Ross Burton <ross.burton@intel.com> ---- - configure.ac | 25 ++----------------------- - 1 file changed, 2 insertions(+), 23 deletions(-) - -diff --git a/configure.ac b/configure.ac -index fca1a9c..d2aa2ed 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -55,9 +55,9 @@ AC_ARG_WITH(xorg-module-dir, - [moduledir="$libdir/xorg/modules"]) - - AC_ARG_ENABLE(dri, AS_HELP_STRING([--disable-dri], -- [Disable DRI support [[default=auto]]]), -+ [Disable DRI support [[default=enabled]]]), - [DRI="$enableval"], -- [DRI=auto]) -+ [DRI=yes]) - AC_ARG_ENABLE(exa, - AS_HELP_STRING([--disable-exa], - [Disable EXA support [[default=enabled]]]), -@@ -76,27 +76,6 @@ sdkdir=`$PKG_CONFIG --variable=sdkdir xorg-server` - - # Checks for libraries. - --if test "x$DRI" != xno; then -- AC_CHECK_FILE([${sdkdir}/dri.h], -- [have_dri_h="yes"], [have_dri_h="no"]) -- AC_CHECK_FILE([${sdkdir}/sarea.h], -- [have_sarea_h="yes"], [have_sarea_h="no"]) -- AC_CHECK_FILE([${sdkdir}/dristruct.h], -- [have_dristruct_h="yes"], [have_dristruct_h="no"]) --fi -- --AC_MSG_CHECKING([whether to include DRI support]) --if test "x$DRI" = xauto; then -- if test "x$have_dri_h" = xyes && \ -- test "x$have_sarea_h" = xyes && \ -- test "x$have_dristruct_h" = xyes; then -- DRI="yes" -- else -- DRI="no" -- fi --fi --AC_MSG_RESULT([$DRI]) -- - AM_CONDITIONAL(DRI, test "x$DRI" = xyes) - if test "x$DRI" = xyes; then - PKG_CHECK_MODULES(DRI, [libdrm >= 2.0 xf86driproto]) --- -1.7.10.4 - diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb index a9ae901d05..34b3e4cde6 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.0.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-mga_2.0.1.bb @@ -4,16 +4,14 @@ SUMMARY = "X.Org X server -- Matrox MGA display driver" DESCRIPTION = "mga is an Xorg driver for Matrox video cards" -LIC_FILES_CHKSUM = "file://COPYING;md5=bc1395d2cd32dfc5d6c57d2d8f83d3fc" - -SRC_URI += "file://checkfile.patch" +LIC_FILES_CHKSUM = "file://COPYING;md5=4aa220f495ce9be5ce4243d21ebac14f" DEPENDS += "virtual/libx11 libpciaccess" COMPATIBLE_HOST = '(i.86.*-linux|x86_64.*-linux)' -SRC_URI[md5sum] = "b8fc99b4adea8bfe80156b13df4b6c9c" -SRC_URI[sha256sum] = "268946e1a13e9d80e4f724a0740df9e6e8c8bad37697fcbf456924e9fdbb5d79" +XORG_DRIVER_COMPRESSOR = ".tar.xz" +SRC_URI[sha256sum] = "27a33b70837965bb4a5f27fd260be085ca5bba837a4e62907f093c2f205603ab" PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'opengl', 'dri', '', d)}" PACKAGECONFIG[dri] = "--enable-dri,--disable-dri,drm xorgproto,xserver-xorg-extension-dri" diff --git a/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb b/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb index d471610bab..fbf6406caf 100644 --- a/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb +++ b/meta-oe/recipes-graphics/xorg-driver/xf86-video-nouveau_1.0.17.bb @@ -15,5 +15,7 @@ REQUIRED_DISTRO_FEATURES += "opengl" COMPATIBLE_HOST = '(i.86|x86_64).*-linux' +CFLAGS += "-Wno-error=implicit-function-declaration" + SRC_URI += "file://0001-nouveau-fixup-driver-for-new-X-server-ABI.patch" SRC_URI[sha256sum] = "499322e27a55c8183166bf2dd1e47d085eb834143e0d7036baba8427b90c156b" diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch b/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch deleted file mode 100644 index 32a24b4be1..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/0001-lbx_zlib-Mark-declration-with-extern.patch +++ /dev/null @@ -1,36 +0,0 @@ -From 95ed4b743f197e20f1884a326d5a7128187a7ba6 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Thu, 13 Aug 2020 17:56:30 -0700 -Subject: [PATCH] lbx_zlib: Mark declration with extern - -Fixes build with gcc10/-fno-common - -Upstream-Status: Pending -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/lbx_zlib/lbx_zlib.h | 12 ++++++------ - 1 file changed, 6 insertions(+), 6 deletions(-) - -diff --git a/src/lbx_zlib/lbx_zlib.h b/src/lbx_zlib/lbx_zlib.h -index 8ae8956..bec3b96 100644 ---- a/src/lbx_zlib/lbx_zlib.h -+++ b/src/lbx_zlib/lbx_zlib.h -@@ -136,9 +136,9 @@ extern void Xfree(pointer /*ptr*/); - #endif - - /* lbx_zlib.c */ --unsigned long stream_out_compressed; --unsigned long stream_out_uncompressed; --unsigned long stream_out_plain; --unsigned long stream_in_compressed; --unsigned long stream_in_uncompressed; --unsigned long stream_in_plain; -+extern unsigned long stream_out_compressed; -+extern unsigned long stream_out_uncompressed; -+extern unsigned long stream_out_plain; -+extern unsigned long stream_in_compressed; -+extern unsigned long stream_in_uncompressed; -+extern unsigned long stream_in_plain; --- -2.28.0 - diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch b/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch deleted file mode 100644 index f9f4a6382c..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil-1.1.0/mkg3states-1.1.patch +++ /dev/null @@ -1,55 +0,0 @@ -diff -uNr liblbxutil-1.1.0.orig/configure.ac liblbxutil-1.1.0/configure.ac ---- liblbxutil-1.1.0.orig/configure.ac 2009-12-04 23:52:04.000000000 +0100 -+++ liblbxutil-1.1.0/configure.ac 2009-12-16 10:45:00.000000000 +0100 -@@ -50,4 +50,5 @@ - - AC_OUTPUT([Makefile - src/Makefile -+ src/image/Makefile - lbxutil.pc]) -diff -uNr liblbxutil-1.1.0.orig/src/image/Makefile.am liblbxutil-1.1.0/src/image/Makefile.am ---- liblbxutil-1.1.0.orig/src/image/Makefile.am 1970-01-01 01:00:00.000000000 +0100 -+++ liblbxutil-1.1.0/src/image/Makefile.am 2009-12-16 10:45:00.000000000 +0100 -@@ -0,0 +1,15 @@ -+# evil hack -+CFLAGS=$(CFLAGS_FOR_BUILD) -+CPPFLAGS=$(CPPFLAGS_FOR_BUILD) -+LDFLAGS=$(LDFLAGS_FOR_BUILD) -+ -+CC=$(CC_FOR_BUILD) -+LIBTOOL = @LIBTOOL@ --tag=CC -+ -+noinst_PROGRAMS = mkg3states -+ -+mkg3states_SOURCES = \ -+ mkg3states.c -+ -+mkg3states_CFLAGS=$(CFLAGS_FOR_BUILD) -+mkg3states_LDFLAGS=$(LDFLAGS_FOR_BUILD) -diff -uNr liblbxutil-1.1.0.orig/src/Makefile.am liblbxutil-1.1.0/src/Makefile.am ---- liblbxutil-1.1.0.orig/src/Makefile.am 2009-12-16 10:48:11.000000000 +0100 -+++ liblbxutil-1.1.0/src/Makefile.am 2009-12-16 10:46:47.000000000 +0100 -@@ -3,10 +3,7 @@ - AM_CFLAGS = $(CWARNFLAGS) $(LBXUTIL_CFLAGS) - INCLUDES = -I$(top_srcdir)/include - --noinst_PROGRAMS = mkg3states -- --mkg3states_SOURCES = \ -- $(srcdir)/image/mkg3states.c -+SUBDIRS = image - - liblbxutil_la_SOURCES = \ - $(srcdir)/lbx_zlib/reqstats.h \ -@@ -38,9 +35,8 @@ - - $(srcdir)/image/dfaxg42d.c: g3states.h - --g3states.h: mkg3states -- -rm -f g3states.h -- $(AM_V_GEN) ./mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h -+g3states.h: image/mkg3states -+ $(AM_V_GEN) ./image/mkg3states -c > g3states.h_ && mv g3states.h_ g3states.h - - liblbxutil_la_LDFLAGS = -version-number 1:0:0 -no-undefined - diff --git a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb b/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb deleted file mode 100644 index 58b4f31b17..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/liblbxutil_1.1.0.bb +++ /dev/null @@ -1,16 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc - -LIC_FILES_CHKSUM = "file://COPYING;md5=b0d5bdc98f7ebab3b6c3791d9bf40907" - -SUMMARY = "XFIXES Extension" -DEPENDS += " xorgproto zlib" -PE = "1" -PR = "r11" - -SRC_URI += "file://mkg3states-1.1.patch \ - file://0001-lbx_zlib-Mark-declration-with-extern.patch \ - " -SRC_URI[md5sum] = "273329a78c2e9ea189ac416c7fde94a1" -SRC_URI[sha256sum] = "c6b6ff7858ec619cafa8205debca6bf78c5610a2844a782ed643c7fd017cf8ae" - -export CC_FOR_BUILD = "gcc" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.16.bb index 08d9b232e0..ee14cf747d 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.14.bb +++ b/meta-oe/recipes-graphics/xorg-lib/libxaw_1.0.16.bb @@ -6,8 +6,9 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=1c65719d42900bb81b83e8293c20a364" PE = "1" -SRC_URI[md5sum] = "c1ce21c296bbf3da3e30cf651649563e" -SRC_URI[sha256sum] = "76aef98ea3df92615faec28004b5ce4e5c6855e716fa16de40c32030722a6f8e" +XORG_PN = "libXaw" + +SRC_URI[sha256sum] = "731d572b54c708f81e197a6afa8016918e2e06dfd3025e066ca642a5b8c39c8f" do_install:append () { ln -sf libXaw6.so.6 ${D}${libdir}/libXaw.so.6 @@ -23,5 +24,3 @@ FILES:libxaw8 = "${libdir}/libXaw8.so.8*" # Avoid dependency on libxaw as it is not build RDEPENDS:${PN}-dev = "" - -XORG_PN = "libXaw" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb b/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb deleted file mode 100644 index 103da1f085..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/libxkbui_1.0.2.bb +++ /dev/null @@ -1,10 +0,0 @@ -require recipes-graphics/xorg-lib/xorg-lib-common.inc -SUMMARY = "X11 keyboard UI presentation library" -LICENSE = "SGI-1" -LIC_FILES_CHKSUM = "file://COPYING;md5=4641deddaa80fe7ca88e944e1fd94a94" -DEPENDS += "virtual/libx11 libxt libxkbfile" -PE = "1" -PR = "r10" - -SRC_URI[md5sum] = "1143e456f7429e18e88f2eadb2f2b6b1" -SRC_URI[sha256sum] = "20c23101d63234ee5f6d696dfa069b29c6c58e39eff433bcd7705b50b3ffa214" diff --git a/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.0.bb b/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.1.bb index 4fe9992f20..3b15153b6b 100644 --- a/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.0.bb +++ b/meta-oe/recipes-graphics/xorg-lib/libxpresent_1.0.1.bb @@ -4,8 +4,9 @@ DEPENDS += "xorgproto libxfixes libxrandr" LIC_FILES_CHKSUM = "file://COPYING;md5=3c1ce42c334a6f5cccb0277556a053e0" -SRC_URI = "http://xorg.freedesktop.org/archive/individual/lib/libXpresent-${PV}.tar.bz2" -SRC_URI[md5sum] = "edd87ac15bb666081898dd7382fcbff5" -SRC_URI[sha256sum] = "c11ae015141a9afbe10f4f2b8ee00b11adca6373dc1b9808d7c6c138b2da7b8a" +XORG_EXT = "tar.bz2" + +SRC_URI = "http://xorg.freedesktop.org/archive/individual/lib/libXpresent-${PV}.tar.xz" +SRC_URI[sha256sum] = "b964df9e5a066daa5e08d2dc82692c57ca27d00b8cc257e8e960c9f1cf26231b" XORG_PN = "libXpresent" diff --git a/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.3.bb b/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.3.bb deleted file mode 100644 index f935edd6fe..0000000000 --- a/meta-oe/recipes-graphics/xorg-lib/xcb-util-cursor_0.1.3.bb +++ /dev/null @@ -1,11 +0,0 @@ -require recipes-graphics/xorg-lib/xcb-util.inc - -SUMMARY = "XCB port of libXcursor" - -DEPENDS += "xcb-util xcb-util-renderutil xcb-util-image" - -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=ce469b61c70ff8d7cce0547476891974" - -SRC_URI[md5sum] = "6ac3b17cba51aaaa36ba035a53527214" -SRC_URI[sha256sum] = "05a10a0706a1a789a078be297b5fb663f66a71fb7f7f1b99658264c35926394f" diff --git a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb index d24f666bcf..073b3f0912 100644 --- a/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb +++ b/meta-oe/recipes-graphics/xscreensaver/xscreensaver_6.04.bb @@ -9,8 +9,12 @@ SRC_URI = "https://www.jwz.org/${BPN}/${BP}.tar.gz \ file://0002-build-Do-not-build-po-files.patch \ file://0001-configure-Ignore-CONF_STATUS-for-gtk-and-openGL-need.patch \ " +MIRRORS += "https://www.jwz.org/${BPN} https://ftp.osuosl.org/pub/blfs/conglomeration/${BPN}" + SRC_URI[sha256sum] = "787014b29f0c5793ecc2d93e1109a049ff48ab0c29b851dab34f683ceef6b152" +UPSTREAM_CHECK_URI = "https://www.jwz.org/xscreensaver/download.html" + DEPENDS = "intltool-native libx11 libxext libxt libxft libxi glib-2.0-native bc-native libpam jpeg" # These are only needed as part of the stopgap screensaver implementation: RDEPENDS:${PN} = " \ @@ -32,11 +36,11 @@ PACKAGECONFIG = "png ${@bb.utils.contains('DISTRO_FEATURES','systemd','systemd', PACKAGECONFIG[systemd] = "--with-systemd=yes,--with-systemd=no,systemd" PACKAGECONFIG[png] = "--with-png=yes,--with-png=no,libpng" -CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking ${@append_libtool_sysroot(d)}" +CONFIGUREOPTS:remove = "--disable-silent-rules --disable-dependency-tracking" EXTRA_OECONF:remove = "--disable-static" do_install:append() { - install -D ${WORKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service + install -D ${UNPACKDIR}/xscreensaver.service ${D}${systemd_unitdir}/system/xscreensaver.service for f in xscreensaver-getimage-file xscreensaver-getimage-video webcollage xscreensaver-text vidwhacker do sed -i -e "s|${STAGING_BINDIR_NATIVE}/perl-native/perl|/usr/bin/perl|g" ${D}/${libexecdir}/${PN}/$f diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch index 2bfe85b285..6f738e7376 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-COPYING-add-GPLv2-license-file.patch @@ -11,6 +11,8 @@ Signed-off-by: Yu Ke <ke.yu@intel.com> Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + COPYING | 339 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 339 insertions(+) create mode 100644 COPYING diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch index 0ed12d106f..ea7c7d6a94 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0001-Don-t-install-Xsession-or-Xserver.patch @@ -10,6 +10,8 @@ be used as before. Signed-off-by: Jussi Kukkonen <jussi.kukkonen@intel.com> --- +Upstream-Status: Pending + Makefile | 2 -- 1 file changed, 2 deletions(-) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch index 0be3fa5b39..b408234ecb 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0002-add-setdpi-Xinit.d-script.patch @@ -6,6 +6,8 @@ Subject: [PATCH] add setdpi Xinit.d script Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/Xinit.d/50setdpi | 92 ++++++++++++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 92 insertions(+) create mode 100644 X11/Xinit.d/50setdpi diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch index 53a283feae..4a9342c934 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0006-add-support-for-etc-X11-xserver-system.patch @@ -6,6 +6,8 @@ Subject: [PATCH] add support for /etc/X11/xserver-system Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch index 94a35407af..ba35d1cf6c 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0007-use-own-functions-file-instead-etc-init.d-functions.patch @@ -8,6 +8,8 @@ Subject: [PATCH] use own functions file instead /etc/init.d/functions Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + Makefile | 1 + X11/Xinit.d/11zaurus | 2 +- X11/Xinit.d/12keymap | 2 +- diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch index 90d0f25843..a04e563f82 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0008-xserver-common-add-dpi-and-nocursor-params-for-gta01.patch @@ -7,6 +7,8 @@ Subject: [PATCH] xserver-common: add dpi and nocursor params for gta01 and Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch index 8fb69b3561..993b320154 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0009-xserver-common-add-support-for-n900-alias-nokia_rx-5.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for n900 alias nokia_rx-51_board Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch index d30c7bbdcb..2948cd611b 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0010-xserver-common-add-support-for-nexus-S-alias-herring.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for nexus S alias herring Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch index 23e17f0988..342d49becd 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0011-xserver-common-add-support-for-nexus-one-alias-mahim.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for nexus one alias mahimahi Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 3 +++ 1 file changed, 3 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch index 5e794f6b31..94f9d2ca6f 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0012-xserver-common-add-support-for-gta04-alias-OpenPhoen.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for gta04 alias OpenPhoenux Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch index 78d2e40297..c023b583b0 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common-1.34/0013-xserver-common-add-support-for-tuna-alias-Galaxy-Nex.patch @@ -6,6 +6,8 @@ Subject: [PATCH] xserver-common: add support for tuna alias Galaxy Nexus Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com> --- +Upstream-Status: Pending + X11/xserver-common | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb index 574d259bdf..3f577bfa05 100644 --- a/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb +++ b/meta-oe/recipes-graphics/xserver-common/xserver-common_1.34.bb @@ -2,7 +2,6 @@ SUMMARY = "Common X11 scripts and support files" LICENSE = "GPL-2.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" -PR = "r9" # we are using a gpe-style Makefile inherit features_check gpe diff --git a/meta-oe/recipes-graphics/yad/yad_6.0.bb b/meta-oe/recipes-graphics/yad/yad_6.0.bb index 40fccbdc1a..9e46215fd8 100644 --- a/meta-oe/recipes-graphics/yad/yad_6.0.bb +++ b/meta-oe/recipes-graphics/yad/yad_6.0.bb @@ -1,6 +1,5 @@ SUMMARY = "Yet Another Dialog" DESCRIPTION = "Program allowing you to display GTK+ dialog boxes from command line or shell scripts." -AUTHOR = "Victor Ananjevsky" LICENSE = "GPL-3.0-only" LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" diff --git a/meta-oe/recipes-graphics/ydotool/ydotool_git.bb b/meta-oe/recipes-graphics/ydotool/ydotool_git.bb new file mode 100644 index 0000000000..3acf70235e --- /dev/null +++ b/meta-oe/recipes-graphics/ydotool/ydotool_git.bb @@ -0,0 +1,26 @@ +SUMMARY = "Generic Linux command-line automation tool (no X!)" +DESCRIPTION = "ydotool is not limited to Wayland. You can use it on anything as long as it accepts keyboard/mouse/whatever input." +LICENSE = "AGPL-3.0-or-later" +LIC_FILES_CHKSUM = "file://LICENSE;md5=eb1e647870add0502f8f010b19de32af" + +PV = "1.0.4+git" + +SRC_URI = "git://github.com/ReimuNotMoe/ydotool;protocol=https;branch=master" +SRCREV = "0c295346d55afcc6aebaaee564333b3e1efabcbd" + +S = "${WORKDIR}/git" + +inherit cmake systemd + +EXTRA_OECMAKE = "\ + -DBUILD_DOCS=OFF \ +" + +do_install:append() { + if ! ${@bb.utils.contains('DISTRO_FEATURES','systemd','true','false',d)}; then + rm -rf ${D}${systemd_user_unitdir} + rmdir ${D}${nonarch_libdir}/systemd ${D}${nonarch_libdir} + fi +} +SYSTEMD_SERVICE:${PN} = "ydotoold.service" +SYSTEMD_AUTO_ENABLE = "disable" |