From e07c6f9648d478943b5ecd6f1c42cc91cae0f547 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 16 Dec 2024 02:01:58 +0000 Subject: gentoo auto-resync : 16:12:2024 - 02:01:58 --- dev-libs/Manifest.gz | Bin 100537 -> 100519 bytes dev-libs/c-blosc2/Manifest | 2 +- dev-libs/c-blosc2/c-blosc2-2.15.2.ebuild | 2 +- dev-libs/efl/Manifest | 3 +- dev-libs/efl/efl-1.27.0-r1.ebuild | 2 + dev-libs/efl/files/efl-1.27-eina_string_view.patch | 32 ++ dev-libs/glib/Manifest | 7 +- dev-libs/glib/glib-2.80.5-r1.ebuild | 437 +++++++++++++++++++++ dev-libs/glib/glib-2.80.5.ebuild | 5 + dev-libs/glib/glib-2.82.2.ebuild | 430 -------------------- dev-libs/glib/glib-2.82.4-r1.ebuild | 437 +++++++++++++++++++++ dev-libs/glib/glib-2.82.4.ebuild | 430 -------------------- dev-libs/intel-compute-runtime/Manifest | 2 +- .../intel-compute-runtime-24.35.30872.25-r1.ebuild | 84 ++++ .../intel-compute-runtime-24.35.30872.25.ebuild | 83 ---- dev-libs/libmodbus/Manifest | 2 +- dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild | 2 +- dev-libs/weston/Manifest | 4 +- dev-libs/weston/weston-14.0.1-r1.ebuild | 147 +++++++ dev-libs/weston/weston-14.0.1.ebuild | 147 ------- dev-libs/weston/weston-9999.ebuild | 2 +- 21 files changed, 1157 insertions(+), 1103 deletions(-) create mode 100644 dev-libs/efl/files/efl-1.27-eina_string_view.patch create mode 100644 dev-libs/glib/glib-2.80.5-r1.ebuild delete mode 100644 dev-libs/glib/glib-2.82.2.ebuild create mode 100644 dev-libs/glib/glib-2.82.4-r1.ebuild delete mode 100644 dev-libs/glib/glib-2.82.4.ebuild create mode 100644 dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25-r1.ebuild delete mode 100644 dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25.ebuild create mode 100644 dev-libs/weston/weston-14.0.1-r1.ebuild delete mode 100644 dev-libs/weston/weston-14.0.1.ebuild (limited to 'dev-libs') diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz index 15352601a366..36ea0d96bd0f 100644 Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ diff --git a/dev-libs/c-blosc2/Manifest b/dev-libs/c-blosc2/Manifest index dea9aed594d0..68d4f818d1f3 100644 --- a/dev-libs/c-blosc2/Manifest +++ b/dev-libs/c-blosc2/Manifest @@ -1,5 +1,5 @@ DIST c-blosc2-2.15.1.gh.tar.gz 3203267 BLAKE2B 0009afc8e9357a9d9787a60ee549bb21d68e952ca076f529add0f67500f2055a43463b3d612b600197579fd640b937024070508cb92b911d77e8ff4d8c7f16e5 SHA512 56e7395297ce8e336b2e881bf4dae169268ef19328bae8c037aa297696f723196f65eb3f66c03728d1c6492b768e17ad586f8aae29c9033b571f736d391e9ab9 DIST c-blosc2-2.15.2.gh.tar.gz 3174873 BLAKE2B f656b81689ff30c54fd977e3652c8ee4a74320f2b4d9e2b25aa909254ed6f94021cebc63c6ddc1878a0125f97b56fc6583152c3cfae445adc976149e2449d69f SHA512 6208c2cfdd19eedada0b3a264229b1f17dee09280a66ce7d22dfcee80fe320a6cd68b5cc64994852316b7987f319284a5de70d043feb84f3d756b3ef30b723f7 EBUILD c-blosc2-2.15.1.ebuild 1488 BLAKE2B aa6fa8d8067e7d68ab520ef84e93ad971c34c81260ead49675ba02cd48da79cd0c01ef09404a95ef5048356b3e19c98e93a2ea617e4cde495d5b835acaf82f97 SHA512 e3f1ef57a6c2a397dd33cbd71dc2043d72c42d8779f2ccd2eaa4882f0cdadaaa79097d378cecaff2e3e9de5ca4db39998535f75017847700219914f7b23764e7 -EBUILD c-blosc2-2.15.2.ebuild 1490 BLAKE2B 4d45000725ef8f75064ebcb070b6855ff501c78d6a065d0b67f92269d4ec88f547a3e9c1d2ea71c44ed96c64cfa1b44d88226b6f26b0d90aaf9ce52118a301dc SHA512 85c2432a23ceefd068cedcd81a36621ebb2364bff3df26c16d6d53328ec76cfda1898ef9061ea773686b4cfbfa9259e61e34cbcd8b24cca0a125ef06c85c099a +EBUILD c-blosc2-2.15.2.ebuild 1489 BLAKE2B 3e6c1933ecfc2e0e8cab5d74af06c07755b78a539a4cf49dc33f163aa5c4d73171a6820742d408be5a7a03d316b84247ec5d202b42345542b34d20190d80b1bf SHA512 2db914dfa4dec9ad1582d90e7934bce273a9f4d827298b8f6988ed1cb1d498340a10ac0de3c9d4a1e8de7f83112deeebf2d24b2e6dd35ad72fdaaa9e402b4e04 MISC metadata.xml 327 BLAKE2B 5fafd7f688780e7c5479d492da4943b9a95122d5c64e36e4415fe69a708f983f9463824981d771424c1c75f7236a159ef843738a0b31430ccd572770fbc5a74e SHA512 9d2aa06eb8e144bafe1c65b9c7704993633f9e1db629d77209e8c832e09de34c641d9f588cf208d8f5f65ff489c56f1e01ef573213439ba99678601d6a790ee0 diff --git a/dev-libs/c-blosc2/c-blosc2-2.15.2.ebuild b/dev-libs/c-blosc2/c-blosc2-2.15.2.ebuild index d0cef6e9e054..d470861b5caf 100644 --- a/dev-libs/c-blosc2/c-blosc2-2.15.2.ebuild +++ b/dev-libs/c-blosc2/c-blosc2-2.15.2.ebuild @@ -17,7 +17,7 @@ SRC_URI=" LICENSE="BSD" SLOT="0/4" -KEYWORDS="~amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 arm arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux" IUSE="test +zlib +zstd" REQUIRED_USE="test? ( zlib zstd )" RESTRICT="!test? ( test )" diff --git a/dev-libs/efl/Manifest b/dev-libs/efl/Manifest index ba9671662e79..381b47a390fe 100644 --- a/dev-libs/efl/Manifest +++ b/dev-libs/efl/Manifest @@ -1,3 +1,4 @@ +AUX efl-1.27-eina_string_view.patch 1384 BLAKE2B a2582818ff1a0f0bf5c3ebb70256cf449c1196ef1d409cbd4bcd5f7e5b1d7b51331a3350a0200211204a8743b099e23d8b6b5f349f130046546609d127dd3aad SHA512 9024545ec77be7582862c3b38dc2c718d8df93257f7025a0c4dbc8de3858dd4d9815c570386c9b2327581d757e3e34d527f7499040ea7406917684098ea94cd7 DIST efl-1.27.0.tar.xz 168543208 BLAKE2B 082f7089f1a017db8e62f36fb2a51e18c7d00b74b8e865a60d066e49921c69720101deb3184a125633a6c646e241b8765cccc038c906c00d4ca16ecb705faf6f SHA512 5dda2f630463a2504d9246be17449579bbc470904e137b02b3b5c44db033dec2688f6c477885de1485944d875ee62619b6e7c5d4d3657225951f6feaf83b4fa4 -EBUILD efl-1.27.0-r1.ebuild 8049 BLAKE2B b97f3c7b77cee38757ae17dac9a579b4130b011950baed616cd14e42cd4fec1bec93994d3154e2637d3fc0306c786541bb6c73c0518e1333e3fad2dd0d55dde5 SHA512 c212dfd6bd0529a52f8472c8b9e364f3e7561977086f92aae6e9b2e6ee88ef30296f4e0772dd495cd69b92e524711a32e7323e96d658857151f1c571a0f1c9a1 +EBUILD efl-1.27.0-r1.ebuild 8110 BLAKE2B 1ded95f800d9c459c6e6248c49302146b3d3e79acdc461146a3377eff724abca595b5351d08393efc6a2ff103691e79c639f28f76b0d0b893f1d55b2a4c4e307 SHA512 4dbcfad9f03f59d857b421368b7ae401f0744343935148b4885c6cf718fb7c9ad12bfcba3535fd194a6a13f36e0785cc7b4822cac8e15e880bd2bfb5317c26b4 MISC metadata.xml 1835 BLAKE2B 9057e58727f82d085606315896cca8f37f81fc9642cb3d40fed53f07ae09bedfd6d1d1a23878bca9e7e2713314d83c26dcfbf305557cfdfbeeeb01bfb73b2867 SHA512 ac1d09983c4f6e992dd92cc6aa4770a6a847be3a4f5b4236867d411f5c730e8b743574864b948301782eedd72e78dfdd6e7a4deeffd4a09f2f52f958e9a1e6c7 diff --git a/dev-libs/efl/efl-1.27.0-r1.ebuild b/dev-libs/efl/efl-1.27.0-r1.ebuild index f64a6f6f2aac..06352ba5d97a 100644 --- a/dev-libs/efl/efl-1.27.0-r1.ebuild +++ b/dev-libs/efl/efl-1.27.0-r1.ebuild @@ -132,6 +132,8 @@ BDEPEND="${PYTHON_DEPS} nls? ( sys-devel/gettext ) wayland? ( dev-util/wayland-scanner )" +PATCHES=( "${FILESDIR}/${PN}-1.27-eina_string_view.patch" ) + pkg_setup() { # Deprecated, provided for backward-compatibility. Everything is moved to libefreet.so. QA_FLAGS_IGNORED="/usr/$(get_libdir)/libefreet_trash.so.${PV} diff --git a/dev-libs/efl/files/efl-1.27-eina_string_view.patch b/dev-libs/efl/files/efl-1.27-eina_string_view.patch new file mode 100644 index 000000000000..8e3bb9c1f460 --- /dev/null +++ b/dev-libs/efl/files/efl-1.27-eina_string_view.patch @@ -0,0 +1,32 @@ +https://git.enlightenment.org/enlightenment/efl/issues/71 + +commit 6c3630ffda0884b86e6ffc9d00d7315ab67858e5 +Author: Ted Rodgers +Date: Wed Aug 21 10:56:13 2024 -0400 + + eina_string_view.hh change lenght to length + + fixes #71 + +diff --git a/src/bindings/cxx/eina_cxx/eina_string_view.hh b/src/bindings/cxx/eina_cxx/eina_string_view.hh +index 77798db70f..f0bbcb705d 100644 +--- a/src/bindings/cxx/eina_cxx/eina_string_view.hh ++++ b/src/bindings/cxx/eina_cxx/eina_string_view.hh +@@ -181,7 +181,7 @@ public: + size_type rfind(basic_string_view const& s) const + { + const_reverse_iterator iter = std::search(crbegin(), crend(), s.crbegin(), s.crend(), Traits::eq); +- return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.lenght(); ++ return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.length(); + } + + size_type rfind(basic_string_view const& s, size_type pos) const +@@ -189,7 +189,7 @@ public: + if (pos >= _len) + return npos; + const_reverse_iterator iter = std::search(crbegin()+pos, crend(), s.crbegin(), s.crend(), Traits::eq); +- return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.lenght(); ++ return iter == crend() ? npos : reverse_distance(crbegin(), iter) - s.length(); + } + + size_type rfind(CharT c) const diff --git a/dev-libs/glib/Manifest b/dev-libs/glib/Manifest index 7624730126b7..fd391ad0f933 100644 --- a/dev-libs/glib/Manifest +++ b/dev-libs/glib/Manifest @@ -7,7 +7,6 @@ DIST glib-2.78.4.tar.xz 5331892 BLAKE2B ada7134597d7d863e581a2bb1097ac07a63b27b5 DIST glib-2.78.6.tar.xz 5344808 BLAKE2B d16173794c4aa019459cf8c8c84d4107fb8393828f41ec6c631b9452890f34f9022ed848a543ed134fdb8a575faef6b941cea3e05de512eb1b7a99f7601a2485 SHA512 8d75f8fd77b6309215ca86a0c7648878efe11051f18b279840c137669017ea4066388f8682367e4ea3f154333d833c9dc28ccd4a66a91f0c3854a40a2838f8da DIST glib-2.80.4.tar.xz 5535760 BLAKE2B 1d2b301703b27a5c2def370e1d44b4f7b08a940969563ce9d8d7c38e5f0a32163b95523e09cedc4a57b2af84a57d63dc545abcb31b61a8066ef62ba396fb4f3c SHA512 efdc7dd1e0609b0f2d988a8cc8fd4a3fda96e8450832f905f7686f9063b727cb996e0e4e638aca62f60b76f9f04be62e089a615413e64cf298c7eef26e074570 DIST glib-2.80.5.tar.xz 5538308 BLAKE2B 3f17ff85a85d20858b69c2dccc1e5d6ffd92661a8cfda8b8770dd391861999ff3381008f4fe382e90f0a7798fe218debda7f559f6e3ac8f9305e3be98b879969 SHA512 c9cc9f99e217fd950810fcfbfa7300c7850cae4dbfbabc03cdcadb6dcca2e51ea7979ceb68c09d8e9776fd1c04db73b89b81f748c8bd911e1f7ad9f704dff172 -DIST glib-2.82.2.tar.xz 5555528 BLAKE2B 930fa7816082e6ba4b7f394985840bb6abf4fe9a4451286cddd3cfc8a4f3d4e3b4f06f09fbb34486f6fd47d0b72363b06a280ccae62d061724a7a2e00734bc4c SHA512 d5b761ec0c088496f2f9e5767568076a30ff492c272f21133560689f4e6a177d403c78d71ef85da63de331152c4d1f27b65d3e927ebfaf0fb63592f66e564ea1 DIST glib-2.82.4.tar.xz 5556896 BLAKE2B 62caecc7570b1639f6ddf1deb9debb6d3d6180b74f497f2fcace5ce65d6e28996555d51e5b4980f500bdc3f811b5b6214521b1170f553f2fa1fd240fd0eec835 SHA512 5df0b3c56fe6cf6c94019e29afb408174a5864cdb97cf58d5a12a0f83990b5c2004a49c8e3b0e195f5808874b5911a4a7b3d6aea8718aada1b40561e623cd08d DIST gobject-introspection-1.80.1.tar.xz 1040228 BLAKE2B 7a8c1da9bc8aef293deedde1eed97536fa2f42f79a9761ac8ededb0676e46b636545a69e20e63d812844aeb626fa4fb7ce3c7922e51554fdc79560f16443acd9 SHA512 f45c2c1b105086488d974c6134db9910746df8edb187772f2ecd249656a1047c8ac88ba51f5bf7393c3d99c3ace143ecd09be256c2f4d0ceee110c9ad51a839a DIST gobject-introspection-1.82.0.tar.xz 1052872 BLAKE2B 8336ae26d48a71a203655d9d268076f603055ceabb55dbfa676f2c67b4096b83afc106d485dc45d02b3a8be806f9ef50d54806a82e61f2a252ae59543c61e934 SHA512 e139fadb4174c72b648914f3774d89fc0e5eaee45bba0c13edf05de883664dad8276dbc34006217bb09871ed4bad23adab51ff232a17b9eb131329b2926cafb7 @@ -16,7 +15,7 @@ EBUILD glib-2.78.3.ebuild 11145 BLAKE2B 9500014a458c528207d29e2ac5915803203456a5 EBUILD glib-2.78.4-r1.ebuild 11390 BLAKE2B 569236b2fc6694eb09b999b94ce027b8fb9152aa2876ed08199fcbb52b894be1660a42da41c063926844b507d5e89eed8cc40c8049bb71b2a887494245974324 SHA512 8eface9ce9509f9661c8f2e7c51e1ede41e6d0db4589c9987a24a4168bf0c4cebf69835825d4d994c70802052bfe487b77629b45219c0c282351328ba476d26b EBUILD glib-2.78.6.ebuild 11340 BLAKE2B c53403ccbcbd18e678f8e2c6e53b39ccc6cb558be4e7f96df26f986a4c51ea86cf601bf0a122c2530dfc762af2a1cbe6e85f524687c738a8eb3940afeb6541a9 SHA512 7c1b4e8e69ca36d6b52855c7edbe4b584d549025d88783010359b96469c98b217dd50819ae971c7bfee637a30bd864b991c3a16cc538492b4c7075d719e30f4c EBUILD glib-2.80.4.ebuild 11467 BLAKE2B c0efaa4ab793d792f8ca300fddc586b1f09e477898c962d6ee528330992db8d1a633e176e2079f4302a1e5d904e919599ac9ca1e37cd5a542ccf14aa8c7d9f73 SHA512 7d6fb8190795ac10bb9b31f0f618452dc7ed7f3a1cd84aabb258c4fe6cfb3dcee96b0a4430a2d0b42055687c0736464efb218db22862c48c30e31f90f173b84e -EBUILD glib-2.80.5.ebuild 14999 BLAKE2B 083862c3396eed2a73bd9ad65fa5aae30dca0080150f0c89b1a40ab3e0ca127e3bdd4646cc1029d2067ff337825b8e5249e4335e5ff4bd39f85b1481f282b442 SHA512 b2d4d43224309e7089086f09e2aeb0770db81fd04657881386a2d0fa9bb3dda3367663054e3e452e2d7cdba2a178968ad07a1fc505378bc6a49be08c4aa7981c -EBUILD glib-2.82.2.ebuild 14999 BLAKE2B a2687ecb20c0f4f7d60bcc7d7762f3a56898d9bfa6f3141c555a42f56411590a9d7c5b06bd1f8f300143d8ed326e54e6bd11f2f28d7bb81600e3d846ddaa1d78 SHA512 de491994a5c86a1acf32f81e688d414b489827b2e8e594b4ccf3d15a8f65c6d4ef1db44d2b3567b950b3966f109b31300c0971b8f9465009d0b615949a169c81 -EBUILD glib-2.82.4.ebuild 14999 BLAKE2B a2687ecb20c0f4f7d60bcc7d7762f3a56898d9bfa6f3141c555a42f56411590a9d7c5b06bd1f8f300143d8ed326e54e6bd11f2f28d7bb81600e3d846ddaa1d78 SHA512 de491994a5c86a1acf32f81e688d414b489827b2e8e594b4ccf3d15a8f65c6d4ef1db44d2b3567b950b3966f109b31300c0971b8f9465009d0b615949a169c81 +EBUILD glib-2.80.5-r1.ebuild 15399 BLAKE2B a6f813d0f0a69e1457c4cefc3de17d8f994368f943972c951c1500e1b2a1003e237bfe7b3574c2cb9e2b0db960a19ca9781ba9fe89838a52fd84b79302430eb7 SHA512 22b5da24628db8a8ea72263a8682bc0be77ab8547fd5f1a04a4e71e06077bead0d51dc621326ede93850cc8d82bf83668038a72b06518de720a05e59e64b2d6c +EBUILD glib-2.80.5.ebuild 15291 BLAKE2B c939b8e376c803270074061f2702d643d6d713a3775157df0effe1bbf270803a52c9f2021f03273185cc723ca0958a83d3c3712dc86fd8177557a96762165806 SHA512 101b872a11dcc09e3b249b8f586729e80361f1d270595d19140d57967aa2a3984c619eeab9413d8214041eb9c74aeb89d61add32393d6a4c55284ebe93a4be3d +EBUILD glib-2.82.4-r1.ebuild 15399 BLAKE2B be43d3de64c1a42b391c4d150f98d875a69c7bbf0bec7e7cc220ebed317c736fdfcf68266aef44eb2e52892ae33d414f8f80424f0789ede1f94e4a66d64dc592 SHA512 51dd8fb72b3532cd48e7ff1291b806403d69f1b3fea1ffd405f9294feea1c145dee509b5e5fdbf9e351aa6813763d9ddefa8f8047e304b330f24dac0d457bb3f MISC metadata.xml 1499 BLAKE2B 5a75e3b360e4656fe9127f2dc3ba7e90df3eae0586a025b4eefc2317398e53815c98a8014ea6f0dd69ae8afdafa066eec61c18e9fa86d24c78a3f11404c2a7a8 SHA512 2b12c409bf16cf9e01e80c30a6707aac5b48ca4cdeac3852028c003c6cb2d50b5e82be73adeefb8341fd4f157e0f7d22505cebfc2ee0f6d64ca77a7d3cfa8271 diff --git a/dev-libs/glib/glib-2.80.5-r1.ebuild b/dev-libs/glib/glib-2.80.5-r1.ebuild new file mode 100644 index 000000000000..a07569da4316 --- /dev/null +++ b/dev-libs/glib/glib-2.80.5-r1.ebuild @@ -0,0 +1,437 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..13} ) + +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +INTROSPECTION_PN="gobject-introspection" +INTROSPECTION_PV="1.80.1" +INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}" +SRC_URI=" + ${SRC_URI} + introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} ) +" +INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}" +INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + introspection? ( + >=dev-libs/gobject-introspection-common-${INTROSPECTION_PV} + ) + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + doc? ( >=dev-util/gi-docgen-2023.1 ) + dev-python/docutils + systemtap? ( >=dev-debug/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig + + introspection? ( + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + sys-devel/bison + app-alternatives/lex + ${PYTHON_DEPS} + ) +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +python_check_deps() { + if use introspection ; then + python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + sed -i -e '/install : true/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + # Link the glib source to the introspection subproject directory so it can be built there first + if use introspection ; then + ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib" + fi + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + # Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only) + if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + einfo "Bootstrapping gobject-introspection..." + INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin" + INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)" + + local emesonargs=( + -Dpython="${EPYTHON}" + -Dbuild_introspection_data=true + # Build an internal copy of glib for the internal copy of gobject-introspection + --force-fallback-for=glib + # Tell meson to make paths in pkgconfig files relative, because we arent doing an actual install + -Dpkgconfig.relocatable=true + + # We want as minimal a build as possible here to speed things up + # and reduce the risk of failures. + -Dglib:selinux=disabled + -Dglib:xattr=false + -Dglib:libmount=disabled + -Dglib:man-pages=disabled + -Dglib:dtrace=false + -Dglib:systemtap=false + -Dglib:sysprof=disabled + -Dglib:documentation=false + -Dglib:tests=false + -Dglib:installed_tests=false + -Dglib:nls=disabled + -Dglib:oss_fuzz=disabled + -Dglib:libelf=disabled + -Dglib:multiarch=false + ) + + ORIG_SOURCE_DIR=${EMESON_SOURCE} + EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + + ORIG_BUILD_DIR=${BUILD_DIR} + BUILD_DIR=${INTROSPECTION_BUILD_DIR} + + pushd ${INTROSPECTION_SOURCE_DIR} || die + + meson_src_configure + meson_src_compile + # Install to the portage temp directory so that pkgconfig relative paths resolve correctly + meson_src_install --destdir "${T}" --skip-subprojects glib + + popd || die + + EMESON_SOURCE=${ORIG_SOURCE_DIR} + BUILD_DIR=${ORIG_BUILD_DIR} + + # Add gobject-introspection binaries and pkgconfig files to path + export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" + + # Override primary pkgconfig search paths to prioritize our internal copy + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + + # Set the normal primary pkgconfig search paths as secondary + # (We also need to prepend our just-built one for later use of + # g-ir-scanner to use the new one and to help workaround bugs like + # bug #946221.) + export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + + # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them + for gliblib in glib gobject gthread gmodule gio girepository; do + export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" + done + + # Add the paths to the gobject-introspection python modules to python path so they can be imported + export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}" + fi + + # TODO: Can this be cleaned up now we have -Dglib_debug? (bug #946485) + use debug && EMESON_BUILD_TYPE=debug + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature debug glib_debug) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman-pages=enabled + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_use doc documentation) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + $(meson_native_use_feature introspection) + ) + + # Workaround for bug #938302 + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + # TODO: Use ${ABI} here to be unique for multilib? + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + + meson_src_test --timeout-multiplier 20 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache || die + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + fi +} diff --git a/dev-libs/glib/glib-2.80.5.ebuild b/dev-libs/glib/glib-2.80.5.ebuild index d27759baf6d3..2c8085382ed4 100644 --- a/dev-libs/glib/glib-2.80.5.ebuild +++ b/dev-libs/glib/glib-2.80.5.ebuild @@ -246,6 +246,11 @@ multilib_src_configure() { ORIG_SOURCE_DIR=${EMESON_SOURCE} EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + ORIG_BUILD_DIR=${BUILD_DIR} BUILD_DIR=${INTROSPECTION_BUILD_DIR} diff --git a/dev-libs/glib/glib-2.82.2.ebuild b/dev-libs/glib/glib-2.82.2.ebuild deleted file mode 100644 index 16ca673a8268..000000000000 --- a/dev-libs/glib/glib-2.82.2.ebuild +++ /dev/null @@ -1,430 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..13} ) - -inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="https://www.gtk.org/" - -INTROSPECTION_PN="gobject-introspection" -INTROSPECTION_PV="1.82.0" -INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}" -SRC_URI=" - ${SRC_URI} - introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} ) -" -INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}" -INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" -RESTRICT="!test? ( test )" - -# * elfutils (via libelf) does not build on Windows. gresources are not embedded -# within ELF binaries on that platform anyway and inspecting ELF binaries from -# other platforms is not that useful so exclude the dependency in this case. -# * Technically static-libs is needed on zlib, util-linux and perhaps more, but -# these are used by GIO, which glib[static-libs] consumers don't really seem -# to need at all, thus not imposing the deps for now and once some consumers -# are actually found to static link libgio-2.0.a, we can revisit and either add -# them or just put the (build) deps in that rare consumer instead of recursive -# RDEPEND here (due to lack of recursive DEPEND). -RDEPEND=" - !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] - >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - introspection? ( - >=dev-libs/gobject-introspection-common-${INTROSPECTION_PV} - ) - kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) - xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) - elf? ( virtual/libelf:0= ) - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -# libxml2 used for optional tests that get automatically skipped -BDEPEND=" - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=sys-devel/gettext-0.19.8 - doc? ( >=dev-util/gi-docgen-2023.1 ) - dev-python/docutils - systemtap? ( >=dev-debug/systemtap-1.3 ) - ${PYTHON_DEPS} - test? ( >=sys-apps/dbus-1.2.14 ) - virtual/pkgconfig - - introspection? ( - $(python_gen_any_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - virtual/pkgconfig - sys-devel/bison - app-alternatives/lex - ${PYTHON_DEPS} - ) -" -# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen - -PDEPEND=" - dbus? ( gnome-base/dconf ) - mime? ( x11-misc/shared-mime-info ) -" -# shared-mime-info needed for gio/xdgmime, bug #409481 -# dconf is needed to be able to save settings, bug #498436 - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gio-querymodules$(get_exeext) -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch -) - -python_check_deps() { - if use introspection ; then - python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - if use test ; then - CONFIG_CHECK="~IPV6" - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." - fi - linux-info_pkg_setup - fi - python-any-r1_pkg_setup -} - -src_prepare() { - if use test; then - # TODO: Review the test exclusions, especially now with meson - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 - if ! has_version dev-util/desktop-file-utils ; then - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," - ewarn "think on installing it to get these tests run." - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die - sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die - fi - - # gdesktopappinfo requires existing terminal (gnome-terminal or any - # other), falling back to xterm if one doesn't exist - #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then - # ewarn "Some tests will be skipped due to missing terminal program" - # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready - # for backport (or in a bump) and file new issue if still fails - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die - # desktop-app-info/launch* might fail similarly - sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die - #fi - - # https://bugzilla.gnome.org/show_bug.cgi?id=722604 - sed -i -e "/timer\/stop/d" glib/tests/timer.c || die - sed -i -e "/timer\/basic/d" glib/tests/timer.c || die - - ewarn "Tests for search-utils have been skipped" - sed -i -e "/search-utils/d" glib/tests/meson.build || die - - # Play nice with network-sandbox, but this approach would defeat the purpose of the test - #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die - else - # Don't build tests, also prevents extra deps, bug #512022 - sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die - fi - - # Don't build fuzzing binaries - not used - sed -i -e '/subdir.*fuzzing/d' meson.build || die - - # gdbus-codegen is a separate package - sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die - sed -i -e '/install : true/d' gio/gdbus-2.0/codegen/meson.build || die - - # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon - sed -i -e '/install_dir/d' gio/tests/meson.build || die - - cat > "${T}/glib-test-ld-wrapper" <<-EOF - #!/usr/bin/env sh - exec \${LD:-ld} "\$@" - EOF - chmod a+x "${T}/glib-test-ld-wrapper" || die - sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - - # make default sane for us - if use prefix ; then - sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die - # bug #308609, without path, bug #314057 - export PERL=perl - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # fix standards conflicts - sed -i \ - -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ - -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ - meson.build || die - sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ - glib/giounix.c || die - fi - - # disable native macOS integrations - sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ - meson.build || die - sed -i \ - -e '/AvailabilityMacros.h/d' \ - gio/giomodule.c || die - - # Link the glib source to the introspection subproject directory so it can be built there first - if use introspection ; then - ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib" - fi - - default - gnome2_environment_reset - # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only -} - -multilib_src_configure() { - # TODO: figure a way to pass appropriate values for all cross properties - # that glib uses (search for get_cross_property) - #if tc-is-cross-compiler ; then - # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - # TODO-meson: This should be in meson cross file as 'growing_stack' - # property; and more, look at get_cross_property - #case ${CHOST} in - #hppa*|metag*) export glib_cv_stack_grows=yes ;; - #*) export glib_cv_stack_grows=no ;; - #esac - #fi - - # Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only) - if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then - einfo "Bootstrapping gobject-introspection..." - INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin" - INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)" - - local emesonargs=( - -Dpython="${EPYTHON}" - -Dbuild_introspection_data=true - # Build an internal copy of glib for the internal copy of gobject-introspection - --force-fallback-for=glib - # Tell meson to make paths in pkgconfig files relative, because we arent doing an actual install - -Dpkgconfig.relocatable=true - - # We want as minimal a build as possible here to speed things up - # and reduce the risk of failures. - -Dglib:selinux=disabled - -Dglib:xattr=false - -Dglib:libmount=disabled - -Dglib:man-pages=disabled - -Dglib:dtrace=false - -Dglib:systemtap=false - -Dglib:sysprof=disabled - -Dglib:documentation=false - -Dglib:tests=false - -Dglib:installed_tests=false - -Dglib:nls=disabled - -Dglib:oss_fuzz=disabled - -Dglib:libelf=disabled - -Dglib:multiarch=false - ) - - ORIG_SOURCE_DIR=${EMESON_SOURCE} - EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} - - ORIG_BUILD_DIR=${BUILD_DIR} - BUILD_DIR=${INTROSPECTION_BUILD_DIR} - - pushd ${INTROSPECTION_SOURCE_DIR} || die - - meson_src_configure - meson_src_compile - # Install to the portage temp directory so that pkgconfig relative paths resolve correctly - meson_src_install --destdir "${T}" --skip-subprojects glib - - popd || die - - EMESON_SOURCE=${ORIG_SOURCE_DIR} - BUILD_DIR=${ORIG_BUILD_DIR} - - # Add gobject-introspection binaries and pkgconfig files to path - export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" - - # Override primary pkgconfig search paths to prioritize our internal copy - export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" - - # Set the normal primary pkgconfig search paths as secondary - # (We also need to prepend our just-built one for later use of - # g-ir-scanner to use the new one and to help workaround bugs like - # bug #946221.) - export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" - - # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them - for gliblib in glib gobject gthread gmodule gio girepository; do - export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" - done - - # Add the paths to the gobject-introspection python modules to python path so they can be imported - export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}" - fi - - use debug && EMESON_BUILD_TYPE=debug - - local emesonargs=( - -Ddefault_library=$(usex static-libs both shared) - -Druntime_dir="${EPREFIX}"/run - $(meson_feature selinux) - $(meson_use xattr) - -Dlibmount=enabled # only used if host_system == 'linux' - -Dman-pages=enabled - $(meson_use systemtap dtrace) - $(meson_use systemtap) - $(meson_feature sysprof) - $(meson_use doc documentation) - $(meson_use test tests) - -Dinstalled_tests=false - -Dnls=enabled - -Doss_fuzz=disabled - $(meson_native_use_feature elf libelf) - -Dmultiarch=false - $(meson_native_use_feature introspection) - ) - - # Workaround for bug #938302 - if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then - local native_file="${T}"/meson.${CHOST}.ini.local - cat >> ${native_file} <<-EOF || die - [binaries] - dtrace='stap-dtrace' - EOF - emesonargs+=( --native-file "${native_file}" ) - fi - - meson_src_configure -} - -multilib_src_test() { - export XDG_CONFIG_DIRS=/etc/xdg - export XDG_DATA_DIRS=/usr/local/share:/usr/share - # TODO: Use ${ABI} here to be unique for multilib? - export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" - export LC_TIME=C # bug #411967 - export TZ=UTC - unset GSETTINGS_BACKEND # bug #596380 - python_setup - - # https://bugs.gentoo.org/839807 - local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict /usr/b - - # Related test is a bit nitpicking - mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die - chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die - - meson_src_test --timeout-multiplier 20 --no-suite flaky -} - -multilib_src_install() { - meson_src_install - keepdir /usr/$(get_libdir)/gio/modules -} - -multilib_src_install_all() { - # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps - # and removals, and test depend on glib-utils instead; revisit now with - # meson - rm "${ED}/usr/bin/glib-genmarshal" || die - rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die - rm "${ED}/usr/bin/glib-mkenums" || die - rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die - rm "${ED}/usr/bin/gtester-report" || die - rm "${ED}/usr/share/man/man1/gtester-report.1" || die - # gdbus-codegen manpage installed by dev-util/gdbus-codegen - rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die -} - -pkg_preinst() { - xdg_pkg_preinst - - # Make gschemas.compiled belong to glib alone - local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"${cache} || die - fi - - multilib_pkg_preinst() { - # Make giomodule.cache belong to glib alone - local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"${cache} || die - else - touch "${ED}"${cache} || die - fi - } - - # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache - # file due to inability to create it and GIO might not look at any of the modules there - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_preinst - fi -} - -pkg_postinst() { - xdg_pkg_postinst - # glib installs no schemas itself, but we force update for fresh install in case - # something has dropped in a schemas file without direct glib dep; and for upgrades - # in case the compiled schema format could have changed - gnome2_schemas_update - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_postinst - else - ewarn "Updating of GIO modules cache skipped due to cross-compilation." - ewarn "You might want to run gio-querymodules manually on the target for" - ewarn "your final image for performance reasons and re-run it when packages" - ewarn "installing GIO modules get upgraded or added to the image." - fi - - for v in ${REPLACING_VERSIONS}; do - if ver_test "$v" "-lt" "2.63.6"; then - ewarn "glib no longer installs the gio-launch-desktop binary. You may need" - ewarn "to restart your session for \"Open With\" dialogs to work." - fi - done -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache || die - } - multilib_foreach_abi multilib_pkg_postrm - rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled || die - fi -} diff --git a/dev-libs/glib/glib-2.82.4-r1.ebuild b/dev-libs/glib/glib-2.82.4-r1.ebuild new file mode 100644 index 000000000000..ac8c41e59cfb --- /dev/null +++ b/dev-libs/glib/glib-2.82.4-r1.ebuild @@ -0,0 +1,437 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_REQ_USE="xml(+)" +PYTHON_COMPAT=( python3_{10..13} ) + +inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg + +DESCRIPTION="The GLib library of C routines" +HOMEPAGE="https://www.gtk.org/" + +INTROSPECTION_PN="gobject-introspection" +INTROSPECTION_PV="1.82.0" +INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}" +SRC_URI=" + ${SRC_URI} + introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} ) +" +INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}" +INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" + +LICENSE="LGPL-2.1+" +SLOT="2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" +IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" +RESTRICT="!test? ( test )" + +# * elfutils (via libelf) does not build on Windows. gresources are not embedded +# within ELF binaries on that platform anyway and inspecting ELF binaries from +# other platforms is not that useful so exclude the dependency in this case. +# * Technically static-libs is needed on zlib, util-linux and perhaps more, but +# these are used by GIO, which glib[static-libs] consumers don't really seem +# to need at all, thus not imposing the deps for now and once some consumers +# are actually found to static link libgio-2.0.a, we can revisit and either add +# them or just put the (build) deps in that rare consumer instead of recursive +# RDEPEND here (due to lack of recursive DEPEND). +RDEPEND=" + !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] + >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] + >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] + >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] + introspection? ( + >=dev-libs/gobject-introspection-common-${INTROSPECTION_PV} + ) + kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) + selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) + xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) + elf? ( virtual/libelf:0= ) + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) +" +DEPEND="${RDEPEND}" +# libxml2 used for optional tests that get automatically skipped +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + >=sys-devel/gettext-0.19.8 + doc? ( >=dev-util/gi-docgen-2023.1 ) + dev-python/docutils + systemtap? ( >=dev-debug/systemtap-1.3 ) + ${PYTHON_DEPS} + test? ( >=sys-apps/dbus-1.2.14 ) + virtual/pkgconfig + + introspection? ( + $(python_gen_any_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + virtual/pkgconfig + sys-devel/bison + app-alternatives/lex + ${PYTHON_DEPS} + ) +" +# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen + +PDEPEND=" + dbus? ( gnome-base/dconf ) + mime? ( x11-misc/shared-mime-info ) +" +# shared-mime-info needed for gio/xdgmime, bug #409481 +# dconf is needed to be able to save settings, bug #498436 + +MULTILIB_CHOST_TOOLS=( + /usr/bin/gio-querymodules$(get_exeext) +) + +PATCHES=( + "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch +) + +python_check_deps() { + if use introspection ; then + python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" + fi +} + +pkg_setup() { + if use kernel_linux ; then + CONFIG_CHECK="~INOTIFY_USER" + if use test ; then + CONFIG_CHECK="~IPV6" + WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." + fi + linux-info_pkg_setup + fi + python-any-r1_pkg_setup +} + +src_prepare() { + if use test; then + # TODO: Review the test exclusions, especially now with meson + # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 + if ! has_version dev-util/desktop-file-utils ; then + ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," + ewarn "think on installing it to get these tests run." + sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die + sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die + fi + + # gdesktopappinfo requires existing terminal (gnome-terminal or any + # other), falling back to xterm if one doesn't exist + #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then + # ewarn "Some tests will be skipped due to missing terminal program" + # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson + # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready + # for backport (or in a bump) and file new issue if still fails + sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die + # desktop-app-info/launch* might fail similarly + sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die + #fi + + # https://bugzilla.gnome.org/show_bug.cgi?id=722604 + sed -i -e "/timer\/stop/d" glib/tests/timer.c || die + sed -i -e "/timer\/basic/d" glib/tests/timer.c || die + + ewarn "Tests for search-utils have been skipped" + sed -i -e "/search-utils/d" glib/tests/meson.build || die + + # Play nice with network-sandbox, but this approach would defeat the purpose of the test + #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die + else + # Don't build tests, also prevents extra deps, bug #512022 + sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die + fi + + # Don't build fuzzing binaries - not used + sed -i -e '/subdir.*fuzzing/d' meson.build || die + + # gdbus-codegen is a separate package + sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die + sed -i -e '/install : true/d' gio/gdbus-2.0/codegen/meson.build || die + + # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon + sed -i -e '/install_dir/d' gio/tests/meson.build || die + + cat > "${T}/glib-test-ld-wrapper" <<-EOF + #!/usr/bin/env sh + exec \${LD:-ld} "\$@" + EOF + chmod a+x "${T}/glib-test-ld-wrapper" || die + sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die + + # make default sane for us + if use prefix ; then + sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die + # bug #308609, without path, bug #314057 + export PERL=perl + fi + + if [[ ${CHOST} == *-solaris* ]] ; then + # fix standards conflicts + sed -i \ + -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ + -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ + meson.build || die + sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ + glib/giounix.c || die + fi + + # disable native macOS integrations + sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ + meson.build || die + sed -i \ + -e '/AvailabilityMacros.h/d' \ + gio/giomodule.c || die + + # Link the glib source to the introspection subproject directory so it can be built there first + if use introspection ; then + ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib" + fi + + default + gnome2_environment_reset + # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only +} + +multilib_src_configure() { + # TODO: figure a way to pass appropriate values for all cross properties + # that glib uses (search for get_cross_property) + #if tc-is-cross-compiler ; then + # https://bugzilla.gnome.org/show_bug.cgi?id=756473 + # TODO-meson: This should be in meson cross file as 'growing_stack' + # property; and more, look at get_cross_property + #case ${CHOST} in + #hppa*|metag*) export glib_cv_stack_grows=yes ;; + #*) export glib_cv_stack_grows=no ;; + #esac + #fi + + # Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only) + if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then + einfo "Bootstrapping gobject-introspection..." + INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin" + INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)" + + local emesonargs=( + -Dpython="${EPYTHON}" + -Dbuild_introspection_data=true + # Build an internal copy of glib for the internal copy of gobject-introspection + --force-fallback-for=glib + # Tell meson to make paths in pkgconfig files relative, because we arent doing an actual install + -Dpkgconfig.relocatable=true + + # We want as minimal a build as possible here to speed things up + # and reduce the risk of failures. + -Dglib:selinux=disabled + -Dglib:xattr=false + -Dglib:libmount=disabled + -Dglib:man-pages=disabled + -Dglib:dtrace=false + -Dglib:systemtap=false + -Dglib:sysprof=disabled + -Dglib:documentation=false + -Dglib:tests=false + -Dglib:installed_tests=false + -Dglib:nls=disabled + -Dglib:oss_fuzz=disabled + -Dglib:libelf=disabled + -Dglib:multiarch=false + ) + + ORIG_SOURCE_DIR=${EMESON_SOURCE} + EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} + + # g-ir-scanner has some relocatable logic but it searches + # for 'lib', not 'lib64', so it can't find itself and eventually + # falls back to the system installation. See bug #946221. + sed -i -e "/^pylibdir =/s:'lib:'$(get_libdir):" "${EMESON_SOURCE}"/tools/g-ir-tool-template.in || die + + ORIG_BUILD_DIR=${BUILD_DIR} + BUILD_DIR=${INTROSPECTION_BUILD_DIR} + + pushd ${INTROSPECTION_SOURCE_DIR} || die + + meson_src_configure + meson_src_compile + # Install to the portage temp directory so that pkgconfig relative paths resolve correctly + meson_src_install --destdir "${T}" --skip-subprojects glib + + popd || die + + EMESON_SOURCE=${ORIG_SOURCE_DIR} + BUILD_DIR=${ORIG_BUILD_DIR} + + # Add gobject-introspection binaries and pkgconfig files to path + export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" + + # Override primary pkgconfig search paths to prioritize our internal copy + export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" + + # Set the normal primary pkgconfig search paths as secondary + # (We also need to prepend our just-built one for later use of + # g-ir-scanner to use the new one and to help workaround bugs like + # bug #946221.) + export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" + + # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them + for gliblib in glib gobject gthread gmodule gio girepository; do + export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" + done + + # Add the paths to the gobject-introspection python modules to python path so they can be imported + export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}" + fi + + # TODO: Can this be cleaned up now we have -Dglib_debug? (bug #946485) + use debug && EMESON_BUILD_TYPE=debug + + local emesonargs=( + -Ddefault_library=$(usex static-libs both shared) + -Druntime_dir="${EPREFIX}"/run + $(meson_feature debug glib_debug) + $(meson_feature selinux) + $(meson_use xattr) + -Dlibmount=enabled # only used if host_system == 'linux' + -Dman-pages=enabled + $(meson_use systemtap dtrace) + $(meson_use systemtap) + $(meson_feature sysprof) + $(meson_use doc documentation) + $(meson_use test tests) + -Dinstalled_tests=false + -Dnls=enabled + -Doss_fuzz=disabled + $(meson_native_use_feature elf libelf) + -Dmultiarch=false + $(meson_native_use_feature introspection) + ) + + # Workaround for bug #938302 + if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then + local native_file="${T}"/meson.${CHOST}.ini.local + cat >> ${native_file} <<-EOF || die + [binaries] + dtrace='stap-dtrace' + EOF + emesonargs+=( --native-file "${native_file}" ) + fi + + meson_src_configure +} + +multilib_src_test() { + export XDG_CONFIG_DIRS=/etc/xdg + export XDG_DATA_DIRS=/usr/local/share:/usr/share + # TODO: Use ${ABI} here to be unique for multilib? + export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" + export LC_TIME=C # bug #411967 + export TZ=UTC + unset GSETTINGS_BACKEND # bug #596380 + python_setup + + # https://bugs.gentoo.org/839807 + local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} + addpredict /usr/b + + # Related test is a bit nitpicking + mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die + + meson_src_test --timeout-multiplier 20 --no-suite flaky +} + +multilib_src_install() { + meson_src_install + keepdir /usr/$(get_libdir)/gio/modules +} + +multilib_src_install_all() { + # These are installed by dev-util/glib-utils + # TODO: With patching we might be able to get rid of the python-any deps + # and removals, and test depend on glib-utils instead; revisit now with + # meson + rm "${ED}/usr/bin/glib-genmarshal" || die + rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die + rm "${ED}/usr/bin/glib-mkenums" || die + rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die + rm "${ED}/usr/bin/gtester-report" || die + rm "${ED}/usr/share/man/man1/gtester-report.1" || die + # gdbus-codegen manpage installed by dev-util/gdbus-codegen + rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die +} + +pkg_preinst() { + xdg_pkg_preinst + + # Make gschemas.compiled belong to glib alone + local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"/${cache} || die + else + touch "${ED}"${cache} || die + fi + + multilib_pkg_preinst() { + # Make giomodule.cache belong to glib alone + local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" + + if [[ -e ${EROOT}${cache} ]]; then + cp "${EROOT}"${cache} "${ED}"${cache} || die + else + touch "${ED}"${cache} || die + fi + } + + # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache + # file due to inability to create it and GIO might not look at any of the modules there + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_preinst + fi +} + +pkg_postinst() { + xdg_pkg_postinst + # glib installs no schemas itself, but we force update for fresh install in case + # something has dropped in a schemas file without direct glib dep; and for upgrades + # in case the compiled schema format could have changed + gnome2_schemas_update + + multilib_pkg_postinst() { + gnome2_giomodule_cache_update \ + || die "Update GIO modules cache failed (for ${ABI})" + } + if ! tc-is-cross-compiler ; then + multilib_foreach_abi multilib_pkg_postinst + else + ewarn "Updating of GIO modules cache skipped due to cross-compilation." + ewarn "You might want to run gio-querymodules manually on the target for" + ewarn "your final image for performance reasons and re-run it when packages" + ewarn "installing GIO modules get upgraded or added to the image." + fi + + for v in ${REPLACING_VERSIONS}; do + if ver_test "$v" "-lt" "2.63.6"; then + ewarn "glib no longer installs the gio-launch-desktop binary. You may need" + ewarn "to restart your session for \"Open With\" dialogs to work." + fi + done +} + +pkg_postrm() { + xdg_pkg_postrm + gnome2_schemas_update + + if [[ -z ${REPLACED_BY_VERSION} ]]; then + multilib_pkg_postrm() { + rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache || die + } + multilib_foreach_abi multilib_pkg_postrm + rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled || die + fi +} diff --git a/dev-libs/glib/glib-2.82.4.ebuild b/dev-libs/glib/glib-2.82.4.ebuild deleted file mode 100644 index 16ca673a8268..000000000000 --- a/dev-libs/glib/glib-2.82.4.ebuild +++ /dev/null @@ -1,430 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 -PYTHON_REQ_USE="xml(+)" -PYTHON_COMPAT=( python3_{10..13} ) - -inherit gnome.org gnome2-utils linux-info meson-multilib multilib python-any-r1 toolchain-funcs xdg - -DESCRIPTION="The GLib library of C routines" -HOMEPAGE="https://www.gtk.org/" - -INTROSPECTION_PN="gobject-introspection" -INTROSPECTION_PV="1.82.0" -INTROSPECTION_P="${INTROSPECTION_PN}-${INTROSPECTION_PV}" -SRC_URI=" - ${SRC_URI} - introspection? ( mirror://gnome/sources/gobject-introspection/${INTROSPECTION_PV%.*}/gobject-introspection-${INTROSPECTION_PV}.tar.${GNOME_TARBALL_SUFFIX} ) -" -INTROSPECTION_SOURCE_DIR="${WORKDIR}/${INTROSPECTION_P}" -INTROSPECTION_BUILD_DIR="${WORKDIR}/${INTROSPECTION_P}-build" - -LICENSE="LGPL-2.1+" -SLOT="2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -IUSE="dbus debug +elf doc +introspection +mime selinux static-libs sysprof systemtap test utils xattr" -RESTRICT="!test? ( test )" - -# * elfutils (via libelf) does not build on Windows. gresources are not embedded -# within ELF binaries on that platform anyway and inspecting ELF binaries from -# other platforms is not that useful so exclude the dependency in this case. -# * Technically static-libs is needed on zlib, util-linux and perhaps more, but -# these are used by GIO, which glib[static-libs] consumers don't really seem -# to need at all, thus not imposing the deps for now and once some consumers -# are actually found to static link libgio-2.0.a, we can revisit and either add -# them or just put the (build) deps in that rare consumer instead of recursive -# RDEPEND here (due to lack of recursive DEPEND). -RDEPEND=" - !=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] - >=dev-libs/libpcre2-10.32:0=[${MULTILIB_USEDEP},unicode(+),static-libs?] - >=dev-libs/libffi-3.0.13-r1:=[${MULTILIB_USEDEP}] - >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] - >=virtual/libintl-0-r2[${MULTILIB_USEDEP}] - introspection? ( - >=dev-libs/gobject-introspection-common-${INTROSPECTION_PV} - ) - kernel_linux? ( >=sys-apps/util-linux-2.23[${MULTILIB_USEDEP}] ) - selinux? ( >=sys-libs/libselinux-2.2.2-r5[${MULTILIB_USEDEP}] ) - xattr? ( !elibc_glibc? ( >=sys-apps/attr-2.4.47-r1[${MULTILIB_USEDEP}] ) ) - elf? ( virtual/libelf:0= ) - sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) -" -DEPEND="${RDEPEND}" -# libxml2 used for optional tests that get automatically skipped -BDEPEND=" - app-text/docbook-xsl-stylesheets - dev-libs/libxslt - >=sys-devel/gettext-0.19.8 - doc? ( >=dev-util/gi-docgen-2023.1 ) - dev-python/docutils - systemtap? ( >=dev-debug/systemtap-1.3 ) - ${PYTHON_DEPS} - test? ( >=sys-apps/dbus-1.2.14 ) - virtual/pkgconfig - - introspection? ( - $(python_gen_any_dep ' - dev-python/setuptools[${PYTHON_USEDEP}] - ') - virtual/pkgconfig - sys-devel/bison - app-alternatives/lex - ${PYTHON_DEPS} - ) -" -# TODO: >=dev-util/gdbus-codegen-${PV} test dep once we modify gio/tests/meson.build to use external gdbus-codegen - -PDEPEND=" - dbus? ( gnome-base/dconf ) - mime? ( x11-misc/shared-mime-info ) -" -# shared-mime-info needed for gio/xdgmime, bug #409481 -# dconf is needed to be able to save settings, bug #498436 - -MULTILIB_CHOST_TOOLS=( - /usr/bin/gio-querymodules$(get_exeext) -) - -PATCHES=( - "${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch -) - -python_check_deps() { - if use introspection ; then - python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]" - fi -} - -pkg_setup() { - if use kernel_linux ; then - CONFIG_CHECK="~INOTIFY_USER" - if use test ; then - CONFIG_CHECK="~IPV6" - WARNING_IPV6="Your kernel needs IPV6 support for running some tests, skipping them." - fi - linux-info_pkg_setup - fi - python-any-r1_pkg_setup -} - -src_prepare() { - if use test; then - # TODO: Review the test exclusions, especially now with meson - # Disable tests requiring dev-util/desktop-file-utils when not installed, bug #286629, upstream bug #629163 - if ! has_version dev-util/desktop-file-utils ; then - ewarn "Some tests will be skipped due dev-util/desktop-file-utils not being present on your system," - ewarn "think on installing it to get these tests run." - sed -i -e "/appinfo\/associations/d" gio/tests/appinfo.c || die - sed -i -e "/g_test_add_func/d" gio/tests/desktop-app-info.c || die - fi - - # gdesktopappinfo requires existing terminal (gnome-terminal or any - # other), falling back to xterm if one doesn't exist - #if ! has_version x11-terms/xterm && ! has_version x11-terms/gnome-terminal ; then - # ewarn "Some tests will be skipped due to missing terminal program" - # These tests seem to sometimes fail even with a terminal; skip for now and reevulate with meson - # Also try https://gitlab.gnome.org/GNOME/glib/issues/1601 once ready - # for backport (or in a bump) and file new issue if still fails - sed -i -e "/appinfo\/launch/d" gio/tests/appinfo.c || die - # desktop-app-info/launch* might fail similarly - sed -i -e "/desktop-app-info\/launch-as-manager/d" gio/tests/desktop-app-info.c || die - #fi - - # https://bugzilla.gnome.org/show_bug.cgi?id=722604 - sed -i -e "/timer\/stop/d" glib/tests/timer.c || die - sed -i -e "/timer\/basic/d" glib/tests/timer.c || die - - ewarn "Tests for search-utils have been skipped" - sed -i -e "/search-utils/d" glib/tests/meson.build || die - - # Play nice with network-sandbox, but this approach would defeat the purpose of the test - #sed -i -e "s/localhost/127.0.0.1/g" gio/tests/gsocketclient-slow.c || die - else - # Don't build tests, also prevents extra deps, bug #512022 - sed -i -e '/subdir.*tests/d' {.,gio,glib}/meson.build || die - fi - - # Don't build fuzzing binaries - not used - sed -i -e '/subdir.*fuzzing/d' meson.build || die - - # gdbus-codegen is a separate package - sed -i -e '/install_dir/d' gio/gdbus-2.0/codegen/meson.build || die - sed -i -e '/install : true/d' gio/gdbus-2.0/codegen/meson.build || die - - # Same kind of meson-0.50 issue with some installed-tests files; will likely be fixed upstream soon - sed -i -e '/install_dir/d' gio/tests/meson.build || die - - cat > "${T}/glib-test-ld-wrapper" <<-EOF - #!/usr/bin/env sh - exec \${LD:-ld} "\$@" - EOF - chmod a+x "${T}/glib-test-ld-wrapper" || die - sed -i -e "s|'ld'|'${T}/glib-test-ld-wrapper'|g" gio/tests/meson.build || die - - # make default sane for us - if use prefix ; then - sed -i -e "s:/usr/local:${EPREFIX}/usr:" gio/xdgmime/xdgmime.c || die - # bug #308609, without path, bug #314057 - export PERL=perl - fi - - if [[ ${CHOST} == *-solaris* ]] ; then - # fix standards conflicts - sed -i \ - -e 's/\<\(_XOPEN_SOURCE_EXTENDED\)\>/_POSIX_PTHREAD_SEMANTICS/' \ - -e '/\<_XOPEN_SOURCE\>/s/\<2\>/600/' \ - meson.build || die - sed -i -e '/#define\s\+_POSIX_SOURCE/d' \ - glib/giounix.c || die - fi - - # disable native macOS integrations - sed -i -e '/glib_conf.set(.HAVE_\(CARBON\|COCOA\).,/s/true/false/' \ - meson.build || die - sed -i \ - -e '/AvailabilityMacros.h/d' \ - gio/giomodule.c || die - - # Link the glib source to the introspection subproject directory so it can be built there first - if use introspection ; then - ln -s "${S}" "${INTROSPECTION_SOURCE_DIR}/subprojects/glib" - fi - - default - gnome2_environment_reset - # TODO: python_name sedding for correct python shebang? Might be relevant mainly for glib-utils only -} - -multilib_src_configure() { - # TODO: figure a way to pass appropriate values for all cross properties - # that glib uses (search for get_cross_property) - #if tc-is-cross-compiler ; then - # https://bugzilla.gnome.org/show_bug.cgi?id=756473 - # TODO-meson: This should be in meson cross file as 'growing_stack' - # property; and more, look at get_cross_property - #case ${CHOST} in - #hppa*|metag*) export glib_cv_stack_grows=yes ;; - #*) export glib_cv_stack_grows=no ;; - #esac - #fi - - # Build internal copy of gobject-introspection to avoid circular dependency (Built for native abi only) - if multilib_native_use introspection && ! has_version ">=dev-libs/${INTROSPECTION_P}" ; then - einfo "Bootstrapping gobject-introspection..." - INTROSPECTION_BIN_DIR="${T}/${EPREFIX}/usr/bin" - INTROSPECTION_LIB_DIR="${T}/${EPREFIX}/usr/$(get_libdir)" - - local emesonargs=( - -Dpython="${EPYTHON}" - -Dbuild_introspection_data=true - # Build an internal copy of glib for the internal copy of gobject-introspection - --force-fallback-for=glib - # Tell meson to make paths in pkgconfig files relative, because we arent doing an actual install - -Dpkgconfig.relocatable=true - - # We want as minimal a build as possible here to speed things up - # and reduce the risk of failures. - -Dglib:selinux=disabled - -Dglib:xattr=false - -Dglib:libmount=disabled - -Dglib:man-pages=disabled - -Dglib:dtrace=false - -Dglib:systemtap=false - -Dglib:sysprof=disabled - -Dglib:documentation=false - -Dglib:tests=false - -Dglib:installed_tests=false - -Dglib:nls=disabled - -Dglib:oss_fuzz=disabled - -Dglib:libelf=disabled - -Dglib:multiarch=false - ) - - ORIG_SOURCE_DIR=${EMESON_SOURCE} - EMESON_SOURCE=${INTROSPECTION_SOURCE_DIR} - - ORIG_BUILD_DIR=${BUILD_DIR} - BUILD_DIR=${INTROSPECTION_BUILD_DIR} - - pushd ${INTROSPECTION_SOURCE_DIR} || die - - meson_src_configure - meson_src_compile - # Install to the portage temp directory so that pkgconfig relative paths resolve correctly - meson_src_install --destdir "${T}" --skip-subprojects glib - - popd || die - - EMESON_SOURCE=${ORIG_SOURCE_DIR} - BUILD_DIR=${ORIG_BUILD_DIR} - - # Add gobject-introspection binaries and pkgconfig files to path - export PATH="${INTROSPECTION_BIN_DIR}:${PATH}" - - # Override primary pkgconfig search paths to prioritize our internal copy - export PKG_CONFIG_LIBDIR="${INTROSPECTION_LIB_DIR}/pkgconfig:${INTROSPECTION_BUILD_DIR}/meson-private" - - # Set the normal primary pkgconfig search paths as secondary - # (We also need to prepend our just-built one for later use of - # g-ir-scanner to use the new one and to help workaround bugs like - # bug #946221.) - export PKG_CONFIG_PATH="${PKG_CONFIG_LIBDIR}:$(pkg-config --variable pc_path pkg-config)" - - # Add the paths to the built glib libraries to the library path so that gobject-introspection can load them - for gliblib in glib gobject gthread gmodule gio girepository; do - export LD_LIBRARY_PATH="${BUILD_DIR}/${gliblib}:${LD_LIBRARY_PATH}" - done - - # Add the paths to the gobject-introspection python modules to python path so they can be imported - export PYTHONPATH="${INTROSPECTION_LIB_DIR}/gobject-introspection:${PYTHONPATH}" - fi - - use debug && EMESON_BUILD_TYPE=debug - - local emesonargs=( - -Ddefault_library=$(usex static-libs both shared) - -Druntime_dir="${EPREFIX}"/run - $(meson_feature selinux) - $(meson_use xattr) - -Dlibmount=enabled # only used if host_system == 'linux' - -Dman-pages=enabled - $(meson_use systemtap dtrace) - $(meson_use systemtap) - $(meson_feature sysprof) - $(meson_use doc documentation) - $(meson_use test tests) - -Dinstalled_tests=false - -Dnls=enabled - -Doss_fuzz=disabled - $(meson_native_use_feature elf libelf) - -Dmultiarch=false - $(meson_native_use_feature introspection) - ) - - # Workaround for bug #938302 - if use systemtap && has_version "dev-debug/systemtap[-dtrace-symlink(+)]" ; then - local native_file="${T}"/meson.${CHOST}.ini.local - cat >> ${native_file} <<-EOF || die - [binaries] - dtrace='stap-dtrace' - EOF - emesonargs+=( --native-file "${native_file}" ) - fi - - meson_src_configure -} - -multilib_src_test() { - export XDG_CONFIG_DIRS=/etc/xdg - export XDG_DATA_DIRS=/usr/local/share:/usr/share - # TODO: Use ${ABI} here to be unique for multilib? - export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp" - export LC_TIME=C # bug #411967 - export TZ=UTC - unset GSETTINGS_BACKEND # bug #596380 - python_setup - - # https://bugs.gentoo.org/839807 - local -x SANDBOX_PREDICT=${SANDBOX_PREDICT} - addpredict /usr/b - - # Related test is a bit nitpicking - mkdir -p "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die - chmod 0700 "$G_DBUS_COOKIE_SHA1_KEYRING_DIR" || die - - meson_src_test --timeout-multiplier 20 --no-suite flaky -} - -multilib_src_install() { - meson_src_install - keepdir /usr/$(get_libdir)/gio/modules -} - -multilib_src_install_all() { - # These are installed by dev-util/glib-utils - # TODO: With patching we might be able to get rid of the python-any deps - # and removals, and test depend on glib-utils instead; revisit now with - # meson - rm "${ED}/usr/bin/glib-genmarshal" || die - rm "${ED}/usr/share/man/man1/glib-genmarshal.1" || die - rm "${ED}/usr/bin/glib-mkenums" || die - rm "${ED}/usr/share/man/man1/glib-mkenums.1" || die - rm "${ED}/usr/bin/gtester-report" || die - rm "${ED}/usr/share/man/man1/gtester-report.1" || die - # gdbus-codegen manpage installed by dev-util/gdbus-codegen - rm "${ED}/usr/share/man/man1/gdbus-codegen.1" || die -} - -pkg_preinst() { - xdg_pkg_preinst - - # Make gschemas.compiled belong to glib alone - local cache="/usr/share/glib-2.0/schemas/gschemas.compiled" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"/${cache} || die - else - touch "${ED}"${cache} || die - fi - - multilib_pkg_preinst() { - # Make giomodule.cache belong to glib alone - local cache="/usr/$(get_libdir)/gio/modules/giomodule.cache" - - if [[ -e ${EROOT}${cache} ]]; then - cp "${EROOT}"${cache} "${ED}"${cache} || die - else - touch "${ED}"${cache} || die - fi - } - - # Don't run the cache ownership when cross-compiling, as it would end up with an empty cache - # file due to inability to create it and GIO might not look at any of the modules there - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_preinst - fi -} - -pkg_postinst() { - xdg_pkg_postinst - # glib installs no schemas itself, but we force update for fresh install in case - # something has dropped in a schemas file without direct glib dep; and for upgrades - # in case the compiled schema format could have changed - gnome2_schemas_update - - multilib_pkg_postinst() { - gnome2_giomodule_cache_update \ - || die "Update GIO modules cache failed (for ${ABI})" - } - if ! tc-is-cross-compiler ; then - multilib_foreach_abi multilib_pkg_postinst - else - ewarn "Updating of GIO modules cache skipped due to cross-compilation." - ewarn "You might want to run gio-querymodules manually on the target for" - ewarn "your final image for performance reasons and re-run it when packages" - ewarn "installing GIO modules get upgraded or added to the image." - fi - - for v in ${REPLACING_VERSIONS}; do - if ver_test "$v" "-lt" "2.63.6"; then - ewarn "glib no longer installs the gio-launch-desktop binary. You may need" - ewarn "to restart your session for \"Open With\" dialogs to work." - fi - done -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update - - if [[ -z ${REPLACED_BY_VERSION} ]]; then - multilib_pkg_postrm() { - rm -f "${EROOT}"/usr/$(get_libdir)/gio/modules/giomodule.cache || die - } - multilib_foreach_abi multilib_pkg_postrm - rm -f "${EROOT}"/usr/share/glib-2.0/schemas/gschemas.compiled || die - fi -} diff --git a/dev-libs/intel-compute-runtime/Manifest b/dev-libs/intel-compute-runtime/Manifest index af7939c68419..19132245fa77 100644 --- a/dev-libs/intel-compute-runtime/Manifest +++ b/dev-libs/intel-compute-runtime/Manifest @@ -1,3 +1,3 @@ DIST intel-compute-runtime-24.35.30872.25.tar.gz 7375680 BLAKE2B 8aede769b46ecdb2eb49346bc87c1e58fbefa382e80419a301b00197fbdc977f62b001e7670a912a28c736aafc59e60d45a4c4d3e61331d6001307c184d3a4b8 SHA512 4e09f432f1f3a7f8c3b9a7bbd6981f2b26a837fc6f6b4459d21bb51fcce94a3c95726d23fb77be2664c7fbdf4dd270e1ec21af1bc815e718a5df865e8bbdac03 -EBUILD intel-compute-runtime-24.35.30872.25.ebuild 2003 BLAKE2B b3a02def5ebc4a8a5afa9207322eb6628c431a3d6325b1d540be9b9c1ab2b3f3c8d6c3e3648adf6a1160223d35fd45f71d94a482d9117cb216951d31ba783625 SHA512 265e802d96fd5e3ded0ba47b87521070cc255d337097bafe8acaf972a665107aeae25346c8e6a187facfb58ac0f878a41ff044a7d1b00d82bd85c12a19fdb6f6 +EBUILD intel-compute-runtime-24.35.30872.25-r1.ebuild 2047 BLAKE2B b890ad5021719f3dac0e874c5b1a21a6b063634b33401282f23a7e98b2ecff534a18551fd560e1063327039a725095666eca0355dc6ab22913882cf11f87dd2a SHA512 2fcc67b63a59f7547a085a6ab4296d61b3ae84a79852f3b37706aa60f44c2041c9f88dbd7b4f04eee2faed52456e789cab4577f97ee101347d091a3770b60fb5 MISC metadata.xml 1429 BLAKE2B 6c2fde2fda8cd6b9d707c400c5b4d38e3d74dd73617faa9dd80f84100d499182ea959e695a473d32307914e76a26bae531a92677f0e4bedbdf05fc1cbd3095ff SHA512 ac61568ad36df6f6c8470b43f32d048930e4a569ec86d58ff563a86ae748f6bddb8700de487e4967da4998160f1c01517be0817cccc445a821984aff36617b6d diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25-r1.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25-r1.ebuild new file mode 100644 index 000000000000..341100484c5f --- /dev/null +++ b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25-r1.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +CMAKE_BUILD_TYPE="Release" +MY_PN="${PN/intel-/}" +MY_P="${MY_PN}-${PV}" + +inherit cmake flag-o-matic + +DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver" +HOMEPAGE="https://github.com/intel/compute-runtime" +SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${MY_P}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="amd64" +IUSE="+l0 +vaapi" + +RDEPEND=" + >=dev-util/intel-graphics-compiler-1.0.17657.8 + >=media-libs/gmmlib-22.5.2:= +" + +DEPEND=" + ${RDEPEND} + dev-libs/intel-metrics-discovery:= + >=dev-libs/intel-metrics-library-1.0.173:= + dev-libs/libnl:3 + dev-libs/libxml2:2 + >=dev-util/intel-graphics-system-controller-0.9.3:= + media-libs/mesa + >=virtual/opencl-3 + l0? ( >=dev-libs/level-zero-1.17.42:= ) + vaapi? ( + x11-libs/libdrm[video_cards_intel] + media-libs/libva + ) +" + +BDEPEND="virtual/pkgconfig" + +DOCS=( "README.md" "FAQ.md" ) + +src_prepare() { + # Remove '-Werror' from default + sed -e '/Werror/d' -i CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + # Filtered for two reasons: + # 1) https://github.com/intel/compute-runtime/issues/528 + # 2) bug #930199 + filter-lto + + local mycmakeargs=( + -DCCACHE_ALLOWED="OFF" + -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" + -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" + -DBUILD_WITH_L0="$(usex l0)" + -DDISABLE_LIBVA="$(usex !vaapi)" + -DNEO_ALLOW_LEGACY_PLATFORMS_SUPPORT="ON" + -DNEO_DISABLE_LTO="ON" + -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include" + -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include" + -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors" + -DSUPPORT_DG1="ON" + -Wno-dev + + # See https://github.com/intel/intel-graphics-compiler/issues/204 + # -DNEO_DISABLE_BUILTINS_COMPILATION="ON" + + # If enabled, tests are automatically run during + # the compile phase and we cannot run them because + # they require permissions to access the hardware. + -DSKIP_UNIT_TESTS="1" + ) + + cmake_src_configure +} diff --git a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25.ebuild b/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25.ebuild deleted file mode 100644 index 26093c05fb99..000000000000 --- a/dev-libs/intel-compute-runtime/intel-compute-runtime-24.35.30872.25.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_BUILD_TYPE="Release" -MY_PN="${PN/intel-/}" -MY_P="${MY_PN}-${PV}" - -inherit cmake flag-o-matic - -DESCRIPTION="Intel Graphics Compute Runtime for oneAPI Level Zero and OpenCL Driver" -HOMEPAGE="https://github.com/intel/compute-runtime" -SRC_URI="https://github.com/intel/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${MY_P}" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64" -IUSE="+l0 +vaapi" - -RDEPEND=" - >=dev-util/intel-graphics-compiler-1.0.17657.8 - >=media-libs/gmmlib-22.5.2:= -" - -DEPEND=" - ${RDEPEND} - dev-libs/intel-metrics-discovery:= - >=dev-libs/intel-metrics-library-1.0.173:= - dev-libs/libnl:3 - dev-libs/libxml2:2 - >=dev-util/intel-graphics-system-controller-0.9.3:= - media-libs/mesa - >=virtual/opencl-3 - l0? ( >=dev-libs/level-zero-1.17.42:= ) - vaapi? ( - x11-libs/libdrm[video_cards_intel] - media-libs/libva - ) -" - -BDEPEND="virtual/pkgconfig" - -DOCS=( "README.md" "FAQ.md" ) - -src_prepare() { - # Remove '-Werror' from default - sed -e '/Werror/d' -i CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # Filtered for two reasons: - # 1) https://github.com/intel/compute-runtime/issues/528 - # 2) bug #930199 - filter-lto - - local mycmakeargs=( - -DCCACHE_ALLOWED="OFF" - -DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr" - -DCMAKE_INSTALL_LIBDIR="$(get_libdir)" - -DBUILD_WITH_L0="$(usex l0)" - -DDISABLE_LIBVA="$(usex !vaapi)" - -DNEO_DISABLE_LTO="ON" - -DNEO__METRICS_LIBRARY_INCLUDE_DIR="${ESYSROOT}/usr/include" - -DKHRONOS_GL_HEADERS_DIR="${ESYSROOT}/usr/include" - -DOCL_ICD_VENDORDIR="${EPREFIX}/etc/OpenCL/vendors" - -DSUPPORT_DG1="ON" - -Wno-dev - - # See https://github.com/intel/intel-graphics-compiler/issues/204 - # -DNEO_DISABLE_BUILTINS_COMPILATION="ON" - - # If enabled, tests are automatically run during - # the compile phase and we cannot run them because - # they require permissions to access the hardware. - -DSKIP_UNIT_TESTS="1" - ) - - cmake_src_configure -} diff --git a/dev-libs/libmodbus/Manifest b/dev-libs/libmodbus/Manifest index f1b80e6e4503..6a9c9c9a5b03 100644 --- a/dev-libs/libmodbus/Manifest +++ b/dev-libs/libmodbus/Manifest @@ -2,5 +2,5 @@ AUX libmodbus-3.1.11-cflags.patch 297 BLAKE2B a4710989cb7b8b7719c7fad3de8c7fdcba DIST libmodbus-3.1.10.tar.gz 463325 BLAKE2B ea1c54e52f0927e9e97b2303b35925d6a40b30f1eed881eeed2d05a229c858ebdde6212431699e24a331744b30f447dfe6704c7ca0d4eb73d193ae5b5055c4b3 SHA512 d9a56d2cd3285823b287b6bf4f79741f2e626e09cfc1872405a306e8dcc0f64c15695e8aee45614071c615cd248b87293ef2351c830120a515d28303bad0ccee DIST libmodbus-3.1.11.tar.gz 478276 BLAKE2B 7fb6c5cc05bca71067b377211da78046abefb9bd74c8f0f0c567324ea7c874d7aa509e2d67f9a1fd9288719e87fdbca280cf4d5612e222f1ef0ef613b2fae988 SHA512 76192230c548640b0954b471aa5d346488115d0690bd932370814f442de56c4316002a5f0288f5955a4b396168ebe7c463a40a029e57df16c7fa4b3d83af6acb EBUILD libmodbus-3.1.10.ebuild 690 BLAKE2B adf47b3463e698daba8b23f060243ea71aa464252fad1e77c401647a1a20e71ee0c5b361410af6aabe8aa8803d30a08fcbf899458ce657cd8b59606824081115 SHA512 23ad79d565fa84c21a337a61405c6cf911e06f4f753092fd58f9b64f1a0cb6ec444601303f2290d405af031792a509e4ecafb803dff3723f237c21faa843e5fc -EBUILD libmodbus-3.1.11-r1.ebuild 804 BLAKE2B d30e9953368eb6c99b2071376ff2317312ad596a94093b0ae366a95431f61b12a7022a94316598cf2e664c9400b3173dae8cdbbdcd24f656f73d409c5cdc2fa1 SHA512 5d3af5fe07d0a6bfa3e106ed0fe31521e7aa0e81a1a13403766c0d8f671b44653320fd4dbab960408f0af30145bdfdd71bf92f1a12486c1d4e355a4dc860f8af +EBUILD libmodbus-3.1.11-r1.ebuild 803 BLAKE2B 27fda707c512d50f93406fdf74b4f31c8999f035e0b24b5899e878105f279cc727a6c150073c41cb6ce40d19e066d70032f4da0f4693518681e68b257d70f997 SHA512 9805cda0f49701e5471f4a0232b11b6b04271d4299882d743605f5fb271e3ea9d42ec84c2d31286967493db5d210b7bf0ab31f2c1c5762ac57ee0f349a764790 MISC metadata.xml 400 BLAKE2B 13cbac9e5f8b0b4af1330ef236dff85b8d3f167cabb19979942fa610c525c9d0b532e5c6a359f716ab198872f622dbbbe9575fc1ab53f82b8abe8e4996e6d921 SHA512 248080a171c05cca240271d8dc3e7cd0b30e78100697dddf0a0d8216d4d0c42abc9c52731b0abaa5de9dbacf9c402ada6e1b406699b7eefdb0ede78717d587c5 diff --git a/dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild b/dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild index 65ff23423f4d..1fdfa0e1065b 100644 --- a/dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild +++ b/dev-libs/libmodbus/libmodbus-3.1.11-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/stephane/${PN}/releases/download/v${PV}/${P}.tar.gz" LICENSE="LGPL-3" SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 arm ~arm64 ~ppc ppc64 ~riscv x86" IUSE="static-libs test" RESTRICT="!test? ( test )" diff --git a/dev-libs/weston/Manifest b/dev-libs/weston/Manifest index e90e433f9eef..e9ebac2ff5b5 100644 --- a/dev-libs/weston/Manifest +++ b/dev-libs/weston/Manifest @@ -7,6 +7,6 @@ DIST weston-13.0.3.tar.xz 1986952 BLAKE2B cc3e2be9f1fbcbfd45c9e75a9a34bbb7cd7525 DIST weston-14.0.1.tar.xz 2043220 BLAKE2B 0129b0ca24d912fd7b0155f77ecbcb53c39ae7e761e79f45aa47eb66b729d798365c041f53079410b7e0913cf09b93ec2155f27a7cf5a6d82d6cbd7e1fb3d703 SHA512 2d782f98f28b39b990acecfc885f62ab34c9cdd22ef06b09c5d8df792112c47b365f89c2bf05d871e36ddfb4c49aa7e6d05ff60fe67a2657727162e4f564a412 EBUILD weston-13.0.0-r4.ebuild 3900 BLAKE2B e25a59fc19fc49062d60d3019e177a013b8ae6904217fc22d8d6ddc0d5ced4f3f275529400914478b0963ca5bf88398a3ae56cd1a4e23d3620a77e75f4c7b491 SHA512 10c7c387c7cfcb348d076bf60714b0c6d503a93526c7238c28a113dc92bd85bf53105718cf57c6430d5074ece581a66399db6841465a2e012c2b4fcb4de52ef5 EBUILD weston-13.0.3-r2.ebuild 3794 BLAKE2B 3f654b5be3cb3f32f5f0d8956c2d8b30fb0a2165aea3b5fe3b077023b4d9739a98b7e9f60ede679bddd44b6302ce0ff30d081acae49678be0d7083e242fff4da SHA512 759a67316eb5bfa8b20940a8df82f885ebd7301f429056d5ef44362703178b1f97e0a69ce318e0eff01f259ccd9d74585f542c94b682e999692c1b18e8a939cb -EBUILD weston-14.0.1.ebuild 3767 BLAKE2B 17894164513e3fd16e888639f8a20bd69c6de373e2e3c3fcf0ba78b7e11e963c9d209de5b7a83276819a86c191d247bb5a3a793e3330aae9b9d51b666519fd1d SHA512 5e42c5c71229ad9bfbb8415b3d53e0a4c2d0cbb196eda76fe09f6e808d49950de684ca19c35acf64e89ec2e361344ae86c05cdeff3f1149478b4fcc8bc81c870 -EBUILD weston-9999.ebuild 3694 BLAKE2B 54c79d4c39f1cc19383177a998c30c6f06a9f7a1640a3b96bcb278b766009df6e5e5b7486acf6eacd1cc1a1c42b4496f48f5e15565ca1f3283a65d4497d76d57 SHA512 78eabab467eef65dd8ff1c21601e51505cc01942ceb9fe772def3e5506e3691c317b81c8c9fcba18c8de616170d6cddd06f25141d533f7196a61cc0b5928a97b +EBUILD weston-14.0.1-r1.ebuild 3766 BLAKE2B d506ecc97b1050abe63c62fe0cbf49e3b15802a222885d6245b752edcd214b28aea562626af6da227b1affc4aa2f0757cd33ce270179135efc40866e9c8f8c0c SHA512 a196f929dfe68c417fb89fb4d7818f6aca420724cffcbb39e9608bf1962753cc298e5c4cf01225487fca267e08d229fbcdf15e064859a706ebe7ff25d504466d +EBUILD weston-9999.ebuild 3693 BLAKE2B fba564d7047f9acec583ca895d4fd2f820297004be871f11aacfa99301bfe246ab5b16674689928735b0fc04bd9df55a2f544238fa4e5dbca202f9d4cbba70c3 SHA512 f89d7ba463c4f78c7d225063c139c1963589e24bcd565f67f7006326ba63208dc1b4ded0096f35ba23b1e13b2c4203ae58ee7e7c7a0054652d06a4b7e57f9a49 MISC metadata.xml 1512 BLAKE2B 9601dd1e3a3f977f92597a498a03eb819ea19b7a8434b3a0b27c138a5f9a6aa6f0642d82c1817797a57ff576e4058f7d54cf62e3ac5b5069a844f017fb47f5a7 SHA512 fc88d3a27063106d9c554253dceb65b9e6aa6207a502b4c6cb865c9529685b738e88b7fb84258201193248d0e6060cc84bc8a29661fdb71194fe499dbb0cae57 diff --git a/dev-libs/weston/weston-14.0.1-r1.ebuild b/dev-libs/weston/weston-14.0.1-r1.ebuild new file mode 100644 index 000000000000..c8aa006e2454 --- /dev/null +++ b/dev-libs/weston/weston-14.0.1-r1.ebuild @@ -0,0 +1,147 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +if [[ ${PV} = 9999* ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git" + GIT_ECLASS="git-r3" + EXPERIMENTAL="true" +fi + +PYTHON_COMPAT=( python3_{10..13} ) +inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS} + +DESCRIPTION="Wayland reference compositor" +HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston" + +if [[ ${PV} = *9999* ]]; then + SRC_URI="${SRC_PATCHES}" +else + SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" +fi + +LICENSE="MIT CC-BY-SA-3.0" +SLOT="0" + +IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + drm? ( gles2 ) + pipewire? ( drm ) + remoting? ( drm gles2 ) + screen-sharing? ( rdp ) + test? ( desktop headless lcms xwayland ) + wayland-compositor? ( gles2 ) + || ( drm headless rdp vnc wayland-compositor X ) +" + +RDEPEND=" + >=dev-libs/libinput-1.2.0 + >=dev-libs/wayland-1.22.0 + media-libs/libpng:0= + sys-auth/seatd:= + >=x11-libs/cairo-1.11.3 + >=x11-libs/libdrm-2.4.108 + >=x11-libs/libxkbcommon-0.5.0 + >=x11-libs/pixman-0.25.2 + x11-misc/xkeyboard-config + drm? ( + =media-libs/mesa-17.1[gbm(+)] + >=sys-libs/mtdev-1.1.0 + >=virtual/udev-136 + ) + editor? ( x11-libs/pango ) + examples? ( x11-libs/pango ) + gles2? ( media-libs/libglvnd ) + jpeg? ( media-libs/libjpeg-turbo:0= ) + lcms? ( >=media-libs/lcms-2.9:2 ) + pipewire? ( >=media-video/pipewire-0.3:= ) + rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) + remoting? ( + media-libs/gstreamer:1.0 + media-libs/gst-plugins-base:1.0 + ) + systemd? ( sys-apps/systemd ) + vnc? ( + =dev-libs/aml-0.3* + =gui-libs/neatvnc-0.8* + sys-libs/pam + ) + webp? ( media-libs/libwebp:0= ) + X? ( + >=x11-libs/libxcb-1.9 + x11-libs/libX11 + ) + xwayland? ( + x11-base/xwayland + x11-libs/cairo[X,xcb(+)] + >=x11-libs/libxcb-1.9 + x11-libs/libXcursor + >=x11-libs/xcb-util-cursor-0.1.4 + ) +" +DEPEND="${RDEPEND} + >=dev-libs/wayland-protocols-1.33 +" +BDEPEND=" + ${PYTHON_DEPS} + dev-util/wayland-scanner + virtual/pkgconfig +" + +PATCHES=( + "${FILESDIR}"/${PN}-kiosk-test.patch +) + +src_configure() { + local emesonargs=( + $(meson_use drm backend-drm) + -Dbackend-drm-screencast-vaapi=false + $(meson_use headless backend-headless) + $(meson_use pipewire backend-pipewire) + $(meson_use rdp backend-rdp) + $(meson_use screen-sharing screenshare) + $(meson_use vnc backend-vnc) + $(meson_use wayland-compositor backend-wayland) + $(meson_use X backend-x11) + -Dbackend-default=auto + $(meson_use gles2 renderer-gl) + $(meson_use xwayland) + $(meson_use systemd) + $(meson_use remoting) + $(meson_use pipewire) + $(meson_use desktop shell-desktop) + $(meson_use fullscreen shell-fullscreen) + $(meson_use ivi shell-ivi) + $(meson_use kiosk shell-kiosk) + $(meson_use lcms color-management-lcms) + $(meson_use jpeg image-jpeg) + $(meson_use webp image-webp) + -Dtools=debug,info,terminal + $(meson_use examples demo-clients) + -Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "") + $(meson_use resize-optimization resize-pool) + $(meson_use test tests) + -Dtest-junit-xml=false + "${myconf[@]}" + ) + meson_src_configure +} + +src_test() { + xdg_environment_reset + addwrite /dev/dri/ + + # xwayland test can fail if X11 socket already exists. + cd "${BUILD_DIR}" || die + meson test $(meson test --list | grep -Exv "xwayland") || die +} + +src_install() { + meson_src_install + readme.gentoo_create_doc +} diff --git a/dev-libs/weston/weston-14.0.1.ebuild b/dev-libs/weston/weston-14.0.1.ebuild deleted file mode 100644 index 562deb26dca7..000000000000 --- a/dev-libs/weston/weston-14.0.1.ebuild +++ /dev/null @@ -1,147 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -if [[ ${PV} = 9999* ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/wayland/weston.git" - GIT_ECLASS="git-r3" - EXPERIMENTAL="true" -fi - -PYTHON_COMPAT=( python3_{10..13} ) -inherit meson python-any-r1 readme.gentoo-r1 xdg-utils ${GIT_ECLASS} - -DESCRIPTION="Wayland reference compositor" -HOMEPAGE="https://wayland.freedesktop.org/ https://gitlab.freedesktop.org/wayland/weston" - -if [[ ${PV} = *9999* ]]; then - SRC_URI="${SRC_PATCHES}" -else - SRC_URI="https://gitlab.freedesktop.org/wayland/${PN}/-/releases/${PV}/downloads/${P}.tar.xz" - KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86" -fi - -LICENSE="MIT CC-BY-SA-3.0" -SLOT="0" - -IUSE="+desktop +drm editor examples fullscreen +gles2 headless ivi jpeg kiosk lcms pipewire rdp remoting +resize-optimization screen-sharing +suid systemd test vnc wayland-compositor webp +X xwayland" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - drm? ( gles2 ) - pipewire? ( drm ) - remoting? ( drm gles2 ) - screen-sharing? ( rdp ) - test? ( desktop headless lcms xwayland ) - wayland-compositor? ( gles2 ) - || ( drm headless rdp vnc wayland-compositor X ) -" - -RDEPEND=" - >=dev-libs/libinput-1.2.0 - >=dev-libs/wayland-1.22.0 - media-libs/libpng:0= - sys-auth/seatd:= - >=x11-libs/cairo-1.11.3 - >=x11-libs/libdrm-2.4.108 - >=x11-libs/libxkbcommon-0.5.0 - >=x11-libs/pixman-0.25.2 - x11-misc/xkeyboard-config - drm? ( - =media-libs/mesa-17.1[gbm(+)] - >=sys-libs/mtdev-1.1.0 - >=virtual/udev-136 - ) - editor? ( x11-libs/pango ) - examples? ( x11-libs/pango ) - gles2? ( media-libs/libglvnd ) - jpeg? ( media-libs/libjpeg-turbo:0= ) - lcms? ( >=media-libs/lcms-2.9:2 ) - pipewire? ( >=media-video/pipewire-0.3:= ) - rdp? ( >=net-misc/freerdp-2.3.0:2=[server] ) - remoting? ( - media-libs/gstreamer:1.0 - media-libs/gst-plugins-base:1.0 - ) - systemd? ( sys-apps/systemd ) - vnc? ( - =dev-libs/aml-0.3* - =gui-libs/neatvnc-0.8* - sys-libs/pam - ) - webp? ( media-libs/libwebp:0= ) - X? ( - >=x11-libs/libxcb-1.9 - x11-libs/libX11 - ) - xwayland? ( - x11-base/xwayland - x11-libs/cairo[X,xcb(+)] - >=x11-libs/libxcb-1.9 - x11-libs/libXcursor - >=x11-libs/xcb-util-cursor-0.1.4 - ) -" -DEPEND="${RDEPEND} - >=dev-libs/wayland-protocols-1.33 -" -BDEPEND=" - ${PYTHON_DEPS} - dev-util/wayland-scanner - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-kiosk-test.patch -) - -src_configure() { - local emesonargs=( - $(meson_use drm backend-drm) - -Dbackend-drm-screencast-vaapi=false - $(meson_use headless backend-headless) - $(meson_use pipewire backend-pipewire) - $(meson_use rdp backend-rdp) - $(meson_use screen-sharing screenshare) - $(meson_use vnc backend-vnc) - $(meson_use wayland-compositor backend-wayland) - $(meson_use X backend-x11) - -Dbackend-default=auto - $(meson_use gles2 renderer-gl) - $(meson_use xwayland) - $(meson_use systemd) - $(meson_use remoting) - $(meson_use pipewire) - $(meson_use desktop shell-desktop) - $(meson_use fullscreen shell-fullscreen) - $(meson_use ivi shell-ivi) - $(meson_use kiosk shell-kiosk) - $(meson_use lcms color-management-lcms) - $(meson_use jpeg image-jpeg) - $(meson_use webp image-webp) - -Dtools=debug,info,terminal - $(meson_use examples demo-clients) - -Dsimple-clients=$(usex examples damage,dmabuf-v4l,im,shm,touch$(usex gles2 ,dmabuf-egl,egl "") "") - $(meson_use resize-optimization resize-pool) - $(meson_use test tests) - -Dtest-junit-xml=false - "${myconf[@]}" - ) - meson_src_configure -} - -src_test() { - xdg_environment_reset - addwrite /dev/dri/ - - # xwayland test can fail if X11 socket already exists. - cd "${BUILD_DIR}" || die - meson test $(meson test --list | grep -Exv "xwayland") || die -} - -src_install() { - meson_src_install - readme.gentoo_create_doc -} diff --git a/dev-libs/weston/weston-9999.ebuild b/dev-libs/weston/weston-9999.ebuild index 926c3adacbbe..0451f05d9271 100644 --- a/dev-libs/weston/weston-9999.ebuild +++ b/dev-libs/weston/weston-9999.ebuild @@ -60,7 +60,7 @@ RDEPEND=" jpeg? ( media-libs/libjpeg-turbo:0= ) lcms? ( >=media-libs/lcms-2.9:2 ) pipewire? ( >=media-video/pipewire-0.3:= ) - rdp? ( >=net-misc/freerdp-2.3.0:2=[server] ) + rdp? ( >=net-misc/freerdp-2.3.0:=[server] ) remoting? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 -- cgit v1.2.3