From 60f657b5e6155f26601c7def7baa11cee72246d0 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 1 Feb 2023 21:05:47 +0000 Subject: gentoo auto-resync : 01:02:2023 - 21:05:47 --- media-libs/Manifest.gz | Bin 68090 -> 68082 bytes media-libs/libpulse/Manifest | 2 +- media-libs/libpulse/libpulse-16.1-r2.ebuild | 2 +- media-libs/libtgvoip/Manifest | 2 - .../libtgvoip/libtgvoip-2.4.4_p20220117.ebuild | 63 --- media-libs/mesa/Manifest | 4 +- media-libs/mesa/mesa-23.0.0_rc3.ebuild | 465 +++++++++++++++++++++ media-libs/mesa/mesa-9999.ebuild | 2 - media-libs/noise-suppression-for-voice/Manifest | 2 - ...oise-suppression-for-voice-0.9_p20200705.ebuild | 38 -- media-libs/tg_owt/Manifest | 5 - ...g_owt-0_pre20211207-fix-dcsctp-references.patch | 17 - .../tg_owt-0_pre20220209-allow-disabling-X11.patch | 117 ------ .../tg_owt-0_pre20220209-gcc-12-cstddef.patch | 20 - media-libs/tg_owt/tg_owt-0_pre20220209.ebuild | 118 ------ 15 files changed, 470 insertions(+), 387 deletions(-) delete mode 100644 media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild create mode 100644 media-libs/mesa/mesa-23.0.0_rc3.ebuild delete mode 100644 media-libs/noise-suppression-for-voice/noise-suppression-for-voice-0.9_p20200705.ebuild delete mode 100644 media-libs/tg_owt/files/tg_owt-0_pre20211207-fix-dcsctp-references.patch delete mode 100644 media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch delete mode 100644 media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstddef.patch delete mode 100644 media-libs/tg_owt/tg_owt-0_pre20220209.ebuild (limited to 'media-libs') diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz index dd1371eabeed..9615700b81bc 100644 Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ diff --git a/media-libs/libpulse/Manifest b/media-libs/libpulse/Manifest index 37114fb00647..a8d44fdf0e57 100644 --- a/media-libs/libpulse/Manifest +++ b/media-libs/libpulse/Manifest @@ -2,5 +2,5 @@ AUX pulseaudio-16.1-memfd-cleanup.patch 988 BLAKE2B cbb25ef86099e1c13bd07c33c871 AUX pulseaudio-16.1-proplist-util-without-gdkx.patch 1486 BLAKE2B 74b6ed59dff2ab4c62bab9e218874ff4da1d651f8ff80d715965b7be61323d77436851f6f2ffb9f8667c9ee918d6eca315fea3f6fe2670798f1ef6ed58728a3c SHA512 a5b5ac40083237ea0cd916506eb490891937affc1d69f81399a6a1f8f0782ebe9654641463ab33931add749282880ab415dbf0f89bd1a1d6a0f88f2845886d13 DIST pulseaudio-16.1.tar.xz 1545596 BLAKE2B 535706abcea2cae39834b23c8bdc37f71b0e633de2d8e43ea4425da97a850b57c2f980c318681cbc86cf1e746200609dad41f8b96ecf4568f86d94aa6831c9a1 SHA512 33b0b4292f05e0882f3ec822cf5720414bb34c523d80fe287b9740d6be219787c562e8024c9b0d9e2ee010771ca72c7ae4f27df1bbef9c9cb6bb6a23cbcc412f EBUILD libpulse-16.1-r1.ebuild 5779 BLAKE2B 4477cae3655af8ea4d2e0917cfe3fa4821f824affbefe77ee23f4d560e5c68bc1a8ac15c2fc94682311d466301afd0d9fea6e22e2cf4bf2016a1e1c090e876a9 SHA512 c4b40281466a4284128b5143c7e27ac30c198b562c79f1efe6c828ba9571d73d5d76c1821eda47fe8b6c978a14e15eeef9e0c5abce1cf71a300ad772886d58f4 -EBUILD libpulse-16.1-r2.ebuild 5899 BLAKE2B fea4eb8a65cf64d7fa9eaf2416434fa1d5c5eb372242c80b7c65dac67e28a2d8d497d8591d8039b0be2df276df3c0e85bdc1ea3288259fad7afc1377dd8b5a4a SHA512 e93f119cf47b505049a4010b793890a2ad2496a9ed87c7dcfb42bc49e558fdf560a9a406abf102090dae3fa56cee7a7a9ce731f6384e65106f759f58944d239b +EBUILD libpulse-16.1-r2.ebuild 5898 BLAKE2B 553dbd8f3b0a24970c69c0e12f2a2c3cbe977dec6458dad3d822bdfcec3e6930c5585f8e55073504a4123e1f0c459052fbc353c5e367d8c44cb4a1ccd29a7995 SHA512 e2adb4e4213ed449521f2297cd0e59be10ede401b2693bdb1d0c7368bee0375b261d779f360a520cc45d1fc855c6d2ff25ce1c0e65c6c10f78b12726dea7baa7 MISC metadata.xml 925 BLAKE2B 00eb044359e5cbbaa5fdd085a76be9582c1142dc7334ebcfca531975961bbe35bd4d7a3b1f06e760126b0422614103480c1199128a908567dbe477af017f5ae7 SHA512 9c244a9725fa5acf9d1c3e869cd794d0d70dbe29126af877ea5918adf12c9ebfe87576c074db8126d168368ca93bb0e5577912780eb467377ef58d4cf44895bb diff --git a/media-libs/libpulse/libpulse-16.1-r2.ebuild b/media-libs/libpulse/libpulse-16.1-r2.ebuild index af07b6423020..98ced2602c91 100644 --- a/media-libs/libpulse/libpulse-16.1-r2.ebuild +++ b/media-libs/libpulse/libpulse-16.1-r2.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]]; then EGIT_REPO_URI="https://gitlab.freedesktop.org/pulseaudio/pulseaudio" else SRC_URI="https://freedesktop.org/software/pulseaudio/releases/${MY_P}.tar.xz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux" fi S="${WORKDIR}/${MY_P}" diff --git a/media-libs/libtgvoip/Manifest b/media-libs/libtgvoip/Manifest index 22b6bb7c7d35..2e0bd064bcab 100644 --- a/media-libs/libtgvoip/Manifest +++ b/media-libs/libtgvoip/Manifest @@ -1,7 +1,5 @@ -DIST libtgvoip-2.4.4_p20220117.tar.gz 1098045 BLAKE2B 752b3b26f511316b8261d9ebb833e2b74df91377daca255fbbeefb18b3ab3811b97eaee1d9965e95ed9d215467e6ff5dc857369d381d470570cb87c3bfec33af SHA512 b9d8e354e9b8f9226d5e06397fdf3c91f71fee890db7d180dffae2e3fb6f74bca1c31b7f87049257c3edf44c2171780ed5781877cf8f2d40b2d56c1f5385ef77 DIST libtgvoip-2.4.4_p20220503.tar.gz 1098061 BLAKE2B 5389a3783fa5179d10a18ef0282ab65d1526c829852095718384c2ba476ebfb1ee1f997f71b47424ef60a826055bc63d0d2dde7980de98c978860d72717ffefb SHA512 68f1e5b46df3b974d39333949e586ed00243044ff4bcac31937cba7eced6266fdacfd6ff3c6453f7dfa64ec82dd3aeafa251411dc85de0aae26b2cd0d8a79013 DIST libtgvoip-2.4.4_p20221208.tar.gz 1098020 BLAKE2B 6f1eae38e4396ca3b88ab4337176a6076d5f9008b2a865cd286265a9b73d83d44c2cc6828b65dcb580a897a19badeab502395e2128a15c276ae796ac1ab0da68 SHA512 62243629890b1c13f1dbbffae4f82964a0fe23d2071852730674ccbef31126c6e205cfa526f07ba1549ef8eae31e371fb4335ce5f95fd649560bee2b3b530e64 -EBUILD libtgvoip-2.4.4_p20220117.ebuild 1586 BLAKE2B 8ee4658a921472e3c5aaa2cccb6059620041f71ee4c8fb24fdcf3759b4f5bbb99c481c888f71300cc82a49ec4037fec96065f89c36145b57b293a9818cba3e54 SHA512 0159bdc29c80a8c2ac03783bded57b68908d814a1113431db85b62042b1c00b433f9bce4359201ec43a79205e27463c84b33a33254cf3aa3b25a9343fe1039e2 EBUILD libtgvoip-2.4.4_p20220503.ebuild 1586 BLAKE2B 8219e767ea77c7a3777012ddf59d25a536ea7bec408db6cdb81d668e3ccc0084a418c7b7285ebf5cffc6b8be47907a62dd9f3bd8d010f2cd58fe0b154c385962 SHA512 e3f2d19cd142b64a3ba4fbc4cf99f24c150c2b750f05a47a03fa58bbd8faf20424817ca001ae30110036982c0f2c4809d250ce871cd3207365f8b5261dcf001e EBUILD libtgvoip-2.4.4_p20221208.ebuild 1587 BLAKE2B 2c82a5c99a19e2e6dfdc31e2b98cdba038223802f607253923a597a3a3647383bd1ba2717f3477a9d9ebad9507a68a3a3b325f8567b2aee9f902daeb9a5ef499 SHA512 e5c3723a0e91f3c232fbf697df73bc6ec0e0cad40b78eb25c92277a07512a7d14a972ae733ad7fc0e60c15a29a1c07655b0777f00d29a862c64d983dbb34195c MISC metadata.xml 633 BLAKE2B 53413d3bf4124e2d415bd0851deac01649bdf5f44069805a8e8904b93a0ad731df46169813955670aafedb6630a6fe7102b5954339df59435aafa6a6a35bd954 SHA512 96a69dcfd9e0b615fefb8ea9a8715ad2a2d4c62ce59e725434de3fe42889bb93c2b4ac1fbd2d20a23be62c9a59ca70e93f883247a83f344ff9abde2970cd4e50 diff --git a/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild b/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild deleted file mode 100644 index dacbfd4d1e58..000000000000 --- a/media-libs/libtgvoip/libtgvoip-2.4.4_p20220117.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic autotools - -DESCRIPTION="VoIP library for Telegram clients" -HOMEPAGE="https://github.com/telegramdesktop/libtgvoip" - -LIBTGVOIP_COMMIT="a090c6a8f7bfb365b301d85bb8c9664d71321c5c" -SRC_URI="https://github.com/telegramdesktop/libtgvoip/archive/${LIBTGVOIP_COMMIT}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN}-${LIBTGVOIP_COMMIT}" - -LICENSE="Unlicense" -SLOT="0" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" -IUSE="+dsp +alsa pulseaudio" - -DEPEND=" - dev-libs/openssl:= - media-libs/opus - alsa? ( media-libs/alsa-lib ) - dsp? ( media-libs/tg_owt:= ) - pulseaudio? ( media-sound/pulseaudio ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" -REQUIRED_USE=" - || ( alsa pulseaudio ) -" - -src_prepare() { - # Will be controlled by us - sed -i -e '/^CFLAGS += -DTGVOIP_NO_DSP/d' Makefile.am || die - # https://bugs.gentoo.org/717210 - echo 'libtgvoip_la_LIBTOOLFLAGS = --tag=CXX' >> Makefile.am || die - default - eautoreconf -} - -src_configure() { - # Not using the CMake build despite being the preferred one, because - # it's lacking relevant configure options. - local myconf=( - --disable-dsp # WebRTC is linked from tg_owt - $(use_with alsa) - $(use_with pulseaudio pulse) - ) - if use dsp; then - append-cppflags "-I${ESYSROOT}/usr/include/tg_owt" - append-cppflags "-I${ESYSROOT}/usr/include/tg_owt/third_party/abseil-cpp" - append-libs '-ltg_owt' - else - append-cppflags '-DTGVOIP_NO_DSP' - fi - econf "${myconf[@]}" -} - -src_install() { - default - find "${D}" -name '*.la' -delete || die -} diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest index 31a9b5eccb69..82c6f34853d6 100644 --- a/media-libs/mesa/Manifest +++ b/media-libs/mesa/Manifest @@ -1,8 +1,10 @@ DIST mesa-22.2.5.tar.xz 16524904 BLAKE2B 5891e76e818dcd665ebac6dadbf223f382380206ec0edc85f8d9f6e298ab3126d9992fc7d4e38c12b455f21e6e40f3849b08ffaacc0cb38454b2e23c06277d36 SHA512 9039cf31e719b66a6ecea48e7f871d187333a1accd3fa77ce2cb36ce539682dd50f09bccc11a0c35760051768108699cf90dfb0936809faf1e1294cc5d1ec0af DIST mesa-22.3.2.tar.xz 16988720 BLAKE2B 8fdadd77a7bcac1b0ba6955b452a89cf823650ad3296128b82471888da666a33407e6ea2784ccf3f49c04a34fecfcd6a172372828fd2200e74d7dcf97e9c5938 SHA512 32934dd23cfcd6165c365597d9a469da0b806b72ea98a200f499344c3b47815db3bf78875b4ea766d2d28d9c70b50c1615d2d3fcbfd4769447fe0a9d3b32951f DIST mesa-22.3.3.tar.xz 17009624 BLAKE2B 2d5381b21268ed616f0adf1f479958492d812ac9f4a5dbe96df0c37ac778fc24f8522bf13a1d8da9c8062b04e642b0929f3a376738c6ccd5442c98d39e241ec5 SHA512 dcf166bc7c80e6ad09337e0188219e5ea4bdc558bc4b4ca35ce30d5421568f6b5328e5508b3175a2696521214e466354d8652ade22468ce448d9f61d5709c8a1 +DIST mesa-23.0.0-rc3.tar.xz 17427732 BLAKE2B dfa4f77b7e43ed505c6cb00806965fa4a809831888baa270f3f05bccdfa560fbd19d150fca68fba4b7653d284d72dcec6f016eea2ee36de589e5c4b875a121ef SHA512 adad86189ae27eb5cf89d7b6e0626a78f49f5a72cdea0f4eb59d76aae74c657251d07c3142c578e1e13edef73947d4807c25eebf9598b8a0e16a70c584916ce5 EBUILD mesa-22.2.5.ebuild 12662 BLAKE2B e7fec8b5b563e96173125e559fe4bc8222e59f8371217a32a76768906fbe1a5cc6d13d4830ed37ba7eb8b07689f2d33970533a6db89a9f00926921da98c44fac SHA512 de9088f4d19d360be2516360da5b6fa21f2aa659b856f025917efe68dc5815c7bc3cea6f5d5957f562cc0cc15839fe9226d3a70ed69e90fbdfc043e89cd9e8c2 EBUILD mesa-22.3.2.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6 EBUILD mesa-22.3.3.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6 -EBUILD mesa-9999.ebuild 12462 BLAKE2B d43a4976f031cf9de1095665f70d2a4a6973ba29ee101412f088fa6246411aa35d73aebbcdcb24b413d14a7184980ce584b5061d3a626fcfa32049f13fd4f55e SHA512 593dbf8c3343ec14e8505b18f6883d709b22ec2e5b9d4b92dac9f4c7ca6b6dab9bc0ebcfc65eade4b1cb28211b92e73f64f0d4d1788482c7eb9d14804adb35b6 +EBUILD mesa-23.0.0_rc3.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128 +EBUILD mesa-9999.ebuild 12382 BLAKE2B 883a782e0d028cd6834b116a1f925a9ebe6caadc6b84e13ac4292bf01856b08d72a5abb9e1f3aa7f45ed79cf1fe99ad54b9f8504839816cc84785e559c2e1234 SHA512 05ae527c57274805e81b0bd73560bc11e4b0caadeafd4a2ad82d6c6737243411463e51ccdbcff38b594fbcc16b4a10b040b5fadbd4ae4d48124a95c9c2312128 MISC metadata.xml 1705 BLAKE2B d00c5edf48d5fb9c7485958569d8be761b0a8a79b893d50347687d2fd1c4ffac1325bbc32254737f8249e8b2cef2e86ae7b06a3c6351f7a03844f48ce1df428d SHA512 5c67ebd046a486e5e45864f79233ce659e0fa1d4c30284e9f3908c73d2f3480af50dddcf0676b8ed0ffe60a991ed4b59ce199d7ea16d6520a191ad076c5a9ec0 diff --git a/media-libs/mesa/mesa-23.0.0_rc3.ebuild b/media-libs/mesa/mesa-23.0.0_rc3.ebuild new file mode 100644 index 000000000000..e85c95eeb1ec --- /dev/null +++ b/media-libs/mesa/mesa-23.0.0_rc3.ebuild @@ -0,0 +1,465 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{9..11} ) + +inherit llvm meson-multilib python-any-r1 linux-info + +MY_P="${P/_/-}" + +DESCRIPTION="OpenGL-like graphic library for Linux" +HOMEPAGE="https://www.mesa3d.org/ https://mesa.freedesktop.org/" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/mesa/mesa.git" + inherit git-r3 +else + SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +LICENSE="MIT" +SLOT="0" +RESTRICT="!test? ( test )" + +RADEON_CARDS="r300 r600 radeon radeonsi" +VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware" +for card in ${VIDEO_CARDS}; do + IUSE_VIDEO_CARDS+=" video_cards_${card}" +done + +IUSE="${IUSE_VIDEO_CARDS} + cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm + lm-sensors opencl osmesa +proprietary-codecs selinux + test unwind vaapi valgrind vdpau vulkan + vulkan-overlay wayland +X xa zink +zstd" + +REQUIRED_USE=" + d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) + vulkan? ( video_cards_radeonsi? ( llvm ) ) + vulkan-overlay? ( vulkan ) + video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) + video_cards_radeonsi? ( llvm ) + xa? ( X ) + zink? ( vulkan ) +" + +LIBDRM_DEPSTRING=">=x11-libs/libdrm-2.4.110" +RDEPEND=" + >=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}] + >=media-libs/libglvnd-1.3.2[X?,${MULTILIB_USEDEP}] + >=sys-libs/zlib-1.2.8[${MULTILIB_USEDEP}] + unwind? ( sys-libs/libunwind[${MULTILIB_USEDEP}] ) + llvm? ( + video_cards_radeonsi? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_r600? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + video_cards_radeon? ( + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + ) + lm-sensors? ( sys-apps/lm-sensors:=[${MULTILIB_USEDEP}] ) + opencl? ( + >=virtual/opencl-3[${MULTILIB_USEDEP}] + dev-libs/libclc + virtual/libelf:0=[${MULTILIB_USEDEP}] + ) + vaapi? ( + >=media-libs/libva-1.7.3:=[${MULTILIB_USEDEP}] + ) + vdpau? ( >=x11-libs/libvdpau-1.1:=[${MULTILIB_USEDEP}] ) + selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] ) + wayland? ( >=dev-libs/wayland-1.18.0[${MULTILIB_USEDEP}] ) + ${LIBDRM_DEPSTRING}[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,${MULTILIB_USEDEP}] + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libxshmfence-1.1[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXxf86vm-1.1.3[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.13:=[${MULTILIB_USEDEP}] + x11-libs/libXfixes[${MULTILIB_USEDEP}] + ) + zink? ( media-libs/vulkan-loader:=[${MULTILIB_USEDEP}] ) + zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] ) +" +for card in ${RADEON_CARDS}; do + RDEPEND="${RDEPEND} + video_cards_${card}? ( ${LIBDRM_DEPSTRING}[video_cards_radeon] ) + " +done +RDEPEND="${RDEPEND} + video_cards_radeonsi? ( ${LIBDRM_DEPSTRING}[video_cards_amdgpu] ) +" + +# Please keep the LLVM dependency block separate. Since LLVM is slotted, +# we need to *really* make sure we're not pulling one than more slot +# simultaneously. +# +# How to use it: +# 1. List all the working slots (with min versions) in ||, newest first. +# 2. Update the := to specify *max* version, e.g. < 10. +# 3. Specify LLVM_MAX_SLOT, e.g. 9. +LLVM_MAX_SLOT="16" +LLVM_DEPSTR=" + || ( + sys-devel/llvm:16[${MULTILIB_USEDEP}] + sys-devel/llvm:15[${MULTILIB_USEDEP}] + ) + =dev-python/mako-0.8.0[\${PYTHON_USEDEP}]") + vulkan? ( dev-util/glslang ) + wayland? ( dev-util/wayland-scanner ) +" + +S="${WORKDIR}/${MY_P}" +EGIT_CHECKOUT_DIR=${S} + +QA_WX_LOAD=" +x86? ( + usr/lib*/libglapi.so.0.0.0 + usr/lib*/libGLESv1_CM.so.1.1.0 + usr/lib*/libGLESv2.so.2.0.0 + usr/lib*/libGL.so.1.2.0 + usr/lib*/libOSMesa.so.8.0.0 + usr/lib/libGLX_mesa.so.0.0.0 +)" + +llvm_check_deps() { + local flags=${MULTILIB_USEDEP} + if use video_cards_r600 || use video_cards_radeon || use video_cards_radeonsi + then + flags+=",llvm_targets_AMDGPU(-)" + fi + + if use opencl; then + has_version "sys-devel/clang:${LLVM_SLOT}[${flags}]" || return 1 + fi + has_version "sys-devel/llvm:${LLVM_SLOT}[${flags}]" +} + +pkg_pretend() { + if use vulkan; then + if ! use video_cards_d3d12 && + ! use video_cards_freedreno && + ! use video_cards_intel && + ! use video_cards_radeonsi && + ! use video_cards_v3d; then + ewarn "Ignoring USE=vulkan since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d" + fi + fi + + if use opencl; then + if ! use video_cards_r600 && + ! use video_cards_radeonsi; then + ewarn "Ignoring USE=opencl since VIDEO_CARDS does not contain r600 or radeonsi" + fi + fi + + if use vaapi; then + if ! use video_cards_d3d12 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vaapi since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau" + fi + fi + + if use vdpau; then + if ! use video_cards_d3d12 && + ! use video_cards_r300 && + ! use video_cards_r600 && + ! use video_cards_radeonsi && + ! use video_cards_nouveau; then + ewarn "Ignoring USE=vdpau since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau" + fi + fi + + if use xa; then + if ! use video_cards_freedreno && + ! use video_cards_nouveau && + ! use video_cards_vmware; then + ewarn "Ignoring USE=xa since VIDEO_CARDS does not contain freedreno, nouveau, or vmware" + fi + fi + + if ! use llvm; then + use opencl && ewarn "Ignoring USE=opencl since USE does not contain llvm" + fi + + if use osmesa && ! use llvm; then + ewarn "OSMesa will be slow without enabling USE=llvm" + fi +} + +python_check_deps() { + python_has_version -b ">=dev-python/mako-0.8.0[${PYTHON_USEDEP}]" +} + +pkg_setup() { + # warning message for bug 459306 + if use llvm && has_version sys-devel/llvm[!debug=]; then + ewarn "Mismatch between debug USE flags in media-libs/mesa and sys-devel/llvm" + ewarn "detected! This can cause problems. For details, see bug 459306." + fi + + if use video_cards_intel || + use video_cards_radeonsi; then + if kernel_is -ge 5 11 3; then + CONFIG_CHECK="~KCMP" + elif kernel_is -ge 5 11; then + CONFIG_CHECK="~CHECKPOINT_RESTORE" + elif kernel_is -ge 5 10 20; then + CONFIG_CHECK="~KCMP" + else + CONFIG_CHECK="~CHECKPOINT_RESTORE" + fi + linux-info_pkg_setup + fi + + if use llvm; then + llvm_pkg_setup + fi + python-any-r1_pkg_setup +} + +multilib_src_configure() { + local emesonargs=() + + local platforms + use X && platforms+="x11" + use wayland && platforms+=",wayland" + emesonargs+=(-Dplatforms=${platforms#,}) + + if use video_cards_intel || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_use d3d9 gallium-nine)) + else + emesonargs+=(-Dgallium-nine=false) + fi + + if use video_cards_d3d12 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vaapi gallium-va)) + use vaapi && emesonargs+=( -Dva-libs-path="${EPREFIX}"/usr/$(get_libdir)/va/drivers ) + else + emesonargs+=(-Dgallium-va=disabled) + fi + + if use video_cards_d3d12; then + emesonargs+=($(meson_feature vaapi gallium-d3d12-video)) + fi + + if use video_cards_d3d12 || + use video_cards_r300 || + use video_cards_r600 || + use video_cards_radeonsi || + use video_cards_nouveau; then + emesonargs+=($(meson_feature vdpau gallium-vdpau)) + else + emesonargs+=(-Dgallium-vdpau=disabled) + fi + + if use video_cards_freedreno || + use video_cards_nouveau || + use video_cards_vmware; then + emesonargs+=($(meson_feature xa gallium-xa)) + else + emesonargs+=(-Dgallium-xa=disabled) + fi + + if use video_cards_freedreno || + use video_cards_lima || + use video_cards_panfrost || + use video_cards_v3d || + use video_cards_vc4 || + use video_cards_vivante; then + gallium_enable -- kmsro + fi + + gallium_enable -- swrast + gallium_enable video_cards_freedreno freedreno + gallium_enable video_cards_intel crocus i915 iris + gallium_enable video_cards_lima lima + gallium_enable video_cards_d3d12 d3d12 + gallium_enable video_cards_nouveau nouveau + gallium_enable video_cards_panfrost panfrost + gallium_enable video_cards_v3d v3d + gallium_enable video_cards_vc4 vc4 + gallium_enable video_cards_virgl virgl + gallium_enable video_cards_vivante etnaviv + gallium_enable video_cards_vmware svga + gallium_enable zink zink + + gallium_enable video_cards_r300 r300 + gallium_enable video_cards_r600 r600 + gallium_enable video_cards_radeonsi radeonsi + if ! use video_cards_r300 && \ + ! use video_cards_r600; then + gallium_enable video_cards_radeon r300 r600 + fi + + # opencl stuff + emesonargs+=( + -Dgallium-opencl="$(usex opencl icd disabled)" + ) + + if use vulkan; then + vulkan_enable video_cards_freedreno freedreno + vulkan_enable video_cards_intel intel + vulkan_enable video_cards_d3d12 microsoft-experimental + vulkan_enable video_cards_radeonsi amd + vulkan_enable video_cards_v3d broadcom + fi + + driver_list() { + local drivers="$(sort -u <<< "${1// /$'\n'}")" + echo "${drivers//$'\n'/,}" + } + + local vulkan_layers + use vulkan && vulkan_layers+="device-select" + use vulkan-overlay && vulkan_layers+=",overlay" + emesonargs+=(-Dvulkan-layers=${vulkan_layers#,}) + + # In LLVM 16, we've switched to building LLVM with EH/RTTI disabled + # to match upstream defaults. Mesa requires being built the same way. + # https://bugs.gentoo.org/883955 + if [[ ${LLVM_SLOT} -ge 16 ]]; then + emesonargs+=( + -Dcpp_rtti=false + ) + fi + + emesonargs+=( + $(meson_use test build-tests) + -Dglx=$(usex X dri disabled) + -Dshared-glapi=enabled + -Ddri3=enabled + -Degl=enabled + -Dgbm=enabled + -Dglvnd=true + $(meson_feature gles1) + $(meson_feature gles2) + $(meson_feature llvm) + $(meson_feature lm-sensors lmsensors) + $(meson_use osmesa) + $(meson_use selinux) + $(meson_feature unwind libunwind) + $(meson_feature zstd) + $(meson_use cpu_flags_x86_sse2 sse2) + -Dvalgrind=$(usex valgrind auto disabled) + -Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "") + -Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}") + -Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}") + --buildtype $(usex debug debug plain) + -Db_ndebug=$(usex debug false true) + ) + meson_src_configure +} + +multilib_src_test() { + meson_src_test -t 100 +} + +# $1 - VIDEO_CARDS flag (check skipped for "--") +# other args - names of DRI drivers to enable +gallium_enable() { + if [[ $1 == -- ]] || use $1; then + shift + GALLIUM_DRIVERS+=("$@") + fi +} + +vulkan_enable() { + if [[ $1 == -- ]] || use $1; then + shift + VULKAN_DRIVERS+=("$@") + fi +} diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild index eb3f9e101cf3..e85c95eeb1ec 100644 --- a/media-libs/mesa/mesa-9999.ebuild +++ b/media-libs/mesa/mesa-9999.ebuild @@ -110,8 +110,6 @@ LLVM_DEPSTR=" || ( sys-devel/llvm:16[${MULTILIB_USEDEP}] sys-devel/llvm:15[${MULTILIB_USEDEP}] - sys-devel/llvm:14[${MULTILIB_USEDEP}] - sys-devel/llvm:13[${MULTILIB_USEDEP}] ) >, dcsctp::DcSctpSocketCallbacks&, std::unique_ptr >, dcsctp::DcSctpOptions const&)' -/usr/lib/gcc/x86_64-pc-linux-gnu/11.2.1/../../../../x86_64-pc-linux-gnu/bin/ld: /usr/lib64/libtg_owt.so.0.0.0: undefined reference to `vtable for dcsctp::TextPcapPacketObserver' - ---- tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589.orig/CMakeLists.txt -+++ tg_owt-d5c3d43b959c7e9e7d8004b9b7fdadd12ce7d589/CMakeLists.txt -@@ -808,8 +808,6 @@ - media/engine/webrtc_media_engine_defaults.cc - media/engine/webrtc_video_engine.cc - media/engine/webrtc_voice_engine.cc -- media/sctp/dcsctp_transport.cc -- media/sctp/dcsctp_transport.h - media/sctp/sctp_transport_factory.cc - media/sctp/sctp_transport_factory.h - media/sctp/usrsctp_transport.cc diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch b/media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch deleted file mode 100644 index 3d4acfd0d941..000000000000 --- a/media-libs/tg_owt/files/tg_owt-0_pre20220209-allow-disabling-X11.patch +++ /dev/null @@ -1,117 +0,0 @@ -Add -DTG_OWT_USE_X11 - -Allows disabling X11 desktop capturing independently of pipewire support, for -the few people that run wayland without any X11 support whatsoever. - -This setup is untested, but supported by the GNI build system, see: -* src/modules/desktop_capture/BUILD.gn (option rtc_use_x11_extensions) - -Toggling the WEBRTC_USE_X11 define also affects some files under -src/modules/audio_device, but that falls under "X11 support", regardless... - ---- tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7.orig/CMakeLists.txt -+++ tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7/CMakeLists.txt -@@ -21,11 +21,13 @@ - - option(BUILD_SHARED_LIBS "Builds shared libraries instead of static." OFF) - option(TG_OWT_USE_PROTOBUF "Use protobuf to generate additional headers. Useful for packaged build." ${BUILD_SHARED_LIBS}) -+option(TG_OWT_USE_X11 "Use X11 for desktop capture on non-Apple Unix." ON) - option(TG_OWT_USE_PIPEWIRE "Use pipewire for desktop capture on non-Apple Unix." ON) - option(TG_OWT_DLOPEN_PIPEWIRE "dlopen pipewire 0.3 for desktop capture on non-Apple Unix." ${not_packaged_build}) - option(TG_OWT_BUILD_AUDIO_BACKENDS "Build webrtc audio backends." OFF) - - if (NOT UNIX OR APPLE) -+ set(TG_OWT_USE_X11 OFF) - set(TG_OWT_USE_PIPEWIRE OFF) - endif() - -@@ -97,6 +99,10 @@ - add_library(tg_owt) - init_target(tg_owt) - -+if (TG_OWT_USE_X11) -+ link_x11(tg_owt) -+endif() -+ - if (TG_OWT_USE_PIPEWIRE) - if (TG_OWT_DLOPEN_PIPEWIRE) - include(cmake/generate_stubs.cmake) -@@ -188,10 +194,6 @@ - include(cmake/libwebrtcbuild.cmake) - target_link_libraries(tg_owt PUBLIC tg_owt::libwebrtcbuild) - --if (UNIX AND NOT APPLE) -- link_x11(tg_owt) --endif() -- - function(add_sublibrary postfix) - add_library(tg_owt_${postfix} OBJECT) - init_feature_target(tg_owt_${postfix} ${postfix}) -@@ -2258,6 +2260,39 @@ - ) - endif() - -+if (NOT TG_OWT_USE_X11) -+ remove_target_sources(tg_owt ${webrtc_loc} -+ # src/modules/desktop_capture/BUILD.gn (rtc_use_x11_extensions) -+ modules/desktop_capture/linux/mouse_cursor_monitor_x11.cc -+ modules/desktop_capture/linux/mouse_cursor_monitor_x11.h -+ modules/desktop_capture/linux/screen_capturer_x11.cc -+ modules/desktop_capture/linux/screen_capturer_x11.h -+ modules/desktop_capture/linux/shared_x_display.cc -+ modules/desktop_capture/linux/shared_x_display.h -+ modules/desktop_capture/linux/window_capturer_x11.cc -+ modules/desktop_capture/linux/window_capturer_x11.h -+ modules/desktop_capture/linux/window_finder_x11.cc -+ modules/desktop_capture/linux/window_finder_x11.h -+ modules/desktop_capture/linux/window_list_utils.cc -+ modules/desktop_capture/linux/window_list_utils.h -+ modules/desktop_capture/linux/x_atom_cache.cc -+ modules/desktop_capture/linux/x_atom_cache.h -+ modules/desktop_capture/linux/x_error_trap.cc -+ modules/desktop_capture/linux/x_error_trap.h -+ modules/desktop_capture/linux/x_server_pixel_buffer.cc -+ modules/desktop_capture/linux/x_server_pixel_buffer.h -+ modules/desktop_capture/linux/x_window_property.cc -+ modules/desktop_capture/linux/x_window_property.h -+ -+ # screen_drawer_linux.cc depends on x11, rest are revdeps -+ modules/desktop_capture/screen_drawer.cc -+ modules/desktop_capture/screen_drawer.h -+ modules/desktop_capture/screen_drawer_linux.cc -+ modules/desktop_capture/screen_drawer_lock_posix.cc -+ modules/desktop_capture/screen_drawer_lock_posix.h -+ ) -+endif() -+ - if (NOT TG_OWT_USE_PIPEWIRE) - remove_target_sources(tg_owt ${webrtc_loc} - modules/desktop_capture/linux/base_capturer_pipewire.cc ---- tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7.orig/cmake/libwebrtcbuild.cmake -+++ tg_owt-4cba1acdd718b700bb33945c0258283689d4eac7/cmake/libwebrtcbuild.cmake -@@ -28,6 +28,13 @@ - BWE_TEST_LOGGING_COMPILE_TIME_ENABLE=0 - ) - -+if (TG_OWT_USE_X11) -+ target_compile_definitions(libwebrtcbuild -+ INTERFACE -+ WEBRTC_USE_X11 -+ ) -+endif() -+ - if (TG_OWT_USE_PIPEWIRE) - target_compile_definitions(libwebrtcbuild - INTERFACE -@@ -64,11 +71,6 @@ - INTERFACE - WEBRTC_MAC - ) -- else() -- target_compile_definitions(libwebrtcbuild -- INTERFACE -- WEBRTC_USE_X11 -- ) - endif() - - if (CMAKE_SYSTEM_NAME STREQUAL "Linux") diff --git a/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstddef.patch b/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstddef.patch deleted file mode 100644 index c79d6068945e..000000000000 --- a/media-libs/tg_owt/files/tg_owt-0_pre20220209-gcc-12-cstddef.patch +++ /dev/null @@ -1,20 +0,0 @@ -https://bugs.gentoo.org/840526 ---- a/src/modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.cc -+++ b/src/modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.cc -@@ -10,6 +10,7 @@ - - #include "modules/rtp_rtcp/source/rtp_packetizer_av1_test_helper.h" - -+#include - #include - - #include -@@ -42,7 +43,7 @@ std::vector BuildAv1Frame(std::initializer_list obus) { - } - if (obu.header_ & kAv1ObuSizePresentBit) { - // write size in leb128 format. -- size_t payload_size = obu.payload_.size(); -+ std::size_t payload_size = obu.payload_.size(); - while (payload_size >= 0x80) { - raw.push_back(0x80 | (payload_size & 0x7F)); - payload_size >>= 7; diff --git a/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild b/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild deleted file mode 100644 index c9458830e3d7..000000000000 --- a/media-libs/tg_owt/tg_owt-0_pre20220209.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 2020-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit cmake flag-o-matic - -DESCRIPTION="WebRTC build for Telegram" -HOMEPAGE="https://github.com/desktop-app/tg_owt" - -TG_OWT_COMMIT="4cba1acdd718b700bb33945c0258283689d4eac7" -LIBYUV_COMMIT="ad890067f661dc747a975bc55ba3767fe30d4452" -SRC_URI="https://github.com/desktop-app/tg_owt/archive/${TG_OWT_COMMIT}.tar.gz -> ${P}.tar.gz - https://archive.org/download/libyuv-${LIBYUV_COMMIT}.tar/libyuv-${LIBYUV_COMMIT}.tar.gz" -S="${WORKDIR}/${PN}-${TG_OWT_COMMIT}" -# Fetch libyuv archive from: https://chromium.googlesource.com/libyuv/libyuv/+archive/${LIBYUV_COMMIT}.tar.gz - -LICENSE="BSD" -SLOT="0/${PV##*pre}" -KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv" -IUSE="screencast +X" - -# This package's USE flags may change the ABI and require a rebuild of -# dependent pacakges. As such, one should make sure to depend on -# media-libs/tg_owt[x=,y=,z=] for any package that uses this. - -# Bundled libs: -# - libyuv (no stable versioning, www-client/chromium and media-libs/libvpx bundle it) -# - libsrtp (project uses private APIs) -# - pffft (no stable versioning, patched) -DEPEND=" - >=dev-cpp/abseil-cpp-20211102.0:=[cxx17(+)] - dev-libs/libevent:= - dev-libs/openssl:= - dev-libs/protobuf:= - media-libs/libjpeg-turbo:= - >=media-libs/libvpx-1.10.0:= - media-libs/openh264:= - media-libs/opus - media-video/ffmpeg:= - net-libs/usrsctp - screencast? ( - dev-libs/glib:2 - media-video/pipewire:= - ) - X? ( - x11-libs/libX11 - x11-libs/libXcomposite - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXrandr - x11-libs/libXtst - ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}/tg_owt-0_pre20220209-allow-disabling-X11.patch" - "${FILESDIR}/tg_owt-0_pre20211207-fix-dcsctp-references.patch" - "${FILESDIR}/tg_owt-0_pre20220209-gcc-12-cstdint.patch" - "${FILESDIR}/tg_owt-0_pre20220209-gcc-12-cstddef.patch" -) - -src_unpack() { - unpack "${P}.tar.gz" - cd "${S}/src/third_party/libyuv" || die - unpack "libyuv-${LIBYUV_COMMIT}.tar.gz" -} - -src_prepare() { - # libopenh264 has GENERATED files with yasm that aren't excluded by - # EXCLUDE_FROM_ALL, and I have no clue how to avoid this. - # These source files aren't used with system-openh264, anyway. - sed -i '/include(cmake\/libopenh264.cmake)/d' CMakeLists.txt || die - - # "lol" said the scorpion, "lmao" - sed -i '/if (BUILD_SHARED_LIBS)/{n;n;s/WARNING/DEBUG/}' CMakeLists.txt || die - - cmake_src_prepare -} - -src_configure() { - # Defined by -DCMAKE_BUILD_TYPE=Release, avoids crashes - # see https://bugs.gentoo.org/754012 - # EAPI 8 still wipes this flag. - append-cppflags '-DNDEBUG' - - local mycmakeargs=( - -DTG_OWT_USE_X11=$(usex X) - -DTG_OWT_USE_PIPEWIRE=$(usex screencast) - ) - cmake_src_configure -} - -src_install() { - cmake_src_install - - # Save about 15MB of useless headers - rm -r "${ED}/usr/include/tg_owt/rtc_base/third_party" || die - rm -r "${ED}/usr/include/tg_owt/common_audio/third_party" || die - rm -r "${ED}/usr/include/tg_owt/modules/third_party" || die - rm -r "${ED}/usr/include/tg_owt/third_party" || die - - # Install a few headers anyway, as required by net-im/telegram-desktop... - local headers=( - third_party/libyuv/include - rtc_base/third_party/sigslot - rtc_base/third_party/base64 - ) - for dir in "${headers[@]}"; do - pushd "${S}/src/${dir}" > /dev/null || die - find -type f -name "*.h" -exec install -Dm644 '{}' "${ED}/usr/include/tg_owt/${dir}/{}" \; || die - popd > /dev/null || die - done -} -- cgit v1.2.3