From 69721092c033f1c69060d2a5ae865f72a862e583 Mon Sep 17 00:00:00 2001 From: Andrew Geissler Date: Fri, 23 Jul 2021 12:57:00 -0400 Subject: meta-openembedded: subtree update:2449e5f07a..8fbcfb9f02 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Adrian Zaharia (1): ntp: fix ntpdate to wait for subprocesses Akifumi Chikazawa (1): openvpn: add CVE-2020-7224 and CVE-2020-27569 to allowlist Andrea Adami (3): initramfs-kexecboot-image: support cases where machines override IMAGE_FSTYPES initramfs-debug-image: support cases where machines override IMAGE_FSTYPES rapidjson: remove stale LIB_INSTALL_DIR Andreas Müller (50): poppler: upgrade 21.05.0 -> 21.06.0 dbus-broker: upgrade 28 -> 29 libmbim: upgrade 1.24.6 -> 1.24.8 icewm: upgrade 2.3.3 -> 2.3.4 poppler: upgrade 21.06.0 -> 21.06.1 gnome-disk-utility: upgrade 3.36.3 -> 40.1 gnome-font-viewer: upgrade 3.34.0 -> 40.0 pipewire: upgrade 0.3.24 -> 0.3.29 libqmi: upgrade 1.28.4 -> 1.28.6 ttf-noto-emoji: upgrade 20190815 -> 20200916 remmina: upgrade 1.4.17 -> 1.4.18 metacity: upgrade 3.36.1 -> 3.40.0 gnome-flashback: upgrade 3.36.3 -> 3.40.0 gthumb: initial add 3.10.3 atkmm: upgrade 2.28.0 -> 2.28.2 atkmm: build with meson dconf: upgrade 0.38.0 -> 0.40.0 evolution-data-server: upgrade 3.40.1 -> 3.40.2 file-roller: upgrade 3.38.1 -> 3.40.0 glibmm: upgrade 2.62.0 -> 2.66.1 / build with meson / cleanup recipe gmime: upgrade 3.2.6 -> 3.2.7 gnome-autoar; upgrade 0.3.2 -> 0.3.3 gnome-keyring: upgrade 3.36.0 -> 40.0 gnome-online-accounts: upgrade 3.36.0 -> 3.40.0 gnome-terminal: upgrade 3.36.2 -> 3.40.2 gspell: upgrade 1.8.4 -> 1.9.1 gtkmm3: upgrade 3.24.3 -> 3.24.5 gtksourceview4: upgrade 4.6.1 -> 4.8.1 gupnp: upgrade 1.2.6 -> 1.2.7 gvfs: upgrade 1.44.1 -> 1.48.1 libgdata: upgrade 0.17.13 -> 0.18.1 libmediaart 0.7.0: remove libmediaart-2.0: upgrade 1.9.4 -> 1.9.5 / merge inc file / build with meson libsigc++-2.0: upgrade 2.10.6 -> 2.10.7 nautilus: upgrade 40.1 -> 40.2 pangomm: upgrade 2.42.1 -> 2.46.1 / build with meson yelp-xsl: upgrade 3.36.0 -> 4.02 yelp-tools: upgrade 3.32.2 -> 40.0 yelp: upgrade 3.36.0 -> 40.2 modemmanager: upgrade 1.16.4 -> 1.16.6 xfce4-settings: 4.16.1 upgrade 4.16.2 blueman: upgrade 2.1.4 -> 2.2.1 pipewire: upgrade 0.3.30 -> 0-3-31 cmark: upgrade 0.29.0 -> 0.30.0 networkmanager: upgrade 1.30.4 -> 1.32.2 ristretto: upgrade 0.10.0 -> 0.11.0 libgusb: upgrade 0.3.6 -> 0.3.7 poppler: upgrade 21.06.1 -> 21.07.0 gegl: Disable pango on native build to fix gimp build segfaults gimp: remove --disable-vector-icons Bartosz Golaszewski (13): libgpiod: coding style fixes libgpiod: list all packages in a single assignment libgpiod: fix RRECOMMENDS for python bindings libgpiod: correctly split output files into packages libgpiod: add RDEPENDS for tests libgpiod: redirect stdout from the ptest executable to a file libgpiod: ptest: run all test-suites if possible libgpiod: ptest: warn if the gpio-mockup kernel module is not selected libgpiod: ptest: add kernel-modules to RRECOMMENDS libgpiod: ptest: only rrecommend a single module that we need libgpiod: add the python test-suite to the ptest package libgpiod: update my email address python3-joblib: new package Ben Horgan (1): cpputest: Add initial recipe. Version 4.0. Carlos Rafael Giani (2): pipewire: Add filter-chain files to modules-filter-chain package pipewire: Upgrade to 0.3.30 Changqing Li (1): mousepad: fix warning during postinst Chen Qi (1): minifi-cpp: set CLEANBROKEN to 1 Daiane Angolini (1): wireguard-module: Stop overriding modules_install in the recipe Daniel Klauer (1): spidev-test: Update common-licenses reference David Sterling (1): can-isotp: Upgrade to latest on master Ed Tanous (1): Use the built-in options for removing pack tools Geoff Parker (1): cifs-utils: set ROOTSBINDIR to /usr/sbin if DISTRO_FEATURES has usrmerge Gianfranco (2): vboxguestdrivers: add a fix for build failure with kernel 5.13 dlt-daemon: update from 2.18.6 to 2.18.7 Hongxu Jia (1): debootstrap: fix runtime failure on nativesdk Joshua Watt (1): gnome: gnome-shell: Move gsettings to their own package Kai Kang (4): python3-m2crypto: fix word size for qemuppc64 little endian python3-m2crypto: avoid host contamination for swig bats: fix qa issue when multilib eanbled mariadb: fix failures to start install_db.service Khem Raj (57): glog: Upgrade to 0.5.0 mbedtls: Upgrade to 2.26.0 mbedtls: Add packageconfig for warning-as-errors memcached: upgrade to 1.6.9 indent: Remove dead code using count_parens function glm: Fix additional clang warnings tbb: Fix warnings with clang libwebsockets: Update to latest on v4.2-stable packagegroup-meta-oe: Add libparse-yapp-perl netplan: Fix a warning with clang python3-yappi: Fix patching errors packagegroup-meta-oe: Add zsync-curl klibc: Add clang's -rtlib to known options libpfm4: Upgrade to 4.11.0 ltrace: Remove unused static function flashrom: Fix build with clang mongodb: Enable wiredtiger only on aarch64/x86_64 hosts mariadb: Fix build with clang/musl c-ares: Upgrade to 1.17.1 release nodejs: Update to 14.17.1 rocksdb: Upgrade to 6.20.3 rocksdb: Implement toku_time_now function for rv32/rv64 rocksdb: Fix build with ppc64/musl rocksdb: Implement timer for mips rocksdb: Implement timer for armv6+ rocksdb: Fix build with gcc on rv32 and mips libzip: Upgrade to 1.8.0 czmq: Inherit pkgconfig czmq: Add libmicrohttpd feature via packageconfig czmq: Use Cmake knobs to enable/disable designed packageconfigs czmq: Add nss packageconfig meta-python: Add python3-fastjsonschema and its dependencies packagegroup-meta-python: Add newly added recipes python3-process-tests: Add recipe python3-aspectlib: Add ptests python3-execnet: Add ptests python3-py-cpuinfo: Add ptests libc-bench: Do not override ldflags in makefile mpich: Add libgcc to ldflags on x86/glibc mpd: Update to 0.22.9 imlib2: Use propert git SHA in SRCREV suitesparse: Update to 5.10.1 packagegroup-meta-oe: Add libyang sysdig: Disable JIT on ppc64 portaudio-v19: Use GNUInstallDirs to make it portable keepalived: Upgrade to 2.2.2 suitesparse: Fix LIC_FILES_CHKSUM xscreensaver: Update to 6.01 ltrace: Fix mips build with kernels 5.13+ python3-pyusb: Add missing runtime dependency on libusb1 can-isotp: Ignore in world builds postfix: Upgrade to 3.6.1 packagegroup-meta-oe: Add new package cpputest apitrace: Update to latest trunk fatresize: Disable building documentation files layers: Fix git send-email instructions in README autofs: Upgrade to 5.1.7 Leon Anavi (61): python3-oauthlib: Upgrade 3.1.0 -> 3.1.1 python3-django: Upgrade 3.2.3 -> 3.2.4 python3-sqlalchemy: Upgrade 1.4.15 -> 1.4.17 python3-aiohue: Upgrade 2.5.0 -> 2.5.1 python3-typeguard: Upgrade 2.12.0 -> 2.12.1 python3-cbor2: Upgrade 5.3.0 -> 5.4.0 python3-ipython: Upgrade 7.24.0 -> 7.24.1 python3-pkgconfig: Upgrade 1.5.2 -> 1.5.4 python3-humanize: Upgrade 3.6.0 -> 3.7.1 python3-fasteners: Upgrade 0.16 -> 0.16.1 python3-pythonping: Upgrade 1.0.16 -> 1.1.0 python3-bitarray: Upgrade 2.1.0 -> 2.1.2 python3-coloredlogs: Upgrade 15.0 -> 15.0.1 python3-pysonos: Upgrade 0.0.50 -> 0.0.51 python3-dill: Upgrade 0.3.3 -> 0.3.4 python3-humanfriendly: Upgrade 9.1 -> 9.2 python3-zeroconf: Add recipe python3-pychromecast: Upgrade 9.1.2 -> 9.2.0 python3-ifaddr: Fix RDEPENDS python3-bitarray: Upgrade 2.1.2 -> 2.1.3 python3-astroid: Upgrade 2.5.7 -> 2.5.8 python3-license-expression: Upgrade 1.2 -> 21.6.14 python3-humanize: Upgrade 3.7.1 -> 3.9.0 python3-ruamel-yaml: Upgrade 0.17.7 -> 0.17.9 python3-cmd2: Upgrade 1.5.0 -> 2.1.1 python3-fasteners: Upgrade 0.16.1 -> 0.16.3 python3-elementpath: Upgrade 2.2.2 -> 2.2.3 python3-prompt-toolkit: Upgrade 3.0.18 -> 3.0.19 python3-mypy: Upgrade 0.812 -> 0.902 python3-send2trash: Upgrade 1.5.0 -> 1.7.1 python3-pandas: Upgrade 1.2.4 -> 1.2.5 python3-mypy: Upgrade 0.902 -> 0.910 python3-astroid: Upgrade 2.5.8 -> 2.6.0 python3-tqdm: Upgrade 4.61.0 -> 4.61.1 python3-ruamel-yaml: Upgrade 0.17.9 -> 0.17.10 python3-httplib2: Fix runtime dependencies python3-google-api-core: Add recipe python3-google-auth: Add recipe python3-googleapis-common-protos: Add recipe python3-google-api-python-client: Upgrade 2.6.0 -> 2.10.0 python3-ipython: Upgrade 7.24.1 -> 7.25.0 python3-croniter: Upgrade 1.0.13 -> 1.0.15 python3-priority: Upgrade 1.3.0 -> 2.0.0 python3-astroid: Upgrade 2.6.0 -> 2.6.2 python3-watchdog: Upgrade 2.1.2 -> 2.1.3 python3-humanize: Upgrade 3.9.0 -> 3.10.0 python3-pillow: Upgrade 8.2.0 -> 8.3.1 python3-bitarray: Upgrade 2.1.3 -> 2.2.1 python3-cmd2: Upgrade 2.1.1 -> 2.1.2 python3-pandas: Upgrade 1.2.5 -> 1.3.0 python3-texttable: Upgrade 1.6.3 -> 1.6.4 python3-dateutil: Upgrade 2.8.1 -> 2.8.2 python3-requests: Upgrade 2.25.1 -> 2.26.0 python3-websocket-client: Upgrade 1.0.1 -> 1.1.0 python3-pysonos: Upgrade 0.0.51 -> 0.0.53 python3-bitarray: Upgrade 2.2.1 -> 2.2.2 python3-pyusb: Upgrade 1.2.0 -> 1.2.1 python3-zeroconf: Upgrade 0.31.0 -> 0.33.1 python3-yamlloader: Upgrade 1.0.0 -> 1.1.0 python3-astroid: Upgrade 2.6.2 -> 2.6.5 python3-pkgconfig: Upgrade 1.5.4 -> 1.5.5 Luan Rafael Carneiro (1): libwebsockets: Update 4.2.0 -> 4.2.1 Luca Boccassi (2): dbus-broker: remove deprecated linux-4-17 option dbus-broker: enforce required versions of libselinux and libaudit Marek Vasut (1): nss: Fix build on Centos 7 Martin Jansa (1): rygel: require gobject-introspection-data in DISTRO_FEATURES Masaki Ambai (1): nss: add CVE-2006-5201 to allowlist Oleksandr Kravchuk (1): iwd: update to 1.15 Olivier Georget (1): libpfm4 4.10.1 : enable arm64 host platform Ovidiu Panait (1): libeigen: update LICENSE information Pascal Bach (1): python3-thrift: support native recipe Persian Prince (1): samba: Don't guess dirs for perllocal.pod removing Peter Bergin (4): linuxptp: use install from makefile and install more apps linuxptp: add homepage linuxptp: ship example configurations in separate package hiredis: add cmake config file for pkgconfig Peter Kjellerstedt (3): net-snmp: A little clean up net-snmp: Support building for native cryptsetup: Only recommend kernel modules when building for target Philip Balister (1): fftw: Update recipe to 3.3.9. Pierre-Jean Texier (5): libtinyxml2: upgrade 8.1.0 -> 9.0.0 sshfs-fuse: upgrade 3.7.1 -> 3.7.2 monit: upgrade 5.27.2 -> 5.28.0 spitools: upgrade 0.8.7 -> 1.0.0 linuxptp: fix upstream version check Ross Burton (1): zsync-curl: add recipe Sam Van Den Berge (1): libiio: fix installing libiio when python3 bindings are enabled Sekine Shigeki (2): add CVE-2011-2411 to allowlist ntp: add CVE-2016-9312 to allowlist Signed-off-by: Bartosz Golaszewski (1): Revert "libgpiod: ptest: warn if the gpio-mockup kernel module is not selected" Tim Orling (8): libcgi-perl: upgrade 4.51 -> 4.53 libcrypt-openssl-guess-perl: upgrade 0.12 -> 0.13 libextutils-cppguess-perl: upgrade 0.21 -> 0.23 libio-socket-ssl-perl: upgrade 2.068 -> 2.071 libmoo-perl: upgrade 2.004000 -> 2.005004 libnet-dns-perl: upgrade 1.26 -> 1.31 libtest-warnings-perl: upgrade 0.028 -> 0.030 logcheck: upgrade 1.3.20 -> 1.3.23 Tony Tascioglu (2): libyang: create recipe for libyang redis: upgrade to 6.2.4 Trevor Gamblin (9): libnftnl: upgrade 1.1.9 -> 1.2.0 nftables: upgrade 0.9.8 -> 0.9.9 python3-yarl: backport fix for test_url_query test python3-yappi: fix ptests python3-django: upgrade 2.2.23 -> 2.2.24 python3-django: upgrade 3.2.4 -> 3.2.5 python3-geomet: add recipe python3-cassandra-driver: add geomet to RDEPENDS, remove DISTUTILS options python3-geomet: Add missing RDEPENDS; add to packagegroup-meta-python Yi Zhao (14): libldb: upgrade 1.5.8 -> 2.3.0 samba: upgrade 4.10.18 -> 4.14.4 samba: update smb.conf libparse-yapp-perl: add recipe dhcp-relay: update bundled bind to 9.11.32 dhcp-relay: disable backtrace in bundled bind dhcp-relay: update 4.4.2 -> 4.4.2-P1 packagegroup-meta-networking: add dhcp-relay samba: disable check fcntl RW_HINTS when configure samba: upgrade 4.14.4 -> 4.14.5 minifi-cpp: set correct python processor directory in configure file samba: fix shebang for pidl samba: add missing runtime dependency for pidl audit: upgrade 3.0.1 -> 3.0.2 Zoltán Böszörményi (2): mariadb: Use qemu to run cross-compiled binaries mariadb: Upgrade to 10.5.11 hayashi.satoshi@fujitsu.com (1): dracut: add CVE-2010-4176 to allowlist ito-yuichi@fujitsu.com (2): cyrus-sasl: add CVE-2020-8032 to allowlist dovecot: add CVE-2016-4983 to allowlist massimo toscanelli (1): sysbench: fix memory test wangmy (8): samba: Solve the dependency problem when installing Samba fatresize: upgrade 1.0.2 -> 1.1.0 xfsprogs: upgrade 5.10.0 -> 5.12.0 ctags: upgrade 5.9.20210627.0 -> 5.9.20210711.0 icewm: upgrade 2.3.4 -> 2.6.0 yelp: upgrade 40.2 -> 40.3 live555: upgrade 20210406 -> 20210710 modemmanager: upgrade 1.16.6 -> 1.16.8 zangrc (49): python3-idna: upgrade 3.1 -> 3.2 netplan: upgrade 0.101 -> 0.102 wireshark: upgrade 3.4.5 -> 3.4.6 tracker: upgrade 3.0.4 -> 3.1.1 tracker-miners: upgrade 3.0.5 -> 3.1.1 rasdaemon: upgrade 0.6.6 -> 0.6.7 speedtest-cli: upgrade 2.1.2 -> 2.1.3 abseil-cpp: upgrade 20210324 -> 20210324.2 cryptsetup: upgrade 2.3.5 -> 2.3.6 ctags: upgrade 5.9.20210502.0 -> 5.9.20210606.0 opencl-clhpp: upgrade 2.0.13 -> 2.0.14 protobuf: upgrade 3.17.0 -> 3.17.3 toybox: upgrade 0.8.4 -> 0.8.5 fuse3: upgrade 3.10.3 -> 3.10.4 evince: upgrade 40.1 -> 40.2 mosquitto: upgrade 2.0.10 -> 2.0.11 ctags: upgrade 5.9.20210606.0 -> 20210613.0 fsverity-utils: upgrade 1.3 -> 1.4 googletest: upgrade 1.10.0 -> 1.11.0 mg: upgrade 20210314 -> 20210609 nano: upgrade 5.7 -> 5.8 openvpn: upgrade 2.5.2 -> 2.5.3 snort: upgrade 2.9.17.1 -> 2.9.18 function2: upgrade 4.1.0 -> 4.2.0 python3-configargparse: upgrade 1.4.1 -> 1.5 python3-grpcio-tools: upgrade 1.37.0 -> 1.38.1 python3-h5py: upgrade 3.2.1 -> 3.3.0 python3-isort: upgrade 5.8.0 -> 5.9.1 can-utils: upgrade 2020.12.0 -> 2021.06.0 ctags: upgrade 5.9.20210620.0 -> 5.9.20210627.0 python3-gast: upgrade 0.4.0 -> 0.5.0 python3-grpcio: upgrade 1.38.0 -> 1.38.1 python3-haversine: upgrade 2.3.0 -> 2.3.1 python3-m2crypto: upgrade 0.37.1 -> 0.38.0 python3-pyrsistent: upgrade 0.17.3 -> 0.18.0 babl: upgrade 0.1.86 -> 0.1.88 python3-pyusb: upgrade 1.1.1 -> 1.2.0 python3-google-api-python-client: upgrade 2.10.0 -> 2.12.0 firewalld: upgrade 0.9.3 -> 0.9.4 strongswan: upgrade 5.9.2 -> 5.9.3 opencl-clhpp: upgrade 2.0.14 -> 2.0.15 python3-cffi: upgrade 1.14.5 -> 1.14.6 python3-configargparse: upgrade 1.5 -> 1.5.1 python3-cryptography-vectors: upgrade 3.4.6 -> 3.4.7 python3-flask-migrate: upgrade 3.0.0 -> 3.0.1 python3-flask-socketio: upgrade 5.0.3 -> 5.1.0 python3-isort: upgrade 5.9.1 -> 5.9.2 python3-networkx: upgrade 2.5.1 -> 2.6.1 python3-gnupg: upgrade 0.4.6 -> 0.4.7 zhengruoqin (30): opensaf: upgrade 5.21.03 -> 5.21.06 fio: upgrade 3.26 -> 3.27 gensio: upgrade 2.2.5 -> 2.2.7 memtester: upgrade 4.5.0 -> 4.5.1 graphene: upgrade 1.10.2 -> 1.10.6 iozone3: upgrade 490 -> 492 net-snmp: upgrade 5.9 -> 5.9.1 rsnapshot: upgrade 1.4.3 -> 1.4.4 rsyslog: upgrade 8.2104.0 -> 8.2106.0 python3-absl: upgrade 0.12.0 -> 0.13.0 ctags: upgrade 5.9.20210613.0 -> 5.9.20210620.0 fwts: upgrade 21.03.00 -> 21.06.00 grpc: upgrade 1.38.0 -> 1.38.1 libconfig: upgrade 1.7.2 -> 1.7.3 satyr: upgrade 0.37 -> 0.38 libnet-telnet-perl: upgrade 3.04 -> 3.05 python3-scrypt: upgrade 0.8.17 -> 0.8.18 python3-urllib3: upgrade 1.26.5 -> 1.26.6 python3-sqlalchemy: upgrade 1.4.17 -> 1.4.20 python3-qrcode: upgrade 6.1 -> 7.1 python3-regex: upgrade 2021.4.4 -> 2021.7.6 python3-sentry-sdk: upgrade 1.1.0 -> 1.2.0 python3-tqdm: upgrade 4.61.1 -> 4.61.2 python3-xlsxwriter: upgrade 1.4.3 -> 1.4.4 ostree: upgrade 2021.2 -> 2021.3 span-lite: upgrade 0.9.2 -> 0.10.0 python3-pymisp: upgrade 2.4.143 -> 2.4.144 python3-protobuf: upgrade 3.17.0 -> 3.17.3 python3-pulsectl: upgrade 21.5.17 -> 21.5.18 python3-pytun: upgrade 2.3.0 -> 2.4.1 Signed-off-by: Andrew Geissler Change-Id: Ie45184e6f308aa2fc98ee6edf4a3ca1c4afbb5b4 --- .../c-ares/c-ares/cmake-install-libcares.pc.patch | 27 +- .../recipes-support/c-ares/c-ares_1.16.1.bb | 27 -- .../recipes-support/c-ares/c-ares_1.17.1.bb | 27 ++ .../meta-oe/recipes-support/cmark/cmark_0.30.0.bb | 15 ++ .../meta-oe/recipes-support/cmark/cmark_git.bb | 17 -- .../meta-oe/recipes-support/fftw/fftw_3.3.8.bb | 103 -------- .../meta-oe/recipes-support/fftw/fftw_3.3.9.bb | 102 ++++++++ .../recipes-support/function2/function2_4.1.0.bb | 21 -- .../recipes-support/function2/function2_4.2.0.bb | 21 ++ .../0001-Find-Libunwind-during-configure.patch | 119 --------- .../recipes-support/glog/glog/libexecinfo.patch | 14 +- .../meta-oe/recipes-support/glog/glog_0.4.0.bb | 36 --- .../meta-oe/recipes-support/glog/glog_0.5.0.bb | 35 +++ .../recipes-support/libeigen/libeigen_3.3.9.bb | 9 +- .../recipes-support/libgpiod/files/run-ptest | 21 +- .../recipes-support/libgpiod/libgpiod_1.6.3.bb | 57 ++++- .../recipes-support/libgusb/libgusb_0.3.6.bb | 11 - .../recipes-support/libgusb/libgusb_0.3.7.bb | 11 + ...ot-verify-whether-libiio-is-installed-whe.patch | 34 +++ .../meta-oe/recipes-support/libiio/libiio_git.bb | 4 +- .../libtinyxml2/libtinyxml2_8.1.0.bb | 17 -- .../libtinyxml2/libtinyxml2_9.0.0.bb | 17 ++ .../meta-oe/recipes-support/mg/mg_20210314.bb | 38 --- .../meta-oe/recipes-support/mg/mg_20210609.bb | 38 +++ .../meta-oe/recipes-support/monit/monit_5.27.2.bb | 53 ---- .../meta-oe/recipes-support/monit/monit_5.28.0.bb | 52 ++++ .../meta-oe/recipes-support/nano/nano_5.7.bb | 22 -- .../meta-oe/recipes-support/nano/nano_5.8.bb | 22 ++ .../meta-oe/recipes-support/nss/nss_3.64.bb | 5 + .../recipes-support/poppler/poppler_21.05.0.bb | 51 ---- .../recipes-support/poppler/poppler_21.07.0.bb | 51 ++++ .../0001-cmake-Use-GNUInstallDirs.patch | 49 ++++ .../portaudio/portaudio-v19_19.7.0.bb | 1 + .../recipes-support/remmina/remmina_1.4.17.bb | 46 ---- .../recipes-support/remmina/remmina_1.4.18.bb | 46 ++++ .../recipes-support/rsnapshot/rsnapshot_git.bb | 4 +- .../meta-oe/recipes-support/satyr/satyr_0.37.bb | 35 --- .../meta-oe/recipes-support/satyr/satyr_0.38.bb | 35 +++ .../recipes-support/span-lite/span-lite_0.10.0.bb | 12 + .../recipes-support/span-lite/span-lite_0.9.2.bb | 12 - .../recipes-support/spitools/spitools_git.bb | 4 +- .../tbb/tbb/0001-arena-Remove-dead-code.patch | 40 +++ .../meta-oe/recipes-support/tbb/tbb_2021.2.0.bb | 1 + .../vboxguestdrivers/40-linux-5.13-support.patch | 276 +++++++++++++++++++++ .../vboxguestdrivers/vboxguestdrivers_6.1.22.bb | 1 + 45 files changed, 981 insertions(+), 658 deletions(-) delete mode 100644 meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.8.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/mg/mg_20210314.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch delete mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.37.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb delete mode 100644 meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb create mode 100644 meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch create mode 100644 meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch (limited to 'meta-openembedded/meta-oe/recipes-support') diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch index 0eb7e4bbb3..c6f9c6de61 100644 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares/cmake-install-libcares.pc.patch @@ -1,4 +1,4 @@ -From 12414304245cce6ef0e8b9547949be5109845353 Mon Sep 17 00:00:00 2001 +From 2cc41bee63223cb398ea932aad6ecc94ff5b61dd Mon Sep 17 00:00:00 2001 From: Changqing Li Date: Tue, 24 Jul 2018 13:33:33 +0800 Subject: [PATCH] cmake: Install libcares.pc @@ -11,12 +11,13 @@ Signed-off-by: Alexey Firago update to 1.14.0, fix patch warning Signed-off-by: Changqing Li + --- - CMakeLists.txt | 28 +++++++++++++++++++++++----- - 1 file changed, 23 insertions(+), 5 deletions(-) + CMakeLists.txt | 23 +++++++++++++++++------ + 1 file changed, 17 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt -index fd123e1..3a5878d 100644 +index 08c0247..0020d6b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,22 +214,25 @@ ADD_DEFINITIONS(${SYSFLAGS}) @@ -50,9 +51,9 @@ index fd123e1..3a5878d 100644 # When checking for symbols, we need to make sure we set the proper # headers, libraries, and definitions for the detection to work properly -@@ -554,6 +557,15 @@ CONFIGURE_FILE (ares_build.h.cmake ${PROJECT_BINARY_DIR}/ares_build.h) - # Write ares_config.h configuration file. This is used only for the build. - CONFIGURE_FILE (ares_config.h.cmake ${PROJECT_BINARY_DIR}/ares_config.h) +@@ -551,6 +554,15 @@ ENDIF() + # Record toplevel CMakeLists.txt path + set(CARES_TOPLEVEL_DIR "${CMAKE_CURRENT_SOURCE_DIR}") +# Pass required CFLAGS to pkg-config in case of static library +IF (CARES_STATIC) @@ -66,19 +67,11 @@ index fd123e1..3a5878d 100644 # TRANSFORM_MAKEFILE_INC # -@@ -728,6 +740,12 @@ IF (CARES_INSTALL) +@@ -624,7 +636,6 @@ IF (CARES_INSTALL) INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" COMPONENT Devel DESTINATION "${CMAKE_INSTALL_LIBDIR}/pkgconfig") ENDIF () -+# pkg-config file -+IF (CARES_INSTALL) -+ SET (PKGCONFIG_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}/pkgconfig") -+ INSTALL (FILES "${CMAKE_CURRENT_BINARY_DIR}/libcares.pc" DESTINATION ${PKGCONFIG_INSTALL_DIR}) -+ENDIF () -+ +- # Legacy chain-building variables (provided for compatibility with old code). # Don't use these, external code should be updated to refer to the aliases directly (e.g., Cares::cares). SET (CARES_FOUND 1 CACHE INTERNAL "CARES LIBRARY FOUND") --- -2.17.1 - diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb deleted file mode 100644 index 67dd701807..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.16.1.bb +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2012-2014 LG Electronics, Inc. -SUMMARY = "c-ares is a C library that resolves names asynchronously." -HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" -SECTION = "libs" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" - -PV = "1.16.0+gitr${SRCPV}" - -SRC_URI = "\ - git://github.com/c-ares/c-ares.git \ - file://cmake-install-libcares.pc.patch \ - file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ -" -SRCREV = "74a1426ba60e2cd7977e53a22ef839c87415066e" - -UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" - -S = "${WORKDIR}/git" - -inherit cmake pkgconfig - -PACKAGES =+ "${PN}-utils" - -FILES_${PN}-utils = "${bindir}" - -BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb new file mode 100644 index 0000000000..92eb9dae5a --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/c-ares/c-ares_1.17.1.bb @@ -0,0 +1,27 @@ +# Copyright (c) 2012-2014 LG Electronics, Inc. +SUMMARY = "c-ares is a C library that resolves names asynchronously." +HOMEPAGE = "http://daniel.haxx.se/projects/c-ares/" +SECTION = "libs" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://LICENSE.md;md5=fb997454c8d62aa6a47f07a8cd48b006" + +PV = "1.17.1" + +SRC_URI = "\ + git://github.com/c-ares/c-ares.git \ + file://cmake-install-libcares.pc.patch \ + file://0001-fix-configure-error-mv-libcares.pc.cmakein-to-libcar.patch \ +" +SRCREV = "39c73b503d9ef70a58ad1f4a4643f15b01407c66" + +UPSTREAM_CHECK_GITTAGREGEX = "cares-(?P\d+_(\d_?)+)" + +S = "${WORKDIR}/git" + +inherit cmake pkgconfig + +PACKAGES =+ "${PN}-utils" + +FILES_${PN}-utils = "${bindir}" + +BBCLASSEXTEND = "native nativesdk" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb new file mode 100644 index 0000000000..c52a040645 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_0.30.0.bb @@ -0,0 +1,15 @@ +SUMMARY = "CommonMark parsing and rendering library and program in C" +HOMEPAGE = "https://github.com/commonmark/cmark" +LICENSE = "BSD-2-Clause & MIT" +LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" + +SRC_URI = "git://github.com/commonmark/cmark.git" +SRCREV = "8800e66010214384e75f933830ca5585e1ae3060" +S = "${WORKDIR}/git" + +inherit cmake lib_package + +EXTRA_OECMAKE += " \ + -DCMARK_TESTS=OFF \ + -DCMARK_STATIC=OFF \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb b/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb deleted file mode 100644 index f74a39b500..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/cmark/cmark_git.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "CommonMark parsing and rendering library and program in C" -HOMEPAGE = "https://github.com/commonmark/cmark" -LICENSE = "BSD-2-Clause & MIT" -LIC_FILES_CHKSUM = "file://COPYING;md5=81f9cae6293cc0345a9144b78152ab62" - -SRC_URI = "git://github.com/commonmark/cmark.git" -SRCREV = "8daa6b1495124f0b67e6034130e12d7be83e38bd" -S = "${WORKDIR}/git" - -PV = "0.29.0" - -inherit cmake lib_package - -EXTRA_OECMAKE += " \ - -DCMARK_TESTS=OFF \ - -DCMARK_STATIC=OFF \ -" diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.8.bb b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.8.bb deleted file mode 100644 index de175d629f..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.8.bb +++ /dev/null @@ -1,103 +0,0 @@ -DESCRIPTION = "FFTW" -SECTION = "libs" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" - -SRC_URI = " \ - http://www.fftw.org/fftw-${PV}.tar.gz \ - file://0001-NEON-autodetection-segfaults-assume-neon-present.patch \ - file://install-bench.patch \ - file://run-ptest \ -" -SRC_URI[md5sum] = "8aac833c943d8e90d51b697b27d4384d" -SRC_URI[sha256sum] = "6113262f6e92c5bd474f2875fa1b01054c4ad5040f6b0da7c03c98821d9ae303" - -inherit autotools pkgconfig ptest - -# we had multiple recipes in the past -PROVIDES = "fftwl fftwf" - -EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads" - -CFLAGS += "-D_GNU_SOURCE" - -# neon is optional for arm version < 8 -> check tune features -FFTW_NEON = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)}" -# neon is suppored for arm version = 8 -> enable -FFTW_NEON_aarch64 = "--enable-neon" -FFTW_NEON_class-native = "" - -do_configure() { - # configure fftw - rm -rf ${WORKDIR}/build-fftw - mkdir -p ${B} - cd ${B} - # full (re)configure - autotools_do_configure - mv ${B} ${WORKDIR}/build-fftw - - # configure fftwl - rm -rf ${WORKDIR}/build-fftwl - mkdir -p ${B} - cd ${B} - # configure only - oe_runconf --enable-long-double - mv ${B} ${WORKDIR}/build-fftwl - - # configure fftwf - rm -rf ${WORKDIR}/build-fftwf - mkdir -p ${B} - cd ${B} - # configure only - oe_runconf --enable-single ${FFTW_NEON} - mv ${B} ${WORKDIR}/build-fftwf -} - -do_compile() { - for lib in fftw fftwl fftwf; do - cd ${WORKDIR}/build-$lib - autotools_do_compile - done -} - -do_install() { - for lib in fftw fftwl fftwf; do - cd ${WORKDIR}/build-$lib - autotools_do_install - done -} - -do_install_ptest() { - for lib in fftw fftwl fftwf; do - install -d ${D}${PTEST_PATH}/$lib - install -m 0755 ${S}/tests/check.pl ${D}${PTEST_PATH}/$lib - cd ${WORKDIR}/build-$lib - if [ $lib = "fftw" ]; then - mv ${D}${bindir}/bench ${D}${PTEST_PATH}/$lib - fi - if [ $lib = "fftwl" ]; then - mv ${D}${bindir}/benchl ${D}${PTEST_PATH}/$lib - fi - if [ $lib = "fftwf" ]; then - mv ${D}${bindir}/benchf ${D}${PTEST_PATH}/$lib - fi - done -} - -PACKAGES =+ "libfftw libfftwl libfftwf" -FILES_libfftw = "${libdir}/libfftw3.so.* ${libdir}/libfftw3_*.so.*" -FILES_libfftwl = "${libdir}/libfftw3l.so.* ${libdir}/libfftw3l_*.so.*" -FILES_libfftwf = "${libdir}/libfftw3f.so.* ${libdir}/libfftw3f_*.so.*" - -PACKAGES =+ "fftw-wisdom fftwl-wisdom fftwf-wisdom fftw-wisdom-to-conf" -FILES_fftw-wisdom = "${bindir}/fftw-wisdom" -FILES_fftwl-wisdom = "${bindir}/fftwl-wisdom" -FILES_fftwf-wisdom = "${bindir}/fftwf-wisdom" -FILES_fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" - -FILES_${PN}-dev += "${libdir}/cmake" -RDEPENDS_${PN}-dev = "libfftw libfftwl libfftwf" -RDEPENDS_${PN}-ptest += "perl" -RDEPENDS_${PN}-ptest_remove = "fftw" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb new file mode 100644 index 0000000000..9979c21b86 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/fftw/fftw_3.3.9.bb @@ -0,0 +1,102 @@ +DESCRIPTION = "FFTW" +SECTION = "libs" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=59530bdf33659b29e73d4adb9f9f6552" + +SRC_URI = " \ + http://www.fftw.org/fftw-${PV}.tar.gz \ + file://0001-NEON-autodetection-segfaults-assume-neon-present.patch \ + file://install-bench.patch \ + file://run-ptest \ +" +SRC_URI[sha256sum] = "bf2c7ce40b04ae811af714deb512510cc2c17b9ab9d6ddcf49fe4487eea7af3d" + +inherit autotools pkgconfig ptest + +# we had multiple recipes in the past +PROVIDES = "fftwl fftwf" + +EXTRA_OECONF = "--disable-fortran --enable-shared --enable-threads" + +CFLAGS += "-D_GNU_SOURCE" + +# neon is optional for arm version < 8 -> check tune features +FFTW_NEON = "${@bb.utils.contains('TUNE_FEATURES', 'neon', '--enable-neon', '', d)}" +# neon is suppored for arm version = 8 -> enable +FFTW_NEON_aarch64 = "--enable-neon" +FFTW_NEON_class-native = "" + +do_configure() { + # configure fftw + rm -rf ${WORKDIR}/build-fftw + mkdir -p ${B} + cd ${B} + # full (re)configure + autotools_do_configure + mv ${B} ${WORKDIR}/build-fftw + + # configure fftwl + rm -rf ${WORKDIR}/build-fftwl + mkdir -p ${B} + cd ${B} + # configure only + oe_runconf --enable-long-double + mv ${B} ${WORKDIR}/build-fftwl + + # configure fftwf + rm -rf ${WORKDIR}/build-fftwf + mkdir -p ${B} + cd ${B} + # configure only + oe_runconf --enable-single ${FFTW_NEON} + mv ${B} ${WORKDIR}/build-fftwf +} + +do_compile() { + for lib in fftw fftwl fftwf; do + cd ${WORKDIR}/build-$lib + autotools_do_compile + done +} + +do_install() { + for lib in fftw fftwl fftwf; do + cd ${WORKDIR}/build-$lib + autotools_do_install + done +} + +do_install_ptest() { + for lib in fftw fftwl fftwf; do + install -d ${D}${PTEST_PATH}/$lib + install -m 0755 ${S}/tests/check.pl ${D}${PTEST_PATH}/$lib + cd ${WORKDIR}/build-$lib + if [ $lib = "fftw" ]; then + mv ${D}${bindir}/bench ${D}${PTEST_PATH}/$lib + fi + if [ $lib = "fftwl" ]; then + mv ${D}${bindir}/benchl ${D}${PTEST_PATH}/$lib + fi + if [ $lib = "fftwf" ]; then + mv ${D}${bindir}/benchf ${D}${PTEST_PATH}/$lib + fi + done +} + +PACKAGES =+ "libfftw libfftwl libfftwf" +FILES_libfftw = "${libdir}/libfftw3.so.* ${libdir}/libfftw3_*.so.*" +FILES_libfftwl = "${libdir}/libfftw3l.so.* ${libdir}/libfftw3l_*.so.*" +FILES_libfftwf = "${libdir}/libfftw3f.so.* ${libdir}/libfftw3f_*.so.*" + +PACKAGES =+ "fftw-wisdom fftwl-wisdom fftwf-wisdom fftw-wisdom-to-conf" +FILES_fftw-wisdom = "${bindir}/fftw-wisdom" +FILES_fftwl-wisdom = "${bindir}/fftwl-wisdom" +FILES_fftwf-wisdom = "${bindir}/fftwf-wisdom" +FILES_fftw-wisdom-to-conf = "${bindir}/fftw-wisdom-to-conf" + +FILES_${PN}-dev += "${libdir}/cmake" +RDEPENDS_${PN}-dev = "libfftw libfftwl libfftwf" +RDEPENDS_${PN}-ptest += "perl" +RDEPENDS_${PN}-ptest_remove = "fftw" + +BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb deleted file mode 100644 index 56dc30acdc..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.1.0.bb +++ /dev/null @@ -1,21 +0,0 @@ -SUMMARY = "Improved drop-in replacement for std::function" -DESCRIPTION = "Provides improved implementations of std::function." -HOMEPAGE = "https://naios.github.io/function2" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" -SRCREV = "3a0746bf5f601dfed05330aefcb6854354fce07d" -PV .= "+git${SRCPV}" - -SRC_URI += "gitsm://github.com/Naios/function2" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest - -# Installs some data to incorrect top-level /usr directory -do_install_append() { - mkdir -p ${D}/${datadir}/function2 - mv ${D}/${prefix}/Readme.md ${D}/${datadir}/function2/ - mv ${D}/${prefix}/LICENSE.txt ${D}/${datadir}/function2/ -} diff --git a/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb new file mode 100644 index 0000000000..14b9883373 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/function2/function2_4.2.0.bb @@ -0,0 +1,21 @@ +SUMMARY = "Improved drop-in replacement for std::function" +DESCRIPTION = "Provides improved implementations of std::function." +HOMEPAGE = "https://naios.github.io/function2" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" +SRCREV = "02ca99831de59c7c3a4b834789260253cace0ced" +PV .= "+git${SRCPV}" + +SRC_URI += "gitsm://github.com/Naios/function2" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest + +# Installs some data to incorrect top-level /usr directory +do_install_append() { + mkdir -p ${D}/${datadir}/function2 + mv ${D}/${prefix}/Readme.md ${D}/${datadir}/function2/ + mv ${D}/${prefix}/LICENSE.txt ${D}/${datadir}/function2/ +} diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch deleted file mode 100644 index 4c0861cca1..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/0001-Find-Libunwind-during-configure.patch +++ /dev/null @@ -1,119 +0,0 @@ ---- /dev/null -+++ b/cmake/FindLibunwind.cmake -@@ -0,0 +1,54 @@ -+# - Try to find libunwind -+# Once done this will define -+# -+# Libunwind_FOUND - system has libunwind -+# unwind - cmake target for libunwind -+ -+find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") -+include (CheckIncludeFile) -+check_include_file (libunwind.h HAVE_LIBUNWIND_H) -+check_include_file (unwind.h HAVE_UNWIND_H) -+ -+if (CMAKE_SYSTEM_PROCESSOR MATCHES "^arm") -+ set(LIBUNWIND_ARCH "arm") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^aarch64") -+ set(LIBUNWIND_ARCH "aarch64") -+elseif (CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "amd64" OR -+ CMAKE_SYSTEM_PROCESSOR STREQUAL "corei7-64") -+ set(LIBUNWIND_ARCH "x86_64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^i.86$") -+ set(LIBUNWIND_ARCH "x86") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc64") -+ set(LIBUNWIND_ARCH "ppc64") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ppc") -+ set(LIBUNWIND_ARCH "ppc32") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^mips") -+ set(LIBUNWIND_ARCH "mips") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^hppa") -+ set(LIBUNWIND_ARCH "hppa") -+elseif (CMAKE_SYSTEM_PROCESSOR MATCHES "^ia64") -+ set(LIBUNWIND_ARCH "ia64") -+endif() -+ -+find_library (UNWIND_LIBRARY_PLATFORM NAMES "unwind-${LIBUNWIND_ARCH}" DOC "unwind library platform") -+if (UNWIND_LIBRARY_PLATFORM) -+ set(HAVE_LIB_UNWIND "1") -+endif() -+ -+include(FindPackageHandleStandardArgs) -+# handle the QUIETLY and REQUIRED arguments and set Libunwind_FOUND to TRUE -+# if all listed variables are TRUE -+find_package_handle_standard_args(Libunwind DEFAULT_MSG -+ UNWIND_LIBRARY HAVE_LIBUNWIND_H HAVE_UNWIND_H HAVE_LIB_UNWIND) -+ -+mark_as_advanced (UNWIND_LIBRARY UNWIND_LIBRARY_PLATFORM) -+ -+if (Libunwind_FOUND) -+ add_library(unwind INTERFACE IMPORTED) -+ set_target_properties(unwind PROPERTIES -+ INTERFACE_LINK_LIBRARIES "${UNWIND_LIBRARY};${UNWIND_LIBRARY_PLATFORM}" -+ ) -+else() -+ message("Can't find libunwind library") -+endif() ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -64,7 +64,6 @@ check_include_file (dlfcn.h HAVE_DLFCN_H - check_include_file (execinfo.h HAVE_EXECINFO_H) - check_include_file (glob.h HAVE_GLOB_H) - check_include_file (inttypes.h HAVE_INTTYPES_H) --check_include_file (libunwind.h HAVE_LIBUNWIND_H) - check_include_file (memory.h HAVE_MEMORY_H) - check_include_file (pwd.h HAVE_PWD_H) - check_include_file (stdint.h HAVE_STDINT_H) -@@ -80,7 +79,6 @@ check_include_file (syscall.h HAVE_SYSCA - check_include_file (syslog.h HAVE_SYSLOG_H) - check_include_file (ucontext.h HAVE_UCONTEXT_H) - check_include_file (unistd.h HAVE_UNISTD_H) --check_include_file (unwind.h HAVE_UNWIND_H) - check_include_file (pwd.h HAVE_PWD_H) - - check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP) -@@ -116,11 +114,9 @@ check_cxx_compiler_flag (-Wunnamed-type- - # snprintf as an inline function - check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) - --check_library_exists (unwind get_static_proc_name "" HAVE_LIB_UNWIND) - check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) - --find_library (UNWIND_LIBRARY NAMES unwind DOC "unwind library") --mark_as_advanced (UNWIND_LIBRARY) -+find_package(Libunwind) - - check_c_source_compiles (" - #include -@@ -471,9 +467,9 @@ add_library(glog::glog ALIAS glog) - - set_target_properties (glog PROPERTIES POSITION_INDEPENDENT_CODE ON) - --if (UNWIND_LIBRARY) -- target_link_libraries (glog PUBLIC ${UNWIND_LIBRARY}) --endif (UNWIND_LIBRARY) -+if (Libunwind_FOUND) -+ target_link_libraries (glog PUBLIC unwind) -+endif (Libunwind_FOUND) - - if (HAVE_DBGHELP) - target_link_libraries (glog PUBLIC dbghelp) -@@ -678,6 +674,7 @@ export (PACKAGE glog) - install (FILES - ${CMAKE_CURRENT_BINARY_DIR}/glog-config.cmake - ${CMAKE_CURRENT_BINARY_DIR}/glog-config-version.cmake -+ ${CMAKE_CURRENT_SOURCE_DIR}/cmake/FindLibunwind.cmake - DESTINATION ${_glog_CMake_INSTALLDIR}) - - install (EXPORT glog-targets NAMESPACE glog:: DESTINATION ---- a/glog-config.cmake.in -+++ b/glog-config.cmake.in -@@ -8,4 +8,7 @@ include (CMakeFindDependencyMacro) - - @gflags_DEPENDENCY@ - -+list (APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_LIST_DIR}") -+find_dependency (Libunwind) -+ - include ("${CMAKE_CURRENT_LIST_DIR}/glog-targets.cmake") diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch b/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch index ae46d3274f..927c269a6a 100644 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog/libexecinfo.patch @@ -8,17 +8,17 @@ Upstream-Status: Pending Signed-off-by: Khem Raj --- a/CMakeLists.txt +++ b/CMakeLists.txt -@@ -115,6 +115,7 @@ check_cxx_compiler_flag (-Wunnamed-type- - check_symbol_exists (snprintf stdio.h HAVE_SNPRINTF) +@@ -144,6 +144,7 @@ check_cxx_compiler_flag (-Wunnamed-type- + check_symbol_exists (snprintf cstdio HAVE_SNPRINTF) check_library_exists (dbghelp UnDecorateSymbolName "" HAVE_DBGHELP) +check_library_exists (execinfo backtrace "" HAVE_EXECINFO) - find_package(Libunwind) - -@@ -471,6 +472,10 @@ if (Libunwind_FOUND) - target_link_libraries (glog PUBLIC unwind) - endif (Libunwind_FOUND) + check_cxx_source_compiles (" + #include +@@ -584,6 +585,10 @@ if (Unwind_FOUND) + set (Unwind_DEPENDENCY "find_dependency (Unwind ${Unwind_VERSION})") + endif (Unwind_FOUND) +if (HAVE_EXECINFO) + target_link_libraries (glog PUBLIC execinfo) diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb deleted file mode 100644 index 6b101ef676..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.4.0.bb +++ /dev/null @@ -1,36 +0,0 @@ -DESCRIPTION = "The glog library implements application-level logging. This \ -library provides logging APIs based on C++-style streams and various helper \ -macros." -HOMEPAGE = "https://github.com/google/glog" - -LICENSE = "BSD-3-Clause" -LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" - -SRC_URI = " \ - git://github.com/google/glog.git;nobranch=1 \ - file://0001-Find-Libunwind-during-configure.patch \ - file://libexecinfo.patch \ -" - -SRCREV = "96a2f23dca4cc7180821ca5f32e526314395d26a" - -S = "${WORKDIR}/git" - -inherit cmake - -PACKAGECONFIG ?= "shared unwind" -PACKAGECONFIG_remove_riscv64 = "unwind" -PACKAGECONFIG_remove_riscv32 = "unwind" -PACKAGECONFIG_append_libc-musl_riscv64 = " execinfo" -PACKAGECONFIG_append_libc-musl_riscv32 = " execinfo" - -PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" -PACKAGECONFIG[execinfo] = ",,libexecinfo" -PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," - -do_configure_append() { - # remove WORKDIR info to improve reproducibility - if [ -f "${B}/config.h" ] ; then - sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h - fi -} diff --git a/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb new file mode 100644 index 0000000000..c4ba9f244f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/glog/glog_0.5.0.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "The glog library implements application-level logging. This \ +library provides logging APIs based on C++-style streams and various helper \ +macros." +HOMEPAGE = "https://github.com/google/glog" + +LICENSE = "BSD-3-Clause" +LIC_FILES_CHKSUM = "file://COPYING;md5=dc9db360e0bbd4e46672f3fd91dd6c4b" + +SRC_URI = " \ + git://github.com/google/glog.git;nobranch=1 \ + file://libexecinfo.patch \ +" + +SRCREV = "8f9ccfe770add9e4c64e9b25c102658e3c763b73" + +S = "${WORKDIR}/git" + +inherit cmake + +PACKAGECONFIG ?= "shared unwind" +PACKAGECONFIG_remove_riscv64 = "unwind" +PACKAGECONFIG_remove_riscv32 = "unwind" +PACKAGECONFIG_append_libc-musl_riscv64 = " execinfo" +PACKAGECONFIG_append_libc-musl_riscv32 = " execinfo" + +PACKAGECONFIG[unwind] = "-DWITH_UNWIND=ON,-DWITH_UNWIND=OFF,libunwind,libunwind" +PACKAGECONFIG[execinfo] = ",,libexecinfo" +PACKAGECONFIG[shared] = "-DBUILD_SHARED_LIBS=ON,-DBUILD_SHARED_LIBS=OFF,," + +do_configure_append() { + # remove WORKDIR info to improve reproducibility + if [ -f "${B}/config.h" ] ; then + sed -i 's/'$(echo ${WORKDIR} | sed 's_/_\\/_g')'/../g' ${B}/config.h + fi +} diff --git a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb index d6ef98f949..a54d8f8f72 100644 --- a/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb +++ b/meta-openembedded/meta-oe/recipes-support/libeigen/libeigen_3.3.9.bb @@ -1,8 +1,13 @@ DESCRIPTION = "Eigen is a C++ template library for linear algebra: matrices, vectors, numerical solvers, and related algorithms." AUTHOR = "Benoît Jacob and Gaël Guennebaud and others" HOMEPAGE = "http://eigen.tuxfamily.org/" -LICENSE = "MPL-2.0" -LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad" +LICENSE = "MPL-2.0 & Apache-2.0 & BSD-3-Clause & GPLv3 & LGPLv2.1 & MINPACK" +LIC_FILES_CHKSUM = "file://COPYING.MPL2;md5=815ca599c9df247a0c7f619bab123dad \ + file://COPYING.BSD;md5=543367b8e11f07d353ef894f71b574a0 \ + file://COPYING.GPL;md5=d32239bcb673463ab874e80d47fae504 \ + file://COPYING.LGPL;md5=4fbd65380cdd255951079008b364516c \ + file://COPYING.MINPACK;md5=5fe4603e80ef7390306f51ef74449bbd \ +" SRC_URI = "git://gitlab.com/libeigen/eigen.git;protocol=http;nobranch=1" diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest index 4cda05d446..60c661fc10 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/files/run-ptest @@ -1,12 +1,19 @@ #!/bin/sh -testbin="gpiod-test" +testbins="gpiod-test gpio-tools-test gpiod-cxx-test gpiod_py_test.py" + ptestdir=$(dirname "$(readlink -f "$0")") cd $ptestdir/tests -./$testbin -if [ $? -ne 0 ]; then - echo "FAIL: $testbin" -else - echo "PASS: $testbin" -fi +for testbin in $testbins; do + if test -e ./$testbin; then + ./$testbin > ./$testbin.out + if [ $? -ne 0 ]; then + echo "FAIL: $testbin" + else + echo "PASS: $testbin" + fi + else + echo "SKIP: $testbin" + fi +done diff --git a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb index d9c2517057..be5be2f8db 100644 --- a/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb +++ b/meta-openembedded/meta-oe/recipes-support/libgpiod/libgpiod_1.6.3.bb @@ -1,11 +1,12 @@ SUMMARY = "C library and tools for interacting with the linux GPIO character device" -AUTHOR = "Bartosz Golaszewski " +AUTHOR = "Bartosz Golaszewski " LICENSE = "LGPLv2.1+" LIC_FILES_CHKSUM = "file://COPYING;md5=2caced0b25dfefd4c601d92bd15116de" -SRC_URI = "https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ - file://run-ptest \ +SRC_URI = " \ + https://www.kernel.org/pub/software/libs/${BPN}/${BP}.tar.xz \ + file://run-ptest \ " SRC_URI[md5sum] = "28e79f6f70fee1da9079558d8b7b3736" @@ -13,7 +14,7 @@ SRC_URI[sha256sum] = "841be9d788f00bab08ef22c4be5c39866f0e46cb100a3ae49ed816ac9c inherit autotools pkgconfig python3native ptest -PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2" +PACKAGECONFIG[tests] = "--enable-tests,--disable-tests,kmod udev glib-2.0 catch2,bats python3-packaging" PACKAGECONFIG[cxx] = "--enable-bindings-cxx,--disable-bindings-cxx" PACKAGECONFIG[python3] = "--enable-bindings-python,--disable-bindings-python,python3" @@ -26,19 +27,51 @@ EXTRA_OECONF = "--enable-tools" DEPENDS += "autoconf-archive-native" -PACKAGES =+ "${PN}-tools libgpiodcxx" -FILES_${PN}-tools = "${bindir}/*" +PACKAGES =+ "${PN}-tools libgpiodcxx ${PN}-python" +FILES_${PN}-tools = " \ + ${bindir}/gpiodetect \ + ${bindir}/gpioinfo \ + ${bindir}/gpioget \ + ${bindir}/gpioset \ + ${bindir}/gpiofind \ + ${bindir}/gpiomon \ +" +FILES_${PN}-ptest += " \ + ${bindir}/gpiod-test \ + ${bindir}/gpio-tools-test \ + ${bindir}/gpio-tools-test.bats \ + ${bindir}/gpiod-cxx-test \ + ${bindir}/gpiod_py_test.py \ + ${libdir}/libgpiomockup.so.* \ +" FILES_libgpiodcxx = "${libdir}/libgpiodcxx.so.*" - -PACKAGES =+ "${PN}-python" FILES_${PN}-python = "${PYTHON_SITEPACKAGES_DIR}/*.so" FILES_${PN}-staticdev += "${PYTHON_SITEPACKAGES_DIR}/*.a" -RRECOMMENDS_PYTHON = "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '',d)}" -RRECOMMENDS_${PN}-python += "${RRECOMMENDS_PYTHON}" + +RRECOMMENDS_${PN} += "${@bb.utils.contains('PACKAGECONFIG', 'python3', '${PN}-python', '', d)}" +RRECOMMENDS_${PN}-ptest += "kernel-module-gpio-mockup" PACKAGECONFIG_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'ptest', 'tests', '', d)}" do_install_ptest() { - install -d ${D}${PTEST_PATH}/tests - cp ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + install -d ${D}${PTEST_PATH}/tests + + # These are the core C library tests + install -m 0755 ${B}/tests/.libs/gpiod-test ${D}${PTEST_PATH}/tests/ + + # Tools are always built so let's always install them for ptest even if + # we're not selecting libgpiod-tools. + install -m 0755 ${S}/tools/gpio-tools-test ${D}${PTEST_PATH}/tests/ + install -m 0755 ${S}/tools/gpio-tools-test.bats ${D}${PTEST_PATH}/tests/ + for tool in ${FILES_${PN}-tools}; do + install ${B}/tools/.libs/$(basename $tool) ${D}${PTEST_PATH}/tests/ + done + + if ${@bb.utils.contains('PACKAGECONFIG', 'cxx', 'true', 'false', d)}; then + install -m 0755 ${B}/bindings/cxx/tests/.libs/gpiod-cxx-test ${D}${PTEST_PATH}/tests/ + fi + + if ${@bb.utils.contains('PACKAGECONFIG', 'python3', 'true', 'false', d)}; then + install -m 0755 ${S}/bindings/python/tests/gpiod_py_test.py ${D}${PTEST_PATH}/tests/ + fi } diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb deleted file mode 100644 index 2f74013cad..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.6.bb +++ /dev/null @@ -1,11 +0,0 @@ -SUMMARY = "GUsb is a GObject wrapper for libusb1" -LICENSE = "LGPLv2.1" -LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" - -DEPENDS = "glib-2.0 libusb" - -inherit meson gobject-introspection gtk-doc gettext vala - -SRC_URI = "git://github.com/hughsie/libgusb.git" -SRCREV = "b0464454048cac6779d4d51f12fe7f37ae4bbd57" -S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb new file mode 100644 index 0000000000..2b87281793 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libgusb/libgusb_0.3.7.bb @@ -0,0 +1,11 @@ +SUMMARY = "GUsb is a GObject wrapper for libusb1" +LICENSE = "LGPLv2.1" +LIC_FILES_CHKSUM = "file://COPYING;md5=2d5025d4aa3495befef8f17206a5b0a1" + +DEPENDS = "glib-2.0 libusb" + +inherit meson gobject-introspection gtk-doc gettext vala + +SRC_URI = "git://github.com/hughsie/libgusb.git" +SRCREV = "ff9c606d9d72c7dd369ad220d92729556faaaf0c" +S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch b/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch new file mode 100644 index 0000000000..4d3dcd5ced --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libiio/files/0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch @@ -0,0 +1,34 @@ +From 717b0f46b23ddc042da481d1d446bdd1c6c49142 Mon Sep 17 00:00:00 2001 +From: Julien Malik +Date: Mon, 27 Jul 2020 14:34:44 +0200 +Subject: [PATCH] python: Do not verify whether libiio is installed when + cross-compiling + +This should fix #561 + +Signed-off-by: Julien Malik +--- + bindings/python/setup.py.cmakein | 7 +++++++ + 1 file changed, 7 insertions(+) + +diff --git a/bindings/python/setup.py.cmakein b/bindings/python/setup.py.cmakein +index cd14e2e..96d58a8 100644 +--- a/bindings/python/setup.py.cmakein ++++ b/bindings/python/setup.py.cmakein +@@ -54,6 +54,13 @@ class InstallWrapper(install): + install.run(self) + + def _check_libiio_installed(self): ++ cross_compiling = ("${CMAKE_CROSSCOMPILING}" == "TRUE") ++ if cross_compiling: ++ # When cross-compiling, we generally cannot dlopen ++ # the libiio shared lib from the build platform. ++ # Simply skip this check in that case. ++ return ++ + from platform import system as _system + from ctypes import CDLL as _cdll + from ctypes.util import find_library +-- +2.25.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb index 6f37d1e898..d2d6fd4751 100644 --- a/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/libiio/libiio_git.bb @@ -7,7 +7,9 @@ LIC_FILES_CHKSUM = "file://COPYING.txt;md5=7c13b3376cea0ce68d2d2da0a1b3a72c" SRCREV = "565bf68eccfdbbf22cf5cb6d792e23de564665c7" PV = "0.21+git${SRCPV}" -SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https" +SRC_URI = "git://github.com/analogdevicesinc/libiio.git;protocol=https \ + file://0001-python-Do-not-verify-whether-libiio-is-installed-whe.patch \ +" UPSTREAM_CHECK_GITTAGREGEX = "v(?P\d+(\.\d+)+)" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb deleted file mode 100644 index 5245059a89..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_8.1.0.bb +++ /dev/null @@ -1,17 +0,0 @@ -SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" -HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" -SECTION = "libs" -LICENSE = "Zlib" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" - -SRC_URI = "git://github.com/leethomason/tinyxml2.git" - -SRCREV = "3291390336141573e51dfa991b4179c8bcd8f306" - -S = "${WORKDIR}/git" - -inherit cmake - -BBCLASSEXTEND = "native" - -EXTRA_OECMAKE += "-Dtinyxml2_SHARED_LIBS=YES" diff --git a/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb new file mode 100644 index 0000000000..215f32a785 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/libtinyxml2/libtinyxml2_9.0.0.bb @@ -0,0 +1,17 @@ +SUMMARY = "TinyXML-2 is a simple, small, efficient, C++ XML parser that can be easily integrating into other programs" +HOMEPAGE = "http://www.grinninglizard.com/tinyxml2/" +SECTION = "libs" +LICENSE = "Zlib" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=135624eef03e1f1101b9ba9ac9b5fffd" + +SRC_URI = "git://github.com/leethomason/tinyxml2.git" + +SRCREV = "1dee28e51f9175a31955b9791c74c430fe13dc82" + +S = "${WORKDIR}/git" + +inherit cmake + +BBCLASSEXTEND = "native" + +EXTRA_OECMAKE += "-Dtinyxml2_SHARED_LIBS=YES" diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210314.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210314.bb deleted file mode 100644 index 9275dd233d..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210314.bb +++ /dev/null @@ -1,38 +0,0 @@ -SUMMARY = "A portable version of the mg maintained by the OpenBSD team" -HOMEPAGE = "http://homepage.boetes.org/software/mg/" -LICENSE = "PD" -LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" -DEPENDS = "ncurses libbsd" -SECTION = "console/editors" - -SRCREV = "598f7a028f01f85f0dee0e798753bccf93233add" -SRC_URI = "git://github.com/hboetes/mg \ - file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ - file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ - " -SRC_URI_append_libc-musl = "\ - file://0001-Undefine-REGEX-for-musl-based-systems.patch \ - " - -S = "${WORKDIR}/git" - -# CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= -EXTRA_OEMAKE = "\ - 'CC=${CC}' \ - 'LDFLAGS=${LDFLAGS}' \ - \ - 'prefix=${prefix}' \ - 'bindir=${bindir}' \ - 'libdir=${libdir}' \ - 'includedir=${includedir}' \ - 'mandir=${mandir}' \ - 'PKG_CONFIG=pkg-config' \ -" - -CFLAGS += "-I${STAGING_INCDIR}/bsd" - -do_install () { - oe_runmake install DESTDIR=${D} -} - -inherit pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb new file mode 100644 index 0000000000..eb7de1279f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/mg/mg_20210609.bb @@ -0,0 +1,38 @@ +SUMMARY = "A portable version of the mg maintained by the OpenBSD team" +HOMEPAGE = "http://homepage.boetes.org/software/mg/" +LICENSE = "PD" +LIC_FILES_CHKSUM = "file://version.c;md5=1895eb37bf6bd79cdc5c89d8166fabfb" +DEPENDS = "ncurses libbsd" +SECTION = "console/editors" + +SRCREV = "688f49cd67ab30dfa6482c74815e117cbf7af63a" +SRC_URI = "git://github.com/hboetes/mg \ + file://0001-fileio-Include-sys-param.h-for-MAXNAMLEN.patch \ + file://0002-fileio-Define-DEFFILEMODE-if-platform-is-missing.patch \ + " +SRC_URI_append_libc-musl = "\ + file://0001-Undefine-REGEX-for-musl-based-systems.patch \ + " + +S = "${WORKDIR}/git" + +# CFLAGS isn't in EXTRA_OEMAKE, as the makefile picks it up via ?= +EXTRA_OEMAKE = "\ + 'CC=${CC}' \ + 'LDFLAGS=${LDFLAGS}' \ + \ + 'prefix=${prefix}' \ + 'bindir=${bindir}' \ + 'libdir=${libdir}' \ + 'includedir=${includedir}' \ + 'mandir=${mandir}' \ + 'PKG_CONFIG=pkg-config' \ +" + +CFLAGS += "-I${STAGING_INCDIR}/bsd" + +do_install () { + oe_runmake install DESTDIR=${D} +} + +inherit pkgconfig diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb deleted file mode 100644 index b5e16d0f97..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.27.2.bb +++ /dev/null @@ -1,53 +0,0 @@ -DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ -processes, programs, files, directories and filesystems on a UNIX system. \ -Monit conducts automatic maintenance and repair and can execute meaningful \ -causal actions in error situations." - -HOMEPAGE = "http://mmonit.com/monit/" - -LICENSE = "AGPL-3.0" -LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ - file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" - -SRC_URI = " \ - https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ - file://monit \ - file://monitrc \ -" - -SRC_URI[md5sum] = "13a0804dae18ef08198c3ace72f9dd60" -SRC_URI[sha256sum] = "d8809c78d5dc1ed7a7ba32a5a55c5114855132cc4da4805f8d3aaf8cf46eaa4c" - -DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" - -inherit autotools-brokensep systemd update-rc.d - -PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" -PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" - -EXTRA_OECONF = "\ - libmonit_cv_setjmp_available=no \ - libmonit_cv_vsnprintf_c99_conformant=no \ - --with-ssl-lib-dir=${STAGING_LIBDIR} \ - --with-ssl-incl-dir=${STAGING_INCDIR} \ -" - -SYSTEMD_SERVICE_${PN} = "monit.service" -SYSTEMD_AUTO_ENABLE = "enable" - -INITSCRIPT_PACKAGES = "${PN}" -INITSCRIPT_NAME_${PN} = "monit" -INITSCRIPT_PARAMS_${PN} = "defaults 89" - -do_install_append() { - - # Configuration file - install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc - - # SystemD - install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service - sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service - - # SysV - install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit -} diff --git a/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb new file mode 100644 index 0000000000..069d9f81ca --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/monit/monit_5.28.0.bb @@ -0,0 +1,52 @@ +DESCRIPTION = "Monit is a free open source utility for managing and monitoring, \ +processes, programs, files, directories and filesystems on a UNIX system. \ +Monit conducts automatic maintenance and repair and can execute meaningful \ +causal actions in error situations." + +HOMEPAGE = "http://mmonit.com/monit/" + +LICENSE = "AGPL-3.0" +LIC_FILES_CHKSUM = "file://COPYING;md5=ea116a7defaf0e93b3bb73b2a34a3f51 \ + file://libmonit/COPYING;md5=2405f1c59ed1bf3714cebdb40162ce92" + +SRC_URI = " \ + https://mmonit.com/monit/dist/monit-${PV}.tar.gz \ + file://monit \ + file://monitrc \ +" + +SRC_URI[sha256sum] = "9fc6287fd9570b25a85c5d5bf988ee8bd4c54d0e9e01ff04cc4b9398a159849c" + +DEPENDS = "zlib bison-native libnsl2 flex-native openssl virtual/crypt" + +inherit autotools-brokensep systemd update-rc.d + +PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'pam', d)}" +PACKAGECONFIG[pam] = "--with-pam,--without-pam,libpam" + +EXTRA_OECONF = "\ + libmonit_cv_setjmp_available=no \ + libmonit_cv_vsnprintf_c99_conformant=no \ + --with-ssl-lib-dir=${STAGING_LIBDIR} \ + --with-ssl-incl-dir=${STAGING_INCDIR} \ +" + +SYSTEMD_SERVICE_${PN} = "monit.service" +SYSTEMD_AUTO_ENABLE = "enable" + +INITSCRIPT_PACKAGES = "${PN}" +INITSCRIPT_NAME_${PN} = "monit" +INITSCRIPT_PARAMS_${PN} = "defaults 89" + +do_install_append() { + + # Configuration file + install -Dm 0600 ${WORKDIR}/monitrc ${D}${sysconfdir}/monitrc + + # SystemD + install -Dm 0644 ${S}/system/startup/monit.service.in ${D}${systemd_system_unitdir}/monit.service + sed -i -e 's,@prefix@,${exec_prefix},g' ${D}${systemd_unitdir}/system/monit.service + + # SysV + install -Dm 0755 ${WORKDIR}/monit ${D}${sysconfdir}/init.d/monit +} diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb deleted file mode 100644 index 6a293c7635..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.7.bb +++ /dev/null @@ -1,22 +0,0 @@ -SUMMARY = "Small and friendly console text editor" -DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ -Not ANOther editor) is an enhanced clone of the \ -Pico text editor." -HOMEPAGE = "http://www.nano-editor.org/" -SECTION = "console/utils" -LICENSE = "GPLv3" -LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" - -DEPENDS = "ncurses file" -RDEPENDS_${PN} = "ncurses-terminfo-base" - -PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" - -SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" -SRC_URI[sha256sum] = "d4b181cc2ec11def3711b4649e34f2be7a668e70ab506860514031d069cccafa" - -UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" - -inherit autotools gettext pkgconfig - -PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb new file mode 100644 index 0000000000..8ba4ca13f0 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/nano/nano_5.8.bb @@ -0,0 +1,22 @@ +SUMMARY = "Small and friendly console text editor" +DESCRIPTION = "GNU nano (Nano's ANOther editor, or \ +Not ANOther editor) is an enhanced clone of the \ +Pico text editor." +HOMEPAGE = "http://www.nano-editor.org/" +SECTION = "console/utils" +LICENSE = "GPLv3" +LIC_FILES_CHKSUM = "file://COPYING;md5=f27defe1e96c2e1ecd4e0c9be8967949" + +DEPENDS = "ncurses file" +RDEPENDS_${PN} = "ncurses-terminfo-base" + +PV_MAJOR = "${@d.getVar('PV').split('.')[0]}" + +SRC_URI = "https://nano-editor.org/dist/v${PV_MAJOR}/nano-${PV}.tar.xz" +SRC_URI[sha256sum] = "e43b63db2f78336e2aa123e8d015dbabc1720a15361714bfd4b1bb4e5e87768c" + +UPSTREAM_CHECK_URI = "https://ftp.gnu.org/gnu/nano" + +inherit autotools gettext pkgconfig + +PACKAGECONFIG[tiny] = "--enable-tiny," diff --git a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb index fce5a856ee..98be21d40e 100644 --- a/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb +++ b/meta-openembedded/meta-oe/recipes-support/nss/nss_3.64.bb @@ -45,6 +45,8 @@ TDS = "${S}/tentative-dist-staging" TARGET_CC_ARCH += "${LDFLAGS}" +CFLAGS_append_class-native = " -D_XOPEN_SOURCE " + do_configure_prepend_libc-musl () { sed -i -e '/-DHAVE_SYS_CDEFS_H/d' ${S}/nss/lib/dbm/config/config.mk } @@ -277,3 +279,6 @@ FILES_${PN}-dev = "\ RDEPENDS_${PN}-smime = "perl" BBCLASSEXTEND = "native nativesdk" + +# CVE-2006-5201 affects only Sun Solaris +CVE_CHECK_WHITELIST += "CVE-2006-5201" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb deleted file mode 100644 index 4cfc5bd867..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.05.0.bb +++ /dev/null @@ -1,51 +0,0 @@ -SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" -HOMEPAGE = "https://poppler.freedesktop.org/" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ - file://0001-Do-not-overwrite-all-our-build-flags.patch \ - file://basename-include.patch \ - " -SRC_URI[sha256sum] = "dafd537b680fad1215bc40fc53d1f38e8449d7c185bc60d5a89e1d26c90dbd8c" - -DEPENDS = "fontconfig zlib cairo lcms glib-2.0" - -inherit cmake pkgconfig gobject-introspection - -PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" -PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" -PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" -PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" -PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" -PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" -PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" -PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" -PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" - -# surprise - did not expect this to work :) -inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} - -SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" - -EXTRA_OECMAKE += " \ - -DENABLE_CMS=lcms2 \ - -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ - -DBUILD_GTK_TESTS=OFF \ - -DENABLE_ZLIB=ON \ - -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ - ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ -" - -do_configure_append() { - # poppler macro uses pkg-config to check for g-ir runtimes. Something - # makes them point to /usr/bin. Align them to sysroot - that's where the - # gir-wrappers are: - sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja -} - -PACKAGES =+ "libpoppler libpoppler-glib" -FILES_libpoppler = "${libdir}/libpoppler.so.*" -FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" - -RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb new file mode 100644 index 0000000000..975ab1d70d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/poppler/poppler_21.07.0.bb @@ -0,0 +1,51 @@ +SUMMARY = "Poppler is a PDF rendering library based on the xpdf-3.0 code base" +HOMEPAGE = "https://poppler.freedesktop.org/" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +SRC_URI = "http://poppler.freedesktop.org/${BP}.tar.xz \ + file://0001-Do-not-overwrite-all-our-build-flags.patch \ + file://basename-include.patch \ + " +SRC_URI[sha256sum] = "e26ab29f68065de4d6562f0a3e2b5435a83ca92be573b99a1c81998fa286a4d4" + +DEPENDS = "fontconfig zlib cairo lcms glib-2.0" + +inherit cmake pkgconfig gobject-introspection + +PACKAGECONFIG ??= "jpeg openjpeg png tiff nss splash" +PACKAGECONFIG[jpeg] = "-DWITH_JPEG=ON -DENABLE_DCTDECODER=libjpeg,-DWITH_JPEG=OFF -DENABLE_DCTDECODER=none,jpeg" +PACKAGECONFIG[png] = "-DWITH_PNG=ON,-DWITH_PNG=OFF,libpng" +PACKAGECONFIG[tiff] = "-DWITH_TIFF=ON,-DWITH_TIFF=OFF,tiff" +PACKAGECONFIG[curl] = "-DENABLE_LIBCURL=ON,-DENABLE_LIBCURL=OFF,curl" +PACKAGECONFIG[openjpeg] = "-DENABLE_LIBOPENJPEG=openjpeg2,-DENABLE_LIBOPENJPEG=none,openjpeg" +PACKAGECONFIG[qt5] = "-DENABLE_QT5=ON,-DENABLE_QT5=OFF,qtbase qttools-native" +PACKAGECONFIG[nss] = "-DWITH_NSS3=ON,-DWITH_NSS3=OFF,nss" +PACKAGECONFIG[splash] = "-DENABLE_SPLASH=ON,-DENABLE_SPLASH=OFF,boost" + +# surprise - did not expect this to work :) +inherit ${@bb.utils.contains('PACKAGECONFIG', 'qt5', 'cmake_qt5', '', d)} + +SECURITY_CFLAGS = "${SECURITY_NO_PIE_CFLAGS}" + +EXTRA_OECMAKE += " \ + -DENABLE_CMS=lcms2 \ + -DENABLE_UNSTABLE_API_ABI_HEADERS=ON \ + -DBUILD_GTK_TESTS=OFF \ + -DENABLE_ZLIB=ON \ + -DCMAKE_CXX_IMPLICIT_INCLUDE_DIRECTORIES:PATH='${STAGING_INCDIR}' \ + ${@bb.utils.contains('GI_DATA_ENABLED', 'True', '-DENABLE_GOBJECT_INTROSPECTION=ON', '-DENABLE_GOBJECT_INTROSPECTION=OFF', d)} \ +" + +do_configure_append() { + # poppler macro uses pkg-config to check for g-ir runtimes. Something + # makes them point to /usr/bin. Align them to sysroot - that's where the + # gir-wrappers are: + sed -i 's: ${bindir}/g-ir: ${STAGING_BINDIR}/g-ir:' ${B}/build.ninja +} + +PACKAGES =+ "libpoppler libpoppler-glib" +FILES_libpoppler = "${libdir}/libpoppler.so.*" +FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*" + +RDEPENDS_libpoppler = "poppler-data" diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch new file mode 100644 index 0000000000..892399de70 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19/0001-cmake-Use-GNUInstallDirs.patch @@ -0,0 +1,49 @@ +From ced7af0420c1df0ac02f0c25e7c3534431ebd7fd Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Sun, 4 Jul 2021 17:09:49 -0700 +Subject: [PATCH] cmake: Use GNUInstallDirs + +Helps install cmakefiles in right libdir + +Upstream-Status: Submitted [https://github.com/PortAudio/portaudio/pull/610] +Signed-off-by: Khem Raj +--- + CMakeLists.txt | 12 +++++++----- + 1 file changed, 7 insertions(+), 5 deletions(-) + +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -6,6 +6,8 @@ + + CMAKE_MINIMUM_REQUIRED(VERSION 2.8) + ++include(GNUInstallDirs) ++ + # Check if the user is building PortAudio stand-alone or as part of a larger + # project. If this is part of a larger project (i.e. the CMakeLists.txt has + # been imported by some other CMakeLists.txt), we don't want to trump over +@@ -452,18 +454,18 @@ IF(NOT PA_OUTPUT_OSX_FRAMEWORK AND NOT P + CONFIGURE_FILE(cmake_support/portaudio-2.0.pc.in ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc @ONLY) + INSTALL(FILES README.md DESTINATION share/doc/portaudio) + INSTALL(FILES LICENSE.txt DESTINATION share/doc/portaudio) +- INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION lib/pkgconfig) ++ INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/portaudio-2.0.pc DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig) + INSTALL(FILES ${PA_PUBLIC_INCLUDES} DESTINATION include) + INSTALL(TARGETS ${PA_TARGETS} + EXPORT portaudio-targets +- RUNTIME DESTINATION bin +- LIBRARY DESTINATION lib +- ARCHIVE DESTINATION lib) +- INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "lib/cmake/portaudio") ++ RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} ++ LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} ++ ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) ++ INSTALL(EXPORT portaudio-targets FILE "portaudioTargets.cmake" DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio") + EXPORT(TARGETS ${PA_TARGETS} FILE "${PROJECT_BINARY_DIR}/cmake/portaudio/portaudioTargets.cmake") + INSTALL(FILES "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfig.cmake" + "${CMAKE_BINARY_DIR}/cmake/portaudio/portaudioConfigVersion.cmake" +- DESTINATION "lib/cmake/portaudio") ++ DESTINATION "${CMAKE_INSTALL_LIBDIR}/cmake/portaudio") + + IF (NOT TARGET uninstall) + CONFIGURE_FILE( diff --git a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb index 3a0f7894f1..aec482b9b7 100644 --- a/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/portaudio/portaudio-v19_19.7.0.bb @@ -8,6 +8,7 @@ PV = "v190700" SRC_URI = " \ git://github.com/PortAudio/portaudio.git \ file://0001-Find-jack.patch \ + file://0001-cmake-Use-GNUInstallDirs.patch \ " SRCREV = "147dd722548358763a8b649b3e4b41dfffbcfbb6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb deleted file mode 100644 index ef7876786c..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.17.bb +++ /dev/null @@ -1,46 +0,0 @@ -DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" -HOMEPAGE = "https://remmina.org" -SECTION = "Support" -LICENSE = "GPLv2 & openssl" -LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" - -DEPENDS = " \ - glib-2.0-native \ - openssl \ - freerdp \ - gtk+3 \ - gdk-pixbuf \ - atk \ - libgcrypt \ - libsodium \ - libssh \ - vte \ - json-glib \ - libsoup-2.4 \ - libvncserver \ - libsecret \ - libxkbfile \ -" - -DEPENDS_append_libc-musl = " libexecinfo" -LDFLAGS_append_libc-musl = " -lexecinfo" - -SRCREV = "0ef1621b3e16b3168213147a2bfca39da2c2668f" -SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https" -S = "${WORKDIR}/git" - -inherit cmake features_check mime mime-xdg gtk-icon-cache -REQUIRED_DISTRO_FEATURES = "x11" - -EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" - -PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" -# Switch on gtk support in avahi recipe if you want to enable avahi support -PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi" - -RDEPENDS_${PN} = "bash" - -FILES_${PN}+= " \ - ${datadir}/metainfo \ - ${datadir}/mime \ -" diff --git a/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb new file mode 100644 index 0000000000..954da272eb --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/remmina/remmina_1.4.18.bb @@ -0,0 +1,46 @@ +DESCRIPTION = "A feature rich Remote Desktop Application written in GTK+" +HOMEPAGE = "https://remmina.org" +SECTION = "Support" +LICENSE = "GPLv2 & openssl" +LIC_FILES_CHKSUM = "file://LICENSE;md5=dab7215512044d49037272ce1ac4ea8f file://LICENSE.OpenSSL;md5=c1eb3cee0a4dea27503c531267a69769" + +DEPENDS = " \ + glib-2.0-native \ + openssl \ + freerdp \ + gtk+3 \ + gdk-pixbuf \ + atk \ + libgcrypt \ + libsodium \ + libssh \ + vte \ + json-glib \ + libsoup-2.4 \ + libvncserver \ + libsecret \ + libxkbfile \ +" + +DEPENDS_append_libc-musl = " libexecinfo" +LDFLAGS_append_libc-musl = " -lexecinfo" + +SRCREV = "045862cc7d7dd986b349c68131df2f86b9b1cd9c" +SRC_URI = "git://gitlab.com/Remmina/Remmina;protocol=https" +S = "${WORKDIR}/git" + +inherit cmake features_check mime mime-xdg gtk-icon-cache +REQUIRED_DISTRO_FEATURES = "x11" + +EXTRA_OECMAKE += "-DWITH_APPINDICATOR=OFF -DWITH_GETTEXT=OFF -DWITH_TRANSLATIONS=OFF" + +PACKAGECONFIG[spice] = "-DWITH_SPICE=ON, -DWITH_SPICE=OFF, spice spice-protocol" +# Switch on gtk support in avahi recipe if you want to enable avahi support +PACKAGECONFIG[avahi] = "-DWITH_AVAHI=ON, -DWITH_AVAHI=OFF, avahi" + +RDEPENDS_${PN} = "bash" + +FILES_${PN}+= " \ + ${datadir}/metainfo \ + ${datadir}/mime \ +" diff --git a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb index 33f5dccca2..a81d8d6cad 100644 --- a/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/rsnapshot/rsnapshot_git.bb @@ -22,8 +22,8 @@ RDEPENDS_${PN} = "rsync \ perl-module-ipc-open3 \ " -SRCREV = "a9e29850fc33c503c289e245c7bad350eed746d9" -PV = "1.4.3+git${SRCPV}" +SRCREV = "4dc82bfe6be3f83fcfa94946dcf6accfd6a18031" +PV = "1.4.4+git${SRCPV}" SRC_URI = "git://github.com/DrHyde/${BPN};branch=master;protocol=git \ file://configure-fix-cmd_rsync.patch \ diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.37.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.37.bb deleted file mode 100644 index 4630eb0210..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.37.bb +++ /dev/null @@ -1,35 +0,0 @@ -DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ -failure processing, analysis, and reporting supporting kernel space, user \ -space, Python, and Java programs" - -HOMEPAGE = "https://github.com/abrt/satyr" -LICENSE = "GPLv2" - -inherit autotools-brokensep python3native pkgconfig - -SRC_URI = "git://github.com/abrt/satyr.git \ - file://0002-fix-compile-failure-against-musl-C-library.patch \ -" -SRCREV = "4a7d0a31cdeee23bb13739f57926188a795bdf25" -S = "${WORKDIR}/git" - -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -DEPENDS += " \ - gdb \ - gperf-native \ - json-c \ - nettle \ - glib-2.0 \ -" - -PACKAGES += "python3-${BPN}" -FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" - -PACKAGECONFIG ??= "python3 rpm" -PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" -PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" - -do_configure_prepend() { - ${S}/gen-version -} diff --git a/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb new file mode 100644 index 0000000000..d01ea42bd2 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/satyr/satyr_0.38.bb @@ -0,0 +1,35 @@ +DESCRIPTION = "Satyr is a collection of low-level algorithms for program \ +failure processing, analysis, and reporting supporting kernel space, user \ +space, Python, and Java programs" + +HOMEPAGE = "https://github.com/abrt/satyr" +LICENSE = "GPLv2" + +inherit autotools-brokensep python3native pkgconfig + +SRC_URI = "git://github.com/abrt/satyr.git \ + file://0002-fix-compile-failure-against-musl-C-library.patch \ +" +SRCREV = "ad0030f071b7ce7eb748eca3c31cb381038e2b21" +S = "${WORKDIR}/git" + +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +DEPENDS += " \ + gdb \ + gperf-native \ + json-c \ + nettle \ + glib-2.0 \ +" + +PACKAGES += "python3-${BPN}" +FILES_python3-${BPN} = "${PYTHON_SITEPACKAGES_DIR}/${BPN}" + +PACKAGECONFIG ??= "python3 rpm" +PACKAGECONFIG[python3] = "--with-python3, --without-python3,,python3" +PACKAGECONFIG[rpm] = "--with-rpm, --without-rpm, rpm" + +do_configure_prepend() { + ${S}/gen-version +} diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb new file mode 100644 index 0000000000..4cf0dee112 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.10.0.bb @@ -0,0 +1,12 @@ +SUMMARY = "single-file header-only version of a C++20-like span for C++98, C++11 and later" +HOMEPAGE = "https://github.com/martinmoene/span-lite" +LICENSE = "BSL-1.0" +LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" + +SRC_URI += "git://github.com/martinmoene/span-lite" +SRCREV = "2987dd8d3b8fe7c861e3c3f879234cc1c412f03f" + +S = "${WORKDIR}/git" + +inherit cmake +inherit ptest diff --git a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb b/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb deleted file mode 100644 index 16b7c3e540..0000000000 --- a/meta-openembedded/meta-oe/recipes-support/span-lite/span-lite_0.9.2.bb +++ /dev/null @@ -1,12 +0,0 @@ -SUMMARY = "single-file header-only version of a C++20-like span for C++98, C++11 and later" -HOMEPAGE = "https://github.com/martinmoene/span-lite" -LICENSE = "BSL-1.0" -LIC_FILES_CHKSUM = "file://LICENSE.txt;md5=e4224ccaecb14d942c71d31bef20d78c" - -SRC_URI += "git://github.com/martinmoene/span-lite" -SRCREV = "126453198fe2236b31ddfa7353e95d3a06c478ab" - -S = "${WORKDIR}/git" - -inherit cmake -inherit ptest diff --git a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb index cde26df498..bb41a33c14 100644 --- a/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb +++ b/meta-openembedded/meta-oe/recipes-support/spitools/spitools_git.bb @@ -4,9 +4,9 @@ AUTHOR = "Christophe BLAESS" LICENSE="GPLv2" LIC_FILES_CHKSUM = "file://LICENSE;md5=8c16666ae6c159876a0ba63099614381" -BPV = "0.8.7" +BPV = "1.0.0" PV = "${BPV}" -SRCREV = "67937230d70ad87c23c7116a72df83577e309f6f" +SRCREV = "f5d87954bd9e13689481700105efe2f42199d364" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch new file mode 100644 index 0000000000..8a603ffe30 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb/0001-arena-Remove-dead-code.patch @@ -0,0 +1,40 @@ +From b94a1e3d6b5c733ba24cfa0d35450d8659d48289 Mon Sep 17 00:00:00 2001 +From: Khem Raj +Date: Fri, 4 Jun 2021 13:07:28 -0700 +Subject: [PATCH] arena: Remove dead code + +Fixes clang warning +arena.cpp:226:19: error: variable 'drained' set b +ut not used [-Werror,-Wunused-but-set-variable] +| std::intptr_t drained = 0; +| ^ + +Upstream-Status: Submitted [https://github.com/oneapi-src/oneTBB/pull/429] +Signed-off-by: Khem Raj +--- + src/tbb/arena.cpp | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) + +diff --git a/src/tbb/arena.cpp b/src/tbb/arena.cpp +index 4a9c0f8a..c8ed4999 100644 +--- a/src/tbb/arena.cpp ++++ b/src/tbb/arena.cpp +@@ -232,14 +232,13 @@ void arena::free_arena () { + __TBB_ASSERT( !my_global_concurrency_mode, NULL ); + #endif + poison_value( my_guard ); +- std::intptr_t drained = 0; + for ( unsigned i = 0; i < my_num_slots; ++i ) { + // __TBB_ASSERT( !my_slots[i].my_scheduler, "arena slot is not empty" ); + // TODO: understand the assertion and modify + // __TBB_ASSERT( my_slots[i].task_pool == EmptyTaskPool, NULL ); + __TBB_ASSERT( my_slots[i].head == my_slots[i].tail, NULL ); // TODO: replace by is_quiescent_local_task_pool_empty + my_slots[i].free_task_pool(); +- drained += mailbox(i).drain(); ++ mailbox(i).drain(); + my_slots[i].my_default_task_dispatcher->~task_dispatcher(); + } + __TBB_ASSERT(my_fifo_task_stream.empty(), "Not all enqueued tasks were executed"); +-- +2.31.1 + diff --git a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb index f4c52daf41..0b039a181a 100644 --- a/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb +++ b/meta-openembedded/meta-oe/recipes-support/tbb/tbb_2021.2.0.bb @@ -19,6 +19,7 @@ SRC_URI = "git://github.com/oneapi-src/oneTBB.git;protocol=https;branch=${BRANCH file://0001-CMakeLists.txt-exclude-riscv64-riscv32.patch \ file://0001-Disable-use-of-_tpause-instruction.patch \ file://0001-set_my_tls_end_of_input-Use-an-arbitrary-but-valid-p.patch \ + file://0001-arena-Remove-dead-code.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch new file mode 100644 index 0000000000..e95e240492 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers/40-linux-5.13-support.patch @@ -0,0 +1,276 @@ +Subject: Fix build errors with linux 5.13 +Origin: upstream, https://www.virtualbox.org/browser/vbox/trunk +Bug: https://bugs.launchpad.net/bugs/1929193 + +diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h +--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_drv.h 2021-04-28 16:24:47.000000000 +0000 ++++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_drv.h 2021-06-23 10:08:44.431714404 +0000 +@@ -46,20 +41,20 @@ + * Evaluates to true if the linux kernel version is equal or higher to the + * one specfied. */ + #define RTLNX_VER_MIN(a_Major, a_Minor, a_Patch) \ +- (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) ++ (LINUX_VERSION_CODE >= KERNEL_VERSION(a_Major, a_Minor, a_Patch)) + + /** @def RTLNX_VER_MAX + * Evaluates to true if the linux kernel version is less to the one specfied + * (exclusive). */ + #define RTLNX_VER_MAX(a_Major, a_Minor, a_Patch) \ +- (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) ++ (LINUX_VERSION_CODE < KERNEL_VERSION(a_Major, a_Minor, a_Patch)) + + /** @def RTLNX_VER_RANGE + * Evaluates to true if the linux kernel version is equal or higher to the given + * minimum version and less (but not equal) to the maximum version (exclusive). */ + #define RTLNX_VER_RANGE(a_MajorMin, a_MinorMin, a_PatchMin, a_MajorMax, a_MinorMax, a_PatchMax) \ +- ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ +- && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) ++ ( LINUX_VERSION_CODE >= KERNEL_VERSION(a_MajorMin, a_MinorMin, a_PatchMin) \ ++ && LINUX_VERSION_CODE < KERNEL_VERSION(a_MajorMax, a_MinorMax, a_PatchMax) ) + + + /** @def RTLNX_RHEL_MIN +@@ -70,7 +65,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) \ +- ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) ++ ((RHEL_MAJOR) > (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) >= (a_iMinor))) + #else + # define RTLNX_RHEL_MIN(a_iMajor, a_iMinor) (0) + #endif +@@ -83,7 +78,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) \ +- ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) ++ ((RHEL_MAJOR) < (a_iMajor) || ((RHEL_MAJOR) == (a_iMajor) && (RHEL_MINOR) < (a_iMinor))) + #else + # define RTLNX_RHEL_MAX(a_iMajor, a_iMinor) (0) + #endif +@@ -95,7 +90,7 @@ + */ + #if defined(RHEL_MAJOR) && defined(RHEL_MINOR) + # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) \ +- (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) ++ (RTLNX_RHEL_MIN(a_iMajorMin, a_iMinorMin) && RTLNX_RHEL_MAX(a_iMajorMax, a_iMinorMax)) + #else + # define RTLNX_RHEL_RANGE(a_iMajorMin, a_iMinorMin, a_iMajorMax, a_iMinorMax) (0) + #endif +@@ -173,7 +168,9 @@ + #include + #include + #include ++#if RTLNX_VER_MAX(5,13,0) + #include ++#endif + #if RTLNX_VER_MAX(5,12,0) + # include + #endif +@@ -222,7 +219,7 @@ static inline void drm_gem_object_put(st + VBVA_ADAPTER_INFORMATION_SIZE) + #define GUEST_HEAP_SIZE VBVA_ADAPTER_INFORMATION_SIZE + #define GUEST_HEAP_USABLE_SIZE (VBVA_ADAPTER_INFORMATION_SIZE - \ +- sizeof(HGSMIHOSTFLAGS)) ++ sizeof(struct hgsmi_host_flags)) + #define HOST_FLAGS_OFFSET GUEST_HEAP_USABLE_SIZE + + /** How frequently we refresh if the guest is not providing dirty rectangles. */ +@@ -232,7 +229,7 @@ static inline void drm_gem_object_put(st + static inline void *devm_kcalloc(struct device *dev, size_t n, size_t size, + gfp_t flags) + { +- return devm_kzalloc(dev, n * size, flags); ++ return devm_kzalloc(dev, n * size, flags); + } + #endif + +@@ -244,7 +241,7 @@ struct vbox_private { + u8 __iomem *guest_heap; + u8 __iomem *vbva_buffers; + struct gen_pool *guest_pool; +- struct VBVABUFFERCONTEXT *vbva_info; ++ struct vbva_buf_context *vbva_info; + bool any_pitch; + u32 num_crtcs; + /** Amount of available VRAM, including space used for buffers. */ +@@ -252,7 +249,7 @@ struct vbox_private { + /** Amount of available VRAM, not including space used for buffers. */ + u32 available_vram_size; + /** Array of structures for receiving mode hints. */ +- VBVAMODEHINT *last_mode_hints; ++ struct vbva_modehint *last_mode_hints; + + struct vbox_fbdev *fbdev; + +@@ -263,7 +260,11 @@ struct vbox_private { + struct drm_global_reference mem_global_ref; + struct ttm_bo_global_ref bo_global_ref; + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ struct ttm_device bdev; ++#else + struct ttm_bo_device bdev; ++#endif + bool mm_initialised; + } ttm; + +diff -urpN virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c +--- virtualbox-6.1.22-dfsg.orig/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-04-28 16:24:47.000000000 +0000 ++++ virtualbox-6.1.22-dfsg/src/VBox/Additions/linux/drm/vbox_ttm.c 2021-06-23 10:08:07.164057918 +0000 +@@ -48,7 +43,11 @@ + #endif + + ++#if RTLNX_VER_MIN(5,13,0) ++static inline struct vbox_private *vbox_bdev(struct ttm_device *bd) ++#else + static inline struct vbox_private *vbox_bdev(struct ttm_bo_device *bd) ++#endif + { + return container_of(bd, struct vbox_private, ttm.bdev); + } +@@ -188,7 +187,7 @@ static int vbox_ttm_io_mem_reserve(struc + mem->bus.size = mem->num_pages << PAGE_SHIFT; + mem->bus.base = 0; + mem->bus.is_iomem = false; +- if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) ++ if (!(man->flags & TTM_MEMTYPE_FLAG_MAPPABLE)) + return -EINVAL; + switch (mem->mem_type) { + case TTM_PL_SYSTEM: +@@ -205,8 +204,13 @@ static int vbox_ttm_io_mem_reserve(struc + return 0; + } + #else ++# if RTLNX_VER_MAX(5,13,0) + static int vbox_ttm_io_mem_reserve(struct ttm_bo_device *bdev, + struct ttm_resource *mem) ++# else /* > 5.13.0 */ ++static int vbox_ttm_io_mem_reserve(struct ttm_device *bdev, ++ struct ttm_resource *mem) ++# endif /* > 5.13.0 */ + { + struct vbox_private *vbox = vbox_bdev(bdev); + mem->bus.addr = NULL; +@@ -241,7 +245,12 @@ static int vbox_ttm_io_mem_reserve(struc + + + +-#if RTLNX_VER_MIN(5,10,0) ++#if RTLNX_VER_MIN(5,13,0) ++static void vbox_ttm_io_mem_free(struct ttm_device *bdev, ++ struct ttm_resource *mem) ++{ ++} ++#elif RTLNX_VER_MIN(5,10,0) + static void vbox_ttm_io_mem_free(struct ttm_bo_device *bdev, + struct ttm_resource *mem) + { +@@ -253,7 +262,13 @@ static void vbox_ttm_io_mem_free(struct + } + #endif + +-#if RTLNX_VER_MIN(5,10,0) ++#if RTLNX_VER_MIN(5,13,0) ++static void vbox_ttm_tt_destroy(struct ttm_device *bdev, struct ttm_tt *tt) ++{ ++ ttm_tt_fini(tt); ++ kfree(tt); ++} ++#elif RTLNX_VER_MIN(5,10,0) + static void vbox_ttm_tt_destroy(struct ttm_bo_device *bdev, struct ttm_tt *tt) + { + ttm_tt_fini(tt); +@@ -333,7 +348,11 @@ static int vbox_bo_move(struct ttm_buffe + } + #endif + ++#if RTLNX_VER_MIN(5,13,0) ++static struct ttm_device_funcs vbox_bo_driver = { ++#else /* < 5.13.0 */ + static struct ttm_bo_driver vbox_bo_driver = { ++#endif /* < 5.13.0 */ + .ttm_tt_create = vbox_ttm_tt_create, + #if RTLNX_VER_MIN(5,10,0) + .ttm_tt_destroy = vbox_ttm_tt_destroy, +@@ -370,14 +389,22 @@ int vbox_mm_init(struct vbox_private *vb + { + int ret; + struct drm_device *dev = vbox->dev; ++#if RTLNX_VER_MIN(5,13,0) ++ struct ttm_device *bdev = &vbox->ttm.bdev; ++#else + struct ttm_bo_device *bdev = &vbox->ttm.bdev; ++#endif + + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + ret = vbox_ttm_global_init(vbox); + if (ret) + return ret; + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ ret = ttm_device_init(&vbox->ttm.bdev, ++#else + ret = ttm_bo_device_init(&vbox->ttm.bdev, ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + vbox->ttm.bo_global_ref.ref.object, + #endif +@@ -429,7 +456,11 @@ int vbox_mm_init(struct vbox_private *vb + return 0; + + err_device_release: ++#if RTLNX_VER_MIN(5,13,0) ++ ttm_device_fini(&vbox->ttm.bdev); ++#else + ttm_bo_device_release(&vbox->ttm.bdev); ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + err_ttm_global_release: + vbox_ttm_global_release(vbox); +@@ -446,7 +477,11 @@ void vbox_mm_fini(struct vbox_private *v + #else + arch_phys_wc_del(vbox->fb_mtrr); + #endif ++#if RTLNX_VER_MIN(5,13,0) ++ ttm_device_fini(&vbox->ttm.bdev); ++#else + ttm_bo_device_release(&vbox->ttm.bdev); ++#endif + #if RTLNX_VER_MAX(5,0,0) && !RTLNX_RHEL_MAJ_PREREQ(7,7) && !RTLNX_RHEL_MAJ_PREREQ(8,1) + vbox_ttm_global_release(vbox); + #endif +@@ -528,7 +563,9 @@ int vbox_bo_create(struct drm_device *de + { + struct vbox_private *vbox = dev->dev_private; + struct vbox_bo *vboxbo; ++#if RTLNX_VER_MAX(5,13,0) + size_t acc_size; ++#endif + int ret; + + vboxbo = kzalloc(sizeof(*vboxbo), GFP_KERNEL); +@@ -551,16 +588,20 @@ int vbox_bo_create(struct drm_device *de + + vbox_ttm_placement(vboxbo, VBOX_MEM_TYPE_VRAM | VBOX_MEM_TYPE_SYSTEM); + ++#if RTLNX_VER_MAX(5,13,0) + acc_size = ttm_bo_dma_acc_size(&vbox->ttm.bdev, size, + sizeof(struct vbox_bo)); ++#endif + + ret = ttm_bo_init(&vbox->ttm.bdev, &vboxbo->bo, size, + ttm_bo_type_device, &vboxbo->placement, + #if RTLNX_VER_MAX(4,17,0) && !RTLNX_RHEL_MAJ_PREREQ(7,6) && !RTLNX_SUSE_MAJ_PREREQ(15,1) && !RTLNX_SUSE_MAJ_PREREQ(12,5) + align >> PAGE_SHIFT, false, NULL, acc_size, +-#else ++#elif RTLNX_VER_MAX(5,13,0) /* < 5.13.0 */ + align >> PAGE_SHIFT, false, acc_size, +-#endif ++#else /* > 5.13.0 */ ++ align >> PAGE_SHIFT, false, ++#endif /* > 5.13.0 */ + #if RTLNX_VER_MIN(3,18,0) || RTLNX_RHEL_MAJ_PREREQ(7,2) + NULL, NULL, vbox_bo_ttm_destroy); + #else diff --git a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb index a074d0a558..19b8f8f46e 100644 --- a/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb +++ b/meta-openembedded/meta-oe/recipes-support/vboxguestdrivers/vboxguestdrivers_6.1.22.bb @@ -13,6 +13,7 @@ VBOX_NAME = "VirtualBox-${PV}" SRC_URI = "http://download.virtualbox.org/virtualbox/${PV}/${VBOX_NAME}.tar.bz2 \ file://Makefile.utils \ + file://40-linux-5.13-support.patch \ file://add__divmoddi4.patch \ " SRC_URI[md5sum] = "abb1a20021e5915fe38c666e8c11cf80" -- cgit v1.2.3