From 0f558761aa2dee1017b4751e4017205e015a9560 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 29 Jun 2022 12:04:12 +0100 Subject: gentoo resync : 29.12.2022 --- media-video/Manifest.gz | Bin 26503 -> 26179 bytes media-video/amdgpu-pro-amf/Manifest | 2 + .../amdgpu-pro-amf-1.4.24.1420323.ebuild | 55 +++ media-video/avidemux/Manifest | 2 +- media-video/avidemux/avidemux-2.7.8.ebuild | 7 +- media-video/baka-mplayer/Manifest | 2 +- .../baka-mplayer/baka-mplayer-2.0.4-r1.ebuild | 4 +- media-video/bino/Manifest | 2 + media-video/bino/bino-1.6.8.ebuild | 65 +++ media-video/droidcam/Manifest | 4 +- media-video/droidcam/droidcam-1.8.1-r2.ebuild | 155 ------- media-video/droidcam/droidcam-1.8.2.ebuild | 2 +- media-video/ffdiaporama/Manifest | 2 + .../ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild | 59 +++ media-video/ffmpeg-chromium/Manifest | 7 +- .../ffmpeg-chromium/ffmpeg-chromium-100.ebuild | 232 ---------- .../ffmpeg-chromium/ffmpeg-chromium-102.ebuild | 245 ++++++++++ .../ffmpeg-chromium/ffmpeg-chromium-96.ebuild | 231 --------- .../ffmpeg-chromium/files/ffmpeg-chromium-94.patch | 26 -- media-video/ffmpeg/Manifest | 6 +- media-video/ffmpeg/ffmpeg-4.4.2.ebuild | 4 +- media-video/ffmpeg/ffmpeg-5.0.1.ebuild | 4 +- media-video/ffmpeg/ffmpeg-9999.ebuild | 2 +- media-video/ffmpeg2theora/Manifest | 2 +- .../ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild | 6 +- media-video/gxine/Manifest | 4 - .../gxine/files/gxine-0.5.909-fno-common.patch | 22 - media-video/gxine/gxine-0.5.909-r1.ebuild | 71 --- media-video/gxine/metadata.xml | 10 - media-video/handbrake/Manifest | 4 +- media-video/handbrake/handbrake-1.5.1.ebuild | 8 +- media-video/handbrake/handbrake-9999.ebuild | 8 +- media-video/jellyfin-media-player/Manifest | 4 +- .../jellyfin-media-player-1.6.1.ebuild | 83 ---- .../jellyfin-media-player-1.7.0.ebuild | 85 ++++ media-video/jellyfin-web-jmp-bin/Manifest | 4 +- .../jellyfin-web-jmp-bin-10.7.6.ebuild | 24 - .../jellyfin-web-jmp-bin-10.8.0.ebuild | 24 + media-video/mjpegtools/Manifest | 2 +- media-video/mjpegtools/mjpegtools-2.2.1.ebuild | 2 - media-video/mkvtoolnix/Manifest | 5 +- .../files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch | 76 +++ media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild | 131 ++++++ media-video/mkvtoolnix/mkvtoolnix-9999.ebuild | 53 ++- media-video/mpv/Manifest | 8 +- media-video/mpv/mpv-0.33.1-r3.ebuild | 4 +- media-video/mpv/mpv-0.34.0-r1.ebuild | 4 +- media-video/mpv/mpv-0.34.1-r1.ebuild | 6 +- media-video/mpv/mpv-9999.ebuild | 5 +- media-video/nvidia_video_sdk/Manifest | 3 - media-video/nvidia_video_sdk/metadata.xml | 10 - .../nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild | 52 --- media-video/openshot/Manifest | 2 +- media-video/openshot/openshot-2.6.1.ebuild | 4 +- media-video/pipewire/Manifest | 15 +- .../files/pipewire-0.3.50-fix-spa-header.patch | 39 -- ...pewire-0.3.50-treewide-retain-sections-to.patch | 70 --- .../files/pipewire-0.3.52-pulse-path.patch | 78 ++++ media-video/pipewire/metadata.xml | 4 - media-video/pipewire/pipewire-0.3.49-r1.ebuild | 359 -------------- media-video/pipewire/pipewire-0.3.49-r2.ebuild | 360 +++++++++++++++ media-video/pipewire/pipewire-0.3.50-r3.ebuild | 361 --------------- media-video/pipewire/pipewire-0.3.51-r1.ebuild | 362 --------------- media-video/pipewire/pipewire-0.3.51-r2.ebuild | 363 +++++++++++++++ media-video/pipewire/pipewire-0.3.52-r1.ebuild | 366 +++++++++++++++ media-video/pipewire/pipewire-9999.ebuild | 22 +- media-video/pitivi/Manifest | 4 + .../files/pitivi-2021.05-meson-compatibility.patch | 45 ++ .../files/pitivi-2021.05-python-collections.patch | 13 + media-video/pitivi/pitivi-2021.05-r1.ebuild | 91 ++++ media-video/popcorntime-bin/Manifest | 2 +- .../popcorntime-bin/popcorntime-bin-0.4.7.ebuild | 6 +- media-video/qmplay2/Manifest | 2 + media-video/qmplay2/qmplay2-22.06.16.ebuild | 137 ++++++ media-video/rtmpdump/Manifest | 5 +- ...dump-2.4_p20210219-gcc-11-missing-include.patch | 23 + media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild | 3 +- media-video/rtmpdump/rtmpdump-9999.ebuild | 2 +- media-video/simplescreenrecorder/Manifest | 4 +- media-video/simplescreenrecorder/metadata.xml | 5 +- .../simplescreenrecorder-0.4.4.ebuild | 2 +- media-video/subtitlecomposer/Manifest | 3 +- .../files/subtitlecomposer-0.7.1-ffmpeg-5.patch | 65 +++ .../subtitlecomposer/subtitlecomposer-0.7.1.ebuild | 1 + media-video/totem/Manifest | 5 +- .../files/3.38.2-fix-build-with-meson-0.61.1.patch | 41 -- media-video/totem/totem-3.38.2.ebuild | 121 ----- media-video/totem/totem-42.0-r1.ebuild | 2 +- media-video/vdr/Manifest | 6 +- media-video/vdr/vdr-2.2.0-r6.ebuild | 6 +- media-video/vdr/vdr-2.2.0-r7.ebuild | 6 +- media-video/vdr/vdr-2.4.7-r1.ebuild | 4 +- media-video/vidify-audiosync/Manifest | 2 +- .../vidify-audiosync-0.3.0-r1.ebuild | 46 ++ .../vidify-audiosync/vidify-audiosync-0.3.0.ebuild | 46 -- media-video/vidify/Manifest | 2 +- media-video/vidify/vidify-2.2.6-r2.ebuild | 84 ---- media-video/vidify/vidify-2.2.6-r3.ebuild | 84 ++++ media-video/vlc/Manifest | 11 +- media-video/vlc/vlc-3.0.16-r8.ebuild | 3 - media-video/vlc/vlc-3.0.17.3-r1.ebuild | 514 --------------------- media-video/vlc/vlc-3.0.17.3-r2.ebuild | 5 +- media-video/vlc/vlc-3.0.17.4.ebuild | 512 ++++++++++++++++++++ media-video/vlc/vlc-3.0.9999.ebuild | 5 +- media-video/vlc/vlc-9999.ebuild | 5 +- media-video/wireplumber/Manifest | 14 +- ...ix-device-name-deduplication-when-reserva.patch | 117 +++++ ...-enabled-property-to-default-to-true-when.patch | 129 ++++++ ...nodes-don-t-check-if-all-device-nodes-are.patch | 187 ++++++++ ...pting-allow-converting-GValue-holding-NUL.patch | 36 ++ ...10-m-lua-scripting-fix-object-refcounting.patch | 32 ++ .../wireplumber/wireplumber-0.4.10-r1.ebuild | 122 +++++ .../wireplumber/wireplumber-0.4.10-r3.ebuild | 126 +++++ media-video/wireplumber/wireplumber-0.4.10.ebuild | 118 ----- .../wireplumber/wireplumber-0.4.9-r1.ebuild | 2 +- media-video/wireplumber/wireplumber-0.4.9.ebuild | 2 +- media-video/wireplumber/wireplumber-9999.ebuild | 4 +- media-video/yle-dl/Manifest | 8 +- media-video/yle-dl/yle-dl-20220213.ebuild | 63 --- media-video/yle-dl/yle-dl-20220425.ebuild | 54 --- media-video/yle-dl/yle-dl-20220531.ebuild | 54 +++ media-video/yle-dl/yle-dl-20220610.ebuild | 54 +++ 122 files changed, 3968 insertions(+), 3320 deletions(-) create mode 100644 media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1420323.ebuild create mode 100644 media-video/bino/bino-1.6.8.ebuild delete mode 100644 media-video/droidcam/droidcam-1.8.1-r2.ebuild create mode 100644 media-video/ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild delete mode 100644 media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild create mode 100644 media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild delete mode 100644 media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild delete mode 100644 media-video/ffmpeg-chromium/files/ffmpeg-chromium-94.patch delete mode 100644 media-video/gxine/Manifest delete mode 100644 media-video/gxine/files/gxine-0.5.909-fno-common.patch delete mode 100644 media-video/gxine/gxine-0.5.909-r1.ebuild delete mode 100644 media-video/gxine/metadata.xml delete mode 100644 media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild create mode 100644 media-video/jellyfin-media-player/jellyfin-media-player-1.7.0.ebuild delete mode 100644 media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild create mode 100644 media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.8.0.ebuild create mode 100644 media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch create mode 100644 media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild delete mode 100644 media-video/nvidia_video_sdk/Manifest delete mode 100644 media-video/nvidia_video_sdk/metadata.xml delete mode 100644 media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild delete mode 100644 media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch delete mode 100644 media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch create mode 100644 media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch delete mode 100644 media-video/pipewire/pipewire-0.3.49-r1.ebuild create mode 100644 media-video/pipewire/pipewire-0.3.49-r2.ebuild delete mode 100644 media-video/pipewire/pipewire-0.3.50-r3.ebuild delete mode 100644 media-video/pipewire/pipewire-0.3.51-r1.ebuild create mode 100644 media-video/pipewire/pipewire-0.3.51-r2.ebuild create mode 100644 media-video/pipewire/pipewire-0.3.52-r1.ebuild create mode 100644 media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch create mode 100644 media-video/pitivi/files/pitivi-2021.05-python-collections.patch create mode 100644 media-video/pitivi/pitivi-2021.05-r1.ebuild create mode 100644 media-video/qmplay2/qmplay2-22.06.16.ebuild create mode 100644 media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch create mode 100644 media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch delete mode 100644 media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch delete mode 100644 media-video/totem/totem-3.38.2.ebuild create mode 100644 media-video/vidify-audiosync/vidify-audiosync-0.3.0-r1.ebuild delete mode 100644 media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild delete mode 100644 media-video/vidify/vidify-2.2.6-r2.ebuild create mode 100644 media-video/vidify/vidify-2.2.6-r3.ebuild delete mode 100644 media-video/vlc/vlc-3.0.17.3-r1.ebuild create mode 100644 media-video/vlc/vlc-3.0.17.4.ebuild create mode 100644 media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch create mode 100644 media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch create mode 100644 media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch create mode 100644 media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch create mode 100644 media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch create mode 100644 media-video/wireplumber/wireplumber-0.4.10-r1.ebuild create mode 100644 media-video/wireplumber/wireplumber-0.4.10-r3.ebuild delete mode 100644 media-video/wireplumber/wireplumber-0.4.10.ebuild delete mode 100644 media-video/yle-dl/yle-dl-20220213.ebuild delete mode 100644 media-video/yle-dl/yle-dl-20220425.ebuild create mode 100644 media-video/yle-dl/yle-dl-20220531.ebuild create mode 100644 media-video/yle-dl/yle-dl-20220610.ebuild (limited to 'media-video') diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz index 6207661cb063..e9bfd83076b7 100644 Binary files a/media-video/Manifest.gz and b/media-video/Manifest.gz differ diff --git a/media-video/amdgpu-pro-amf/Manifest b/media-video/amdgpu-pro-amf/Manifest index 4f3fe7472b69..162f44c24d35 100644 --- a/media-video/amdgpu-pro-amf/Manifest +++ b/media-video/amdgpu-pro-amf/Manifest @@ -1,7 +1,9 @@ DIST amdgpu-pro-amf-1.4.24.1376756.deb 1302168 BLAKE2B 706528317c317e0319e80decc8a9a59a0c55fed8c4c43c701ba93a2a503fbf5f2ee9fb44cfeb5bd582b013ebb8961514cb5b9faead8f24fdfe2b205f7d2dc656 SHA512 77740014e6bc2c91e822261e4fa247ac0e49747d6ff8af0c3b3046ec993c7c99621b55639ef18582021389a329e52ccc59edb85eb29d9e6a81da6986a487ec3e DIST amdgpu-pro-amf-1.4.24.1384496.deb 1304672 BLAKE2B a21e7d2cf9dc4fe139f87d5c61b4ac715e677fb23aa2cc3eb4a62e20776431d26e234d092d9b28ecad22de2f5acda1f21df394f3a51152c9fd36cdfddab78af2 SHA512 4620dda918196e67f99c8a1df8e3e487769bd3ad94881a3769e46a85a12648f50ba8520476c9eec9e982261354ff92f56803fd8731fa7a7e458670011426ce31 DIST amdgpu-pro-amf-1.4.24.1395274.deb 1304984 BLAKE2B e1b51c6e9dfafcb677314ac881983372cc1d1f09b0112bbe842da06672da8f48e5bd5db358c8067fa23e8a5b4d110b2ea6d998c06357ed32e29accac8ba86c38 SHA512 e809ccf0b93fa8dc44320166ff549e10e1edc6556bb4bf48112de0f20c7e5dda761029aacfa0fd00def30cc647131eb55cf94f01414222c7891d2dad279d33f1 +DIST amdgpu-pro-amf-1.4.24.1420323.deb 1373976 BLAKE2B 64dbcbc079abf523f78663b01066bb74e12f60d56b4a2e7c6765e7b1755a84b1cf5cbe7fcdcc315b42fbb11cfafbf97b0705bb489bead8f84d07f4e81cd84bb6 SHA512 fbe3b24b65bf993dea5bc7d1f6abcb2d0eb938206183962dce1d4634538826e1f4d80f97ee09829af2e745e5f1f97c3bc1c2c8d7cfe4757009157e6996c4b195 EBUILD amdgpu-pro-amf-1.4.24.1376756-r1.ebuild 1283 BLAKE2B d563376c455b3761106c67ae912b7b6ca2047694f104157e98cc802239674676611f4a0bc67ebdeb18c78c26f35af4a75985a4cc8fe4cc8f95d89523c4cd3ae4 SHA512 f810d2cba5bc2d12e0256caeaf03ae94e82b11cf6942b77eb4da6eb34204beebef9f53b4745a6c2bd603507a1549699fc70666e037c10d8020af7076c4e82bec EBUILD amdgpu-pro-amf-1.4.24.1384496-r1.ebuild 1283 BLAKE2B f2504aee7dd019b60621e7cfb4586dfc750ab0fced2929a725ec3b291f109c81eb04791df995947f8d94eac45e990182691e896cf240dfa4ece7eed72c7b8340 SHA512 fce600f954c56aec568828875ad815cc2cf34afaff63414cad75db260a5ad244817ae473295ee1c502341e776ab788086204ebfe085c8c6a8a550a02b63a3587 EBUILD amdgpu-pro-amf-1.4.24.1395274.ebuild 1214 BLAKE2B 7664a37ed9ebaa10343988f9a0ee6ba847279c1ba1066e2e61cf900eee2e508a64770905a8c4fa8673aafca9b185001093ead27dc8ea7e2d5d33ebbc7444f6c9 SHA512 dfd615c64b268387e87178872c850caceb6ebcc9262596c8b20af27c8bc4ff9f640bb1924adee93b908d2269b0e9ca190e4781cb2aa257afe08b6fb73273d4a7 +EBUILD amdgpu-pro-amf-1.4.24.1420323.ebuild 1194 BLAKE2B 767e61d81171971df1de01018a17c66c9c330b79276bcf5943cea00a3b1c84052f7d1b78dec79ef47ccdc41f134e261f524c6ed8190629a001a89ee40c3d03e1 SHA512 b1ef7192ff56cc7692798e52c8d23de2ace76a99908c3431f724dcd9555c6c6bccf66e1be5ab7df7b31864de74256199ffd568c8ac2d2ef7dc132341234aeec2 MISC metadata.xml 402 BLAKE2B 45f4e6adffb186b9a9b36b420aaa5727f025206eca039d9f6fbe3eb302f7200cc24c079480d91c9d92ccd932bef86b87401400f17eba2fd8b4baa3fca66cf236 SHA512 dc9e5a699437291c5f768d66bdfd9d2aaa00e931f358e6d0045e764638332a8db14bd19a782aac0918dc4b42b8658a5974bdfec2971690e6718be247fff512b3 diff --git a/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1420323.ebuild b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1420323.ebuild new file mode 100644 index 000000000000..179799c5a6c5 --- /dev/null +++ b/media-video/amdgpu-pro-amf/amdgpu-pro-amf-1.4.24.1420323.ebuild @@ -0,0 +1,55 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit unpacker + +MY_PV_HIGH=$(ver_cut 1) +MY_PV_MIDDLE=$(ver_cut 2) +MY_PV_LOW=$(ver_cut 3) +MY_PV_REV=$(ver_cut 4) + +MY_PV="${MY_PV_HIGH}.${MY_PV_MIDDLE}.${MY_PV_LOW}" +MY_PV_FULL="${MY_PV}-${MY_PV_REV}" + +MY_PN="amf-amdgpu-pro" + +PRO_VULKAN_PKG_VER="22.10.3" + +DESCRIPTION="AMD's closed source Advanced Media Framework (AMF) driver" +HOMEPAGE="https://www.amd.com/en/support" +SRC_URI="https://repo.radeon.com/amdgpu/${PRO_VULKAN_PKG_VER}/ubuntu/pool/proprietary/a/${MY_PN}/${MY_PN}_${MY_PV_FULL}_amd64.deb -> ${P}.deb" + +S="${WORKDIR}" + +RESTRICT="bindist mirror" + +LICENSE="AMD-GPU-PRO-EULA" +SLOT="0" +KEYWORDS="-* ~amd64" + +RDEPEND=" + media-libs/amdgpu-pro-vulkan + media-libs/libglvnd + x11-libs/libdrm + x11-libs/libX11 +" + +QA_PREBUILT=" + usr/lib64/libamfrt64.so* +" + +src_unpack() { + mkdir "${S}/${PN}-amd64" || die + cd "${S}/${PN}-amd64" || die + unpack_deb "${DISTDIR}/${P}.deb" +} + +src_install() { + insinto "/usr/$(get_libdir)" + + # AMF + doins "${S}/${PN}-amd64/opt/amdgpu-pro/lib/x86_64-linux-gnu/libamfrt64.so.${MY_PV}" + dosym "libamfrt64.so.${MY_PV}" "/usr/$(get_libdir)/libamfrt64.so.1" +} diff --git a/media-video/avidemux/Manifest b/media-video/avidemux/Manifest index 045531353029..c7f0f22b1bf8 100644 --- a/media-video/avidemux/Manifest +++ b/media-video/avidemux/Manifest @@ -1,5 +1,5 @@ AUX avidemux-2.7.4-qt-5.15.patch 523 BLAKE2B 3fdbf41edb47f2827a2bb25d553b6adc9cc872c032762754ce182d75496f705be2e33b210587f436b7d30e1ff3db88fd1596bb5b85b011924244b9fe806816d1 SHA512 c651d4bf4f60d85c068ed1c7733481ea57f9528656bea50193e80006d8102100cb881737553a93dd9d1bfcf8216abb08463f494bebef5fec3fb217099c1c91fb DIST avidemux-2.7.8.tar.gz 22080267 BLAKE2B a1e56856f44d56afac6ea4015f206a3f9301c025b3c8da1528165bd4c139ccc971074ac21aa05b9b3dfd6d514eabcbb375e671c8df9c9e5cae74a0a6597577c4 SHA512 6cd5527ab34517a07bf73e46d01f15b7ff023ff34ed70ee54f1d7dbfb6cf57364a323b4ecb89bb9aadeb9bc05473aacb40d8c4eecc522840a3c1c4b3a8756d82 DIST avidemux-i18n-2.7.8.tar.gz 2488165 BLAKE2B 9e6bfb10e938c880d372570cfe35ba9422a8c0081b116230d831bd421b205a555415350be96b0e3149beb164a0151e04205bded403354d7052aa24884a068407 SHA512 a62b06a3d95577cf805be36f991ccb63d044b7c3633ada65bd5810f0e7d8eb41aa874ef5dd63de4fcacc0be073935bed827b2f0bceba77ab735ac8673c1ad39f -EBUILD avidemux-2.7.8.ebuild 3884 BLAKE2B 91acfbb9a930ae9314088e767da2ba94698193353b458448f81b68960e52aa7e265df3d7c24208f9aa29628f5913106f3356e81b86ff62596a08600f5144c6ff SHA512 90f79565cde6627c6f57b452d62f9342842af01a53d62555ed19ab8f3aa31310b7874e860bd9be8cd4fc7f0946734fafde472f39eacb45555a17a0bbec645872 +EBUILD avidemux-2.7.8.ebuild 3817 BLAKE2B 48c0195f6c6297da7cb7c4f1463f5cd27cb3d7b1a3d2c90777c159260eea82bfe31d6ebc07f9564fdba924228551abfe0b298d0425494348261f3b010aa9385f SHA512 72c507fc9f4ec5af96748a8bce0dd16b21c893178dc9d10341f96536816dd9d10bfae7f033506f91c9c8a443b2d8c0c8d5924902d0928272634d847b9870d2f5 MISC metadata.xml 348 BLAKE2B 4ac0858fce6f3fcc1e57954b575a6bea693b2af81bb1ef9d191aafc85c920eb49530a33e1d23cf21414513217ce7275862ddc19f39e5ee08d67df22507f474ef SHA512 f7852e51252af3580211aebd056f13430f945a1cf5123ea84759df11afb083b35bb74e916b39196a37981dc540ddc3d379a38650c0599e351d68245ae62c65d9 diff --git a/media-video/avidemux/avidemux-2.7.8.ebuild b/media-video/avidemux/avidemux-2.7.8.ebuild index b251f2f04609..2bad184b4aed 100644 --- a/media-video/avidemux/avidemux-2.7.8.ebuild +++ b/media-video/avidemux/avidemux-2.7.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -18,15 +18,14 @@ SRC_URI=" LICENSE="GPL-1 GPL-2 MIT PSF-2 public-domain" SLOT="2.7" KEYWORDS="~amd64 ~x86" -IUSE="debug nls nvenc opengl qt5 sdl vaapi vdpau xv" +IUSE="debug nls opengl qt5 sdl vaapi vdpau xv" BDEPEND=" dev-lang/yasm qt5? ( dev-qt/linguist-tools:5 ) " DEPEND=" - ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?,nvenc?] - nvenc? ( amd64? ( media-video/nvidia_video_sdk:0 ) ) + ~media-libs/avidemux-core-${PV}:${SLOT}[nls?,sdl?,vaapi?,vdpau?,xv?] opengl? ( virtual/opengl:0 ) qt5? ( dev-qt/qtcore:5 diff --git a/media-video/baka-mplayer/Manifest b/media-video/baka-mplayer/Manifest index 21c62ae8d23f..91aeef207dd9 100644 --- a/media-video/baka-mplayer/Manifest +++ b/media-video/baka-mplayer/Manifest @@ -2,7 +2,7 @@ AUX baka-mplayer-2.0.4-gcc5.patch 1251 BLAKE2B 9f514f754499f5b44ae4a077c2025dfa0 AUX baka-mplayer-2.0.4-mpv23.patch 782 BLAKE2B de90ac31fcbdd1cb9fb00eae1e282c6ff7e5ee14dd81bc2d8e07bd36250dcffa5de74dd83f2558bb15cae54ca83279c20f2776f315eea7f5b7a946e53a2e3f82 SHA512 9fda60f3569b88eb71d42562ef1650bfd125bf69f80b25ff1c123fb7efda524b7c14ae1f782d1786e9e68263f66db5af95a30c4e2e87468782da750eacbe456f AUX baka-mplayer-2.0.4-playlist-regression.patch 886 BLAKE2B b2c0edba4a2a0da89494dec05b78e7768a24af94f06fcda7fa4c4066800e673d551ed82f6b45d14f3f7f2d6d855d3e0be8535b5a6d3093fce90a9627e9f3c5c5 SHA512 3905ce72374c59edb09ed5a311ff257da3010386de9b076de516bd008c23d7e757d7c63151ac350bdc281a575b6387a96a44d1ac5e2229a1a325a3dfc5e6ace4 DIST baka-mplayer-2.0.4.tar.gz 988060 BLAKE2B 4d73e6626bab90b2ac818fdc1b0d8ab7758a924805ca8356c6fa94d25df9acbfd53d7e997b58e5c85b68e033f83ce89d6e3b0c3e30ecc23d7d75b4bf74ae0911 SHA512 7898d65e87540bcb528d429dc70daefc7d4c0711b2983326cf6fa3a14e566c2742334378befdb710b8cc59452f960bc17b290058ba9e6878e830de6dbafce55a -EBUILD baka-mplayer-2.0.4-r1.ebuild 1392 BLAKE2B 557b0083d663a96aada33ade3d44d26632983163a2db08c763832130b0e8b254932df7b5a88d4bdd8053be78057c0de9e8456fd083e6331fbb9a72527e1d23c1 SHA512 54f4535ead081d4bc2b86ec11bef81f27ae39835d527b589dc7a962db9615c78bb8e64a7ca0f15d5f42f8ebf362486eaab0ceb1affe5c361121566b551370b63 +EBUILD baka-mplayer-2.0.4-r1.ebuild 1399 BLAKE2B 4e82b0bc35b7740e5891e27412e9156db667106ac2655a5ef6c7c5764893ab73bad86a7362c3dee1a811a95d7bbc319c96d05487ee495a0efcc563520289129a SHA512 e9af289d999d8c35caf425a2a4af7524f5a5031160a5029f683598925f68ef5e567f2a38f18d6218dd5ea47e80d5eaf202b956b86443197d0141f9cd9564c21d EBUILD baka-mplayer-2.0.4.ebuild 1135 BLAKE2B 22e814220d9493f077d266aee064a279e105d4ed4d35db3ffb8d3447b99580a9abe380042a1bd9a8fa9fe68138893f90bfff657c520168ff8d4cea1e73201431 SHA512 21bef7f1e283eb3a60cacb6502525ba46299aeaed11ae77da182755428adcfb526027452fbcdf80576854fa9d05d6eae5f720d9e10fe0e8ea5af649eb201a8f3 EBUILD baka-mplayer-9999.ebuild 1187 BLAKE2B f2ce2028cc9c86799e1e676ccc4cf8fd2fd8dd663605deb74801ae812471295cf1f6537dea13a1960400abbc7f0694ed7015688ea2097575738227598fc8cf25 SHA512 c345059930ff6da0691eddd5e6c3a4c5c445af70bf4bb26b1492a65c337ad3c091455e2a22df67dc918774f7712971e727a9f3accd993adca0e6a3ce942cea46 MISC metadata.xml 741 BLAKE2B 5fea8a8b3fd803742c6f71acc12e35fddee71fe7deddd35c87bfa0a5bef853833ee19864f69986c141a573cbc65cb2ac8b4aa191a8eeb6b28acd05592200956e SHA512 03f290ffac4d0aa5a978d9fe5e7e7a76e83de243c73e920c045a43b333bdc039a2e09f8f65c56dbc77ef7865b2360fc6bb34eaaf64f4a2df992d30dafafb8331 diff --git a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild index 2511f6ebe253..f636c9d563c5 100644 --- a/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild +++ b/media-video/baka-mplayer/baka-mplayer-2.0.4-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -11,7 +11,7 @@ SRC_URI="https://github.com/u8sand/Baka-MPlayer/archive/v${PV}.tar.gz -> ${P}.ta LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm64 ~ppc64 ~x86" IUSE="" BDEPEND=" diff --git a/media-video/bino/Manifest b/media-video/bino/Manifest index 6b2ae142af7d..a2fb05864f18 100644 --- a/media-video/bino/Manifest +++ b/media-video/bino/Manifest @@ -1,4 +1,6 @@ AUX bino-1.6.7-gcc11.patch 883 BLAKE2B 612ff39d9294567d65809f88c4dc9d77011f2dbf5aa318a827299a7323f6706bbc4d82f8834ad8dd180fdef47de8d7fa0b861e93b91f2e2b2016cc09a522ca53 SHA512 3cf037566f6cb1d3eb2eeaf332e657e9eb088627c70752da2c27e5e22956a803fde3bca9071e75ede097c348e0f0e013e9c6d2cd0c15ff80f8b2059cfcab4646 DIST bino-1.6.7.tar.xz 825068 BLAKE2B d9019a793838f33ea1315849aa994b20a1c6127995315dc03972fe6c64a742c73434c07ba06402a1e2bd5357781d18aaf3d19ab2d61788745b2aa99ad3f4c6f4 SHA512 ae8f72b200100664b9fd55963371ce64a2f39e240676494d69b422d662f2295560ba458eb04707b82f88d3c6b3fab98a1ecb40d74799300f96b8eb8be680c9b8 +DIST bino-1.6.8.tar.xz 836712 BLAKE2B 801d6f1ffbf1a7fbaabcdbb2c4bd649662d3b14b08189431a418702177f5de28a8961763c83962fd72cbf6f762fad34ed0b616efc68a723f65b6c72823618897 SHA512 d8cf5be356add4ed3fb36673038b5ffd92d0dc840798cc616fa4b11fec221c7f114347dfc7cdb7a3a24c5599b56301cddc99f84d3862d8e874612960281319cc EBUILD bino-1.6.7.ebuild 1480 BLAKE2B f7841fc972fa8ae1f69fd8cd5c6fe7deffa9deebc12de70df06a7468f90cfcccc50f505a0399d430e537a695dc4e38c9542a13c66b18aa41959fa8cdc0debb09 SHA512 1600712530afc3cdef216324decb214f2c1a907b8dbb195c41c7a83456d60cae130efd94b442b60d1bce6efa19423302368cfa2d76f3bbf9248af591df49ba59 +EBUILD bino-1.6.8.ebuild 1515 BLAKE2B c53f5230459a32bc4d2c63f2232471cbe9f462e2dbdb8f7c5c2965d34b7e8e63064c87c7e6b015334278675edd846fe751a151b343c1a3a5cad6114dc9af9b0d SHA512 d4e684d64a8e8427bdba68ba78fb2b978993619a735fe6c9c74fde6fb733991f5adea74a667e2ce24ef15adcc4f3f59bf8cfce4f668f4006f249ff6d10855d09 MISC metadata.xml 168 BLAKE2B 2e0e000b4c3b6ca04c12903fdbe278415c05a822623c52e9aa95cbbf3d50bcb1246b7edbda7d2f6b559af8950c6374e6e0a69b76319964cfe686bf50b0604a57 SHA512 4dcf45d1809e8390a2d8155c8ebfe0dd610203e392aeab0ccd8a10f42cc8532a4925eff32b35e7a6c35598a4efd288229034ec0732299dbd8cfa0acff705fed3 diff --git a/media-video/bino/bino-1.6.8.ebuild b/media-video/bino/bino-1.6.8.ebuild new file mode 100644 index 000000000000..0cdd8ab1a37c --- /dev/null +++ b/media-video/bino/bino-1.6.8.ebuild @@ -0,0 +1,65 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic qmake-utils xdg + +DESCRIPTION="Stereoscopic and multi-display media player" +HOMEPAGE="https://bino3d.org/" +SRC_URI="https://bino3d.org/releases/${P}.tar.xz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="debug doc lirc video_cards_nvidia" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtopengl:5 + dev-qt/qtwidgets:5 + >=media-libs/glew-1.6.0:0= + >=media-libs/libass-0.9.9 + >=media-libs/openal-1.15.1 + virtual/libintl + >=media-video/ffmpeg-0.7:0= + lirc? ( app-misc/lirc ) + video_cards_nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] )" +DEPEND="${RDEPEND}" +BDEPEND="sys-devel/gettext + virtual/pkgconfig" + +src_configure() { + if use video_cards_nvidia; then + append-cppflags "-I${ESYSROOT}/usr/include/NVCtrl" + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/opengl/nvidia/lib -L${ESYSROOT}/usr/$(get_libdir)" + append-libs "Xext" + fi + + if use lirc; then + append-cppflags "-I${ESYSROOT}/usr/include/lirc" + append-libs "lirc_client" + fi + + # Fix a compilation error because of a multiple definitions error in glew + append-ldflags "-zmuldefs" + + export MOC="$(qt5_get_bindir)"/moc + export RCC="$(qt5_get_bindir)"/rcc + + econf \ + $(use_with video_cards_nvidia xnvctrl) \ + $(use_with lirc) \ + $(use_enable debug) \ + --without-equalizer \ + --with-qt-version=5 +} + +src_install() { + default + + if ! use doc; then + rm -rf "${ED}"/usr/share/doc/${PF}/html || die + fi +} diff --git a/media-video/droidcam/Manifest b/media-video/droidcam/Manifest index 404f842e0d04..af38b128f0e1 100644 --- a/media-video/droidcam/Manifest +++ b/media-video/droidcam/Manifest @@ -1,6 +1,4 @@ AUX droidcam-makefile-fixes.patch 2178 BLAKE2B 223344a2138b0a93f7eaffda4814236acf19a7cf6d4ee6daa03be3b7c601b549ce77219d03f53dbb1ac11493ff991c08f8d035fb91dbed22b590c07628318640 SHA512 73082410683b81794589816a3158ea66ce1c6717f65454f4528e1b00298c88131fec3f460915cfb603ccb85be1b54134869444924bf63c69cee89f03a275b556 -DIST droidcam-1.8.1.tar.gz 84566 BLAKE2B ba023c98159003bef39eac2fcff211243aa5fb2cc4369a333c5b78c9708b8c34ff9987d6b84628b32e436bab776e0c8c83f75b7c6a788f85831d3d17dd468833 SHA512 58ce6014004edcbf89b4847ed916f9cd2757865172c61e446a04b2f6d93395db1013f0cb31f0b10161bfd83a1436e684891c3457371a3ad62308509bb85b4cf4 DIST droidcam-1.8.2.tar.gz 84797 BLAKE2B b2458dd04b467106a6d9a8a9f3d44058641a7c8ca429d5c92f498401c07f6bc364dc056755f21b40faac7e7aec1877250afb119ac3b7f979b24cdeb86f45c384 SHA512 507f513c8d0dffa86afe5368ccab5461931e236b6352269a6eb5e970a79e5f9b386808da3466f3b391e955170b47b24a82663632ddc3c3c84e4de5988b7d3f8f -EBUILD droidcam-1.8.1-r2.ebuild 3465 BLAKE2B 3c93576916f8f61d7b0c6814727b537fa6189bf7aa7fb163cfa1dc7502b6eeea48b8534ebb96a064cf4ccf8e8d9ca0509e03ef1797dce51873c444d2f665b962 SHA512 7959d315ada90ad6d277cd62e66a69e10efbc7623afe8f32436079c0370aa1691167f33f2c533575c8dccc8a36ddb5bf68443f985547f79b868e277ebcf79def -EBUILD droidcam-1.8.2.ebuild 3465 BLAKE2B 0d89d49d2e90f56e75d9cb4aa55900bc2fdf57b6db9f3b54e03c86888bd2f0b2ca1b1ce270f6454f053afa65bd3e0cda9263d1cd97fe3ce9e2896f9672f18710 SHA512 864c77b17edca69e4a82a6e518cf783d021020937bc76c3b1fee7805b4b84d9c3ac73668f926546abd298f402712279f4de8375459880dd56dd4e3d529f58dff +EBUILD droidcam-1.8.2.ebuild 3454 BLAKE2B 7c61b43a0aa8f36bd052325f2b5f0b7bc845a2b761b6a91e109a15bd5ddd490dbe9ca498441b15f0924ab18433309139c3bb798b886254d7c5f4dcd19366b215 SHA512 e04361ee773793c5291faa8f608697aa8b0a90c7350d535dc4d43ca05c518c6f0a9b212a0a49f40fa0742b0b674374938309fe6ab017733ab65a97905deab100 MISC metadata.xml 1421 BLAKE2B 6d46f5cbd0a226d749b35d8e90a965d4f12fa609b6e95ea6effe87730bce525c0fadb14aa3eb8b99d60f91c7c46a542df5073a55f018f9c06877758360b91e60 SHA512 9dfe075ab79599ecfa3cb9cbf607e4e9a14dd6d002fb3f84bd2d809d962a8bf52b7a0a7166b6805ce4816a57c08e57ab4b224ae1de4e44130bb52f1674ea1e02 diff --git a/media-video/droidcam/droidcam-1.8.1-r2.ebuild b/media-video/droidcam/droidcam-1.8.1-r2.ebuild deleted file mode 100644 index 819276a7b5d0..000000000000 --- a/media-video/droidcam/droidcam-1.8.1-r2.ebuild +++ /dev/null @@ -1,155 +0,0 @@ -# Copyright 2019-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit desktop linux-mod xdg - -DESCRIPTION="Use your phone or tablet as webcam with a v4l device driver and app" -HOMEPAGE="https://www.dev47apps.com/droidcam/linux/" -SRC_URI="https://github.com/dev47apps/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -KEYWORDS="~amd64" -LICENSE="GPL-2" -SLOT="0" - -IUSE="gtk" - -# Requires connection to phone/tablet -RESTRICT="test" - -DEPEND=" - app-pda/libplist - app-pda/libusbmuxd - dev-libs/glib - dev-libs/libappindicator:3 - dev-libs/libxml2 - dev-util/android-tools - media-libs/alsa-lib - media-libs/libjpeg-turbo - >=media-libs/speex-1.2.0-r1 - media-video/ffmpeg - gtk? ( - x11-libs/gdk-pixbuf - x11-libs/gtk+:3 - x11-libs/libX11 - x11-libs/pango - ) -" -RDEPEND="${DEPEND}" -BDEPEND="virtual/pkgconfig" - -BUILD_TARGETS="all" -MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)" -MODULESD_V4L2LOOPBACK_DC_ENABLED="yes" - -CONFIG_CHECK="~SND_ALOOP VIDEO_DEV VIDEO_V4L2 MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT" -ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support" - -PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch" - -src_prepare() { - if ! use gtk; then - default - sed -i -e '/cflags gtk+/d' Makefile || die - else - xdg_src_prepare - # remove path and extension from Icon and Exec entry - sed -i -e 's/Icon=\/opt\/droidcam-icon.png/Icon=droidcam/g' \ - -e 's/\/usr\/local\/bin\/droidcam/droidcam/g' \ - droidcam.desktop || die - sed -i -e 's%/opt/droidcam-icon.png%/usr/share/icons/hicolor/96x96/apps/droidcam.png%g' src/droidcam.c || die - fi -} - -src_configure() { - set_arch_to_kernel - default -} - -src_compile() { - if use gtk; then - emake droidcam - fi - emake droidcam-cli - - if linux_chkconfig_present CC_IS_CLANG; then - BUILD_PARAMS+=' CC=${CHOST}-clang' - if linux_chkconfig_present LD_IS_LLD; then - BUILD_PARAMS+=' LD=ld.lld' - if linux_chkconfig_present LTO_CLANG_THIN; then - # kernel enables cache by default leading to sandbox violations - BUILD_PARAMS+=' ldflags-y=--thinlto-cache-dir= LDFLAGS_MODULE=--thinlto-cache-dir=' - fi - fi - fi - export KERNEL_DIR || die - linux-mod_src_compile -} - -src_test() { - pushd "v4l2loopback" || die - default - ./test || die - popd || die -} - -src_install() { - if use gtk; then - dobin droidcam - newicon -s 32 icon.png droidcam.png - newicon -s 96 icon2.png droidcam.png - domenu droidcam.desktop - fi - dobin droidcam-cli - - # The cli and gui do not auto load the module if unloaded (why not though?) - # so we just put it in modules-load.d to make sure it always works - insinto /etc/modules-load.d - if linux_config_exists; then - if linux_chkconfig_module SND_ALOOP; then - newins - "${PN}.conf" <<-EOF - v4l2loopback-dc - snd_aloop - EOF - else - newins - "${PN}.conf" <<-EOF - v4l2loopback-dc - EOF - fi - fi - - einstalldocs - linux-mod_src_install -} - -pkg_preinst() { - linux-mod_pkg_preinst - if use gtk; then - xdg_pkg_preinst - fi -} - -pkg_postinst() { - linux-mod_pkg_postinst - if use gtk; then - xdg_pkg_postinst - else - elog - elog "Only droidcam-cli has been installed since 'gtk' flag was not set" - elog - fi - - elog "The default resolution for v4l2loopback-dc (i.e. droidcam) is 640x480." - elog "You can change this value in /etc/modprobe.d/v4l2loopback-dc.conf" - elog - elog "Links to the Android/iPhone/iPad apps can be found at" - elog "https://www.dev47apps.com/" -} - -pkg_postrm() { - linux-mod_pkg_postrm - if use gtk; then - xdg_pkg_postrm - fi -} diff --git a/media-video/droidcam/droidcam-1.8.2.ebuild b/media-video/droidcam/droidcam-1.8.2.ebuild index 5f559ce94e00..5f32002d8d66 100644 --- a/media-video/droidcam/droidcam-1.8.2.ebuild +++ b/media-video/droidcam/droidcam-1.8.2.ebuild @@ -43,7 +43,7 @@ BUILD_TARGETS="all" MODULE_NAMES="v4l2loopback-dc(video:${S}/v4l2loopback:${S}/v4l2loopback)" MODULESD_V4L2LOOPBACK_DC_ENABLED="yes" -CONFIG_CHECK="~SND_ALOOP VIDEO_DEV VIDEO_V4L2 MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT" +CONFIG_CHECK="~SND_ALOOP VIDEO_DEV MEDIA_SUPPORT MEDIA_CAMERA_SUPPORT" ERROR_SND_ALOOP="CONFIG_SND_ALOOP is optionally required for audio support" PATCHES="${FILESDIR}/${PN}-makefile-fixes.patch" diff --git a/media-video/ffdiaporama/Manifest b/media-video/ffdiaporama/Manifest index 8636b29c1a24..806472213dc0 100644 --- a/media-video/ffdiaporama/Manifest +++ b/media-video/ffdiaporama/Manifest @@ -2,8 +2,10 @@ DIST ffdiaporama-2.2-ffmpeg-3.0.patch 19635 BLAKE2B 000816945e74033b2620f635f59e DIST ffdiaporama-2.2-ffmpeg-4.0.patch 6648 BLAKE2B 1efaecf9dc6180539bc01a6e4f1403864ea2f9318cc1528aac0bb339d840e3eec40ddc60a531d8af52aae5592c38bbcad9d8dd260cedbe01ab655e2135766e6b SHA512 9588352af7b048ade3b681364a4edc29526241b0631e39314b9466f490d66a4e3b795f4c32afd0aadc2a3d63a9ce4e99a6bb77e4c3f79d959e68e82856882d32 DIST ffdiaporama-2.2-ffmpeg-4.4.patch 1034 BLAKE2B f6105f5fc9d928c43fc33d2eb154d97843516f42754154690ca1651c90f9cce21ce03a80ca2fd0440611f30463077a67cccc9d2103d6ffecde80f7ca5ba48142 SHA512 14c2c8361836a0f95224577710b72d48fe9aa5c9a330777b8cb709a1ad02f95d9b8ba0f22ff9250e0a6898cfd8f6839658a94f59082d2da767299a81a38e9f8a DIST ffdiaporama-2.2-libav11.patch 18781 BLAKE2B 95da6d11fa31f18106184c0c14a524c42f03a169503ad58d72e871edc60ef52b5ee6ac6d757e8ddcaa66ba58a1b78bc1ca1a9b116d69a3526fd6bc3e5817a9d9 SHA512 f24f3f6b624763dcc3ea5bc0c52480d986fbec9b123ad5645c11a525c0eefb7b8708f90df4fb728dfab1d640c6dfab9a550874f59d333cff979e3ef56639416e +DIST ffdiaporama-2.2_pre20220403.tar.gz 63270245 BLAKE2B 86e5926285b5c38146065cbbc53182eba77c25fa7eddd79e61276b949f5ad4f217f3e2562bed938f06c191493929afa7f24820ef957243f176b3f8e09d4284a9 SHA512 75076eadf1cbef38590ef250746228598ddb00bec2328589a6fb913ee3ae376a6587e6e90494986c5cbeda7aba6c342992cb5e71e5c8ce26e4fda12238ce72e4 DIST ffdiaporama_bin_2.2.devel.2014.0701.tar.gz 18377677 BLAKE2B 74337dcb935eedfccb769562c9b763f642058d2fc8bf4a3c4a81b1ce857398ee759ce2cf269c31527cece2c18a48505ad46b197e10da8444cbf2131ffb3e1130 SHA512 6531381137c47d3fd2954d09fe922086de1b69638ed4b092faeb9e2982b463c6614314bda56512f6a315bd02b8600d815efb19dca3dae89947df9a48a2ae7b86 DIST ffdiaporama_rsc_2.2.devel.2014.0503.tar.gz 18390602 BLAKE2B 58c38d1f62ec04b217add232873556cf57d13cd17ef672f2087b44c0aac9ee7bc890de3bb812cb1c57093565b06de51ed0ddb0465d9b7fce21311fedf51042a3 SHA512 73faafe54d7d9a3d8d91719ac56cec7323e0a497f77e0c9f243d84782aa6040677236d9e41d3b539c45d6aca2448d737912ec59bd2a7e417749ee548cd68652d DIST ffdiaporama_texturemate_1.0.2014.0125.tar.gz 30352923 BLAKE2B af558994a811508ff6b0f1dc34f33c60fca0a4f40c1cf675e08925b40c8312444a20ea95b0a0c9316225806096e9bbb209faf3e48b74041604c6d81be0175aba SHA512 e9aa9607d670a620b2e3c27d6ec5bf983eb31ab3d3139edf32ebb84d9ffa58b11c822f7db4b3f3c4a430b256719803df4a3a385bd467bdda09f8710d010eb2f5 EBUILD ffdiaporama-2.2_pre20140701-r2.ebuild 2202 BLAKE2B 02c10b37be6a97785ddc840f3fdfca53a87b912f87088502c652b22e78dd7874c89730a80a34550d9e3eeb85ca5bcf7633a6027c910c9b749aaecd58c8085450 SHA512 92b1a53ad3a35127155c88f7ee72981f883e8de5b56c2f8329cefd53c9b510f28ebc4ad7ef7c654637711f1dbaabad59c32347cab20e383f678324af00697e8e +EBUILD ffdiaporama-2.2_pre20220403.ebuild 1238 BLAKE2B 84a216c471637e271e20929a52837df000b24f218fdd28ee8a0dc7c8d30e79772d8b0992272340f288a9f8dd3b875e047aaad80a835132fb0b06853b49b0d787 SHA512 77e442dda67724893b2d7b97e2c5ca706ccb4cbe8dc78b05f12faf819b8e30bdd5053a4d92b584bb09b90c93d6dd277d685e8f6f1ccee5cd4ca2b34bec487cf2 MISC metadata.xml 2287 BLAKE2B 5587b545dc1ebe240f8d283efc446ffd04f14fc885b74b4b8158c1a8aa7e9eecdda98bc523794e845edae8db82cda0ce04617c37be16ad892834b81891e48a5f SHA512 aa07360404af10b3154283e5d3d726b18ea12597db584d65803faf885e9b71c6a5092f118a2c14eb982183a8513ea95e05be33cf37f1026af35bd4be400a41db diff --git a/media-video/ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild b/media-video/ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild new file mode 100644 index 000000000000..f13a63fc974d --- /dev/null +++ b/media-video/ffdiaporama/ffdiaporama-2.2_pre20220403.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +COMMIT="0557dc2d2489b88c813c695b0d75107be82292f8" + +inherit qmake-utils xdg-utils + +DESCRIPTION="Movie creator from photos and video clips" +HOMEPAGE="https://ffdiaporama.tuxfamily.org" +SRC_URI="https://github.com/laurantino/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3 CC-BY-3.0" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="openclipart" + +RDEPEND=" + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qthelp:5 + dev-qt/qtmultimedia:5 + dev-qt/qtsql:5[sqlite] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-gfx/exiv2:= + >=media-video/ffmpeg-4:0=[encode] + openclipart? ( media-gfx/openclipart[svg,-gzip] )" +DEPEND="${RDEPEND}" + +DOCS=( authors.txt ) + +S="${WORKDIR}/${PN}-${COMMIT}" + +src_configure() { + eqmake5 QMAKE_CFLAGS_ISYSTEM= +} + +src_install() { + emake INSTALL_ROOT="${D}" install + if use openclipart; then + dosym ../../clipart/openclipart /usr/share/ffDiaporama/clipart/openclipart + fi +} + +pkg_postinst() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} + +pkg_postrm() { + xdg_desktop_database_update + xdg_mimeinfo_database_update + xdg_icon_cache_update +} diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index 0889111a1e6c..6cfe4fb31077 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -1,8 +1,5 @@ AUX chromium.patch 1536 BLAKE2B 8caf1ff11f8da710138cbb857bd42e8679f98f3c30a3eaddb51611b7c39fb48c23890257997d3ddfee47244e6ffc0abb241e3118e0e8bcbf63442885445bcee3 SHA512 711b338178fe042aff92375d6593197337529986ea55ac6288df4c725145dd06c41fcfc11df4843e03eeaa4bad90ed558acf8f6945b9b96c9751fff92a41811a AUX ffmpeg-chromium-100.patch 1653 BLAKE2B 4d0b025b024aa9ce9e325487c09bb3a566b453198626a2178b119eab56adb73d392a8f4499735310108838f73d48c50f54c9c4b1b19db66c98ef15b39e38c3d4 SHA512 89cbf0cd5c4337e4633af7c814002cb4e909b4d4d385d5a3e265882cf1c4e24e4057512bffe7311e53b8a7886c882929221b07961ae86d115803f9b991ef6a05 -AUX ffmpeg-chromium-94.patch 1617 BLAKE2B 83afc6ae7f6d3b802e7c074545f8e46980751065303dc80283af917771675c987b063a4d39d9ca853b2753c40d38c3484c09a32500011b8faac0fca7e1807dad SHA512 41f4d79581602c475f245fb08f14e065ae2ca5b4863dade0e9652e33786fec90a631aa1a0e67f262ab067a12298883aea2d40309d2303bef76d7d99d06329eb2 -DIST ffmpeg-chromium-100.tar.gz 15144675 BLAKE2B 1195078e12ef0d8b5562b2eed068eea331a03727f3dfbd198fdd1088d70346f892bc9161ecd80ed54f7c5c842c9ae9b16f6d02858f3c4a538ce19de03b5ec9f8 SHA512 35f5ca7164d8d8f58b2f553ec7c6181629af217752fe49bd890051675734864ae4b5d1f135808d101fb0c9855d14842a0074759679a15e9b94fb571c9e2ccee7 -DIST ffmpeg-chromium-96.tar.gz 14782341 BLAKE2B 686f5e0970ab49663e43d54cdb9b0216560dabc676711666c9e51840af64d2c78d47b55bcf36625751676839869e1b1f3b65516499646db00fd29f5ed2ff90d3 SHA512 169a1bf58000be0799b05b1d3f3a63b5a93ec66023d31f1ac6f5d9cd77408a390a9308fb626e94c3f1d4e1170638c1c81ac68b248e06c28d318d731ddda8e4d2 -EBUILD ffmpeg-chromium-100.ebuild 6223 BLAKE2B b61ad726d698c6ae4a4e46b2d84eb30fc01f86d7eb76d3492cabf6fc2a890ae2a7c8b29cd9453153db73a87eb59a58e09c966d5978841e77af5ab3fd09f1d3ed SHA512 42055512d93f34a333342787f3df5a92029f562cc46542c77ef752e6ae6f291031e5910c166ce2608277ebc490c919921e9aa554843ef9bc9c19064e939dc110 -EBUILD ffmpeg-chromium-96.ebuild 6152 BLAKE2B 1afb8f595b0f1bd5259de827ca614343165b97cd60f4443d23139d5162edd065d13e3c37f59a43b8a3837058cebcb360616f7b33c65df1fa408c3afc789a9166 SHA512 00a82ddb95b0457f5347b680ae6c7bf058052de6aacdd9e15435f84a3f2d70c776149f2e9c0ff7935f19e2fe35dcbf05ab2cea43cf6d97c1882353be35d019f6 +DIST ffmpeg-chromium-102.tar.gz 15165192 BLAKE2B ecf9b9ff538730d8a265e25e3d30900b119bfa5baa8e097e58151d744c95b3e768b96f477f6394015cd77a8ae35991c7cdaee5fb2f700d129b6c6d7ee87b34d9 SHA512 f5aa4c47e801d2547321c7995240e004706f9b5835610f9726ac45a63ac58a62de64d463ddeb8c1a001d31d89a4dbaee3a1be568c33316f29dc2b675b2f3161a +EBUILD ffmpeg-chromium-102.ebuild 6555 BLAKE2B 99d055b39c96d49fd571831d6403d3fffd9d806eb8513e0740c321135275b0d75a4f1cda7d8446210770001a975d4e514f0417e3323676536ce771782f9c7f63 SHA512 a6f670c65a11a372fec5e7445c3380a9bd634f4889afef6c5c592fb473e960de9219e8ec672cdcd0fcfdb20f7fc1d012b728cecea1e6ac1f7862db339829a5ca MISC metadata.xml 669 BLAKE2B 3e1b3934b51d07a5620026f2d24e027d217380a9ef7819b3ee54e09b12b0d3ed377cef911989d63a6ab65bd7cb92752997fdd90afb0e6f29dc9496a9035daf4c SHA512 556601bbb7357eb7b8be23a93268b8f173bf16b42518f4b931e97d13880b5e0642546c1ead253a625a8938a9c7020cf52f69eaa629e65de47dfa010af6299674 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild deleted file mode 100644 index da0652b2caa4..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-100.ebuild +++ /dev/null @@ -1,232 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT="574c39cce3231c69bc9a02ac475c27d944bdb113" -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz" - -SLOT="${PV}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" - -KEYWORDS="amd64 ~arm ~arm64" - -# Options to use as use_enable in the foo[:bar] form. -# This will feed configure with $(use_enable foo bar) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - # decoders - mmal +opus:libopus - video_cards_nvidia:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - mmal? ( media-libs/raspberrypi-userland ) - opus? ( >=media-libs/opus-1.0.2-r2 ) - vaapi? ( >=x11-libs/libva-1.2.1-r1:0= ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.2.189:= ) -" - -DEPEND="${RDEPEND} -" -BDEPEND=" - >=sys-devel/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}"/${PN}-100.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654 - is-flagq "-flto*" && myconf+=( "--enable-lto" ) - filter-flags "-flto*" - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - local extra_libs - if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then - # bug #782811 - # bug #790590 - extra_libs+="$(test-flags-CCLD -latomic) " - fi - - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --strip="$(tc-getSTRIP)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --extra-libs="${extra_libs}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-lzo \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild new file mode 100644 index 000000000000..d9fff1865360 --- /dev/null +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-102.ebuild @@ -0,0 +1,245 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +COMMIT="5cd95cdf972ad92c38a4ea2d059ac9d6167302ca" +DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" +HOMEPAGE="https://ffmpeg.org/" +SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz" + +SLOT="${PV}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) +" + +KEYWORDS="amd64 ~arm ~arm64" + +# Options to use as use_enable in the foo[:bar] form. +# This will feed configure with $(use_enable foo bar) +# or $(use_enable foo foo) if no :bar is set. +# foo is added to IUSE. +FFMPEG_FLAG_MAP=( + cpudetection:runtime-cpudetect debug + +gpl + vaapi vdpau vulkan + # decoders + mmal +opus:libopus + video_cards_nvidia:ffnvcodec + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +IUSE=" + ${FFMPEG_FLAG_MAP[@]%:*} +" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 +) +ARM_CPU_REQUIRED_USE=" + arm64? ( cpu_flags_arm_v8 ) + cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) + cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) +" +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +RDEPEND=" + mmal? ( media-libs/raspberrypi-userland ) + opus? ( >=media-libs/opus-1.0.2-r2 ) + vaapi? ( >=x11-libs/libva-1.2.1-r1:0= ) + video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 ) + vdpau? ( >=x11-libs/libvdpau-0.7 ) + vulkan? ( >=media-libs/vulkan-loader-1.2.189:= ) +" + +DEPEND="${RDEPEND} +" +BDEPEND=" + >=sys-devel/make-3.81 + virtual/pkgconfig + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) +" + +REQUIRED_USE=" + ${CPU_REQUIRED_USE}" +RESTRICT=" + test +" + +S="${WORKDIR}" + +PATCHES=( + "${FILESDIR}"/${PN}-100.patch + "${FILESDIR}"/chromium.patch +) + +src_prepare() { + export revision=git-N-g${COMMIT:0:10} + default + + # -fdiagnostics-color=auto gets appended after user flags which + # will ignore user's preference. + sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die +} + +src_configure() { + local myconf=( ) + + # bug 842201 + use ia64 && tc-is-gcc && append-flags \ + -fno-tree-ccp \ + -fno-tree-dominator-opts \ + -fno-tree-fre \ + -fno-code-hoisting \ + -fno-tree-pre \ + -fno-tree-vrp + + local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) + + for i in "${ffuse[@]#+}" ; do + myconf+=( $(use_enable ${i%:*} ${i#*:}) ) + done + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # LTO support, bug #566282, bug #754654 + is-flagq "-flto*" && myconf+=( "--enable-lto" ) + filter-flags "-flto*" + + # Mandatory configuration + myconf=( + --disable-stripping + # This is only for hardcoded cflags; those are used in configure checks that may + # interfere with proper detections, bug #671746 and bug #645778 + # We use optflags, so that overrides them anyway. + --disable-optimizations + --disable-libcelt # bug #664158 + "${myconf[@]}" + ) + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *freebsd*) + myconf+=( --target-os=freebsd ) + ;; + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + local extra_libs + if use arm || use ppc || use mips || [[ ${CHOST} == *i486* ]] ; then + # bug #782811 + # bug #790590 + extra_libs+="$(test-flags-CCLD -latomic) " + fi + + set -- "${S}/configure" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ + --cc="$(tc-getCC)" \ + --cxx="$(tc-getCXX)" \ + --ar="$(tc-getAR)" \ + --nm="$(tc-getNM)" \ + --strip="$(tc-getSTRIP)" \ + --ranlib="$(tc-getRANLIB)" \ + --pkg-config="$(tc-getPKG_CONFIG)" \ + --optflags="${CFLAGS}" \ + --extra-libs="${extra_libs}" \ + --disable-all \ + --disable-autodetect \ + --disable-error-resilience \ + --disable-everything \ + --disable-faan \ + --disable-iconv \ + --disable-network \ + --enable-avcodec \ + --enable-avformat \ + --enable-avutil \ + --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ + --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ + --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ + --enable-pic \ + --enable-static \ + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} + + echo "${@}" + "${@}" || die +} + +src_compile() { + emake V=1 libffmpeg +} + +src_install() { + emake V=1 DESTDIR="${D}" install-libffmpeg +} diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild deleted file mode 100644 index d98240ebe12e..000000000000 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-96.ebuild +++ /dev/null @@ -1,231 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit flag-o-matic toolchain-funcs - -COMMIT="d772086c1ec3d79dbf7098f0ba96beffc501e16f" -DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" -HOMEPAGE="https://ffmpeg.org/" -SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}.tar.gz" - -SLOT="${PV}" -LICENSE=" - !gpl? ( LGPL-2.1 ) - gpl? ( GPL-2 ) -" - -KEYWORDS="amd64 ~arm ~arm64" - -# Options to use as use_enable in the foo[:bar] form. -# This will feed configure with $(use_enable foo bar) -# or $(use_enable foo foo) if no :bar is set. -# foo is added to IUSE. -FFMPEG_FLAG_MAP=( - cpudetection:runtime-cpudetect debug - +gpl - vaapi vdpau vulkan - # decoders - mmal +opus:libopus - video_cards_nvidia:ffnvcodec - # Threads; we only support pthread for now but ffmpeg supports more - +threads:pthreads -) - -IUSE=" - ${FFMPEG_FLAG_MAP[@]%:*} -" - -# Strings for CPU features in the useflag[:configure_option] form -# if :configure_option isn't set, it will use 'useflag' as configure option -ARM_CPU_FEATURES=( - cpu_flags_arm_thumb:armv5te - cpu_flags_arm_v6:armv6 - cpu_flags_arm_thumb2:armv6t2 - cpu_flags_arm_neon:neon - cpu_flags_arm_vfp:vfp - cpu_flags_arm_vfpv3:vfpv3 - cpu_flags_arm_v8:armv8 -) -ARM_CPU_REQUIRED_USE=" - arm64? ( cpu_flags_arm_v8 ) - cpu_flags_arm_v8? ( cpu_flags_arm_vfpv3 cpu_flags_arm_neon ) - cpu_flags_arm_neon? ( cpu_flags_arm_thumb2 cpu_flags_arm_vfp ) - cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) - cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) - cpu_flags_arm_v6? ( cpu_flags_arm_thumb ) -" -X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) -X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) -X86_CPU_REQUIRED_USE=" - cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) - cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) - cpu_flags_x86_xop? ( cpu_flags_x86_avx ) - cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) - cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) - cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) - cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) - cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) - cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) - cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) - cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) - cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) - cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) -" - -CPU_FEATURES_MAP=( - ${ARM_CPU_FEATURES[@]} - ${X86_CPU_FEATURES[@]} -) -IUSE="${IUSE} - ${CPU_FEATURES_MAP[@]%:*}" - -CPU_REQUIRED_USE=" - ${ARM_CPU_REQUIRED_USE} - ${X86_CPU_REQUIRED_USE} -" - -RDEPEND=" - mmal? ( media-libs/raspberrypi-userland ) - opus? ( >=media-libs/opus-1.0.2-r2 ) - vaapi? ( >=x11-libs/libva-1.2.1-r1:0= ) - video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1 ) - vdpau? ( >=x11-libs/libvdpau-0.7 ) - vulkan? ( >=media-libs/vulkan-loader-1.1.97:= ) -" - -DEPEND="${RDEPEND} -" -BDEPEND=" - >=sys-devel/make-3.81 - virtual/pkgconfig - cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) -" - -REQUIRED_USE=" - ${CPU_REQUIRED_USE}" -RESTRICT=" - test -" - -S="${WORKDIR}" - -PATCHES=( - "${FILESDIR}"/${PN}-94.patch - "${FILESDIR}"/chromium.patch -) - -src_prepare() { - export revision=git-N-g${COMMIT:0:10} - default - echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die -} - -src_configure() { - local myconf=( ) - - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) - - for i in "${ffuse[@]#+}" ; do - myconf+=( $(use_enable ${i%:*} ${i#*:}) ) - done - - # CPU features - for i in "${CPU_FEATURES_MAP[@]}" ; do - use ${i%:*} || myconf+=( --disable-${i#*:} ) - done - - # Try to get cpu type based on CFLAGS. - # Bug #172723 - # We need to do this so that features of that CPU will be better used - # If they contain an unknown CPU it will not hurt since ffmpeg's configure - # will just ignore it. - for i in $(get-flag mcpu) $(get-flag march) ; do - [[ ${i} = native ]] && i="host" # bug #273421 - myconf+=( --cpu=${i} ) - break - done - - # LTO support, bug #566282, bug #754654 - is-flagq "-flto*" && myconf+=( "--enable-lto" ) - filter-flags "-flto*" - - # Mandatory configuration - myconf=( - --disable-stripping - # This is only for hardcoded cflags; those are used in configure checks that may - # interfere with proper detections, bug #671746 and bug #645778 - # We use optflags, so that overrides them anyway. - --disable-optimizations - --disable-libcelt # bug #664158 - "${myconf[@]}" - ) - - # cross compile support - if tc-is-cross-compiler ; then - myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) - case ${CHOST} in - *freebsd*) - myconf+=( --target-os=freebsd ) - ;; - *mingw32*) - myconf+=( --target-os=mingw32 ) - ;; - *linux*) - myconf+=( --target-os=linux ) - ;; - esac - fi - - local extra_libs - if use arm || use ppc ; then - # bug #782811 - # bug #790590 - extra_libs+="$(test-flags-CCLD -latomic) " - fi - - set -- "${S}/configure" \ - --prefix="${EPREFIX}/usr" \ - --libdir="${EPREFIX}/usr/$(get_libdir)" \ - --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ - --cc="$(tc-getCC)" \ - --cxx="$(tc-getCXX)" \ - --ar="$(tc-getAR)" \ - --nm="$(tc-getNM)" \ - --ranlib="$(tc-getRANLIB)" \ - --pkg-config="$(tc-getPKG_CONFIG)" \ - --optflags="${CFLAGS}" \ - --extra-libs="${extra_libs}" \ - --disable-all \ - --disable-autodetect \ - --disable-error-resilience \ - --disable-everything \ - --disable-faan \ - --disable-iconv \ - --disable-lzo \ - --disable-network \ - --enable-avcodec \ - --enable-avformat \ - --enable-avutil \ - --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ - --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ - --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ - --enable-pic \ - --enable-static \ - "${myconf[@]}" \ - ${EXTRA_FFMPEG_CONF} - - echo "${@}" - "${@}" || die -} - -src_compile() { - emake V=1 libffmpeg -} - -src_install() { - emake V=1 DESTDIR="${D}" install-libffmpeg -} diff --git a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-94.patch b/media-video/ffmpeg-chromium/files/ffmpeg-chromium-94.patch deleted file mode 100644 index ba1dfd2c0518..000000000000 --- a/media-video/ffmpeg-chromium/files/ffmpeg-chromium-94.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- FFmpeg-chromium/configure 2021-10-07 22:32:34.230130424 +0100 -+++ FFmpeg/configure 2021-10-07 22:34:30.978861042 +0100 -@@ -6474,15 +6464,14 @@ - { require_pkg_config libopenjpeg "libopenjp2 >= 2.1.0" openjpeg.h opj_version -DOPJ_STATIC && add_cppflags -DOPJ_STATIC; } } - enabled libopenmpt && require_pkg_config libopenmpt "libopenmpt >= 0.2.6557" libopenmpt/libopenmpt.h openmpt_module_create -lstdc++ && append libopenmpt_extralibs "-lstdc++" - enabled libopenvino && require libopenvino c_api/ie_c_api.h ie_c_api_version -linference_engine_c_api --# Chromium uses a built in copy of libopus that is not visible to pkg-config. --# enabled libopus && { --# enabled libopus_decoder && { --# require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create --# } --# enabled libopus_encoder && { --# require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create --# } --# } -+enabled libopus && { -+ enabled libopus_decoder && { -+ require_pkg_config libopus opus opus_multistream.h opus_multistream_decoder_create -+ } -+ enabled libopus_encoder && { -+ require_pkg_config libopus opus opus_multistream.h opus_multistream_surround_encoder_create -+ } -+} - enabled libpulse && require_pkg_config libpulse libpulse pulse/pulseaudio.h pa_context_new - enabled librabbitmq && require_pkg_config librabbitmq "librabbitmq >= 0.7.1" amqp.h amqp_new_connection - enabled librav1e && require_pkg_config librav1e "rav1e >= 0.4.0" rav1e.h rav1e_context_new diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 63fc9af9da85..4d27e4d37c65 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -16,7 +16,7 @@ DIST ffmpeg-5.0.1.tar.xz.asc 520 BLAKE2B 686a8c372d26bd0158a0e79f6cbe8d9c46127bd EBUILD ffmpeg-4.2.4-r1.ebuild 17888 BLAKE2B 1caa0e1cd92a80e88155728d6f27b3096013489d214ea9a149f3075d2b3c86b85c715461a5b8e37d51dbba64c6774b660370b66683bb1ab24083f54ec2ab035d SHA512 1fc959b91614b8c24b84ad26f7c0a5aa1e6f0d9676c5782bb436ba98ad699facc5dd2b7733680f77994290fd5ede9ce4ae86663bf7addfec45b42bd03fa98e10 EBUILD ffmpeg-4.3.2-r1.ebuild 17976 BLAKE2B 316f31b8f30fa052c7ea64736b8286cb4868b4d118e1bd8165cfd6d32ff44d0178d7ac5fa32998ba6241025f3df7179c5a8ba2955fad875ea8fa0d2d9b0260d0 SHA512 fa2e327f64e1f279cf22ba5b148d23cfd22763f32d053444b292ce34b06ab231beaff5b42aa07b39089bc798301060fdedfd224716276c510549b28749af9ab8 EBUILD ffmpeg-4.4.1-r5.ebuild 18614 BLAKE2B f339b1cacbfc6255c8b15cf722a9c901c8b3c9e20a1f3a5e7282f5aa3ab8c288bb51617234c2be296527d9c99e0c820a0d7bb0f82076b3b07d5fdcdf41f3b3e5 SHA512 6ee56aae37236be11dc3155c4fa76984c5ce8a95032c733a23e6e344db51c3b9e74de684cdb3e02b5df0eb6e46ba0b5f501de73ecd8060664715a57fe14fb3a8 -EBUILD ffmpeg-4.4.2.ebuild 18876 BLAKE2B a5207f2d74a5be9112d19f590c1ca347e3aa5f003b7cdfa370f1d5ae5b91b062a5991274283bd3a6defaaf8a3880faaeb9c9753907dcbf153a89b300acf32129 SHA512 3f6bcd2707b8101d58515572e55f9016b6d52cc8b516ccaa7f0a3fe02a3e90d4a8788f0c6ff6f9bfcc8e91a4c2eaab7fc8d1afa8266302266308360374914f35 -EBUILD ffmpeg-5.0.1.ebuild 18972 BLAKE2B 8d515f2215fdfac3e91c04b124bb0416e42fc342218170b018c3c2ae31cc45b97bea3cc81c7619fc92565630bc84ddf6263d9b9bfd75bb45aac912868a24e809 SHA512 e9cad84a777242a01227f3d9c6d5e793b5575c67c7ea4edbebc51738dc13aa60df256a241fdbe501bc04eb1b4694dce133bcbfce34f08b10413d93ef9928192b -EBUILD ffmpeg-9999.ebuild 18860 BLAKE2B 93849bb34591d76ec42624de561c6bc0ccc076e6d887325971c17d71fa6ffa4f95c13d86c8a3012ee296a55a4c670d74c22a3a4b5ccabc12b11ec457bf7576db SHA512 40758ac1f01bea9dcb31d38594a5507f189cb7e33527cdbd8c1bd402059775a2096c07376d6d114eb18d0bfeb6ec762650582962fc5e54ee7b34bf09eaf120a3 +EBUILD ffmpeg-4.4.2.ebuild 18887 BLAKE2B 4adc1872b5df2a306ad4f230359aa2261c3211410a6eef7446c3dafc9f9c6349faf4e9ecaf598e308d63f01248ca42f240e2135c26abb09cc3350715a20f01a6 SHA512 aa663faa996b4fb4b76a2c169f6a66a04cc4d27f91f6b2efda2aeda238322f3e02cfb6e69fe112ba43f234c8a0e170bb2abea860ae51f0015e6feea07da1a9f9 +EBUILD ffmpeg-5.0.1.ebuild 18983 BLAKE2B 45de0f2010ab8e1996d14d3614565f257fe2c7f13c229353eff69af64b35246681ff474f0e7de9b5b1c26860f674dbf6c4c52b916e0c4f7c159ae2942603861c SHA512 0435e99befe17495a217633f92e8b763411830098ad45eaf4081594e6a834b8aa767cbaeac22cf7ee88f4b3349d5368c6a41edf1a666c3d7b4d9f9ea7108d452 +EBUILD ffmpeg-9999.ebuild 18860 BLAKE2B 36e3fad1ad002150d1464edc7df21bb3414e6ff73298d18f88d8c8cc0cb5d576920bdfcad0a309c85c21083ea359df320a84208804396c434abb6ab7d2a9b697 SHA512 2cb7ac3423acd5daf364af027ff77c372069f71659d56ad62cd29b446d5427d43156c9ffb6a6883e7a495b074256f3e2e972e73a9fb145f3301d858ffa6d68c5 MISC metadata.xml 6269 BLAKE2B 5d7f3a5376927ddf9d9c95c7465bc2b8df451be3c2ba62be38cce88449222fb6b9d6c30d88e89c403a2d60eb3b3d3f95f762ac85f85f07d54712a24d2712e40f SHA512 fbd108f665076751db688ddd0bf05b9d1fd004eff547a6a3707be369e6919efe989d82f43c09775456fa0035699ec249c8a9941dbdbf7952b1c6be11cd26acda diff --git a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild index 5d9c4833feb2..aa24bd41cead 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.2.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -287,6 +287,7 @@ RDEPEND="${RDEPEND} " DEPEND="${RDEPEND} + amf? ( media-libs/amf-headers ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " @@ -295,7 +296,6 @@ DEPEND="${RDEPEND} BDEPEND+=" >=sys-devel/make-3.81 virtual/pkgconfig - amf? ( media-libs/amf-headers ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) diff --git a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild index 22a2b8e62697..e56d6421adff 100644 --- a/media-video/ffmpeg/ffmpeg-5.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-5.0.1.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -287,6 +287,7 @@ RDEPEND="${RDEPEND} " DEPEND="${RDEPEND} + amf? ( media-libs/amf-headers ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " @@ -295,7 +296,6 @@ DEPEND="${RDEPEND} BDEPEND+=" >=sys-devel/make-3.81 virtual/pkgconfig - amf? ( media-libs/amf-headers ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 074e2445512e..5ea93957661b 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -287,6 +287,7 @@ RDEPEND="${RDEPEND} " DEPEND="${RDEPEND} + amf? ( media-libs/amf-headers ) ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) v4l? ( sys-kernel/linux-headers ) " @@ -295,7 +296,6 @@ DEPEND="${RDEPEND} BDEPEND+=" >=sys-devel/make-3.81 virtual/pkgconfig - amf? ( media-libs/amf-headers ) cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) cuda? ( >=sys-devel/clang-7[llvm_targets_NVPTX] ) doc? ( sys-apps/texinfo ) diff --git a/media-video/ffmpeg2theora/Manifest b/media-video/ffmpeg2theora/Manifest index 682e6441fe1f..656bc7fe7b0e 100644 --- a/media-video/ffmpeg2theora/Manifest +++ b/media-video/ffmpeg2theora/Manifest @@ -1,5 +1,5 @@ AUX ffmpeg2theora-0.29-swr.patch 778 BLAKE2B e0b57be8a1941abc1c3c2c01939dc339a705c9cc7ce1a0de81a868023dc6d9bb7593ae3b7c10cae9ad9e3418819637a2f9e20c42409047f5b9d5686864eacf15 SHA512 38ab469efff0f7607cbc8d8b9c57e1b4e92ce02ff2d4380aa2a04e1e3092e8b5fb2b95eb1c761df4809333d6979cb66fcd8892d245777d375adacfdd82d07c73 AUX ffmpeg2theora-0.29-underlinking.patch 507 BLAKE2B 337a94a9a948d375a4930686951d1b0db4c8e8bf97c63c2e46729b721e9c0b11e7c5dae648826b5afda0b35e22f8cc4e876513a74831d61c436bcb3937719d51 SHA512 44be5be61ab9786446d49498cf0496b9600b65ecba9b1199f98ee9030f5224887f6a1de73eaab1ee04cefa391ffcfd8629eb4cb9d3e28216569b570cc1e96e48 DIST ffmpeg2theora-0.30.tar.bz2 91269 BLAKE2B e5a57679cb874e7052db184e8e24b60da640ed818affa228cf5353216c64d2805aee375f67cfa2653112beafa36d492a274ced745846e53f81101e0f97418c41 SHA512 2c77d2c5e705751928e2bfd86c4fe4c2b7df2ca2ce70f3dfeb0014a3269eef067587eaa045c11b0db86c69176d8f01a43b3ad75544d181c016a89aa50b6518c1 -EBUILD ffmpeg2theora-0.30-r1.ebuild 1140 BLAKE2B b73f50a9576cff8bc2d3af5d9b7985900b2212b7b804d31424a08784541e415adcaf395974fa86ef7bdf7b2bbfb542f355dc967d152e256e769ed5e14cfd1453 SHA512 97cd5f0adee3e41521859f855b3dc280967ed5d4a29008fb6e21b899f617c1f72d370f0fef3768efcea81a5c13fd262f38a171aca7d6c7211f0da51376a8b4d9 +EBUILD ffmpeg2theora-0.30-r1.ebuild 1140 BLAKE2B 3a1268132dfedc20ca44bdb182160d11576e1837a42be0693498efa434b9f0447d91e80d2363d855130b25d78a65387f884e78ebe7b15dc8b67811a939116e1a SHA512 e7862823bfb04b9fe5be74b811d02cd2208600bdd9c7b93ddb9793eafb63e99bdac2ef4ab9a12f43bb2e590a2507ae67f02376d2e25798cce57c975c6883fceb MISC metadata.xml 315 BLAKE2B da08396535f51aab2d889ad283829418c8673cdd7b3f3d87558723798b399f8e15279c63f47c1f111b3b41f0c39c5c1dfb5ed8e89b0d1cbe5c8ff21dc3624c44 SHA512 875203b4b87e7592ac84105f23b5c103c68ebf22fb4a3f225b75bb77f9fc18d99c08a7b23b9245d042ca6ece974e27edac89bd437c6e4c6666063ebc0666550d diff --git a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild index 20f04265bb9f..e7e7a2bd9320 100644 --- a/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild +++ b/media-video/ffmpeg2theora/ffmpeg2theora-0.30-r1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{7..9} ) +PYTHON_COMPAT=( python3_{8..10} ) inherit python-any-r1 scons-utils DESCRIPTION="A simple converter to create Ogg Theora files" @@ -22,8 +22,7 @@ RDEPEND=" >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )" DEPEND="${RDEPEND}" -BDEPEND=" - virtual/pkgconfig" +BDEPEND="virtual/pkgconfig" PATCHES=( "${FILESDIR}"/${PN}-0.29-swr.patch @@ -32,6 +31,7 @@ PATCHES=( src_prepare() { default + 2to3 -n -w --no-diffs SConstruct || die } diff --git a/media-video/gxine/Manifest b/media-video/gxine/Manifest deleted file mode 100644 index d9fc15ff584d..000000000000 --- a/media-video/gxine/Manifest +++ /dev/null @@ -1,4 +0,0 @@ -AUX gxine-0.5.909-fno-common.patch 559 BLAKE2B 070ac7218be823a96287e067fec31c3f7f70ab4d6aaff495eaea940e3cd77c3ef27d3f11b64c84a47bb5dd5352d855d996b91e32dd993a895771f2f5cd3a88a8 SHA512 6bff8ce76588f9a25e3006f0b669332d1f0dc0326334f449e7dd3b7f3840d8c0e631e8c301b7d7726d5ad9e3630dc50d318b2f918ab4f2508c60de06568a8030 -DIST gxine-0.5.909.tar.xz 928544 BLAKE2B 4b649aca2602eafb5931f5f869d00d9e50f8e23c416bba0a661d895630f70840591cd3286626fc024deb45fe1484d8f640c2fb1412f536b665e6ff6b8091ce40 SHA512 87e65bb87fa416535f76253e4394447c6cd7dfaaa209b76c07b9aa81aeca0ca09399991bb2be8e6928fa3883ff61b155e173610c6c28aab10f5b1487e0699215 -EBUILD gxine-0.5.909-r1.ebuild 1528 BLAKE2B bb7a0e47538d2cd5c1b3e2f64b095818a6f082562f03f29b721dcbdc18b16220ad15421dc3d1bdf4a571f509aeb81e1bf402223f22241b3266633a7d60dae58d SHA512 a432b8022a6926f917151e6d619fbc9b375d2fc1b853f34b9a3ac6716ecff86e73b9622e5c4918439c7b8acabdf947c6129d6521e747c8f1feee669ba458165a -MISC metadata.xml 306 BLAKE2B 7b39fc99019fe536176ec75ba4cb917ff75743bd20f0d2d4740afc7ba27ce546168b6a7f8ee8eb37baeabe98396e21d97767891af93d595eaead25307a477ebe SHA512 ec9df9baf1db2b0d056cb271ae22b640dc518806502dd74cd062f7d3324c48945e7645ee173a19a3620b4dfb820cc0400b0b68c11e62f9d169e89650d8f2663b diff --git a/media-video/gxine/files/gxine-0.5.909-fno-common.patch b/media-video/gxine/files/gxine-0.5.909-fno-common.patch deleted file mode 100644 index 32ad6c3770b2..000000000000 --- a/media-video/gxine/files/gxine-0.5.909-fno-common.patch +++ /dev/null @@ -1,22 +0,0 @@ -https://bugs.gentoo.org/709306 ---- a/src/main.c -+++ b/src/main.c -@@ -75,6 +75,7 @@ - * globals - */ - -+extern int gxine_init_count; - int verbosity; - GtkWidget *app = NULL; - const char *plugindir, *bindir, *logodir, *pixmapdir, *icondir, *miscdir, *confdir; ---- a/src/utils.h -+++ b/src/utils.h -@@ -108,7 +108,7 @@ void do_pending_events (void); - - const char *get_copyright_notice (void); - --int gxine_init_count; -+extern int gxine_init_count; - static inline void gxine_init_add (GSourceFunc func, gpointer data) - { - ++gxine_init_count; diff --git a/media-video/gxine/gxine-0.5.909-r1.ebuild b/media-video/gxine/gxine-0.5.909-r1.ebuild deleted file mode 100644 index f8dca86551cf..000000000000 --- a/media-video/gxine/gxine-0.5.909-r1.ebuild +++ /dev/null @@ -1,71 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools xdg - -DESCRIPTION="GTK+ Front-End for libxine" -HOMEPAGE="http://xine.sourceforge.net/" -SRC_URI="mirror://sourceforge/xine/${P}.tar.xz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ppc ppc64 x86" -IUSE="l10n_cs l10n_de lirc nls udev xinerama" - -DEPEND=" - media-libs/xine-lib[gtk] - x11-libs/gtk+:2 - dev-lang/spidermonkey:0 - dev-libs/glib - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXrender - x11-libs/libxcb - lirc? ( app-misc/lirc ) - nls? ( virtual/libintl ) - udev? ( dev-libs/libgudev:= ) - xinerama? ( x11-libs/libXinerama )" -RDEPEND="${DEPEND}" -BDEPEND=" - virtual/pkgconfig - nls? ( sys-devel/gettext )" - -PATCHES=( "${FILESDIR}"/${P}-fno-common.patch ) - -src_prepare() { - default - # need to disable calling of xine-list when running without - # userpriv, otherwise we get sandbox violations (bug #233847) - if [[ ${EUID} == 0 ]]; then - sed -i -e 's:^XINE_LIST=.*$:XINE_LIST=:' configure.ac || die - fi - - eautoreconf -} - -src_configure() { - econf \ - --enable-watchdog \ - --with-xcb \ - --without-browser-plugin \ - --without-dbus \ - --without-hal \ - $(use_enable nls) \ - $(use_enable lirc) \ - $(use_with udev gudev) \ - $(use_with xinerama) -} - -src_install() { - emake DESTDIR="${D}" \ - docdir="${EPREFIX}"/usr/share/doc/${PF} \ - docsdir="${EPREFIX}"/usr/share/doc/${PF} \ - install - - dodoc AUTHORS BUGS ChangeLog README{,_l10n} TODO - - use l10n_cs && dodoc README.cs - use l10n_de && dodoc README.de -} diff --git a/media-video/gxine/metadata.xml b/media-video/gxine/metadata.xml deleted file mode 100644 index 43aae5be9f8b..000000000000 --- a/media-video/gxine/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - media-video@gentoo.org - - - xine - - diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 58cb75ebe96e..7e3a809cf358 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -7,6 +7,6 @@ AUX handbrake-9999-system-tools.patch 1489 BLAKE2B 2a3286dc1cd37d85e1edb1312688a DIST handbrake-1.4.2.tar.bz2 15991593 BLAKE2B 966b54d35dd5544800208edc9045eaf26f3253aa470686b9ea29cdf69393af140829b21072133684661fd881eee7f97b90f9c7edfa87f187058dd1b14d1a748b SHA512 ba8ffe01cd813e9991716eabb2844e1ed414e3a2c547154b89588389e96846af9f2dd47f66d735101fdacd5be1928e34e4bab31e6a189779e77001ffdb0b427e DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d18144829272a6298f2af0831e5ea7533ef2f8b201fd98389269b0ea12bbba15d0b76f09afeff6ed1d9ed313f20cf8f3a1 SHA512 63c5933f77d417a89512abd278a1d844f2b7a36ec9f8ab664c1a1348fd228ee389fc8e349b2df6cbf5d617b912d4634457ebea86490ff5ed4930f39a90dc7568 EBUILD handbrake-1.4.2-r2.ebuild 4072 BLAKE2B 965d544ea6ebc761306ff09503ca4211f2d6283031d42a9fc5ae29e7bbb9988744dfec15b9549eb8c75f9e892cf64f0430384802d0ff867205c84612d09fbca6 SHA512 18e0e2b7794fcf39af1c1951fb4b0a8b4e046ac0d021af913502ad6fb3335aa184630b68f472a363edf075f2ff7fb9a7ffedcba152d70704595ce4a780c6a95a -EBUILD handbrake-1.5.1.ebuild 4155 BLAKE2B 1aaf12dd8fa6f6f74655f860c9fd50d7bb4e2ca23d86d413f7bd4966fbce4d62238beda0b127c3654e80906dce185ccb8a7c65b7dafb7867c10fd547d473e92f SHA512 ebc2c2885b711c014df56dbc8a132f6fed4c3b92b718420225817f61e5e6912feb4edfeb10360f0090ce965a84c13db7506ed2f57a62bd2d3aaae084fa0210f8 -EBUILD handbrake-9999.ebuild 4073 BLAKE2B 8b2d6db78de39f0d96a3ebd2f5c1a2a68c683f59a7e0bcbc26e62f9c75c81d7f16f371e6d468b4295e5a1bd13d580ddb4681c5ce8becc38f0e6bcb72ce4735e3 SHA512 aefa37c8343d79e4bf283f7198a096356665f72c1387458f17ed905ff61b32c52c076eebcc265062edc808a555489bc8284bb39fee7c4f9eda7e16dc0bbef525 +EBUILD handbrake-1.5.1.ebuild 4225 BLAKE2B d5da03655481493e9ce060404229464d07360ae962a4c995bab5ec85e9678a87b25e10e26688704975455c713aae3ae4e672e4241f5b6ad5709f6f2ec19f43c7 SHA512 9e06c55d75e36882d75312b636ec2a1b862d180205aac8141aa03a92e5d074083869cdb5ab86b5c3eac4fa3d011a6f72ccb052142d2a284b92970a323c0cdd8a +EBUILD handbrake-9999.ebuild 4144 BLAKE2B fa2a04aeaef71ed01c307b3f8f4b3492be1f7ebf09a2af23ae1bd4198ae30dc9c22647b8518676ec7d8259e2f5bed97944948b6faa5110fd01d1602129e5cef7 SHA512 0fd867616bfb718327a3a0fc0657492839fb80950925a6669b0cc5ece72e75f4e5a9f57c8fca5077dab47ca02cc065778428969ea4a7083019374a5a1cd2613e MISC metadata.xml 988 BLAKE2B 2c2543998aaf038e587c97734225e42d3ffcfdb3700756c6c4933fec290c5925f1ea622689a6af6d3ffe56740a713d59034786853aa59617cbb43543438f1970 SHA512 013be7227a93e05f90c45411b46d35e26c14ba1d25d1e801b259bc641d643f81489611bfc1aa0b17d6df1689e9f2878454301ff33e8ffa417839b8e2ab486383 diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild b/media-video/handbrake/handbrake-1.5.1.ebuild index c5f8eebf74a2..5401dffd7c51 100644 --- a/media-video/handbrake/handbrake-1.5.1.ebuild +++ b/media-video/handbrake/handbrake-1.5.1.ebuild @@ -14,7 +14,7 @@ else MY_P="HandBrake-${PV}" SRC_URI="https://github.com/HandBrake/HandBrake/releases/download/${PV}/${MY_P}-source.tar.bz2 -> ${P}.tar.bz2" S="${WORKDIR}/${MY_P}" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 ~x86" fi DESCRIPTION="Open-source, GPL-licensed, multiplatform, multithreaded video transcoder" @@ -73,10 +73,12 @@ RDEPEND=" nvenc? ( media-libs/nv-codec-headers ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) " -DEPEND=" +DEPEND="${RDEPEND}" +# cmake needed for custom script: bug #852701 +BDEPEND=" ${PYTHON_DEPS} - ${RDEPEND} dev-lang/nasm + dev-util/cmake dev-util/intltool " diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index ab3d4b77a810..eb1f331a43f3 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -73,10 +73,12 @@ RDEPEND=" nvenc? ( media-libs/nv-codec-headers ) x265? ( >=media-libs/x265-3.2:0=[10bit,12bit,numa?] ) " -DEPEND=" +DEPEND="${RDEPEND}" +# cmake needed for custom script: bug #852701 +BDEPEND=" ${PYTHON_DEPS} - ${RDEPEND} dev-lang/nasm + dev-util/cmake dev-util/intltool " diff --git a/media-video/jellyfin-media-player/Manifest b/media-video/jellyfin-media-player/Manifest index 0cc08fea0cb6..6144f4cfc6ce 100644 --- a/media-video/jellyfin-media-player/Manifest +++ b/media-video/jellyfin-media-player/Manifest @@ -1,3 +1,3 @@ -DIST jellyfin-media-player-1.6.1.tar.gz 573443 BLAKE2B d5a4d6b8d3ee2c5651b1d1be32514722e1b300231760d22d9929eb4b3579b723f72e24b403a875186cd8646bbe799db6b7ff7d0641ab592b68205ef71a8c40d6 SHA512 12e22f6a0d0769427aad01a37d18a68f057d0c5fa93ee308c5f7fe2e7a1a27ceea3b05f5cbf232264467e159bcdac18aa5042838ad7888dd008f0fb3a6751081 -EBUILD jellyfin-media-player-1.6.1.ebuild 1713 BLAKE2B ef0056539995539369eb3df0fe0e537f578d2ed1f2b3e60befd52566ceade5d54c8a7d73f4dfff995cce1f1e154bc1951951e32f2261b2912d1a7e50e5ddc3a5 SHA512 7aed4852ef1608b1ffd190da01ade031299d6a536c2c2dc950372bf582ca9d11e4a9684c156efc86a99ec73f65f8f6644b0fb051f02d01044849c205d3b33fef +DIST jellyfin-media-player-1.7.0.tar.gz 574396 BLAKE2B 074495988f10e456f3c5cd8c3c0bf470c68df770163403aa6cfc0e1e0b6f51127d9640632f1ad6bf33b5302063971d63c84c86d2d83755991f309bf8882c16f3 SHA512 ebf1ce7d5cbd958ce81ed0f2e2a70e33b26cfeab55eb1acd5b465ec228f8dfa8ee27490cf31099244f022400dd5066e3f685863d841ebb68e31a124c912b5d5d +EBUILD jellyfin-media-player-1.7.0.ebuild 1749 BLAKE2B acba1565fd7ce4c2c9e0fde57e17680c10127e77acbd5b9305c97d749029ac05a35a06745aebc617f674fe9fe6f0f674b88783236b912fb2d61ec842c1f9b491 SHA512 71d14b2b8f2a22e4d6638779283887e8616c4f1309db90937a87d66893b31edc4f20d19466d49d18c90f4db1420a2afecef4a218b3f34b12860e957e91eef575 MISC metadata.xml 514 BLAKE2B b1e93ea1ee93d768cdbe7ffa4251b3d647fd39a1f9df6386b3fadaae2420d43358259401c0f0430c4a73adbb7f909614f4c983dd20071fd3e83848ba636013ce SHA512 7640bce309c006863708f7366809bb11a8675e83ae034bec35089e3a4c9fb32713340ee9a22781ab2b56a8454c5cff870c701389de9531f008a5e7f5fda0b533 diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild deleted file mode 100644 index 418d9eddf93e..000000000000 --- a/media-video/jellyfin-media-player/jellyfin-media-player-1.6.1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) -inherit cmake python-any-r1 - -DESCRIPTION="Jellyfin Desktop Client based on Plex Media Player" -HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player" - -SRC_URI=" - https://github.com/jellyfin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz -" -# GPL-2.0 for JMP itself -# licenses for code in external/: -# MIT for qhttp -# BSD for qslog -LICENSE=" - GPL-2 - BSD - MIT -" -SLOT="0" - -KEYWORDS="~amd64" -IUSE="+dbus" - -DEPEND=" - dev-libs/libcec - dev-qt/qtcore:5 - dev-qt/qtdeclarative:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtquickcontrols:5 - dev-qt/qtwebchannel:5 - dev-qt/qtwebengine:5 - dev-qt/qtwidgets:5 - dev-qt/qtwidgets:5 - dev-qt/qtx11extras:5 - dev-qt/qtxml:5 - media-libs/libsdl2 - media-video/mpv[libmpv] - sys-libs/zlib - virtual/opengl - x11-libs/libX11 - x11-libs/libXrandr - dbus? ( dev-qt/qtdbus:5 ) -" - -BDEPEND=" - ${PYTHON_DEPS} - virtual/pkgconfig -" - -# x11-misc/xdg-utils is used for xdg-screensaver, which is used to inhibit -# screen locking - -RDEPEND=" - ${DEPEND} - media-video/jellyfin-web-jmp-bin - !dbus? ( x11-misc/xdg-utils ) -" - -src_prepare() { - # disable jmp installing jwc in it's build system - sed -i '/..\/dist\//d' src/CMakeLists.txt || die 'sed failed' - - cmake_src_prepare -} - -src_configure() { - local mycmakeargs=( - -DOpenGL_GL_PREFERENCE=GLVND - # PMP, at least prior to the fork into JMP, used to download codecs, - # for safe measure, disable that. - -DENABLE_CODECS=OFF - # LINUX_X11POWER instructs JMP to use xdg-screensaver instead of dbus - # for inhibiting screen saving. - -DLINUX_X11POWER="$(usex dbus OFF ON)" - ) - cmake_src_configure -} diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.7.0.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.7.0.ebuild new file mode 100644 index 000000000000..348aa5bf5dcc --- /dev/null +++ b/media-video/jellyfin-media-player/jellyfin-media-player-1.7.0.ebuild @@ -0,0 +1,85 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +JWC_VERSION=10.8.0 + +PYTHON_COMPAT=( python3_{8..11} ) +inherit cmake python-any-r1 + +DESCRIPTION="Jellyfin Desktop Client based on Plex Media Player" +HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player" + +SRC_URI=" + https://github.com/jellyfin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz +" +# GPL-2.0 for JMP itself +# licenses for code in external/: +# MIT for qhttp +# BSD for qslog +LICENSE=" + GPL-2 + BSD + MIT +" +SLOT="0" + +KEYWORDS="~amd64" +IUSE="+dbus" + +DEPEND=" + dev-libs/libcec + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtwebchannel:5 + dev-qt/qtwebengine:5 + dev-qt/qtwidgets:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + media-libs/libsdl2 + media-video/mpv[libmpv] + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXrandr + dbus? ( dev-qt/qtdbus:5 ) +" + +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +# x11-misc/xdg-utils is used for xdg-screensaver, which is used to inhibit +# screen locking + +RDEPEND=" + ${DEPEND} + ~media-video/jellyfin-web-jmp-bin-${JWC_VERSION} + !dbus? ( x11-misc/xdg-utils ) +" + +src_prepare() { + # disable jmp installing jwc in it's build system + sed -i '/..\/dist\//d' src/CMakeLists.txt || die 'sed failed' + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + -DOpenGL_GL_PREFERENCE=GLVND + # PMP, at least prior to the fork into JMP, used to download codecs, + # for safe measure, disable that. + -DENABLE_CODECS=OFF + # LINUX_X11POWER instructs JMP to use xdg-screensaver instead of dbus + # for inhibiting screen saving. + -DLINUX_X11POWER="$(usex dbus OFF ON)" + ) + cmake_src_configure +} diff --git a/media-video/jellyfin-web-jmp-bin/Manifest b/media-video/jellyfin-web-jmp-bin/Manifest index 06f1b280213a..765172b5c0b1 100644 --- a/media-video/jellyfin-web-jmp-bin/Manifest +++ b/media-video/jellyfin-web-jmp-bin/Manifest @@ -1,3 +1,3 @@ -DIST jellyfin-web-jmp-bin-10.7.6.zip 37127792 BLAKE2B 9756d1d2a2f00970291464c6b667d14df058ddace7d2ddc49c3e9072ca9ecc7f6388255afa701165bc7d8cf6dad12067afd3cdfae082de533faf2aa483868e87 SHA512 e4cd2d63c724e6ede78007c58f5e405b2ca97d1de0e0e86710fdf8756fedac2d50b1da10b61efd4888ffea3738bfde8f3510e49e38c61bf0bd47613634bc20c3 -EBUILD jellyfin-web-jmp-bin-10.7.6.ebuild 538 BLAKE2B 0beded2340b5662832f08e3f00df789115786615c4ee2fb7e55208cf3bc91bb9ab2813861310e61fa083d3984d912922fb619daa37028d2144359e35fe495682 SHA512 85899fd5bafd9a5767b3be1d43d1ac891335ae14be8af4f3caeb5804bdfc245993a936a76271f01d1b69c76e341b441f4556ea13de3f79edce80b228ba8d426d +DIST jellyfin-web-jmp-bin-10.8.0.zip 44565218 BLAKE2B ecb8ee8d5e8c6ac8d813bdbbce9bb76de807e2f3282586fbcbf5f088b5402a153b0b4e644c940cde064dcfe304ff8486dfa743152aeb7757d36ccf1af38ff3d5 SHA512 1d804a17fcaed760ca16baa912840978745079815c7093f6d85eea5b0d238325df96b951f378822224a43f16a1dfe10617e71573e4e2f63c1e6db947ddbf3b3e +EBUILD jellyfin-web-jmp-bin-10.8.0.ebuild 538 BLAKE2B 5267aeeeb79cd5b6c9d37d077b5d3984d666e0b4550e6511d6a2e0739904e3ed8cf92aaf532c2d744cca2c1a53ea8705618e16622abd6065fb352374f83c682c SHA512 124b4192b6701582719150aa95043b11405ad0f9a938d039fa19cf90bd8422958365950f9634ea9d3a230cb1317b78ac15e6ae2b4638923da29a9ddd789e1166 MISC metadata.xml 514 BLAKE2B b1e93ea1ee93d768cdbe7ffa4251b3d647fd39a1f9df6386b3fadaae2420d43358259401c0f0430c4a73adbb7f909614f4c983dd20071fd3e83848ba636013ce SHA512 7640bce309c006863708f7366809bb11a8675e83ae034bec35089e3a4c9fb32713340ee9a22781ab2b56a8454c5cff870c701389de9531f008a5e7f5fda0b533 diff --git a/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild deleted file mode 100644 index 46f12a5b2e43..000000000000 --- a/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.7.6.ebuild +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DESCRIPTION="Modified Jellyfin Web Client for use inside Jellyfin Media Player" -HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player" -SRC_URI=" - https://github.com/iwalton3/${PN%-bin}/releases/download/jwc-${PV}/dist.zip -> ${P}.zip -" -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~amd64" - -BDEPEND=" - app-arch/unzip -" - -S="${WORKDIR}/dist" - -src_install() { - insinto /usr/share/jellyfinmediaplayer/web-client/desktop - doins -r . -} diff --git a/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.8.0.ebuild b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.8.0.ebuild new file mode 100644 index 000000000000..cd0c93934ceb --- /dev/null +++ b/media-video/jellyfin-web-jmp-bin/jellyfin-web-jmp-bin-10.8.0.ebuild @@ -0,0 +1,24 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DESCRIPTION="Modified Jellyfin Web Client for use inside Jellyfin Media Player" +HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player" +SRC_URI=" + https://github.com/iwalton3/${PN%-bin}/releases/download/jwc-${PV}/dist.zip -> ${P}.zip +" +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64" + +BDEPEND=" + app-arch/unzip +" + +S="${WORKDIR}/dist" + +src_install() { + insinto /usr/share/jellyfinmediaplayer/web-client/desktop + doins -r . +} diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index cdd1b6f08d43..5b9546181931 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -1,3 +1,3 @@ DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b SHA512 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830 -EBUILD mjpegtools-2.2.1.ebuild 2678 BLAKE2B 29638b99460d472a4d8c71641e0ce1c2b3b0377d64332ca2f4eac9e6a731b8832e94429bbcd736a6142aa4fb34cd11f886ec3e52e1e854c7d84d599e242840fc SHA512 33fae3bf926b6f36a575dc703dde5f10bd30b0e4eb550712a8eb12d9e135031611763c23b07efd1412366ddc5d9547b54d6cbe670c4d6bc863f44ffe27e06987 +EBUILD mjpegtools-2.2.1.ebuild 2617 BLAKE2B 53272f4b88500c840475d19d00c401bebeb3653b400be7425ebd6d6650d4c52aca45eb3caa5bedfb41abd3f490405b281b3a1b4ed702a35eedc250fe62c57ca4 SHA512 638448731ed67385b5425c04524a93548881a7e63c71b477d5da8786c2558e2278cb8ad0e960e04839c58f96f91ed7e361309c76e30b86c56f34fffd99f9efc0 MISC metadata.xml 538 BLAKE2B 420dc5b1516f83aed28539d6c9cb3964135bd67d9a8c334eb5ad72bc95156fe3795ca8098cebc46e7a263e3a84cdb8bfe1a393b7f9a9f47eeaf24527748723a9 SHA512 c53c44b7a0bdea16c3c56d11edde87edea9849ffb37b2eba21701ad5791f1348d61d7216457efa0964c1503d89e2d86c4616d1fda240129f98ab2b68ec5e6926 diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild index 91c3b73db7fd..4be0d04f001e 100644 --- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild +++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild @@ -46,8 +46,6 @@ src_prepare() { } multilib_src_configure() { - [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2 - local myconf=( --enable-compile-warnings $(use_enable cpu_flags_x86_mmx simd-accel) diff --git a/media-video/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 33420fd3f6a8..2f7273525c6d 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,13 +1,16 @@ AUX mkvtoolnix-49.0.0-qt5dbus.patch 1442 BLAKE2B 041c33dcb691377b4b50a4c24f1eac528dda0227ccf2baf3732239b481ff6007bf5a8ddd9304dd7c2faff149f1cfbdbfb194eb30a3b19eea0803f10734572421 SHA512 d9a72bb0b8fc7c9915e4efa1e9758d4f9d6b68f1ad6ef9898dd0b5e693c8e1236b37fc97a9786c233f8909417309ea6bb9c1fb71054818f31eeb4c43faa46a06 AUX mkvtoolnix-56.1.0-optlevel.patch 607 BLAKE2B 62c3ef3717a54030b1acc586e9468f4d8d783755f7762ccebe18b0f8b0214268477a5a218b2fc02f3e2f770664507d43119f13046a31c94f865f01d0000a8a68 SHA512 b8eec05844aa8ef4f27416a78f5231496e34a112126e8ef403d18cab26b94756bd60323b51cf0d59a5a44d7b379bbf09f6b7b1b7e29b9282a0a2e82a5b3f325e AUX mkvtoolnix-58.0.0-qt5dbus.patch 1500 BLAKE2B f85f6a50bd4d4f44470ec6f85729cfca22518859b34e2cf6e1dac25a35d58170b626afe3a1f12f41b1f2d34d4763ab3b180139b402675071794a0dcd29503209 SHA512 6c6ffc83f6c4ed482347cc172467189add3662430a029d74e94d1373a1f0e519fced494812691d7b38c054bc010f1c670f1f6be97819fc142c402d5264c3595e +AUX mkvtoolnix-67.0.0-no-uic-qtwidgets.patch 2494 BLAKE2B 1d23ca6e908947d80e3ea7567508714cd73461a7571dda88a227bf9d4ca3ec86113ad596ff64dc6bfea641c8b097fffa1b4b359a17f5b24c0305c7e6628103b7 SHA512 982953a7f992def139140298a5a6b2ceeae6afaf5123b8e12c46523ab1f799994aa2f5d435bebb8091ca63e56bb44310a39a6382c313f8e4083cfea67daff41d DIST mkvtoolnix-57.0.0.tar.xz 7635780 BLAKE2B e0253dc0f48b0c98ee30590560daecbb7cef19e0f92f5baa4694c829c75f28146f7cde58a85a02575b314c2f94efc048003e51f8f6b29abeff2ca1a8d1f28a18 SHA512 583cd9148a361f0886a3e18f32597a980b5ca56d1bba95b36ca613ee291f2cb3d95a0c749a32e6fa480e8dc8f8375e2bd04a1c4b21fd15d8056d8bb2d6082b99 DIST mkvtoolnix-60.0.0.tar.xz 7657960 BLAKE2B 094c13ac7e73e79f3cc7eae0768625482c4808a4323239a93de34d1406583bfe676d71855dd1f7eae9a8a0ff0a7badf50c04c71f9d2fbb4afd9ff5f05b9353ea SHA512 90bbb95c3a7a91bd47f76aaec9459a1f6f26a381ff03db1047c0fdb41cb87bdd96160c448152357a2b306adbd26f478112ac5d5e8215ee37331a15fc89fa43c3 DIST mkvtoolnix-61.0.0.tar.xz 7662500 BLAKE2B de9d73658fe779b34b21fded8e6676b76fed5ce5ecd598aeff12e8c4f120353f63413f260bacc30c0a102a4eb6d4b907feaabdd84d80d20469a3ae8341bce5f1 SHA512 9f35b5af8784eb4b92b437f41b5df677aa7fc859827eaef4d0e2d8531ad9908331f70a852c7e6e965a5f8cec47b38c6c91b8fbdbcaee0edca54f8cbb000ba582 DIST mkvtoolnix-64.0.0.tar.xz 7700012 BLAKE2B f0c64786fdc3d05915650a08ca398dc7f5356b9a9ce9cb108fb40a4394a7518dd45143717fde7af1dccd3e7e43d343f81d69633c78f1201670924257529baede SHA512 252fdf0a9497d34f2a407ca0d3e584d1cd5a2f566b793a3a6b9af8473855d89e55ce79a8b4aff71d5a25f7a15ca991f84a3c4441168553af9feffdfe75e19844 +DIST mkvtoolnix-67.0.0.tar.xz 7791720 BLAKE2B 815172f1e120d90ec33cbc6dac1bb3aad793edc0b629f0bab9400a0732d3b692f983d7eca82c61c453ccd245dea948d0950bcb357e3104d2012554871e09c80c SHA512 eed390cb305b5fcaddf11d68a9021f9ddc22a62d1eb95f4c0a34161a7662dd62495c87193a2d951f0fe30fb9a6b5b93f06ed7fedc24ed674da531f2c2317c997 EBUILD mkvtoolnix-57.0.0.ebuild 2969 BLAKE2B 402ed70eb494854ce19cebf3e78809b8f96df652dcdaa385210eb0b7417a342aed1065245ffc06a76b62c05a5be009ff38f562049fc07ad2f7100f32e4fbc8d9 SHA512 2f6ee7dbfb8702dcd1cb9c358906e0fc850f8cd3d209ae21144311f0cef58f5a037cb3d748390206ec65b026ac22797636f1d11b81afc4c7ba75ed4a0fbf4d37 EBUILD mkvtoolnix-60.0.0.ebuild 2687 BLAKE2B 97fdbe6d11985f608d996dc43954480ea3a007ad753a610836ad62d04977c319a2ebee16af88d4b1072032a54356088705cac8a4acabad1a7a94045710b6b7c3 SHA512 7e80c992f5bab78ba16a4a8540d5f3a54883d3a9ee58d4690964f2d07cf829d4762cc21941bde4ead37528d81c45f73d72996235bc7137bd7f39493be897818f EBUILD mkvtoolnix-61.0.0.ebuild 2707 BLAKE2B f2a49d0826ba6790ae810dde53e798490312b8ce89257ebcf69f0f1a5e0cebf76a77098920fa2d07d4f6a84ee2eeeeb0546f006423e941332b664707d4177acf SHA512 c78a908c2be0e394ae42100b4196347e79903df925e2c436cc6140bf0d54e4f18ee798bd2f4e6643f202a0106d57f2fadbc2d9724f938126f98c2f960d6f4acc EBUILD mkvtoolnix-64.0.0.ebuild 2717 BLAKE2B b5711556f9c73bda4a13cdb51e01db8a7c98966cb5579ff6c8cb01169e979a11e516c8e0d3884ffb1b5f2e941b885182c2b7b031deb1742798a06f0339ca1e72 SHA512 b6c8a32ef2c59cdf1a9587ec3d48e1d89f319c8b1c41caa6729f6baf7e5d215bf28c86ce35cfd00ca34908e06245fb400a0f69c3915a8bee5095922fb2a1b2db -EBUILD mkvtoolnix-9999.ebuild 2671 BLAKE2B 6bb0eb933e98fc11327d4d3a74fcc7d7d8328219ed36959fc3051a4a133a70c64b8106db5d2cbc5e7fd673e8ccad0e217967ef2948fe943c111e04fcd738b9e5 SHA512 7a815fda661aa4030665888768436e363bcf71f75aa55c921fe93d08de50b7b1360645228494af546febd3b4161d6450499430254e93a66162fbd3186c5342b5 +EBUILD mkvtoolnix-67.0.0.ebuild 2927 BLAKE2B c2fdc8769179233ce9de4ab683b27c1e73e58af440907817cb08ddbe33598d0ed67f96831b9250dcf510ec659edc6a15be39f3546eae41371137a0bcd96d7b73 SHA512 2856e3ae8d784b23497ac56be624e0830974fe2339ac031f7cda247ad772ab8052972a62964e788ec06d2269efcab5e5cfa74a09f801ff3baee400cca481ce96 +EBUILD mkvtoolnix-9999.ebuild 2931 BLAKE2B baf0ebefaf8adbb46010c76d55f71d1950453d4f4ef32821be0d646cb8428d5bd9884e0ff50fc8ce9baf4362e5cd2f9dc5e3e38bdab72958dcddba19399dedf8 SHA512 8f93889fd7e55f80d55ab4cfbf7b89b7cc683c09b0eb7646d740ecf164d417434ffde452dbfd069a90eccfb1cc8b0ebf79ab6b7ec12cfca6e4146027a319fee3 MISC metadata.xml 256 BLAKE2B ff2b5536809c94dc64867bca73d779a31bd343559cd65520c9b5684091734b3ccf7bf495335890df5533857480794cb3258566e5836e8dce7514b6833ba93f37 SHA512 b7f3d0564d06254ff552beec9594236b84ebc3ad87adab673f68963bcc4dfbf2e29b401e75486ba41b9b526de74b73f65e9d5e901221f810363497aa694c8567 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch new file mode 100644 index 000000000000..a5f5fd2009b8 --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch @@ -0,0 +1,76 @@ +https://bugs.gentoo.org/844097 + +We should only check for UIC (provided by qtwidgets) if we're building the GUI. + +Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used +for e.g. MIME type detection since 59.0.0), but the rest of Qt +(like qtwidgets) is only needed for the GUI build. + +The build system incorrectly unconditionally checks for UIC. We fix it here +to only check for it when doing a GUI build. + +First hunk (ac/qt5.m4, removing UIC check): Signed-off-by: Duane Robertson duane@duanerobertson.com +Second hunk (rest, adding UIC check conditional on enable_gui): Signed-off-by: Sam James +--- a/ac/qt5.m4 ++++ b/ac/qt5.m4 +@@ -51,7 +51,6 @@ check_qt5() { + AC_PATH_PROG(LCONVERT, lconvert,, [$qt_searchpath]) + AC_PATH_PROG(MOC, moc,, [$qt_searchpath]) + AC_PATH_PROG(RCC, rcc,, [$qt_searchpath]) +- AC_PATH_PROG(UIC, uic,, [$qt_searchpath]) + + if test x"$MOC" = x; then + AC_MSG_CHECKING(for Qt 5) +@@ -62,11 +61,6 @@ check_qt5() { + AC_MSG_CHECKING(for Qt 5) + AC_MSG_RESULT(no: could not find the rcc executable) + return +- +- elif test x"$UIC" = x; then +- AC_MSG_CHECKING(for Qt 5) +- AC_MSG_RESULT(no: could not find the uic executable) +- return + fi + + + +--- a/ac/qt_common.m4 ++++ b/ac/qt_common.m4 +@@ -5,6 +5,37 @@ fi + if test x"$enable_gui" = xyes; then + BUILD_GUI=yes + ++ # Copied from ac/qt6.m4. ++ qmake_properties="`mktemp`" ++ ++ "$QMAKE" -query > "$qmake_properties" ++ ++ qmake_ver="`$ac_cv_path_EGREP '^QT_VERSION:' "$qmake_properties" | sed 's/^QT_VERSION://'`" ++ ++ AC_MSG_CHECKING(for qmake's version) ++ if test -z "qmake_ver"; then ++ AC_MSG_RESULT(unknown; please contact the author) ++ return ++ elif ! check_version $qt_min_ver $qmake_ver; then ++ AC_MSG_RESULT(too old: $qmake_ver, neet at least $qt_mIN-ver) ++ return ++ else ++ AC_MSG_RESULT($qmake_ver) ++ fi ++ ++ qt_bindir="`$ac_cv_path_EGREP '^QT_INSTALL_BINS:' "$qmake_properties" | sed 's/^QT_INSTALL_BINS://'`" ++ qt_libexecdir="`$ac_cv_path_EGREP '^QT_INSTALL_LIBEXECS:' "$qmake_properties" | sed 's/^QT_INSTALL_LIBEXECS://'`" ++ qt_searchpath="$qt_libexecdir:$qt_bindir:$PATH" ++ ++ rm -f "$qmake_properties" ++ ++ AC_PATH_PROG(UIC, uic,, [$qt_searchpath]) ++ if test x"$UIC" = x; then ++ AC_MSG_CHECKING(for Qt 5 UIC (qtwidgets)) ++ AC_MSG_RESULT(no: could not find the uic executable) ++ exit 1 ++ fi ++ + if test x"$have_qt6" = "xyes" ; then + opt_features_yes="$opt_features_yes\n * MKVToolNix GUI (with Qt 6)" + else diff --git a/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild new file mode 100644 index 000000000000..0b4de7083e3b --- /dev/null +++ b/media-video/mkvtoolnix/mkvtoolnix-67.0.0.ebuild @@ -0,0 +1,131 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit autotools flag-o-matic multiprocessing qmake-utils xdg + +if [[ ${PV} == *9999 ]] ; then + EGIT_REPO_URI="https://gitlab.com/mbunkus/mkvtoolnix.git" + EGIT_SUBMODULES=() + inherit git-r3 +else + SRC_URI="https://mkvtoolnix.download/sources/${P}.tar.xz" + KEYWORDS="amd64 ppc ppc64 x86" +fi + +DESCRIPTION="Tools to create, alter, and inspect Matroska files" +HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" + +LICENSE="GPL-2" +SLOT="0" +IUSE="dbus debug dvd gui nls pch test" +RESTRICT="!test? ( test )" + +# check NEWS.md for build system changes entries for boost/libebml/libmatroska +# version requirement updates and other packaging info +RDEPEND=" + >=dev-libs/boost-1.66:= + dev-libs/gmp:= + >=dev-libs/libebml-1.4.2:= + >=dev-libs/libfmt-8.0.1:= + >=dev-libs/pugixml-1.11:= + media-libs/flac:= + >=media-libs/libmatroska-1.6.3:= + media-libs/libogg:= + media-libs/libvorbis:= + sys-libs/zlib + dvd? ( media-libs/libdvdread:= ) + dev-qt/qtcore:5 + gui? ( + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtmultimedia:5 + ) + app-text/cmark:0= + dbus? ( dev-qt/qtdbus:5 ) +" +DEPEND="${RDEPEND} + >=dev-cpp/nlohmann_json-3.9.1 + >=dev-libs/utfcpp-3.1.2 + test? ( dev-cpp/gtest ) +" +BDEPEND=" + app-text/docbook-xsl-stylesheets + dev-libs/libxslt + dev-ruby/rake + virtual/pkgconfig + nls? ( + sys-devel/gettext + app-text/po4a + ) +" + +PATCHES=( + "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch +) + +src_prepare() { + default + + if [[ ${PV} == *9999 ]]; then + ./autogen.sh || die + fi + + # bug #692018 + sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die + + eautoreconf + + # remove bundled libs + rm -r lib/{fmt,libebml,libmatroska,nlohmann-json,pugixml,utf8-cpp} || die +} + +src_configure() { + # bug #692322, use system dev-libs/utfcpp + append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp + + local myeconfargs=( + $(use_enable debug) + $(usex pch "" --disable-precompiled-headers) + $(use_enable dbus) + + # Qt (of some version) is always needed, even for non-GUI builds, + # to do e.g. MIME detection. See e.g. bug #844097. + # But most of the Qt deps are conditional on a GUI build. + --disable-qt6 + --enable-qt5 + $(use_enable gui) + --with-qmake="$(qt5_get_bindir)"/qmake + + $(use_with dvd dvdread) + $(use_with nls gettext) + $(usex nls "" --with-po4a-translate=false) + --disable-update-check + --disable-optimization + --with-boost="${ESYSROOT}"/usr + --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) + ) + + econf "${myeconfargs[@]}" +} + +src_compile() { + rake V=1 -j$(makeopts_jobs) || die +} + +src_test() { + rake V=1 -j$(makeopts_jobs) tests:unit || die + rake V=1 -j$(makeopts_jobs) tests:run_unit || die +} + +src_install() { + DESTDIR="${D}" rake -j$(makeopts_jobs) install || die + + einstalldocs + dodoc NEWS.md + doman doc/man/*.1 +} diff --git a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild index 6bb7e14ab307..0939d7201a9b 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-9999.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 inherit autotools flag-o-matic multiprocessing qmake-utils xdg @@ -19,36 +19,37 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" LICENSE="GPL-2" SLOT="0" -IUSE="dbus debug dvd nls pch test" +IUSE="dbus debug dvd gui nls pch test" RESTRICT="!test? ( test )" # check NEWS.md for build system changes entries for boost/libebml/libmatroska # version requirement updates and other packaging info RDEPEND=" >=dev-libs/boost-1.66:= - >=dev-libs/libebml-1.4.0:= - >=dev-libs/libfmt-6.1.0:= - dev-libs/libpcre2:= - dev-libs/pugixml:= + dev-libs/gmp:= + >=dev-libs/libebml-1.4.2:= + >=dev-libs/libfmt-8.0.1:= + >=dev-libs/pugixml-1.11:= media-libs/flac:= >=media-libs/libmatroska-1.6.3:= media-libs/libogg:= media-libs/libvorbis:= - sys-apps/file sys-libs/zlib dvd? ( media-libs/libdvdread:= ) dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtconcurrent:5 - dev-qt/qtmultimedia:5 + gui? ( + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtwidgets:5 + dev-qt/qtconcurrent:5 + dev-qt/qtmultimedia:5 + ) app-text/cmark:0= dbus? ( dev-qt/qtdbus:5 ) " DEPEND="${RDEPEND} - dev-cpp/nlohmann_json - dev-libs/utfcpp + >=dev-cpp/nlohmann_json-3.9.1 + >=dev-libs/utfcpp-3.1.2 test? ( dev-cpp/gtest ) " BDEPEND=" @@ -62,16 +63,20 @@ BDEPEND=" ) " -PATCHES=( "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch ) +PATCHES=( + "${FILESDIR}"/mkvtoolnix-58.0.0-qt5dbus.patch + "${FILESDIR}"/mkvtoolnix-67.0.0-no-uic-qtwidgets.patch +) src_prepare() { - xdg_src_prepare + default + if [[ ${PV} == *9999 ]]; then ./autogen.sh || die fi - # https://bugs.gentoo.org/692018 - sed -e 's/pandoc/diSaBlEd/' -i ac/pandoc.m4 || die + # bug #692018 + sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die eautoreconf @@ -80,16 +85,22 @@ src_prepare() { } src_configure() { - # bug 692322, use system dev-libs/utfcpp + # bug #692322, use system dev-libs/utfcpp append-cppflags -I"${ESYSROOT}"/usr/include/utf8cpp local myeconfargs=( $(use_enable debug) $(usex pch "" --disable-precompiled-headers) $(use_enable dbus) + + # Qt (of some version) is always needed, even for non-GUI builds, + # to do e.g. MIME detection. See e.g. bug #844097. + # But most of the Qt deps are conditional on a GUI build. --disable-qt6 --enable-qt5 - --with-qmake=$(qt5_get_bindir)/qmake + $(use_enable gui) + --with-qmake="$(qt5_get_bindir)"/qmake + $(use_with dvd dvdread) $(use_with nls gettext) $(usex nls "" --with-po4a-translate=false) diff --git a/media-video/mpv/Manifest b/media-video/mpv/Manifest index 5667169c99b5..d2c6664647a7 100644 --- a/media-video/mpv/Manifest +++ b/media-video/mpv/Manifest @@ -3,8 +3,8 @@ DIST mpv-0.34.0.tar.gz 3287976 BLAKE2B 9fc412544d81b249c71eed0d6669121a1942771ec DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e DIST waf-2.0.22 104880 BLAKE2B 6cae9e764712012ef97f790c723b86a2603dc64e9bafcec02c5251dbc1b23ec629db26c02eee2a72a77cf70c11d2729a626ea71f3cb50a6281257fd6f63eadf0 SHA512 4156cefa65b7e6349ddb1ca643bbdf3e4444449d137e5f595535564271d521362291f257765329015671584ac2c596a0ad98cfdbd621f5d5352141a55d384292 DIST waf-2.0.9 103104 BLAKE2B c7e996aa49662da3ff941d076fc7e2dd23e867ade92a3b2ae07560b76d63a69e495184a1f9c76be5c51977ddb1713f9247f62e672033ecb988ac559e3a47e546 SHA512 0755170ded115b03e78a2096f197cd9fff62b5036db764153d26ce426f182ea7d7b8231cfa1a10b4a564a8480428502f3691851df66e7b83c7bca8e5fe26de7d -EBUILD mpv-0.33.1-r3.ebuild 9720 BLAKE2B 8a2d518fcaa64b2e2dedb2b728c9cc1fa07ca54acc1e716fed99cf4b3c46edd90e4ad756ff3409a0509400930a25b8aff62475c5e210ec87c254b986322b5c6c SHA512 24be8f183448b42f568782b8d82a887f755951cc9ebfd9fcfdb2dc809bd44a7959557c1cde7bfaf345b678787a4178324c414465bfde966755ac94044b8ad5da -EBUILD mpv-0.34.0-r1.ebuild 9723 BLAKE2B ea3092ef06dc08e0fd4eeca8a8f3eaad4a8e092276b320a6bcd443edb892cb402ecdc8b4816c59df0f104512a250b861b569a5faaabea9bafc950ba2b20c9367 SHA512 87f666a4f8f6e27d234fe249a20350da7984fa6e609fb57b9f9c75292b6002d5c1afd77761971652645e320c9a37b447fb8df20c292edfec60087c7f865d70d0 -EBUILD mpv-0.34.1-r1.ebuild 9723 BLAKE2B ea3092ef06dc08e0fd4eeca8a8f3eaad4a8e092276b320a6bcd443edb892cb402ecdc8b4816c59df0f104512a250b861b569a5faaabea9bafc950ba2b20c9367 SHA512 87f666a4f8f6e27d234fe249a20350da7984fa6e609fb57b9f9c75292b6002d5c1afd77761971652645e320c9a37b447fb8df20c292edfec60087c7f865d70d0 -EBUILD mpv-9999.ebuild 9723 BLAKE2B 3399a6b6172d8a297d9eb1fbc104ff53ea427c88baa4c3c5cac731d8377c788269438d04d1d5a870003e173ad121b6c1c938b8838b8dbd7620d3458338e39168 SHA512 344718103007d763a6a642671d71f3c05bae4d42f0f34d778beedf05dfd8f243309b2119ceb57fdd9c12e3ad35e867452a51965d7ba7f299b8e028cf68171eb0 +EBUILD mpv-0.33.1-r3.ebuild 9698 BLAKE2B 18a25640c9ba5e3d1b3f06d75d1f9eca75a2eb202a67b6107a9e1704012ef3b20f819ab7e38567068439450b3c9feba916a484ab34e7fca94ec47623965878c0 SHA512 4358a7a120e72cb6cb036aaa30469d534eaecb7596017b3a54ad07443f89732102eb037b9c22fddcd95cbb7660ef0a59fb2f5476b7dbc3e78a804a0d94947a51 +EBUILD mpv-0.34.0-r1.ebuild 9701 BLAKE2B fd2f7cbeabd539efa9625d476efdf86bd15de954f100fbdb01ee3549fb92fcf380d9bbcf003dec17d901711007c822b01274a535ff92caa09c978edfbf20db97 SHA512 78ed75d5e4393aacbcba8f223cacc00ea88184c30df9316b7daf4ec2e52b3f65fbd3661468639e9a5ebf52d14e336cf358ccad2659c386ef3052012ce107a572 +EBUILD mpv-0.34.1-r1.ebuild 9697 BLAKE2B 91b819898ec285d53675ec92cbc988db16d943f68a5ec54ff1334064a4aeb67033a2375d8398000a1e6d732b2267b9e813ca4a9e6dfde5950a3c4fba51994cbd SHA512 250ed490a9fdc3ab9133f8ddd4195d6820679293bdab104cec9fb3efbc385cfa8e5207321b7bbab20fa16f45e2cee937ac5b74c86dbab0b0a680317d9c724e2c +EBUILD mpv-9999.ebuild 9724 BLAKE2B 4f539d603252eeb344634f958db5d36fe915205a6d38ecd5bef42de866dd99d7a6979bd4554d673b6ede0adcb992d5fadbc59b994c6ea536704fa64e42bda315 SHA512 b6a755f113b588482d0d0f8f8dc4822dbf2fb6c74a5d1d4213b4ad5269a979f3071d717f8a1e498aca5c76dc91df33f55dacb09affb6fd9e61a963d34513bd14 MISC metadata.xml 2137 BLAKE2B fe78cb8478cac266c72c939fd87043c0a685c12c840e0966d34d58b1c9dd39767197d93762d8150454a5e2f58ecf0c68cde1289bb392cd92b0d199a81d5f4ff6 SHA512 bd37f4f676eaf2507484d28b0b29f861e575a6232bc67413cae1c09fd16481d5a62b2646ee2e9e5b5a0c5bd8a0dfa63d1b4ef80e3f70c1ef8ff040d103fd6beb diff --git a/media-video/mpv/mpv-0.33.1-r3.ebuild b/media-video/mpv/mpv-0.33.1-r3.ebuild index bd6de4e3f9f0..101a71f0731c 100644 --- a/media-video/mpv/mpv-0.33.1-r3.ebuild +++ b/media-video/mpv/mpv-0.33.1-r3.ebuild @@ -146,8 +146,8 @@ src_configure() { tc-export CC PKG_CONFIG AR if use raspberry-pi; then - append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include" - append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" + append-cflags -I"${ESYSROOT}/opt/vc/include" + append-ldflags -L"${ESYSROOT}/opt/vc/lib" fi local mywafargs=( diff --git a/media-video/mpv/mpv-0.34.0-r1.ebuild b/media-video/mpv/mpv-0.34.0-r1.ebuild index 398bdb258c34..c6bf9d1ac4aa 100644 --- a/media-video/mpv/mpv-0.34.0-r1.ebuild +++ b/media-video/mpv/mpv-0.34.0-r1.ebuild @@ -146,8 +146,8 @@ src_configure() { tc-export CC PKG_CONFIG AR if use raspberry-pi; then - append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include" - append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" + append-cflags -I"${ESYSROOT}/opt/vc/include" + append-ldflags -L"${ESYSROOT}/opt/vc/lib" fi local mywafargs=( diff --git a/media-video/mpv/mpv-0.34.1-r1.ebuild b/media-video/mpv/mpv-0.34.1-r1.ebuild index 398bdb258c34..74d217d95401 100644 --- a/media-video/mpv/mpv-0.34.1-r1.ebuild +++ b/media-video/mpv/mpv-0.34.1-r1.ebuild @@ -16,7 +16,7 @@ HOMEPAGE="https://mpv.io/ https://github.com/mpv-player/mpv" if [[ ${PV} != *9999* ]]; then SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux" + KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ppc ppc64 ~riscv x86 ~amd64-linux" DOCS=( RELEASE_NOTES ) else EGIT_REPO_URI="https://github.com/mpv-player/mpv.git" @@ -146,8 +146,8 @@ src_configure() { tc-export CC PKG_CONFIG AR if use raspberry-pi; then - append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include" - append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" + append-cflags -I"${ESYSROOT}/opt/vc/include" + append-ldflags -L"${ESYSROOT}/opt/vc/lib" fi local mywafargs=( diff --git a/media-video/mpv/mpv-9999.ebuild b/media-video/mpv/mpv-9999.ebuild index 6d29fba49c11..647b7976525a 100644 --- a/media-video/mpv/mpv-9999.ebuild +++ b/media-video/mpv/mpv-9999.ebuild @@ -106,6 +106,7 @@ COMMON_DEPEND=" x11-libs/libXScrnSaver x11-libs/libXext x11-libs/libXinerama + x11-libs/libXpresent x11-libs/libXrandr opengl? ( x11-libs/libXdamage @@ -146,8 +147,8 @@ src_configure() { tc-export CC PKG_CONFIG AR if use raspberry-pi; then - append-cflags -I"${SYSROOT%/}${EPREFIX}/opt/vc/include" - append-ldflags -L"${SYSROOT%/}${EPREFIX}/opt/vc/lib" + append-cflags -I"${ESYSROOT}/opt/vc/include" + append-ldflags -L"${ESYSROOT}/opt/vc/lib" fi local mywafargs=( diff --git a/media-video/nvidia_video_sdk/Manifest b/media-video/nvidia_video_sdk/Manifest deleted file mode 100644 index 09343e087bc8..000000000000 --- a/media-video/nvidia_video_sdk/Manifest +++ /dev/null @@ -1,3 +0,0 @@ -DIST nvidia_video_sdk_6.0.1.zip 21310785 BLAKE2B 4563e919c268c7ba6f1686946f5a3e687f87312cd647ee52e8f57c8d5d356c40259b99b2aa427df9c7110bee9741c4c79c373b721643a3efa1568086e6681b3d SHA512 1ab398010f5018482170bf722d84278b1920f003119143911fbb0a811e6f1237a039b4120011cc141728f3fd3d7667295ce8703717eafad82b4675bb3211df87 -EBUILD nvidia_video_sdk-6.0.1.ebuild 1144 BLAKE2B 5981cc9cd5466e9209566ae8c9fc444abf90129a028245a8fb3e44a639cfe00faa9d7cd28b4bf3fd16a8133fbbee9ea382318a883579246f5c03a8e930295c34 SHA512 d5a6878d631ef430b42673b3898f27d5cae06e3831e0a3f13994441be74ecf9c92fe0e8ebec1d1e72bf8763f841617bc59c0610d0fe71cab1bc732a9db672509 -MISC metadata.xml 300 BLAKE2B 3756538d8cc167339fce2a7c39197e0b2da84a4d358f6278ae181a1e817c5f12719faa1829ed150125a0fcf327af7f59c66ebcf9e694a31c9d28034ecd5820ac SHA512 231d7163e780a745ebaafe0699c99cb096f4b69bc64dc16d6f93d12dfb208f2112f8493a062b8753bd8e2cdaa7d4514381870361bead2b437f06edd67ce57e51 diff --git a/media-video/nvidia_video_sdk/metadata.xml b/media-video/nvidia_video_sdk/metadata.xml deleted file mode 100644 index 116ea2518b81..000000000000 --- a/media-video/nvidia_video_sdk/metadata.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - media-video@gentoo.org - - - Build and install example tools. - - diff --git a/media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild b/media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild deleted file mode 100644 index 01f9d9e605a7..000000000000 --- a/media-video/nvidia_video_sdk/nvidia_video_sdk-6.0.1.ebuild +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright 1999-2017 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit versionator toolchain-funcs - -MY_P="${PN}_${PV}" - -DESCRIPTION="NVIDIA Video Codec SDK" -HOMEPAGE="https://developer.nvidia.com/nvidia-video-codec-sdk" -SRC_URI="https://developer.nvidia.com/video-sdk-$(replace_all_version_separators '') -> ${MY_P}.zip" - -LICENSE="MIT tools? ( NVIDIA-CODEC-SDK )" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="tools" - -RDEPEND=" - !media-video/nvenc - >=x11-drivers/nvidia-drivers-347.09" -DEPEND="${RDEPEND} - app-arch/unzip" - -S="${WORKDIR}/${MY_P}" - -TOOLS="NvEncoder NvEncoderPerf NvTranscoder NvEncoderLowLatency" - -src_compile() { - if use tools ; then - export EXTRA_LDFLAGS="${LDFLAGS}" - for i in ${TOOLS} ; do - pushd "${S}/Samples/${i}" || die - emake GCC="$(tc-getCXX)" CCFLAGS="${CXXFLAGS}" - popd - done - fi -} - -src_install() { - if use tools ; then - for i in ${TOOLS}; do - dobin "${S}/Samples/${i}/${i}" - done - dodoc "${S}/Samples/NVIDIA_Video_Codec_SDK_Samples_Guide.pdf" - fi - - dodoc doc/*.pdf ReadMe.txt Release_notes.txt - - insinto /usr/include - doins Samples/common/inc/nvEncodeAPI.h -} diff --git a/media-video/openshot/Manifest b/media-video/openshot/Manifest index a9edb2f7ebb2..a8835e6c7109 100644 --- a/media-video/openshot/Manifest +++ b/media-video/openshot/Manifest @@ -1,3 +1,3 @@ DIST openshot-2.6.1.tar.gz 68566443 BLAKE2B b3a163983bdb811103e5d9307beeb38938719747f743dd58520a0166c08eb11f4592d47bf24224062f9db323a66a2f353eb22f087982b929d60a519cd2c40789 SHA512 9e2d1eae5d72ec2deab914e464dac0d84a864ba2ca63104fad57c90fc907764d5683149fb8136d50030cae993cef9a977e995b0783868988de4668e71a3a5ee2 -EBUILD openshot-2.6.1.ebuild 1363 BLAKE2B 68738cce0efcd5d36a89379b0e1af7e71ddc61a39573e98fb9a2d7eac6793cf458adf9f369e6f7fdaedfc6a264de1dec7d7251e0914c63045a7421898524a65f SHA512 934c19b48e552b6560181e11d504c819589ecc1ab69249d138ac1a672ceeb0ecbe7c83c1bd70442c1d9e4f89e9200fed9874830cfb5476abc8c3f2272eafe048 +EBUILD openshot-2.6.1.ebuild 1363 BLAKE2B 67fcf8b800bfc8ddf841ded5980c26c807a686740226bad2822d947cf2c559d7445aea0a1f009ffa18f1e01389b94829465e51a1badef994330ec94f4a26d55c SHA512 2509faea5fa78e19ee777ae005634817a4280eb1a811f299883b3ea33ad7bf5fe4e1c65a74dd6647d554922cb46dcdc16d58c8e97022359edfe2b055d098b65e MISC metadata.xml 521 BLAKE2B 0594441c26e88ba0aa7ea85be94580dd73588711f4a9c529ab7525b7535a3753579f7ab17d71a9ee4d801b269eeb214a4a5886a9bf2c89752ea6d9540a191294 SHA512 1028c0ac29289a8507d9e23e963c4f3341fdc59d36d06780f6d212f667212509d50781be5544636827af141d8f0d16c45ece1bd8010f37ee6c91464b9dd14687 diff --git a/media-video/openshot/openshot-2.6.1.ebuild b/media-video/openshot/openshot-2.6.1.ebuild index 10693ece187b..fb074b3802f1 100644 --- a/media-video/openshot/openshot-2.6.1.ebuild +++ b/media-video/openshot/openshot-2.6.1.ebuild @@ -3,7 +3,7 @@ EAPI=7 -PYTHON_COMPAT=( python3_{8,9} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE=xml DISTUTILS_SINGLE_IMPL=1 @@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_PN}-${PV}" LICENSE="GPL-3+" SLOT="1" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="doc" RDEPEND="$(python_gen_cond_dep ' diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index e1993a281404..8a8c9deb0565 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -8,20 +8,19 @@ AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2c AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532 AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407 AUX pipewire-0.3.49-x86-cast.patch 813 BLAKE2B 11107bb9c5a4c626c2ccc4e4aa62c6370b7e0851a7c788caf51ce33151e7e23e70c7d460f19357c3a3b3fa54ac682637f954737b9445fbb67490c9f823a6280d SHA512 0b8cc44f6da29f3a91dc8a15093dfc6f14e9a2220a02d41ddbccc7ea3cadf62d92d8db12602eab0587f782478a5b2264ae0dd887179645fafda8f3ffd4843089 -AUX pipewire-0.3.50-fix-spa-header.patch 1256 BLAKE2B 728296383a96f3b1e283132d2e97c2b26f5edc676d6ae6f7d697d997ba67fad0aedcf30642ca2bfb72c8bef1ef90c7ffb27e1dda8c8d452a71719530bed03f70 SHA512 d3062ea859c3310481395b9d622ee3ada0bae14ee56e3f7d8678b5cb1f5ab4af2d38ecc718e56f5330150f3af999bbd80603048ced66a73c51723a719bf753af -AUX pipewire-0.3.50-treewide-retain-sections-to.patch 2636 BLAKE2B 75f47ff173f3caf07347006889320c3ea5c8588ce081cfe1059383db36ddd5b0ba6492389841b2c8bfe92bbfb968b12281a701020ad92fc538f10c3a2c26b448 SHA512 7521d13afaa143fa160a3ba966239150de88cda916f961765fb7bf6a31113be4a96028f08a97e2b203875a6eaff2efb9d3501d2154efbef4c0a8afd7ed55e141 +AUX pipewire-0.3.52-pulse-path.patch 2586 BLAKE2B 2569452967f54ac531f07852fcd78070e61f5972c95eed8d8690461f215330e92aad6eca8c5ac393b0903e6d0c26e8a69fac51b445c39aa428cfd47f0ad4d659 SHA512 0ec2d9ceb5acfdf0ecedb7683db52d0d2ddbee52f318a77720134ec51e920d0f76621b4b44c531b7b1c857d161979351eccb08734e6cb80d0c7a8925399d58b3 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14 DIST pipewire-0.3.49.tar.gz 1769037 BLAKE2B 2567bc98933bfbb295358886e8f97db2af2f0a6ee3c2586c1718e39f7eedaed8528a4663753ba56d3295e42576da015ce9278f22aff9bbd9ca43d883bff5a2f6 SHA512 36398872f7d7b31193d7a8885bbdfb415a122bd779874107a0642202dfd8408f39fddf769bfbae4533c2cc99fe9ef67903d50cc721e936aa4802229f1c46d809 -DIST pipewire-0.3.50.tar.gz 1773182 BLAKE2B d286b73553471795ea8ed60c82e12c955f1835a7a3a8d45baeda6b1e20a795221230b50c21619af4ef5b2b4962d2783de00b1ab2b22b091220970c334de8b9dc SHA512 e29a626258ab28d74e35e310037fac374fe009fb56e0fa41cef7abb1ec6abb26f828cff1b17500f92f1dd4c95c1e0e98f6af497d315dd463f81c2649d1e8ee23 DIST pipewire-0.3.51.tar.gz 1789070 BLAKE2B 8538eb9f2178efa26365f30b324b707826e580caa1fd9c09b62c561c140c14186e0d2b04808fa78eb5642ddccf1a347def19934ecd654be06b215a693075b6fc SHA512 a762fd260b4b14ad9ef142be11ab1c22268da6726e2179559ffb254f0ce7daf7a502779e33c64313a9c6a9fc1bd15150b76be04ec81aa27c35dbb4333cecdb4a +DIST pipewire-0.3.52.tar.gz 1810238 BLAKE2B bb75eff5fe7700d0a303fbfed7910aebd82346a5a21c4a0d17c06e6991bc90bb6d4f6b9559c25788494cb11faff957523dcd7f0c4c8a40be11b81c63a5a9e5ef SHA512 30e9cf74c92babafe386f02a03bb5c41a8ee5591a02f15845cca1ee44f091ce68eb14d48943d43b680cb525026a19e0290997670f9a82156eaa72e974fe6d01a EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14 EBUILD pipewire-0.3.36.ebuild 10263 BLAKE2B 033b26477ad91c843e9307504ce8eddcad7977a386925a1960409767946a88ac539954c7647075bb48ac373b4e36fecf0bbdb5d50351213b51465ea298cad336 SHA512 38d6225ab02d31d1fe33723f7c14a385648853b5f4f84cfd13fcf7f91489dffc2c5fbac5f649bdf80bdd9a4bd1b19977bae59eba83beca9c3d9e34030f6f332b -EBUILD pipewire-0.3.49-r1.ebuild 12957 BLAKE2B dc2ceab687f47b8ef2039f52d7e95fab419146027d6c95a9c50fc94cf2caafec61f14a4a49f440e295fa6e5e8dff45eedd402909ec6eb3f5d4350cb83058d9e9 SHA512 ffd61a276c2b6112d5c7d7084a586a51ecbbff7b3704fb0ced6f6e7091232fc2c585eef2953948eced6473c96d229b9cd866bd5e6bfec10bb7cec812e2a992fd -EBUILD pipewire-0.3.50-r3.ebuild 13058 BLAKE2B 00d3c2330778e5395953b8e9871750cb07e5c2b46056ac5a2d8841d71edb78498af99312ef9240891da008b5ccc7f54999c56b9b88c5636611564aa40797ccc5 SHA512 1c3727e58523069b6d6242c9e5444e1945d3a6327580928658f03beda40818036ca47c2355e4146951f8cea959a85ac34d523dd8b569f15f52a28d319b25e56b -EBUILD pipewire-0.3.51-r1.ebuild 13076 BLAKE2B 664c8f09c7bbb051b9c6607783908bc21a789db9ca326f017e4f1c884602874845f00d5b8de373d0fcd14e68a5e75d45697a96157b63a5db40fc93ceab4fbe71 SHA512 2f12b8a14a89c66f7ab6b4979d93a4c7e1847fefa60602b54102a9c9443f0d9e11822e243e97d46c27d0f07e030e1669c12c03d7edb8f134ef0012e24cc8b1da -EBUILD pipewire-9999.ebuild 12919 BLAKE2B 10e2fef609dd04de13f69aa0665977481b05b0ce6521bf962f436388a507fb3cc18c60e9a58d35d85286fb16b44431cc6526037c8a648a7801f249837b1d98ae SHA512 a680c473a25766d22762bbcc8bd51097f874da3690619199c31125fb22d664f5a454b52ca136f909676993588b9b4f7a12d581ca17258016fc86c77659741739 -MISC metadata.xml 1617 BLAKE2B e24aeb1644a4fe0a9ca35ad078149c1736de01820ee78d78cd733b06313a82294913601ceab2f35eee98a608bc5c25d184d285810916c42902515058a57e13b4 SHA512 992b300e69e808ecd51c4e3073941d7e577889e4d8d8573b7643a49fb3bb7de1fb2c48d4f99c8e703c5cd7d03bd55f6cffa2c1ccca052f89d6a4cabccb09a76e +EBUILD pipewire-0.3.49-r2.ebuild 13074 BLAKE2B bc61ce451afa845425c53de628ddf8eba92ea106dbabd56f995aab078f7112d42cc1649efbeb1ef0c582dd298da74be1df634d6195097ab8787fda761b46c76e SHA512 751dce1df4347d4f1d218d5f147a2c52f23b0f5c5f737d636dc4a89f9fd5c1b8ac44c57a0132f95e0836ba9fa2120832bf5cf7dd01e28d27bb2395939ea8bbe1 +EBUILD pipewire-0.3.51-r2.ebuild 13195 BLAKE2B a4aadc7f5831560ad74b95fba740f5fed50dceb2a9d436c806375782b5376788662fba4afc7172b523a097915c627bd85602ccd5b276851b112d34a3c56b92f3 SHA512 3e4729db31116edb0a6474e48ce90b60cb330320ca594daabed67d99a510d2f2c1de031d41e4c2d95ddd1d39179dbad46cb6a1d3ff0a82a0b7c9c6260cd1d1c8 +EBUILD pipewire-0.3.52-r1.ebuild 13293 BLAKE2B 17049f576d95cacf15f9e2ba4e0e11c61ecb36cf9cf6cad87b847ffdb5873b3b61607f727af6c3c6c6fd8cbbf3620da6ecb0bf8f77329ae79b34cd7af248dbd2 SHA512 ccaa19700ef8aec87ecb0e1c3a537cf15e7a08a3b603241d3a095e6ba22127d897662ddd3f495b923534f2889714129862c9dec14d3ee59262558d6c7faae9f8 +EBUILD pipewire-9999.ebuild 13256 BLAKE2B 0b486819318ee79b892192e04510a9cdb52465dfcfb9e744b84b0779f56a907d6db64ece5ecddae968696b627f91ea9bf83dcdb090ad47cf878f68752b1bd6c1 SHA512 7193f9ebe1ced1cc1a1b84bd45dde762ed1205df938be724cdaabb76562fc0de960a86e3e90164d46e14a9134bc37ae9e0dbfd84d399cf9f52b93825a0aad71c +MISC metadata.xml 1505 BLAKE2B 415865adf3ecd15444849f69b312a96fb8b59c2a909751b3f8ad868c176fe4c22f76ba0fba78268c75e0847d9c7eb9cc93dbc11d0303d040bb56ded2fc37da9e SHA512 9bd27f8d83889d59bf4fc692e630ab34d2e5fa508bb823c4595b505f95339003c7a81ce1bb37c7294e5a788e9e76297654625d4dfa9aaa3efff05c32e19175b2 diff --git a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch b/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch deleted file mode 100644 index 5b9ad3cf2d7c..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.50-fix-spa-header.patch +++ /dev/null @@ -1,39 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d3ea3142e1a4de206e616bc18f63a529e6b4986a.patch -https://bugs.gentoo.org/838427 - -From: psykose -Date: Wed, 13 Apr 2022 21:57:49 +0000 -Subject: [PATCH] spa: fix c90 header include - -placing declarations after code is invalid under ISO c90 - -Fixes !1211 ---- a/spa/include/spa/utils/string.h -+++ b/spa/include/spa/utils/string.h -@@ -276,10 +276,11 @@ static inline int spa_scnprintf(char *buffer, size_t size, const char *format, . - static inline float spa_strtof(const char *str, char **endptr) - { - static locale_t locale = NULL; -+ locale_t prev; - float v; - if (SPA_UNLIKELY(locale == NULL)) - locale = newlocale(LC_ALL_MASK, "C", NULL); -- locale_t prev = uselocale(locale); -+ prev = uselocale(locale); - v = strtof(str, endptr); - uselocale(prev); - return v; -@@ -319,10 +320,11 @@ static inline bool spa_atof(const char *str, float *val) - static inline double spa_strtod(const char *str, char **endptr) - { - static locale_t locale = NULL; -+ locale_t prev; - double v; - if (SPA_UNLIKELY(locale == NULL)) - locale = newlocale(LC_ALL_MASK, "C", NULL); -- locale_t prev = uselocale(locale); -+ prev = uselocale(locale); - v = strtod(str, endptr); - uselocale(prev); - return v; -GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch b/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch deleted file mode 100644 index 1e1a8198ef26..000000000000 --- a/media-video/pipewire/files/pipewire-0.3.50-treewide-retain-sections-to.patch +++ /dev/null @@ -1,70 +0,0 @@ -https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/e28a052105f8ef35b3f469d3b85e1fcb25106f26 - -From e28a052105f8ef35b3f469d3b85e1fcb25106f26 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Barnab=C3=A1s=20P=C5=91cze?= -Date: Wed, 13 Apr 2022 18:13:12 +0200 -Subject: [PATCH] treewide: retain sections to prevent linker garbage - collection - -The linker may remove sections that are actually used when -"--gc-sections" and "-z start-stop-gc" is set. Add the `retain` -attribute to prevent that. - -Furthermore, fix the alignment for `pwtest_suite_decl` objects. - -See: #2292 -See: https://lld.llvm.org/ELF/start-stop-gc.html -See: https://github.com/systemd/systemd/issues/21847 -See: https://github.com/systemd/systemd/pull/21855 ---- - src/modules/module-protocol-pulse/module.h | 1 + - test/pwtest-implementation.h | 2 +- - test/pwtest.h | 6 ++++-- - 3 files changed, 6 insertions(+), 3 deletions(-) - -diff --git a/src/modules/module-protocol-pulse/module.h b/src/modules/module-protocol-pulse/module.h -index c1153640e..f75d8786c 100644 ---- a/src/modules/module-protocol-pulse/module.h -+++ b/src/modules/module-protocol-pulse/module.h -@@ -47,6 +47,7 @@ struct module_info { - - #define DEFINE_MODULE_INFO(name) \ - __attribute__((used)) \ -+ __attribute__((retain)) \ - __attribute__((section("pw_mod_pulse_modules"))) \ - __attribute__((aligned(__alignof__(struct module_info)))) \ - const struct module_info name -diff --git a/test/pwtest-implementation.h b/test/pwtest-implementation.h -index 7bfad01cf..1525d2056 100644 ---- a/test/pwtest-implementation.h -+++ b/test/pwtest-implementation.h -@@ -131,7 +131,7 @@ void _pwtest_add(struct pwtest_context *ctx, - struct pwtest_suite_decl { - const char *name; - enum pwtest_result (*setup)(struct pwtest_context *, struct pwtest_suite *); --} __attribute__((aligned(16))); -+}; - - - #endif /* PWTEST_IMPLEMENTATION_H */ -diff --git a/test/pwtest.h b/test/pwtest.h -index 9c0737523..6d3070b79 100644 ---- a/test/pwtest.h -+++ b/test/pwtest.h -@@ -494,9 +494,11 @@ enum pwtest_arg { - */ - #define PWTEST_SUITE(cname) \ - static enum pwtest_result (cname##__setup)(struct pwtest_context *ctx, struct pwtest_suite *suite); \ -- static const struct pwtest_suite_decl _test_suite \ - __attribute__((used)) \ -- __attribute((section("pwtest_suite_section"))) = { \ -+ __attribute__((retain)) \ -+ __attribute__((section("pwtest_suite_section"))) \ -+ __attribute__((aligned(__alignof__(struct pwtest_suite_decl)))) \ -+ static const struct pwtest_suite_decl _test_suite = { \ - .name = #cname, \ - .setup = cname##__setup, \ - }; \ --- -GitLab - diff --git a/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch b/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch new file mode 100644 index 000000000000..09d8ffff699f --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.52-pulse-path.patch @@ -0,0 +1,78 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/4821c7ca2fe5e25ba018e9f5d4967f08d6bb816f + +From: Wim Taymans +Date: Thu, 9 Jun 2022 17:06:07 +0200 +Subject: [PATCH] pulse-server: don't append "/pulse" to PULSE_RUNTIME_PATH + +Fixes #2431 +--- a/src/modules/module-protocol-pulse/server.c ++++ b/src/modules/module-protocol-pulse/server.c +@@ -460,7 +460,7 @@ static int parse_unix_address(const char *address, struct sockaddr_storage *addr + if (address[0] != '/') { + char runtime_dir[PATH_MAX]; + +- if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir), "pulse")) < 0) ++ if ((res = get_runtime_dir(runtime_dir, sizeof(runtime_dir))) < 0) + return res; + + res = snprintf(addr.sun_path, sizeof(addr.sun_path), +--- a/src/modules/module-protocol-pulse/utils.c ++++ b/src/modules/module-protocol-pulse/utils.c +@@ -50,27 +50,30 @@ + #include "log.h" + #include "utils.h" + +-int get_runtime_dir(char *buf, size_t buflen, const char *dir) ++int get_runtime_dir(char *buf, size_t buflen) + { +- const char *runtime_dir; ++ const char *runtime_dir, *dir = NULL; + struct stat stat_buf; + int res, size; + + runtime_dir = getenv("PULSE_RUNTIME_PATH"); +- if (runtime_dir == NULL) ++ if (runtime_dir == NULL) { + runtime_dir = getenv("XDG_RUNTIME_DIR"); +- ++ dir = "pulse"; ++ } + if (runtime_dir == NULL) { + pw_log_error("could not find a suitable runtime directory in" + "$PULSE_RUNTIME_PATH and $XDG_RUNTIME_DIR"); + return -ENOENT; + } + +- size = snprintf(buf, buflen, "%s/%s", runtime_dir, dir); ++ size = snprintf(buf, buflen, "%s%s%s", runtime_dir, ++ dir ? "/" : "", dir ? dir : ""); + if (size < 0) + return -errno; + if ((size_t) size >= buflen) { +- pw_log_error("path %s/%s too long", runtime_dir, dir); ++ pw_log_error("path %s%s%s too long", runtime_dir, ++ dir ? "/" : "", dir ? dir : ""); + return -ENAMETOOLONG; + } + +@@ -182,7 +185,7 @@ int create_pid_file(void) { + FILE *f; + int res; + +- if ((res = get_runtime_dir(pid_file, sizeof(pid_file), "pulse")) < 0) ++ if ((res = get_runtime_dir(pid_file, sizeof(pid_file))) < 0) + return res; + + if (strlen(pid_file) > PATH_MAX - sizeof("/pid")) { +--- a/src/modules/module-protocol-pulse/utils.h ++++ b/src/modules/module-protocol-pulse/utils.h +@@ -31,7 +31,7 @@ + struct client; + struct pw_context; + +-int get_runtime_dir(char *buf, size_t buflen, const char *dir); ++int get_runtime_dir(char *buf, size_t buflen); + int check_flatpak(struct client *client, pid_t pid); + pid_t get_client_pid(struct client *client, int client_fd); + const char *get_server_name(struct pw_context *context); +GitLab diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml index f88730b7d3ba..b7e4f57f5480 100644 --- a/media-video/pipewire/metadata.xml +++ b/media-video/pipewire/metadata.xml @@ -13,10 +13,6 @@ asturm@gentoo.org Andreas Sturmlechner - - whissi@gentoo.org - Thomas Deutschmann - https://gitlab.freedesktop.org/pipewire/pipewire/-/issues https://gitlab.freedesktop.org/pipewire/pipewire/-/releases diff --git a/media-video/pipewire/pipewire-0.3.49-r1.ebuild b/media-video/pipewire/pipewire-0.3.49-r1.ebuild deleted file mode 100644 index 06b65b5d8bda..000000000000 --- a/media-video/pipewire/pipewire-0.3.49-r1.ebuild +++ /dev/null @@ -1,359 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="" - SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-${MY_COMMIT} - else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" - fi - - KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" -fi - -DESCRIPTION="Multimedia processing graphs" -HOMEPAGE="https://pipewire.org/" - -LICENSE="MIT LGPL-2.1+ GPL-2" -# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 -SLOT="0/0.4" -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" - -# Once replacing system JACK libraries is possible, it's likely that -# jack-client IUSE will need blocking to avoid users accidentally -# configuring their systems to send PW sink output to the emulated -# JACK's sink - doing so is likely to yield no audio, cause a CPU -# cycles consuming loop (and may even cause GUI crashes)! - -REQUIRED_USE=" - jack-sdk? ( !jack-client ) - system-service? ( systemd ) -" - -RESTRICT="!test? ( test )" - -BDEPEND=" - >=dev-util/meson-0.59 - virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" -RDEPEND=" - acct-group/audio - media-libs/alsa-lib - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-libs/readline:= - sys-libs/ncurses:=[unicode(+)] - virtual/libintl[${MULTILIB_USEDEP}] - bluetooth? ( - media-libs/fdk-aac - media-libs/libldac - media-libs/libfreeaptx - media-libs/sbc - >=net-wireless/bluez-4.101:= - virtual/libusb:1 - ) - echo-cancel? ( media-libs/webrtc-audio-processing:0 ) - extra? ( - >=media-libs/libsndfile-1.0.20 - ) - gstreamer? ( - >=dev-libs/glib-2.32.0:2 - >=media-libs/gstreamer-1.10.0:1.0 - media-libs/gst-plugins-base:1.0 - ) - jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) - jack-sdk? ( - !media-sound/jack-audio-connection-kit - !media-sound/jack2 - ) - lv2? ( media-libs/lilv ) - pipewire-alsa? ( - >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] - ) - !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) - ssl? ( dev-libs/openssl:= ) - systemd? ( sys-apps/systemd ) - system-service? ( - acct-user/pipewire - acct-group/pipewire - ) - udev? ( virtual/libudev[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l ) - X? ( - media-libs/libcanberra - x11-libs/libX11 - x11-libs/libXfixes - ) - zeroconf? ( net-dns/avahi ) -" - -DEPEND="${RDEPEND}" - -# TODO: Consider use cases where pipewire is not used for driving audio -# Doing so with WirePlumber currently involves editing Lua scripts -PDEPEND=">=media-video/wireplumber-0.4.8-r3" - -# Present RDEPEND that are currently always disabled due to the PW -# code using them being required to be disabled by Gentoo guidelines -# (i.e. developer binaries not meant for users) and unready code -# media-video/ffmpeg:= -# media-libs/libsdl2 -# >=media-libs/vulkan-loader-1.1.69 -# -# Ditto for DEPEND -# >=dev-util/vulkan-headers-1.1.69 - -DOCS=( {README,INSTALL}.md NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch - - "${FILESDIR}"/${PN}-0.3.49-x86-cast.patch -) - -# limitsdfile related code taken from =sys-auth/realtime-base-0.1 -# with changes as necessary. -limitsdfile=40-${PN}.conf - -python_check_deps() { - has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - einfo "Generating ${limitsdfile}" - cat > ${limitsdfile} <<- EOF || die - # Start of ${limitsdfile} from ${P} - - @audio - memlock 256 - - $(use system-service && { - echo @pipewire - rtprio 95 - echo @pipewire - priority -19 - echo @pipewire - memlock 4194304 - }) - - # End of ${limitsdfile} from ${P} - EOF -} - -multilib_src_configure() { - # https://bugs.gentoo.org/838301 - filter-flags -fno-semantic-interposition - - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - - $(meson_native_use_feature zeroconf avahi) - $(meson_native_use_feature doc docs) - $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone - $(meson_native_enabled man) - $(meson_feature test tests) - -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests - $(meson_native_use_feature gstreamer) - $(meson_native_use_feature gstreamer gstreamer-device-provider) - $(meson_native_use_feature systemd) - - $(meson_native_use_feature system-service systemd-system-service) - -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" - -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" - - $(meson_native_use_feature systemd systemd-user-service) - $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph - -Dspa-plugins=enabled - -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) - -Daudiomixer=enabled # Matches upstream - -Daudioconvert=enabled # Matches upstream - $(meson_native_use_feature bluetooth bluez5) - $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) - $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) - $(meson_native_use_feature bluetooth bluez5-backend-ofono) - $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) - $(meson_native_use_feature bluetooth bluez5-codec-aac) - $(meson_native_use_feature bluetooth bluez5-codec-aptx) - $(meson_native_use_feature bluetooth bluez5-codec-ldac) - $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) - $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 - -Dcontrol=enabled # Matches upstream - -Daudiotestsrc=enabled # Matches upstream - -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 - -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph - $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client - $(meson_use jack-sdk jack-devel) - $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') - -Dsupport=enabled # Miscellaneous/common plugins, such as null sink - -Devl=disabled # Matches upstream - -Dtest=disabled # fakesink and fakesource plugins - $(meson_native_use_feature lv2) - $(meson_native_use_feature v4l v4l2) - -Dlibcamera=disabled # libcamera is not in Portage tree - $(meson_native_use_feature ssl raop) - -Dvideoconvert=enabled # Matches upstream - -Dvideotestsrc=enabled # Matches upstream - -Dvolume=enabled # Matches upstream - -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) - $(meson_native_use_feature extra pw-cat) - $(meson_feature udev) - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) - $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) - -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build - - # Just for bell sounds in X11 right now. - $(meson_native_use_feature X x11) - $(meson_native_use_feature X x11-xfixes) - $(meson_native_use_feature X libcanberra) - ) - - meson_src_configure -} - -multilib_src_install() { - # Our custom DOCS do not exist in multilib source directory - DOCS= meson_src_install -} - -multilib_src_install_all() { - einstalldocs - - insinto /etc/security/limits.d - doins ${limitsdfile} - - if use pipewire-alsa; then - dodir /etc/alsa/conf.d - # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 - # And the current dosym8 -r implementation is likely affected by the same issue, too. - dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf - dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf - fi - - if ! use systemd; then - insinto /etc/xdg/autostart - newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop - - exeinto /usr/bin - newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher - eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher - fi -} - -pkg_postinst() { - use udev && udev_reload - - elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" - elog "using PipeWire. Do it either manually or add yourself" - elog "to the 'audio' group:" - elog - elog " usermod -aG audio " - elog - - if ! use jack-sdk; then - elog "JACK emulation is incomplete and not all programs will work. PipeWire's" - elog "alternative libraries have been installed to a non-default location." - elog "To use them, put pw-jack before every JACK application." - elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" - elog "provider is still needed to compile the JACK applications themselves." - elog - fi - - if use systemd; then - elog "When switching from PulseAudio, you may need to disable PulseAudio:" - elog - elog " systemctl --user disable pulseaudio.service pulseaudio.socket" - elog - elog "To use PipeWire, the user units must be manually enabled" - elog "by running this command as each user you use for desktop activities:" - elog - elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" - elog - elog "A reboot is recommended to avoid interferences from still running" - elog "PulseAudio daemon." - elog - elog "Both new users and those upgrading need to enable WirePlumber" - elog "for relevant users:" - elog - elog " systemctl --user disable pipewire-media-session.service" - elog " systemctl --user --force enable wireplumber.service" - elog - elog "Root user may replace --user with --global to change system default" - elog "configuration for all of the above commands." - else - ewarn "PipeWire daemon startup has been moved to a launcher script!" - ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no" - ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all" - ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)" - ewarn - ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from" - ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" - ewarn "advised that a D-Bus user session is set up before starting the script." - ewarn - if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then - elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" - elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable" - elog "autospawning of the original daemon by setting:" - elog - elog " autospawn = no" - elog - elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" - elog - elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" - elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" - elog "command:" - elog - elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" - elog - fi - elog "NOTE:" - elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" - elog "into ${EROOT}/etc/pipewire by default. In case you need to change" - elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" - elog "and just override the sections you want to change." - fi - elog - - elog "For latest tips and tricks, troubleshooting information and documentation" - elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" - elog - - optfeature_header "The following can be installed for optional runtime features:" - optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit - - if has_version 'net-misc/ofono' ; then - ewarn "Native backend has become default. Please disable oFono via:" - if systemd_is_booted ; then - ewarn "systemctl disable ofono" - else - ewarn "rc-update delete ofono" - fi - ewarn - fi - - if use system-service; then - ewarn - ewarn "WARNING: you have enabled the system-service USE flag, which installs" - ewarn "the system-wide systemd units that enable PipeWire to run as a system" - ewarn "service. This is more than likely NOT what you want. You are strongly" - ewarn "advised not to enable this mode and instead stick with systemd user" - ewarn "units. The default configuration files will likely not work out of" - ewarn "box, and you are on your own with configuration." - ewarn - fi -} diff --git a/media-video/pipewire/pipewire-0.3.49-r2.ebuild b/media-video/pipewire/pipewire-0.3.49-r2.ebuild new file mode 100644 index 000000000000..b7acb4f37fa8 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.49-r2.ebuild @@ -0,0 +1,360 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" + inherit git-r3 +else + if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="" + SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}"/${PN}-${MY_COMMIT} + else + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" + fi + + KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~sparc x86" +fi + +DESCRIPTION="Multimedia processing graphs" +HOMEPAGE="https://pipewire.org/" + +LICENSE="MIT LGPL-2.1+ GPL-2" +# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 +SLOT="0/0.4" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" + +# Once replacing system JACK libraries is possible, it's likely that +# jack-client IUSE will need blocking to avoid users accidentally +# configuring their systems to send PW sink output to the emulated +# JACK's sink - doing so is likely to yield no audio, cause a CPU +# cycles consuming loop (and may even cause GUI crashes)! + +REQUIRED_USE=" + jack-sdk? ( !jack-client ) + system-service? ( systemd ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + >=dev-util/meson-0.59 + virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" +RDEPEND=" + acct-group/audio + media-libs/alsa-lib + sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + media-libs/sbc + >=net-wireless/bluez-4.101:= + virtual/libusb:1 + ) + echo-cancel? ( media-libs/webrtc-audio-processing:0 ) + extra? ( + >=media-libs/libsndfile-1.0.20 + ) + gstreamer? ( + >=dev-libs/glib-2.32.0:2 + >=media-libs/gstreamer-1.10.0:1.0 + media-libs/gst-plugins-base:1.0 + ) + jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) + jack-sdk? ( + !media-sound/jack-audio-connection-kit + !media-sound/jack2 + ) + lv2? ( media-libs/lilv ) + pipewire-alsa? ( + >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] + !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] + ) + !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd ) + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) + udev? ( virtual/libudev[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l ) + X? ( + media-libs/libcanberra + x11-libs/libX11 + x11-libs/libXfixes + ) + zeroconf? ( net-dns/avahi ) +" + +DEPEND="${RDEPEND}" + +# TODO: Consider use cases where pipewire is not used for driving audio +# Doing so with WirePlumber currently involves editing Lua scripts +PDEPEND=">=media-video/wireplumber-0.4.8-r3" + +# Present RDEPEND that are currently always disabled due to the PW +# code using them being required to be disabled by Gentoo guidelines +# (i.e. developer binaries not meant for users) and unready code +# media-video/ffmpeg:= +# media-libs/libsdl2 +# >=media-libs/vulkan-loader-1.1.69 +# +# Ditto for DEPEND +# >=dev-util/vulkan-headers-1.1.69 + +DOCS=( {README,INSTALL}.md NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch + + "${FILESDIR}"/${PN}-0.3.49-x86-cast.patch +) + +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + einfo "Generating ${limitsdfile}" + cat > ${limitsdfile} <<- EOF || die + # Start of ${limitsdfile} from ${P} + + @audio - memlock 256 + + $(use system-service && { + echo @pipewire - rtprio 95 + echo @pipewire - nice -19 + echo @pipewire - memlock 4194304 + }) + + # End of ${limitsdfile} from ${P} + EOF +} + +multilib_src_configure() { + # https://bugs.gentoo.org/838301 + filter-flags -fno-semantic-interposition + + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + + $(meson_native_use_feature zeroconf avahi) + $(meson_native_use_feature doc docs) + $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone + $(meson_native_enabled man) + $(meson_feature test tests) + -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests + $(meson_native_use_feature gstreamer) + $(meson_native_use_feature gstreamer gstreamer-device-provider) + $(meson_native_use_feature systemd) + + $(meson_native_use_feature system-service systemd-system-service) + -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" + -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" + + $(meson_native_use_feature systemd systemd-user-service) + $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph + -Dspa-plugins=enabled + -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) + -Daudiomixer=enabled # Matches upstream + -Daudioconvert=enabled # Matches upstream + $(meson_native_use_feature bluetooth bluez5) + $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) + $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) + $(meson_native_use_feature bluetooth bluez5-backend-ofono) + $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) + $(meson_native_use_feature bluetooth bluez5-codec-aac) + $(meson_native_use_feature bluetooth bluez5-codec-aptx) + $(meson_native_use_feature bluetooth bluez5-codec-ldac) + $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) + $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 + -Dcontrol=enabled # Matches upstream + -Daudiotestsrc=enabled # Matches upstream + -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 + -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph + $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client + $(meson_use jack-sdk jack-devel) + $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') + -Dsupport=enabled # Miscellaneous/common plugins, such as null sink + -Devl=disabled # Matches upstream + -Dtest=disabled # fakesink and fakesource plugins + $(meson_native_use_feature lv2) + $(meson_native_use_feature v4l v4l2) + -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature ssl raop) + -Dvideoconvert=enabled # Matches upstream + -Dvideotestsrc=enabled # Matches upstream + -Dvolume=enabled # Matches upstream + -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) + $(meson_native_use_feature extra pw-cat) + $(meson_feature udev) + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) + $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) + -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build + + # Just for bell sounds in X11 right now. + $(meson_native_use_feature X x11) + $(meson_native_use_feature X x11-xfixes) + $(meson_native_use_feature X libcanberra) + ) + + meson_src_configure +} + +multilib_src_install() { + # Our custom DOCS do not exist in multilib source directory + DOCS= meson_src_install +} + +multilib_src_install_all() { + einstalldocs + + insinto /etc/security/limits.d + doins ${limitsdfile} + + if use pipewire-alsa; then + dodir /etc/alsa/conf.d + # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 + # And the current dosym8 -r implementation is likely affected by the same issue, too. + dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf + dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf + fi + + if ! use systemd; then + insinto /etc/xdg/autostart + newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop + + exeinto /usr/bin + newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher + eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher + fi +} + +pkg_postinst() { + use udev && udev_reload + + elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" + elog "using PipeWire. Do it either manually or add yourself" + elog "to the 'audio' group:" + elog + elog " usermod -aG audio " + elog + + if ! use jack-sdk; then + elog "JACK emulation is incomplete and not all programs will work. PipeWire's" + elog "alternative libraries have been installed to a non-default location." + elog "To use them, put pw-jack before every JACK application." + elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" + elog "provider is still needed to compile the JACK applications themselves." + elog + fi + + if use systemd; then + elog "When switching from PulseAudio, you may need to disable PulseAudio:" + elog + elog " systemctl --user disable pulseaudio.service pulseaudio.socket" + elog + elog "To use PipeWire, the user units must be manually enabled" + elog "by running this command as each user you use for desktop activities:" + elog + elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" + elog + elog "A reboot is recommended to avoid interferences from still running" + elog "PulseAudio daemon." + elog + elog "Both new users and those upgrading need to enable WirePlumber" + elog "for relevant users:" + elog + elog " systemctl --user disable pipewire-media-session.service" + elog " systemctl --user --force enable wireplumber.service" + elog + elog "Root user may replace --user with --global to change system default" + elog "configuration for all of the above commands." + else + ewarn "PipeWire daemon startup has been moved to a launcher script!" + ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no" + ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all" + ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)" + ewarn + ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from" + ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" + ewarn "advised that a D-Bus user session is set up before starting the script." + ewarn + if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then + elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" + elog "are recommended to edit pulseaudio client configuration files:" + elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf" + elog "if it exists, and disable autospawning of the original daemon by setting:" + elog + elog " autospawn = no" + elog + elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" + elog + elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" + elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" + elog "command:" + elog + elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" + elog + fi + elog "NOTE:" + elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" + elog "into ${EROOT}/etc/pipewire by default. In case you need to change" + elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" + elog "and just override the sections you want to change." + fi + elog + + elog "For latest tips and tricks, troubleshooting information and documentation" + elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" + elog + + optfeature_header "The following can be installed for optional runtime features:" + optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit + + if has_version 'net-misc/ofono' ; then + ewarn "Native backend has become default. Please disable oFono via:" + if systemd_is_booted ; then + ewarn "systemctl disable ofono" + else + ewarn "rc-update delete ofono" + fi + ewarn + fi + + if use system-service; then + ewarn + ewarn "WARNING: you have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable PipeWire to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of" + ewarn "box, and you are on your own with configuration." + ewarn + fi +} diff --git a/media-video/pipewire/pipewire-0.3.50-r3.ebuild b/media-video/pipewire/pipewire-0.3.50-r3.ebuild deleted file mode 100644 index 8f7f7f1488f1..000000000000 --- a/media-video/pipewire/pipewire-0.3.50-r3.ebuild +++ /dev/null @@ -1,361 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="" - SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-${MY_COMMIT} - else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" - fi - - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="Multimedia processing graphs" -HOMEPAGE="https://pipewire.org/" - -LICENSE="MIT LGPL-2.1+ GPL-2" -# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 -SLOT="0/0.4" -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" - -# Once replacing system JACK libraries is possible, it's likely that -# jack-client IUSE will need blocking to avoid users accidentally -# configuring their systems to send PW sink output to the emulated -# JACK's sink - doing so is likely to yield no audio, cause a CPU -# cycles consuming loop (and may even cause GUI crashes)! - -REQUIRED_USE=" - jack-sdk? ( !jack-client ) - system-service? ( systemd ) -" - -RESTRICT="!test? ( test )" - -BDEPEND=" - >=dev-util/meson-0.59 - virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" -RDEPEND=" - acct-group/audio - media-libs/alsa-lib - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-libs/readline:= - sys-libs/ncurses:=[unicode(+)] - virtual/libintl[${MULTILIB_USEDEP}] - bluetooth? ( - media-libs/fdk-aac - media-libs/libldac - media-libs/libfreeaptx - media-libs/sbc - >=net-wireless/bluez-4.101:= - virtual/libusb:1 - ) - echo-cancel? ( media-libs/webrtc-audio-processing:0 ) - extra? ( - >=media-libs/libsndfile-1.0.20 - ) - gstreamer? ( - >=dev-libs/glib-2.32.0:2 - >=media-libs/gstreamer-1.10.0:1.0 - media-libs/gst-plugins-base:1.0 - ) - jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) - jack-sdk? ( - !media-sound/jack-audio-connection-kit - !media-sound/jack2 - ) - lv2? ( media-libs/lilv ) - pipewire-alsa? ( - >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] - ) - !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) - ssl? ( dev-libs/openssl:= ) - systemd? ( sys-apps/systemd ) - system-service? ( - acct-user/pipewire - acct-group/pipewire - ) - udev? ( virtual/libudev[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l ) - X? ( - media-libs/libcanberra - x11-libs/libX11 - x11-libs/libXfixes - ) - zeroconf? ( net-dns/avahi ) -" - -DEPEND="${RDEPEND}" - -# TODO: Consider use cases where pipewire is not used for driving audio -# Doing so with WirePlumber currently involves editing Lua scripts -PDEPEND=">=media-video/wireplumber-0.4.8-r3" - -# Present RDEPEND that are currently always disabled due to the PW -# code using them being required to be disabled by Gentoo guidelines -# (i.e. developer binaries not meant for users) and unready code -# media-video/ffmpeg:= -# media-libs/libsdl2 -# >=media-libs/vulkan-loader-1.1.69 -# -# Ditto for DEPEND -# >=dev-util/vulkan-headers-1.1.69 - -DOCS=( {README,INSTALL}.md NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch - - "${FILESDIR}"/${P}-fix-spa-header.patch - "${FILESDIR}"/${P}-treewide-retain-sections-to.patch - "${FILESDIR}"/${PN}-0.3.49-x86-cast.patch -) - -# limitsdfile related code taken from =sys-auth/realtime-base-0.1 -# with changes as necessary. -limitsdfile=40-${PN}.conf - -python_check_deps() { - has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - einfo "Generating ${limitsdfile}" - cat > ${limitsdfile} <<- EOF || die - # Start of ${limitsdfile} from ${P} - - @audio - memlock 256 - - $(use system-service && { - echo @pipewire - rtprio 95 - echo @pipewire - priority -19 - echo @pipewire - memlock 4194304 - }) - - # End of ${limitsdfile} from ${P} - EOF -} - -multilib_src_configure() { - # https://bugs.gentoo.org/838301 - filter-flags -fno-semantic-interposition - - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - - $(meson_native_use_feature zeroconf avahi) - $(meson_native_use_feature doc docs) - $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone - $(meson_native_enabled man) - $(meson_feature test tests) - -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests - $(meson_native_use_feature gstreamer) - $(meson_native_use_feature gstreamer gstreamer-device-provider) - $(meson_native_use_feature systemd) - - $(meson_native_use_feature system-service systemd-system-service) - -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" - -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" - - $(meson_native_use_feature systemd systemd-user-service) - $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph - -Dspa-plugins=enabled - -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) - -Daudiomixer=enabled # Matches upstream - -Daudioconvert=enabled # Matches upstream - $(meson_native_use_feature bluetooth bluez5) - $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) - $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) - $(meson_native_use_feature bluetooth bluez5-backend-ofono) - $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) - $(meson_native_use_feature bluetooth bluez5-codec-aac) - $(meson_native_use_feature bluetooth bluez5-codec-aptx) - $(meson_native_use_feature bluetooth bluez5-codec-ldac) - $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) - $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 - -Dcontrol=enabled # Matches upstream - -Daudiotestsrc=enabled # Matches upstream - -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 - -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph - $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client - $(meson_use jack-sdk jack-devel) - $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') - -Dsupport=enabled # Miscellaneous/common plugins, such as null sink - -Devl=disabled # Matches upstream - -Dtest=disabled # fakesink and fakesource plugins - $(meson_native_use_feature lv2) - $(meson_native_use_feature v4l v4l2) - -Dlibcamera=disabled # libcamera is not in Portage tree - $(meson_native_use_feature ssl raop) - -Dvideoconvert=enabled # Matches upstream - -Dvideotestsrc=enabled # Matches upstream - -Dvolume=enabled # Matches upstream - -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) - $(meson_native_use_feature extra pw-cat) - $(meson_feature udev) - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) - $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) - -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build - - # Just for bell sounds in X11 right now. - $(meson_native_use_feature X x11) - $(meson_native_use_feature X x11-xfixes) - $(meson_native_use_feature X libcanberra) - ) - - meson_src_configure -} - -multilib_src_install() { - # Our custom DOCS do not exist in multilib source directory - DOCS= meson_src_install -} - -multilib_src_install_all() { - einstalldocs - - insinto /etc/security/limits.d - doins ${limitsdfile} - - if use pipewire-alsa; then - dodir /etc/alsa/conf.d - # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 - # And the current dosym8 -r implementation is likely affected by the same issue, too. - dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf - dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf - fi - - if ! use systemd; then - insinto /etc/xdg/autostart - newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop - - exeinto /usr/bin - newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher - eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher - fi -} - -pkg_postinst() { - use udev && udev_reload - - elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" - elog "using PipeWire. Do it either manually or add yourself" - elog "to the 'audio' group:" - elog - elog " usermod -aG audio " - elog - - if ! use jack-sdk; then - elog "JACK emulation is incomplete and not all programs will work. PipeWire's" - elog "alternative libraries have been installed to a non-default location." - elog "To use them, put pw-jack before every JACK application." - elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" - elog "provider is still needed to compile the JACK applications themselves." - elog - fi - - if use systemd; then - elog "When switching from PulseAudio, you may need to disable PulseAudio:" - elog - elog " systemctl --user disable pulseaudio.service pulseaudio.socket" - elog - elog "To use PipeWire, the user units must be manually enabled" - elog "by running this command as each user you use for desktop activities:" - elog - elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" - elog - elog "A reboot is recommended to avoid interferences from still running" - elog "PulseAudio daemon." - elog - elog "Both new users and those upgrading need to enable WirePlumber" - elog "for relevant users:" - elog - elog " systemctl --user disable pipewire-media-session.service" - elog " systemctl --user --force enable wireplumber.service" - elog - elog "Root user may replace --user with --global to change system default" - elog "configuration for all of the above commands." - else - ewarn "PipeWire daemon startup has been moved to a launcher script!" - ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no" - ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all" - ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)" - ewarn - ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from" - ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" - ewarn "advised that a D-Bus user session is set up before starting the script." - ewarn - if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then - elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" - elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable" - elog "autospawning of the original daemon by setting:" - elog - elog " autospawn = no" - elog - elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" - elog - elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" - elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" - elog "command:" - elog - elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" - elog - fi - elog "NOTE:" - elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" - elog "into ${EROOT}/etc/pipewire by default. In case you need to change" - elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" - elog "and just override the sections you want to change." - fi - elog - - elog "For latest tips and tricks, troubleshooting information and documentation" - elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" - elog - - optfeature_header "The following can be installed for optional runtime features:" - optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit - - if has_version 'net-misc/ofono' ; then - ewarn "Native backend has become default. Please disable oFono via:" - if systemd_is_booted ; then - ewarn "systemctl disable ofono" - else - ewarn "rc-update delete ofono" - fi - ewarn - fi - - if use system-service; then - ewarn - ewarn "WARNING: you have enabled the system-service USE flag, which installs" - ewarn "the system-wide systemd units that enable PipeWire to run as a system" - ewarn "service. This is more than likely NOT what you want. You are strongly" - ewarn "advised not to enable this mode and instead stick with systemd user" - ewarn "units. The default configuration files will likely not work out of" - ewarn "box, and you are on your own with configuration." - ewarn - fi -} diff --git a/media-video/pipewire/pipewire-0.3.51-r1.ebuild b/media-video/pipewire/pipewire-0.3.51-r1.ebuild deleted file mode 100644 index c28ecc739f33..000000000000 --- a/media-video/pipewire/pipewire-0.3.51-r1.ebuild +++ /dev/null @@ -1,362 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" - inherit git-r3 -else - if [[ ${PV} == *_p* ]] ; then - MY_COMMIT="" - SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" - S="${WORKDIR}"/${PN}-${MY_COMMIT} - else - SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" - fi - - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="Multimedia processing graphs" -HOMEPAGE="https://pipewire.org/" - -LICENSE="MIT LGPL-2.1+ GPL-2" -# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 -SLOT="0/0.4" -IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" - -# Once replacing system JACK libraries is possible, it's likely that -# jack-client IUSE will need blocking to avoid users accidentally -# configuring their systems to send PW sink output to the emulated -# JACK's sink - doing so is likely to yield no audio, cause a CPU -# cycles consuming loop (and may even cause GUI crashes)! - -REQUIRED_USE=" - jack-sdk? ( !jack-client ) - system-service? ( systemd ) -" - -RESTRICT="!test? ( test )" - -BDEPEND=" - >=dev-util/meson-0.59 - virtual/pkgconfig - ${PYTHON_DEPS} - $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') - doc? ( - app-doc/doxygen - media-gfx/graphviz - ) -" -RDEPEND=" - acct-group/audio - media-libs/alsa-lib - sys-apps/dbus[${MULTILIB_USEDEP}] - sys-libs/readline:= - sys-libs/ncurses:=[unicode(+)] - virtual/libintl[${MULTILIB_USEDEP}] - bluetooth? ( - media-libs/fdk-aac - media-libs/libldac - media-libs/libfreeaptx - media-libs/sbc - >=net-wireless/bluez-4.101:= - virtual/libusb:1 - ) - echo-cancel? ( media-libs/webrtc-audio-processing:0 ) - extra? ( - >=media-libs/libsndfile-1.0.20 - ) - gstreamer? ( - >=dev-libs/glib-2.32.0:2 - >=media-libs/gstreamer-1.10.0:1.0 - media-libs/gst-plugins-base:1.0 - ) - jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) - jack-sdk? ( - !media-sound/jack-audio-connection-kit - !media-sound/jack2 - ) - lv2? ( media-libs/lilv ) - pipewire-alsa? ( - >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - ) - !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) - ssl? ( dev-libs/openssl:= ) - systemd? ( sys-apps/systemd ) - system-service? ( - acct-user/pipewire - acct-group/pipewire - ) - udev? ( virtual/libudev[${MULTILIB_USEDEP}] ) - v4l? ( media-libs/libv4l ) - X? ( - media-libs/libcanberra - x11-libs/libX11 - x11-libs/libXfixes - ) - zeroconf? ( net-dns/avahi ) -" - -DEPEND="${RDEPEND}" - -# TODO: Consider use cases where pipewire is not used for driving audio -# Doing so with WirePlumber currently involves editing Lua scripts -PDEPEND=">=media-video/wireplumber-0.4.8-r3" - -# Present RDEPEND that are currently always disabled due to the PW -# code using them being required to be disabled by Gentoo guidelines -# (i.e. developer binaries not meant for users) and unready code -# media-video/ffmpeg:= -# media-libs/libsdl2 -# >=media-libs/vulkan-loader-1.1.69 -# -# Ditto for DEPEND -# >=dev-util/vulkan-headers-1.1.69 - -DOCS=( {README,INSTALL}.md NEWS ) - -PATCHES=( - "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch -) - -# limitsdfile related code taken from =sys-auth/realtime-base-0.1 -# with changes as necessary. -limitsdfile=40-${PN}.conf - -python_check_deps() { - has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" -} - -src_prepare() { - default - - einfo "Generating ${limitsdfile}" - cat > ${limitsdfile} <<- EOF || die - # Start of ${limitsdfile} from ${P} - - @audio - memlock 256 - - $(use system-service && { - echo @pipewire - rtprio 95 - echo @pipewire - priority -19 - echo @pipewire - memlock 4194304 - }) - - # End of ${limitsdfile} from ${P} - EOF -} - -multilib_src_configure() { - # https://bugs.gentoo.org/838301 - filter-flags -fno-semantic-interposition - - local emesonargs=( - -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} - - $(meson_native_use_feature zeroconf avahi) - $(meson_native_use_feature doc docs) - $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone - $(meson_native_enabled man) - $(meson_feature test tests) - -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests - $(meson_native_use_feature gstreamer) - $(meson_native_use_feature gstreamer gstreamer-device-provider) - $(meson_native_use_feature systemd) - - $(meson_native_use_feature system-service systemd-system-service) - -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" - -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" - - $(meson_native_use_feature systemd systemd-user-service) - $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph - -Dspa-plugins=enabled - -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) - -Daudiomixer=enabled # Matches upstream - -Daudioconvert=enabled # Matches upstream - $(meson_native_use_feature bluetooth bluez5) - $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) - $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) - $(meson_native_use_feature bluetooth bluez5-backend-ofono) - $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) - $(meson_native_use_feature bluetooth bluez5-codec-aac) - $(meson_native_use_feature bluetooth bluez5-codec-aptx) - $(meson_native_use_feature bluetooth bluez5-codec-ldac) - $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) - $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 - -Dcontrol=enabled # Matches upstream - -Daudiotestsrc=enabled # Matches upstream - -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 - -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph - $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client - $(meson_use jack-sdk jack-devel) - $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') - -Dsupport=enabled # Miscellaneous/common plugins, such as null sink - -Devl=disabled # Matches upstream - -Dtest=disabled # fakesink and fakesource plugins - $(meson_native_use_feature lv2) - $(meson_native_use_feature v4l v4l2) - -Dlibcamera=disabled # libcamera is not in Portage tree - $(meson_native_use_feature ssl raop) - -Dvideoconvert=enabled # Matches upstream - -Dvideotestsrc=enabled # Matches upstream - -Dvolume=enabled # Matches upstream - -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) - $(meson_native_use_feature extra pw-cat) - $(meson_feature udev) - -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" - -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) - $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) - -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build - - # Just for bell sounds in X11 right now. - $(meson_native_use_feature X x11) - $(meson_native_use_feature X x11-xfixes) - $(meson_native_use_feature X libcanberra) - ) - - meson_src_configure -} - -multilib_src_install() { - # Our custom DOCS do not exist in multilib source directory - DOCS= meson_src_install -} - -multilib_src_install_all() { - einstalldocs - - insinto /etc/security/limits.d - doins ${limitsdfile} - - if use pipewire-alsa; then - dodir /etc/alsa/conf.d - - # Install pipewire conf loader hook - insinto /usr/share/alsa/alsa.conf.d - doins "${FILESDIR}"/99-pipewire-default-hook.conf - eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf - - # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 - # And the current dosym8 -r implementation is likely affected by the same issue, too. - dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf - dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf - fi - - if ! use systemd; then - insinto /etc/xdg/autostart - newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop - - exeinto /usr/bin - newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher - eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher - fi -} - -pkg_postinst() { - use udev && udev_reload - - elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" - elog "using PipeWire. Do it either manually or add yourself" - elog "to the 'audio' group:" - elog - elog " usermod -aG audio " - elog - - if ! use jack-sdk; then - elog "JACK emulation is incomplete and not all programs will work. PipeWire's" - elog "alternative libraries have been installed to a non-default location." - elog "To use them, put pw-jack before every JACK application." - elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" - elog "provider is still needed to compile the JACK applications themselves." - elog - fi - - if use systemd; then - elog "When switching from PulseAudio, you may need to disable PulseAudio:" - elog - elog " systemctl --user disable pulseaudio.service pulseaudio.socket" - elog - elog "To use PipeWire, the user units must be manually enabled" - elog "by running this command as each user you use for desktop activities:" - elog - elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" - elog - elog "A reboot is recommended to avoid interferences from still running" - elog "PulseAudio daemon." - elog - elog "Both new users and those upgrading need to enable WirePlumber" - elog "for relevant users:" - elog - elog " systemctl --user disable pipewire-media-session.service" - elog " systemctl --user --force enable wireplumber.service" - elog - elog "Root user may replace --user with --global to change system default" - elog "configuration for all of the above commands." - else - ewarn "PipeWire daemon startup has been moved to a launcher script!" - ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no" - ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all" - ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)" - ewarn - ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from" - ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" - ewarn "advised that a D-Bus user session is set up before starting the script." - ewarn - if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then - elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" - elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable" - elog "autospawning of the original daemon by setting:" - elog - elog " autospawn = no" - elog - elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" - elog - elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" - elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" - elog "command:" - elog - elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" - elog - fi - elog "NOTE:" - elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" - elog "into ${EROOT}/etc/pipewire by default. In case you need to change" - elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" - elog "and just override the sections you want to change." - fi - elog - - elog "For latest tips and tricks, troubleshooting information and documentation" - elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" - elog - - optfeature_header "The following can be installed for optional runtime features:" - optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit - - if has_version 'net-misc/ofono' ; then - ewarn "Native backend has become default. Please disable oFono via:" - if systemd_is_booted ; then - ewarn "systemctl disable ofono" - else - ewarn "rc-update delete ofono" - fi - ewarn - fi - - if use system-service; then - ewarn - ewarn "WARNING: you have enabled the system-service USE flag, which installs" - ewarn "the system-wide systemd units that enable PipeWire to run as a system" - ewarn "service. This is more than likely NOT what you want. You are strongly" - ewarn "advised not to enable this mode and instead stick with systemd user" - ewarn "units. The default configuration files will likely not work out of" - ewarn "box, and you are on your own with configuration." - ewarn - fi -} diff --git a/media-video/pipewire/pipewire-0.3.51-r2.ebuild b/media-video/pipewire/pipewire-0.3.51-r2.ebuild new file mode 100644 index 000000000000..36646e433754 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.51-r2.ebuild @@ -0,0 +1,363 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" + inherit git-r3 +else + if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="" + SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}"/${PN}-${MY_COMMIT} + else + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" + fi + + KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" +fi + +DESCRIPTION="Multimedia processing graphs" +HOMEPAGE="https://pipewire.org/" + +LICENSE="MIT LGPL-2.1+ GPL-2" +# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 +SLOT="0/0.4" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" + +# Once replacing system JACK libraries is possible, it's likely that +# jack-client IUSE will need blocking to avoid users accidentally +# configuring their systems to send PW sink output to the emulated +# JACK's sink - doing so is likely to yield no audio, cause a CPU +# cycles consuming loop (and may even cause GUI crashes)! + +REQUIRED_USE=" + jack-sdk? ( !jack-client ) + system-service? ( systemd ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + >=dev-util/meson-0.59 + virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" +RDEPEND=" + acct-group/audio + media-libs/alsa-lib + sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + media-libs/sbc + >=net-wireless/bluez-4.101:= + virtual/libusb:1 + ) + echo-cancel? ( media-libs/webrtc-audio-processing:0 ) + extra? ( + >=media-libs/libsndfile-1.0.20 + ) + gstreamer? ( + >=dev-libs/glib-2.32.0:2 + >=media-libs/gstreamer-1.10.0:1.0 + media-libs/gst-plugins-base:1.0 + ) + jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) + jack-sdk? ( + !media-sound/jack-audio-connection-kit + !media-sound/jack2 + ) + lv2? ( media-libs/lilv ) + pipewire-alsa? ( + >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] + ) + !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd ) + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) + udev? ( virtual/libudev[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l ) + X? ( + media-libs/libcanberra + x11-libs/libX11 + x11-libs/libXfixes + ) + zeroconf? ( net-dns/avahi ) +" + +DEPEND="${RDEPEND}" + +# TODO: Consider use cases where pipewire is not used for driving audio +# Doing so with WirePlumber currently involves editing Lua scripts +PDEPEND=">=media-video/wireplumber-0.4.8-r3" + +# Present RDEPEND that are currently always disabled due to the PW +# code using them being required to be disabled by Gentoo guidelines +# (i.e. developer binaries not meant for users) and unready code +# media-video/ffmpeg:= +# media-libs/libsdl2 +# >=media-libs/vulkan-loader-1.1.69 +# +# Ditto for DEPEND +# >=dev-util/vulkan-headers-1.1.69 + +DOCS=( {README,INSTALL}.md NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch +) + +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + einfo "Generating ${limitsdfile}" + cat > ${limitsdfile} <<- EOF || die + # Start of ${limitsdfile} from ${P} + + @audio - memlock 256 + + $(use system-service && { + echo @pipewire - rtprio 95 + echo @pipewire - nice -19 + echo @pipewire - memlock 4194304 + }) + + # End of ${limitsdfile} from ${P} + EOF +} + +multilib_src_configure() { + # https://bugs.gentoo.org/838301 + filter-flags -fno-semantic-interposition + + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + + $(meson_native_use_feature zeroconf avahi) + $(meson_native_use_feature doc docs) + $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone + $(meson_native_enabled man) + $(meson_feature test tests) + -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests + $(meson_native_use_feature gstreamer) + $(meson_native_use_feature gstreamer gstreamer-device-provider) + $(meson_native_use_feature systemd) + + $(meson_native_use_feature system-service systemd-system-service) + -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" + -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" + + $(meson_native_use_feature systemd systemd-user-service) + $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph + -Dspa-plugins=enabled + -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) + -Daudiomixer=enabled # Matches upstream + -Daudioconvert=enabled # Matches upstream + $(meson_native_use_feature bluetooth bluez5) + $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) + $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) + $(meson_native_use_feature bluetooth bluez5-backend-ofono) + $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) + $(meson_native_use_feature bluetooth bluez5-codec-aac) + $(meson_native_use_feature bluetooth bluez5-codec-aptx) + $(meson_native_use_feature bluetooth bluez5-codec-ldac) + $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) + $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 + -Dcontrol=enabled # Matches upstream + -Daudiotestsrc=enabled # Matches upstream + -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 + -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph + $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client + $(meson_use jack-sdk jack-devel) + $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') + -Dsupport=enabled # Miscellaneous/common plugins, such as null sink + -Devl=disabled # Matches upstream + -Dtest=disabled # fakesink and fakesource plugins + $(meson_native_use_feature lv2) + $(meson_native_use_feature v4l v4l2) + -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature ssl raop) + -Dvideoconvert=enabled # Matches upstream + -Dvideotestsrc=enabled # Matches upstream + -Dvolume=enabled # Matches upstream + -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) + $(meson_native_use_feature extra pw-cat) + $(meson_feature udev) + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) + $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) + -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build + + # Just for bell sounds in X11 right now. + $(meson_native_use_feature X x11) + $(meson_native_use_feature X x11-xfixes) + $(meson_native_use_feature X libcanberra) + ) + + meson_src_configure +} + +multilib_src_install() { + # Our custom DOCS do not exist in multilib source directory + DOCS= meson_src_install +} + +multilib_src_install_all() { + einstalldocs + + insinto /etc/security/limits.d + doins ${limitsdfile} + + if use pipewire-alsa; then + dodir /etc/alsa/conf.d + + # Install pipewire conf loader hook + insinto /usr/share/alsa/alsa.conf.d + doins "${FILESDIR}"/99-pipewire-default-hook.conf + eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf + + # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 + # And the current dosym8 -r implementation is likely affected by the same issue, too. + dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf + dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf + fi + + if ! use systemd; then + insinto /etc/xdg/autostart + newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop + + exeinto /usr/bin + newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher + eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher + fi +} + +pkg_postinst() { + use udev && udev_reload + + elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" + elog "using PipeWire. Do it either manually or add yourself" + elog "to the 'audio' group:" + elog + elog " usermod -aG audio " + elog + + if ! use jack-sdk; then + elog "JACK emulation is incomplete and not all programs will work. PipeWire's" + elog "alternative libraries have been installed to a non-default location." + elog "To use them, put pw-jack before every JACK application." + elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" + elog "provider is still needed to compile the JACK applications themselves." + elog + fi + + if use systemd; then + elog "When switching from PulseAudio, you may need to disable PulseAudio:" + elog + elog " systemctl --user disable pulseaudio.service pulseaudio.socket" + elog + elog "To use PipeWire, the user units must be manually enabled" + elog "by running this command as each user you use for desktop activities:" + elog + elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" + elog + elog "A reboot is recommended to avoid interferences from still running" + elog "PulseAudio daemon." + elog + elog "Both new users and those upgrading need to enable WirePlumber" + elog "for relevant users:" + elog + elog " systemctl --user disable pipewire-media-session.service" + elog " systemctl --user --force enable wireplumber.service" + elog + elog "Root user may replace --user with --global to change system default" + elog "configuration for all of the above commands." + else + ewarn "PipeWire daemon startup has been moved to a launcher script!" + ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no" + ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all" + ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)" + ewarn + ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from" + ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" + ewarn "advised that a D-Bus user session is set up before starting the script." + ewarn + if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then + elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" + elog "are recommended to edit pulseaudio client configuration files:" + elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf" + elog "if it exists, and disable autospawning of the original daemon by setting:" + elog + elog " autospawn = no" + elog + elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" + elog + elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" + elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" + elog "command:" + elog + elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" + elog + fi + elog "NOTE:" + elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" + elog "into ${EROOT}/etc/pipewire by default. In case you need to change" + elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" + elog "and just override the sections you want to change." + fi + elog + + elog "For latest tips and tricks, troubleshooting information and documentation" + elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" + elog + + optfeature_header "The following can be installed for optional runtime features:" + optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit + + if has_version 'net-misc/ofono' ; then + ewarn "Native backend has become default. Please disable oFono via:" + if systemd_is_booted ; then + ewarn "systemctl disable ofono" + else + ewarn "rc-update delete ofono" + fi + ewarn + fi + + if use system-service; then + ewarn + ewarn "WARNING: you have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable PipeWire to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of" + ewarn "box, and you are on your own with configuration." + ewarn + fi +} diff --git a/media-video/pipewire/pipewire-0.3.52-r1.ebuild b/media-video/pipewire/pipewire-0.3.52-r1.ebuild new file mode 100644 index 000000000000..c94a3f03a994 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.52-r1.ebuild @@ -0,0 +1,366 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" + inherit git-r3 +else + if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="" + SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}"/${PN}-${MY_COMMIT} + else + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" + fi + + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="Multimedia processing graphs" +HOMEPAGE="https://pipewire.org/" + +LICENSE="MIT LGPL-2.1+ GPL-2" +# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49 +SLOT="0/0.4" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl system-service systemd test udev v4l X zeroconf" + +# Once replacing system JACK libraries is possible, it's likely that +# jack-client IUSE will need blocking to avoid users accidentally +# configuring their systems to send PW sink output to the emulated +# JACK's sink - doing so is likely to yield no audio, cause a CPU +# cycles consuming loop (and may even cause GUI crashes)! + +REQUIRED_USE=" + jack-sdk? ( !jack-client ) + system-service? ( systemd ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + >=dev-util/meson-0.59 + virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" +RDEPEND=" + acct-group/audio + media-libs/alsa-lib + sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + media-libs/sbc + >=net-wireless/bluez-4.101:= + virtual/libusb:1 + ) + echo-cancel? ( media-libs/webrtc-audio-processing:0 ) + extra? ( + >=media-libs/libsndfile-1.0.20 + ) + gstreamer? ( + >=dev-libs/glib-2.32.0:2 + >=media-libs/gstreamer-1.10.0:1.0 + media-libs/gst-plugins-base:1.0 + ) + jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) + jack-sdk? ( + !media-sound/jack-audio-connection-kit + !media-sound/jack2 + ) + lv2? ( media-libs/lilv ) + pipewire-alsa? ( + >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] + ) + !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd ) + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) + udev? ( virtual/libudev[${MULTILIB_USEDEP}] ) + v4l? ( media-libs/libv4l ) + X? ( + media-libs/libcanberra + x11-libs/libX11 + x11-libs/libXfixes + ) + zeroconf? ( net-dns/avahi ) +" + +DEPEND="${RDEPEND}" + +# TODO: Consider use cases where pipewire is not used for driving audio +# Doing so with WirePlumber currently involves editing Lua scripts +PDEPEND=">=media-video/wireplumber-0.4.8-r3" + +# Present RDEPEND that are currently always disabled due to the PW +# code using them being required to be disabled by Gentoo guidelines +# (i.e. developer binaries not meant for users) and unready code +# media-video/ffmpeg:= +# media-libs/libsdl2 +# >=media-libs/vulkan-loader-1.1.69 +# +# Ditto for DEPEND +# >=dev-util/vulkan-headers-1.1.69 + +DOCS=( {README,INSTALL}.md NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch + "${FILESDIR}"/${P}-pulse-path.patch +) + +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + einfo "Generating ${limitsdfile}" + cat > ${limitsdfile} <<- EOF || die + # Start of ${limitsdfile} from ${P} + + @audio - memlock 256 + + $(use system-service && { + echo @pipewire - rtprio 95 + echo @pipewire - nice -19 + echo @pipewire - memlock 4194304 + }) + + # End of ${limitsdfile} from ${P} + EOF +} + +multilib_src_configure() { + # https://bugs.gentoo.org/838301 + filter-flags -fno-semantic-interposition + + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + + $(meson_native_use_feature zeroconf avahi) + $(meson_native_use_feature doc docs) + $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone + $(meson_native_enabled man) + $(meson_feature test tests) + -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests + $(meson_native_use_feature gstreamer) + $(meson_native_use_feature gstreamer gstreamer-device-provider) + $(meson_native_use_feature systemd) + + $(meson_native_use_feature system-service systemd-system-service) + -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" + -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" + + $(meson_native_use_feature systemd systemd-user-service) + $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph + -Dspa-plugins=enabled + -Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible) + -Daudiomixer=enabled # Matches upstream + -Daudioconvert=enabled # Matches upstream + $(meson_native_use_feature bluetooth bluez5) + $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) + $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) + $(meson_native_use_feature bluetooth bluez5-backend-ofono) + $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) + $(meson_native_use_feature bluetooth bluez5-codec-aac) + $(meson_native_use_feature bluetooth bluez5-codec-aptx) + $(meson_native_use_feature bluetooth bluez5-codec-ldac) + $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) + $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 + # Not yet packaged. + -Dbluez5-codec-lc3plus=disabled + -Dcontrol=enabled # Matches upstream + -Daudiotestsrc=enabled # Matches upstream + -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 + -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph + $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client + $(meson_use jack-sdk jack-devel) + $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') + -Dsupport=enabled # Miscellaneous/common plugins, such as null sink + -Devl=disabled # Matches upstream + -Dtest=disabled # fakesink and fakesource plugins + $(meson_native_use_feature lv2) + $(meson_native_use_feature v4l v4l2) + -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature ssl raop) + -Dvideoconvert=enabled # Matches upstream + -Dvideotestsrc=enabled # Matches upstream + -Dvolume=enabled # Matches upstream + -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) + $(meson_native_use_feature extra pw-cat) + $(meson_feature udev) + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) + $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) + -Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build + + # Just for bell sounds in X11 right now. + $(meson_native_use_feature X x11) + $(meson_native_use_feature X x11-xfixes) + $(meson_native_use_feature X libcanberra) + ) + + meson_src_configure +} + +multilib_src_install() { + # Our custom DOCS do not exist in multilib source directory + DOCS= meson_src_install +} + +multilib_src_install_all() { + einstalldocs + + insinto /etc/security/limits.d + doins ${limitsdfile} + + if use pipewire-alsa; then + dodir /etc/alsa/conf.d + + # Install pipewire conf loader hook + insinto /usr/share/alsa/alsa.conf.d + doins "${FILESDIR}"/99-pipewire-default-hook.conf + eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf + + # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 + # And the current dosym8 -r implementation is likely affected by the same issue, too. + dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf + dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf + fi + + if ! use systemd; then + insinto /etc/xdg/autostart + newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop + + exeinto /usr/bin + newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher + eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher + fi +} + +pkg_postinst() { + use udev && udev_reload + + elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" + elog "using PipeWire. Do it either manually or add yourself" + elog "to the 'audio' group:" + elog + elog " usermod -aG audio " + elog + + if ! use jack-sdk; then + elog "JACK emulation is incomplete and not all programs will work. PipeWire's" + elog "alternative libraries have been installed to a non-default location." + elog "To use them, put pw-jack before every JACK application." + elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" + elog "provider is still needed to compile the JACK applications themselves." + elog + fi + + if use systemd; then + elog "When switching from PulseAudio, you may need to disable PulseAudio:" + elog + elog " systemctl --user disable pulseaudio.service pulseaudio.socket" + elog + elog "To use PipeWire, the user units must be manually enabled" + elog "by running this command as each user you use for desktop activities:" + elog + elog " systemctl --user enable pipewire.socket pipewire-pulse.socket" + elog + elog "A reboot is recommended to avoid interferences from still running" + elog "PulseAudio daemon." + elog + elog "Both new users and those upgrading need to enable WirePlumber" + elog "for relevant users:" + elog + elog " systemctl --user disable pipewire-media-session.service" + elog " systemctl --user --force enable wireplumber.service" + elog + elog "Root user may replace --user with --global to change system default" + elog "configuration for all of the above commands." + else + ewarn "PipeWire daemon startup has been moved to a launcher script!" + ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no" + ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all" + ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)" + ewarn + ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from" + ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly" + ewarn "advised that a D-Bus user session is set up before starting the script." + ewarn + if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then + elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" + elog "are recommended to edit pulseaudio client configuration files:" + elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf" + elog "if it exists, and disable autospawning of the original daemon by setting:" + elog + elog " autospawn = no" + elog + elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" + elog + elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" + elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" + elog "command:" + elog + elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" + elog + fi + elog "NOTE:" + elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" + elog "into ${EROOT}/etc/pipewire by default. In case you need to change" + elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" + elog "and just override the sections you want to change." + fi + elog + + elog "For latest tips and tricks, troubleshooting information and documentation" + elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" + elog + + optfeature_header "The following can be installed for optional runtime features:" + optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit + + if has_version 'net-misc/ofono' ; then + ewarn "Native backend has become default. Please disable oFono via:" + if systemd_is_booted ; then + ewarn "systemctl disable ofono" + else + ewarn "rc-update delete ofono" + fi + ewarn + fi + + if use system-service; then + ewarn + ewarn "WARNING: you have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable PipeWire to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of" + ewarn "box, and you are on your own with configuration." + ewarn + fi +} diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index e60bb1f87151..9ab78449ccc3 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_COMPAT=( python3_{8..11} ) inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev @@ -19,7 +19,7 @@ else SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" fi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Multimedia processing graphs" @@ -85,7 +85,6 @@ RDEPEND=" lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] - !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) ssl? ( dev-libs/openssl:= ) @@ -145,7 +144,7 @@ src_prepare() { $(use system-service && { echo @pipewire - rtprio 95 - echo @pipewire - priority -19 + echo @pipewire - nice -19 echo @pipewire - memlock 4194304 }) @@ -190,6 +189,8 @@ multilib_src_configure() { $(meson_native_use_feature bluetooth bluez5-codec-ldac) $(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters) $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 + # Not yet packaged. + -Dbluez5-codec-lc3plus=disabled -Dcontrol=enabled # Matches upstream -Daudiotestsrc=enabled # Matches upstream -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 @@ -237,10 +238,16 @@ multilib_src_install_all() { if use pipewire-alsa; then dodir /etc/alsa/conf.d + + # Install pipewire conf loader hook + insinto /usr/share/alsa/alsa.conf.d + doins "${FILESDIR}"/99-pipewire-default-hook.conf + eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf + # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 # And the current dosym8 -r implementation is likely affected by the same issue, too. dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf - dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf + dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf fi if ! use systemd; then @@ -305,8 +312,9 @@ pkg_postinst() { ewarn if has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon'; then elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" - elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable" - elog "autospawning of the original daemon by setting:" + elog "are recommended to edit pulseaudio client configuration files:" + elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf" + elog "if it exists, and disable autospawning of the original daemon by setting:" elog elog " autospawn = no" elog diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest index 1dc02e01c60d..0c3d3fbb5ac0 100644 --- a/media-video/pitivi/Manifest +++ b/media-video/pitivi/Manifest @@ -2,6 +2,10 @@ AUX pitivi-0.999-gst-0.18.patch 1753 BLAKE2B fa8c3f8226987667285817853f8a9f86fe4 AUX pitivi-0.999-metainfo.patch 734 BLAKE2B 6187b6d596c80e3ea00e5b79df6f9092f6be1f3e90037ea7f4638aba60fe47cf77e4a9dd4b77d716fd7b3793da0c501b29462b9e98918fc1de089615de2d4f0c SHA512 dfd9c1e9c84de7883b386dcc9b555d904b5633cdfaa0670de7e95ac3561ff45e4f692fcea77cd6b6d4082d834a41026a73b80d0916c81cb15c95d1508534a599 AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f AUX pitivi-0.999-python38.patch 1809 BLAKE2B fe95c44a409f0a629602d4656cfc90a02e2e676a40d3d3f232457e2a506225f25ab86d585f26ddbaf8551c5efc54e13f474b8b259dd05c2a8285c0b98b9249ba SHA512 f90523242fd8acaa4f0637b8facc5a528186c5dd371f67049b11b307bd6f06c693dd79bb305f2163bed4bd0140bd7fcee86fe7d4b2239be82a7dea47c6038026 +AUX pitivi-2021.05-meson-compatibility.patch 1452 BLAKE2B 453356f66c217b0ae527219819a5ca3ff4a7da60664e21f2fda211c846c3efd9139d8564d93eb907e72e56f2b4f497135c7f7f5d0728a2380844d5b5de040db5 SHA512 394ad3c1317598d7bb020176e1572598f310eb5fa2e37e274fd572a9c8a3338c52accd1a66be8e9322032a1c677481a219bb25da223f348d2469320bde80a2fd +AUX pitivi-2021.05-python-collections.patch 406 BLAKE2B e3c70bb271d95ac5b6bd6f0fb8738b24e8db544140e565173aa71c652ee1c25f8e50f77ef822c3843e4609d531e5f9b25ce299cf82f59db975121a44c1ad0e58 SHA512 20c6c6df1d86a3e5e126b5f3d851fa56651a18a86313c358eef63a423d70e501b28abfc767e7fca8d01e0cd2106d346e2dcdbf8075f60596ac6ada8059e2f5e8 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8 +DIST pitivi-2021.05.tar.xz 11303884 BLAKE2B f87f16cc1ab7ea0f97bc92cdd9f1d5993051ed67b26473748aeb327a4cb51bb32510c845e1665ec3eb3b67c3f0f113c05a514076bad4e13d0fadbd725bcb6bb6 SHA512 3ecb571d501b634ca3a369d4020954cc0b2bc101ceb12bee74d6b38c9ca8f2bf15fe94030421c43503870128d8218548feca7d32cf25b4afcf610365784ca9bb EBUILD pitivi-0.999-r5.ebuild 2908 BLAKE2B d87fc4e7fbf9147bf2bf280ce9128a973ebdac9daeba82f41045641fb311f22b885fa684667d816b420021cd16edd1862b610100754da6adefb4f49fb0736c83 SHA512 4f59f61f9e039d42cd962c4917b3906ec55739dca4994ede2420b7a23cbb5a70c519edc52085f237ca22973b49f9bd2a8e0103f8bd09dc15343b513c05fb5da8 +EBUILD pitivi-2021.05-r1.ebuild 2209 BLAKE2B 7696097b20863ebdfb15d33cc7f52ea73e8320ba4163e1da5c746eef684e737a26e158c3450ac372f4b27a2abb3984676d040cff479634a82bb38db5d210344c SHA512 05a8643450c5ca897c627b782bdf3d3d3de466d80ee00335a033eb79d07640b53776f8e27733d96d9a109c79b412c6b2cb1e5e59d53bc2ceffedcd24e7f2626d MISC metadata.xml 380 BLAKE2B 3ba78024c7a1f5dd825bdb63ea42c4a4c6fef74a881f5acbfb6d707c27f9e0bddab88470f03cb663f564e26a3343e8a849d9f000ba7cf3e1df437ba5ae66086a SHA512 2c728bee57e023b734c64c65824c25ab02744bf49b33f91bc231a5a2ea47f821e5951f628fd558de55e0cad0cc6b95faecb924e226c581008ee342b4e58d6459 diff --git a/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch new file mode 100644 index 000000000000..990f84b06795 --- /dev/null +++ b/media-video/pitivi/files/pitivi-2021.05-meson-compatibility.patch @@ -0,0 +1,45 @@ +From ddf2369d1fc6fddd63f676cc905a8b8e96291a4c Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= +Date: Tue, 25 Jan 2022 15:37:34 +0200 +Subject: [PATCH] Fix compatibility with meson 0.61 + +Previously positional arguments to i18n.merge_files() were just ignored +but this became an error. +--- + data/meson.build | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) + +diff --git a/data/meson.build b/data/meson.build +index 2ea82cf12..60d23169b 100644 +--- a/data/meson.build ++++ b/data/meson.build +@@ -6,7 +6,7 @@ install_subdir('audiopresets', install_dir: pkgdatadir) + install_subdir('videopresets', install_dir: pkgdatadir) + install_subdir('gstpresets', install_dir: pkgdatadir) + +-desktop_file = i18n.merge_file('org.pitivi.Pitivi.desktop', ++desktop_file = i18n.merge_file( + type: 'desktop', + output : 'org.pitivi.Pitivi.desktop', + input : 'org.pitivi.Pitivi.desktop.in', +@@ -25,7 +25,7 @@ if desktop_file_validate.found() + ) + endif + +-appdata_file = i18n.merge_file('org.pitivi.Pitivi.appdata.xml', ++appdata_file = i18n.merge_file( + type: 'xml', + output : 'org.pitivi.Pitivi.appdata.xml', + input : 'org.pitivi.Pitivi.appdata.xml.in', +@@ -43,7 +43,7 @@ if appstream_util.found() + ) + endif + +-i18n.merge_file('org.pitivi.Pitivi-mime.xml', ++i18n.merge_file( + output : 'org.pitivi.Pitivi-mime.xml', + input : 'org.pitivi.Pitivi-mime.xml.in', + po_dir: podir, +-- +GitLab + diff --git a/media-video/pitivi/files/pitivi-2021.05-python-collections.patch b/media-video/pitivi/files/pitivi-2021.05-python-collections.patch new file mode 100644 index 000000000000..fc04cd8d8726 --- /dev/null +++ b/media-video/pitivi/files/pitivi-2021.05-python-collections.patch @@ -0,0 +1,13 @@ +https://src.fedoraproject.org/rpms/pitivi/raw/rawhide/f/collections.patch +--- a/pitivi/utils/loggable.py ++++ b/pitivi/utils/loggable.py +@@ -14,7 +14,7 @@ + # + # You should have received a copy of the GNU Lesser General Public + # License along with this program; if not, see . +-import collections ++import collections.abc as collections + import errno + import fnmatch + import os + diff --git a/media-video/pitivi/pitivi-2021.05-r1.ebuild b/media-video/pitivi/pitivi-2021.05-r1.ebuild new file mode 100644 index 000000000000..92d0aad1b722 --- /dev/null +++ b/media-video/pitivi/pitivi-2021.05-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 +PYTHON_COMPAT=( python3_{8..10} ) +PYTHON_REQ_USE="sqlite" + +inherit gnome.org meson python-single-r1 xdg + +DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework" +HOMEPAGE="https://www.pitivi.org" + +LICENSE="LGPL-2.1" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Do not forget to check pitivi/check.py for dependencies!!! +# gsound, libav, libnotify and v4l are optional +GST_VER="1.18.4" + +COMMON_DEPEND=" + ${PYTHON_DEPS} + $(python_gen_cond_dep ' + >=dev-python/pycairo-1.10[${PYTHON_USEDEP}] + ') + >=x11-libs/cairo-1.10 + + >=media-libs/gstreamer-${GST_VER}:1.0[introspection] +" +RDEPEND="${COMMON_DEPEND} + >=dev-libs/glib-2.30.0:2 + + >=dev-libs/gobject-introspection-1.34:= + + dev-libs/libpeas[${PYTHON_SINGLE_USEDEP}] + + $(python_gen_cond_dep ' + dev-python/dbus-python[${PYTHON_USEDEP}] + >=dev-python/gst-python-1.4:1.0[${PYTHON_USEDEP}] + dev-python/matplotlib[${PYTHON_USEDEP}] + dev-python/numpy[${PYTHON_USEDEP}] + >=dev-python/pygobject-3.8:3[${PYTHON_USEDEP}] + ') + + gnome-base/librsvg:= + + >=media-libs/gstreamer-editing-services-${GST_VER}:1.0[introspection] + >=media-libs/gst-plugins-base-${GST_VER}:1.0[introspection,theora] + >=media-libs/gst-plugins-bad-${GST_VER}:1.0 + >=media-plugins/gst-plugins-gtk-${GST_VER}:1.0 + >=media-libs/gst-plugins-good-${GST_VER}:1.0 + >=media-plugins/gst-plugins-libav-${GST_VER}:1.0 + >=media-plugins/gst-plugins-gdkpixbuf-${GST_VER}:1.0 + + >=x11-libs/libnotify-0.7[introspection] + x11-libs/libwnck:3[introspection] + >=x11-libs/gtk+-3.20.0:3[introspection] +" +DEPEND="${RDEPEND}" +BDEPEND=" + app-text/yelp-tools + $(python_gen_cond_dep ' + dev-python/setuptools[${PYTHON_USEDEP}] + ') + >=dev-util/intltool-0.35.5 + dev-util/itstool + sys-devel/gettext + virtual/pkgconfig +" + +PATCHES=( + # https://gitlab.gnome.org/GNOME/pitivi/-/commit/ddf2369d1fc6fddd63f676cc905a8b8e96291a4c + "${FILESDIR}"/${P}-meson-compatibility.patch + "${FILESDIR}"/${P}-python-collections.patch +) + +src_configure() { + meson_src_configure +} + +src_compile() { + meson_src_compile +} + +src_install() { + meson_src_install + python_fix_shebang "${D}" +} diff --git a/media-video/popcorntime-bin/Manifest b/media-video/popcorntime-bin/Manifest index b7ecf4430735..e526504b069d 100644 --- a/media-video/popcorntime-bin/Manifest +++ b/media-video/popcorntime-bin/Manifest @@ -1,4 +1,4 @@ DIST Popcorn-Time-0.4.7-amd64.deb 101720792 BLAKE2B d437bbc67e7520a59ba1b37dcf17e69e860fc47e2b492c7b3d3df4f1fe0fd848af3fed3962668c296509db5aaca168b48669a6765694195378d47e884d028668 SHA512 9d29bc7a541379b248abc7d4ac4711fa3e6ac2e9645f566d5fba24430b30f1b4c55a7a0ae652f2e57b56f547eda6564a8c0696432ac4cdd099828e0fd3ff010d DIST Popcorn-Time-0.4.7-i386.deb 104588216 BLAKE2B 83ce8dc4d64b03a3918cafca380904ce60078ee1ba317b09884bf1d32fa46ab5b00383d1c15d5d4b6e040609a996d8a4743ae94220209c47ae4ce9e300bf1ad2 SHA512 60270178d343870707ab6d6247321cc983e19e896e09a05d412189d4c22c449768f01d612029b23f2dc449819066fcc6f5cb176a78e08e57450088b8130fd963 -EBUILD popcorntime-bin-0.4.7.ebuild 1202 BLAKE2B 7a3da6ba133628066b0b87b8338adaed31d6ceca7cef8111802958348bf4054a34d7564fa251a79811cfc13183e63e6e495c8f452f32a03374fd50a3207b2c19 SHA512 3a82b74370a6da2487891c3364d4afe556085d9d7ea31920acc7879e953cc0f9ac87d1376efa5b237894f9db165a4d950422b1bcd2d3d0dcd9c1a4028435782b +EBUILD popcorntime-bin-0.4.7.ebuild 1377 BLAKE2B 7d1b04387c2d3bbf35c7f18c1a11ff4dd1ba3d68c8bee2594337ee415ea535ebabfac504b1a412af34cbc199d10bc68454b542df27fcb175ed1ca1be20caee38 SHA512 711903b79ac3286779177a2ddaf51991fd02701d7b0ee4513e1615dec93ac98d74f2862807b260941e36cd87096d95b68bf44696a3009df51e5ce5f9158f2f12 MISC metadata.xml 436 BLAKE2B da1f7867d1f3a3b6a04a0975899b592976adb0299e2c370fa613d025993aeed81f719d1bde50565f3e8da15cfdd4ed6cd7f1bf4abb77c3d9371fdcfe7f4e9d13 SHA512 fec3c45b96ed58c61fb5454edc2351384b67bb52e156542bd0d71ce51f36b5943c1bee083a05c5c99917630da6ca5ffe0b87cfacde3a07d521a3c2032e42985e diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild index 6918fce89e42..cdea8a6ab56f 100644 --- a/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild +++ b/media-video/popcorntime-bin/popcorntime-bin-0.4.7.ebuild @@ -14,7 +14,11 @@ SRC_URI=" S="${WORKDIR}" KEYWORDS="-* ~amd64 ~x86" -LICENSE="GPL-3" +# Electron bundles a bunch of things +LICENSE=" + MIT BSD BSD-2 BSD-4 AFL-2.1 Apache-2.0 Ms-PL GPL-2 LGPL-2.1 APSL-2 + unRAR OFL CC-BY-SA-3.0 MPL-2.0 android public-domain all-rights-reserved +" SLOT="0" RDEPEND=" diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest index 1b018d767dae..d63e890b3da2 100644 --- a/media-video/qmplay2/Manifest +++ b/media-video/qmplay2/Manifest @@ -1,6 +1,8 @@ DIST QMPlay2-src-21.12.24.tar.xz 1609604 BLAKE2B 0b2e1ddc0a089ee0d8d37d3d14f2273b53b4df078c6f1571a5ed44c1234133c3eb21461287eb12027ccb686d844f28939b8dfe236c11fd6cb5831dc825708301 SHA512 fddd1d28a0c7f8ad7fa8ef02bb1181ee2fe4babfd8b9c026d2b1d518c1cf28528c64d296b0050d7c51b1ae558baf2d04fe808b276816d98e839a85dbc67ac136 DIST QMPlay2-src-22.03.19.tar.xz 1612136 BLAKE2B 5b5ff6d4b37c3d1c46e28839e078e3f7bfa4d2d9d88f552a574cc6560ee18996dda8649f47973f2af97224e2ebebbffadf3c6f52b8064fc30ff63c72d7f578e2 SHA512 687fa0b8bc7d3b99432419aeeaedc83773dc3b12d8133872f663419db7123e7093895bc8ac5b64f03acefd1c4e5cf916210ebbef6b6494284e15487763f0d571 +DIST QMPlay2-src-22.06.16.tar.xz 1613312 BLAKE2B b626b184f3d16c85dead8c61a5ccc0bb7b11e6a064fc6a3b4aedbd8a2e9631ac2182a00a5dd9c9de1feb5f357b45ce3d7dc66f9b46d88153cc3bce3d5f869a65 SHA512 f04a83422bcfa105b3ec33843962b844b6efed6700a26426f4a73c0588dc1179985d612748d5c74f6214fdcff86a035272473a35a54a234ec0abef388b0517fe EBUILD qmplay2-21.12.24.ebuild 3336 BLAKE2B 3d8976098e21861788cd780ff3f3e305dd87f9ede70210b121500f4acb1d9c23ca06558056f9df5107d632ba090f6548720b750e9b3306be08caf60518566ff1 SHA512 ccd37998da35fcb75b16d8b3387d4234b5990a25f52d552f83f64123275af069077a09179d0817495825d22d3312dce4bf5c75f6c8685044513e74998063f048 EBUILD qmplay2-22.03.19.ebuild 3324 BLAKE2B 9c4ce7611259460080fbdfb72266426f5b3cd7e71942b87df7cb043f3bb22518a951154bab2bd9ecf2adb424222bff19d3703a015465107c7f17e95f0b541179 SHA512 e4d324867eb01f01f874acd717fe76e30bccc24e8d19d3a2939d977cad168ee4fe6e7ee101c93eff58dc34506e99852f5e08cf53d5a03b1ce65473ab090973a8 +EBUILD qmplay2-22.06.16.ebuild 3324 BLAKE2B 9c4ce7611259460080fbdfb72266426f5b3cd7e71942b87df7cb043f3bb22518a951154bab2bd9ecf2adb424222bff19d3703a015465107c7f17e95f0b541179 SHA512 e4d324867eb01f01f874acd717fe76e30bccc24e8d19d3a2939d977cad168ee4fe6e7ee101c93eff58dc34506e99852f5e08cf53d5a03b1ce65473ab090973a8 EBUILD qmplay2-9999.ebuild 3324 BLAKE2B 9c4ce7611259460080fbdfb72266426f5b3cd7e71942b87df7cb043f3bb22518a951154bab2bd9ecf2adb424222bff19d3703a015465107c7f17e95f0b541179 SHA512 e4d324867eb01f01f874acd717fe76e30bccc24e8d19d3a2939d977cad168ee4fe6e7ee101c93eff58dc34506e99852f5e08cf53d5a03b1ce65473ab090973a8 MISC metadata.xml 1342 BLAKE2B c3e3b0477c49c00aec65e05ec5d940f8fc126efe074460a1f67c39b98654ccc3819669e47ad5ba83ed977a72f9ee41606d9409ef3a377cfb511bdc01aff0ce70 SHA512 2eb6b7c2b72abf37a2165f35ed7cab51653a425d294f4ec866d0c6b4dd53ffbf8b30306a987bb4bba1e952ea246815dc59e22a6e9141151a844ae1b7cbd36bde diff --git a/media-video/qmplay2/qmplay2-22.06.16.ebuild b/media-video/qmplay2/qmplay2-22.06.16.ebuild new file mode 100644 index 000000000000..b7b2b595e0e7 --- /dev/null +++ b/media-video/qmplay2/qmplay2-22.06.16.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake xdg + +DESCRIPTION="A Qt-based video player, which can play most formats and codecs" +HOMEPAGE="https://github.com/zaps166/QMPlay2" + +if [[ ${PV} == *9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://github.com/zaps166/QMPlay2" +else + SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz" + S="${WORKDIR}/QMPlay2-src-${PV}" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="LGPL-3" +SLOT="0" + +IUSE="avdevice +audiofilters +alsa cdio cuvid extensions gme inputs libass + modplug notifications opengl pipewire portaudio pulseaudio sid shaders + +taglib vaapi vdpau videofilters visualizations vulkan xv" + +REQUIRED_USE=" + audiofilters? ( || ( alsa pipewire portaudio pulseaudio ) ) + shaders? ( vulkan )" + +RDEPEND=" + dev-qt/qtcore:5 + dev-qt/qtdbus:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + media-video/ffmpeg + || ( + dev-qt/qtgui:5[X(-)] + dev-qt/qtgui:5[xcb(-)] + ) + alsa? ( media-libs/alsa-lib ) + cdio? ( dev-libs/libcdio[cddb] ) + extensions? ( dev-qt/qtdeclarative:5 ) + gme? ( media-libs/game-music-emu ) + libass? ( media-libs/libass ) + opengl? ( virtual/opengl ) + pipewire? ( media-video/pipewire ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-sound/pulseaudio ) + sid? ( media-libs/libsidplayfp ) + shaders? ( >=media-libs/shaderc-2020.1 ) + taglib? ( media-libs/taglib ) + vaapi? ( + >=media-video/ffmpeg-4.1.3[vaapi] + x11-libs/libva + ) + vdpau? ( media-video/ffmpeg[vdpau] ) + videofilters? ( dev-qt/qtconcurrent:5 ) + vulkan? ( + >=dev-qt/qtgui-5.14.1:5[vulkan] + >=media-libs/vulkan-loader-1.2.133 + ) + xv? ( x11-libs/libXv ) +" +DEPEND="${RDEPEND}" +BDEPEND="dev-qt/linguist-tools:5" + +src_prepare() { + # disable compress man pages + sed -r \ + -e 's/if\(GZIP\)/if\(TRUE\)/' \ + -e 's/(install.+QMPlay2\.1)\.gz/\1/' \ + -i src/gui/CMakeLists.txt || die + + cmake_src_prepare +} + +src_configure() { + local mycmakeargs=( + # core + -DUSE_LINK_TIME_OPTIMIZATION=false + -DUSE_UPDATES=OFF + -DUSE_ALSA=$(usex alsa) + -DUSE_AUDIOCD=$(usex cdio) + -DUSE_DBUS_SUSPEND=ON + -DUSE_FREEDESKTOP_NOTIFICATIONS=ON + -DUSE_LIBASS=$(usex libass) + -DUSE_NOTIFY=$(usex notifications) + -DUSE_OPENGL=$(usex opengl) + -DUSE_VULKAN=$(usex vulkan) + -DUSE_GLSLC=$(usex shaders) + -DUSE_XVIDEO=$(usex xv) + + # ffmpeg + -DUSE_FFMPEG_AVDEVICE=$(usex avdevice) + -DUSE_FFMPEG_VAAPI=$(usex vaapi) + -DUSE_FFMPEG_VDPAU=$(usex vdpau) + + # chiptune + -DUSE_CHIPTUNE_GME=$(usex gme) + -DUSE_CHIPTUNE_SID=$(usex sid) + + # modules + -DUSE_AUDIOFILTERS=$(usex audiofilters) + -DUSE_CUVID=$(usex cuvid) + -DUSE_INPUTS=$(usex inputs) + -DUSE_MODPLUG=$(usex modplug) + -DUSE_PIPEWIRE=$(usex pipewire) + -DUSE_PORTAUDIO=$(usex portaudio) + -DUSE_PULSEAUDIO=$(usex pulseaudio) + -DUSE_TAGLIB=$(usex taglib) + -DUSE_VIDEOFILTERS=$(usex videofilters) + -DUSE_VISUALIZATIONS=$(usex visualizations) + + # extensions + -DUSE_EXTENSIONS=$(usex extensions) + ) + + if use extensions; then + # Move inside an if, to remove unused option warning + mycmakeargs+=( + -DUSE_LASTFM=ON + -DUSE_LYRICS=ON + -DUSE_MEDIABROWSER=ON + -DUSE_MPRIS2=ON + ) + fi + + if [[ ${PV} == *9999 ]]; then + mycmakeargs+=( -DUSE_GIT_VERSION=true ) + else + mycmakeargs+=( -DUSE_GIT_VERSION=false ) + fi + + cmake_src_configure +} diff --git a/media-video/rtmpdump/Manifest b/media-video/rtmpdump/Manifest index 65cf629b90ec..0dbfcc8f32a0 100644 --- a/media-video/rtmpdump/Manifest +++ b/media-video/rtmpdump/Manifest @@ -1,3 +1,4 @@ +AUX rtmpdump-2.4_p20210219-gcc-11-missing-include.patch 487 BLAKE2B 5df79ae71735429236ece558d6069327278dc4f573619dc7a7740591c0b1a7ba03f179c4e35d3d48e6a46da67cfc702c297efa4dc413a76f0bab439c4ddbf354 SHA512 b4cd1f4ec8eeaf7acf8a28b84d8919e3911a6373d61659f6cdcd5953f95e284b5f4c756e96fe6d867d6b531c0a3b4b970b882cbca7395d4feadb0ce168763d21 AUX rtmpdump-fix-chunk-size.patch 1332 BLAKE2B 2044907f1e34c35229d8c1f97e4f9e51fac9d0d45ef9a3b426db556d697d524ffa625d13d299007b8ea3b99034bce5c880bebbc88c43baaafd93c203a24c9c93 SHA512 f97b4780fb8cfffccf59785c5a89c8d4929e21ec587192f10602caaf9a0b008dfbfebaa09db1d9d955fc9911fc443d76bf19972cc59fedfab5a8889f7fe70b5d AUX rtmpdump-openssl-1.1-v2.patch 8964 BLAKE2B 7ac621cafbbd159a9e143f0c0108c4b08230c7e9221be711983c6e525b7b550fd7062182796049f03f35a908eb12947e333b90c25085dce37ac6e7a0a51cff5a SHA512 f3b39e5c52db0e14d686ab02c7e374fae1c47304bee19a66b1e93eb24ad67c2f08af3695b9919ceccfdbf78f5533ce95f9877725aa3e6cc3f9d660c116e83050 AUX rtmpdump-swf_vertification_type_2.patch 545 BLAKE2B e6db03f060ead7122029f15c0cc259e04863c2d5d0d2509a21de69f7fc61c1d3fb0ac062759c52e22e60733acdfb495cb4e6892ba7acb8e1f36ce1fe42f3ccd9 SHA512 5b5b4582b488429f8192b1158903047986d8ebc117c2ed81f7ab18bf59bcf8b8f6bc9a38fae89aff04af2342ca1362288a39516660f2163b94781c838652ad06 @@ -7,6 +8,6 @@ DIST rtmpdump-2.4_p20190330.tar.gz 143037 BLAKE2B ab0edbca444fc71034a1c6386f304d DIST rtmpdump-2.4_p20210219.tar.gz 143043 BLAKE2B 312a44fa6caba3fbae19c248d76dccd22c637884ce37c207afe9de80eb0655a97af51101cd2800a2aea52620578f63e1ccede5070772126297e1c75baff0217b SHA512 2bcd169c8c142390e4a37a5f115bb722f8878188920818349aead50ad6c40b8e96c4f929f1b4d6c26ebc05ee264e6675d3843bf963ad4fbac04c3ce74b7fbb20 EBUILD rtmpdump-2.4_p20161210-r3.ebuild 2696 BLAKE2B ac811b42e9812140688c9b5a33a2255b4457e095de83b096eaae4f9959d0de8a50e919d1e6fb7385e7d256af25ab23c8bd980da70532bc67d8c730e2da4d6af5 SHA512 653d227609c0c1a38a85ce9ceb0eeaca3b6628ba79af5e877d1a2a76e58d2296222ba584da04a55abb784a05c2a8dfdc9d27a95ab07fb16317f36c1c22b73edc EBUILD rtmpdump-2.4_p20190330.ebuild 2633 BLAKE2B 2e115cd1d1710de282de394fef7aac3b10a002606f2da149317f21e685b6e47cffff4b720d5bd303d2f0e6f91f555499f5ae66767d832a9a4b9e67c163224012 SHA512 18ecef8e51588fb946e12de48c9033908bf1988b4681129851f27c176e8b4cfb77fc229c4f0772837f54ed52b11443b1a158e8ed04e3b1673753dc250dcf902f -EBUILD rtmpdump-2.4_p20210219.ebuild 2676 BLAKE2B 515f1f8e5c83018505a2c15624eb5185ff98d15e59c017acbe47c7e63fd08b6f4e5063a38ce9e60108d3826799be4de3e524c400025e1af94530f9bf511af201 SHA512 4c90599c84248c3e0c4158bb0d9b39ce953269f21ebbac0321f746f546d24d268f611fdeba35c905d38ea7c6b0e2648d76a827e4032432925b801bfc018473d4 -EBUILD rtmpdump-9999.ebuild 2676 BLAKE2B 515f1f8e5c83018505a2c15624eb5185ff98d15e59c017acbe47c7e63fd08b6f4e5063a38ce9e60108d3826799be4de3e524c400025e1af94530f9bf511af201 SHA512 4c90599c84248c3e0c4158bb0d9b39ce953269f21ebbac0321f746f546d24d268f611fdeba35c905d38ea7c6b0e2648d76a827e4032432925b801bfc018473d4 +EBUILD rtmpdump-2.4_p20210219.ebuild 2747 BLAKE2B dfb47792858c9ed20aa20fa3ddca2b7edcebfdf08921f2d3e8b5471029ee1552173c2b5540d380775cf000c379a30ba1396aa91d9a982ccc2c6b89a88fdb4904 SHA512 acd00533f72628cc7d037608d7d5756c03a643f006e7d3daece0badcdd9aed42a3d9561346dba0d77d9c8013b592557263b057b154b95a61f8bb84f1df1e8c5e +EBUILD rtmpdump-9999.ebuild 2683 BLAKE2B 24cdd74b4f9864fc85a9c66bba16ed69d663045017176e55d94e6b7f35f7330d1b2aa5571d653172bd2f84711a7d07911496627489815393072e9d3da2eb09bf SHA512 d3329d8412927acd3205a6530ba19c64a512f2a03ae34c38769f2aac1ee11321c7fc196fca55fc59add60a7c3b77a07cab1203f317fedb26a6b59f210be04c28 MISC metadata.xml 746 BLAKE2B 30f330e57b0467571f5536b4689c3a52ed5e36ad759855b90e26226673ebb9b3388ad4b257d8c2c01069aeeb337531e27031828be23e0e56aa0d8076c7ae9abd SHA512 7eb134cf59798c33074457c2238de22a69d7d29469d4d4705c990a29a660837b3df5794af19ac5176056c8010e7d040e0aefa8cbfcdeb1df5d316c2d921cc6ac diff --git a/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch b/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch new file mode 100644 index 000000000000..4325ed07381f --- /dev/null +++ b/media-video/rtmpdump/files/rtmpdump-2.4_p20210219-gcc-11-missing-include.patch @@ -0,0 +1,23 @@ +https://bugs.gentoo.org/828082 +--- a/librtmp/rtmp.c ++++ b/librtmp/rtmp.c +@@ -28,6 +28,7 @@ + #include + #include + #include ++#include + + #include "rtmp_sys.h" + #include "log.h" +diff --git a/librtmp/hashswf.c b/librtmp/hashswf.c +index 32b2eed..e3669e3 100644 +--- a/librtmp/hashswf.c ++++ b/librtmp/hashswf.c +@@ -25,6 +25,7 @@ + #include + #include + #include ++#include + + #include "rtmp_sys.h" + #include "log.h" diff --git a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild index edd05e9dc2dd..8632f208c91f 100644 --- a/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild +++ b/media-video/rtmpdump/rtmpdump-2.4_p20210219.ebuild @@ -27,6 +27,7 @@ PATCHES=( "${FILESDIR}/${PN}-swf_vertification_type_2.patch" "${FILESDIR}/${PN}-swf_vertification_type_2_part_2.patch" "${FILESDIR}/${PN}-fix-chunk-size.patch" + "${FILESDIR}/${PN}-2.4_p20210219-gcc-11-missing-include.patch" ) if [[ ${PV} == *9999 ]] ; then @@ -34,7 +35,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-f1b83c1" fi diff --git a/media-video/rtmpdump/rtmpdump-9999.ebuild b/media-video/rtmpdump/rtmpdump-9999.ebuild index edd05e9dc2dd..8e564b4e273a 100644 --- a/media-video/rtmpdump/rtmpdump-9999.ebuild +++ b/media-video/rtmpdump/rtmpdump-9999.ebuild @@ -34,7 +34,7 @@ if [[ ${PV} == *9999 ]] ; then EGIT_REPO_URI="https://git.ffmpeg.org/rtmpdump.git" inherit git-r3 else - KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" SRC_URI="https://git.ffmpeg.org/gitweb/rtmpdump.git/snapshot/f1b83c10d8beb43fcc70a6e88cf4325499f25857.tar.gz -> ${P}.tar.gz" S="${WORKDIR}/${PN}-f1b83c1" fi diff --git a/media-video/simplescreenrecorder/Manifest b/media-video/simplescreenrecorder/Manifest index 29e61444bc17..318dfac5fac0 100644 --- a/media-video/simplescreenrecorder/Manifest +++ b/media-video/simplescreenrecorder/Manifest @@ -1,6 +1,6 @@ DIST simplescreenrecorder-0.4.3.tar.gz 1918958 BLAKE2B 9d0e07255c7345d8752a8f49fd2e7947db4058c6e6bdbe1239955f96f06543eff24b207bcd049d07eb7d3d5815ad5f1c77721e1fa139f940b1deb3b3da7a46e0 SHA512 c930045d6763bdb026cee80fe82aa0e973de7a1bd92bce9650c5cae627f5d8f8d913f260024410a41170081c8eda61c1aea346bc2d9740b8dc169a3952b3bfd0 DIST simplescreenrecorder-0.4.4.tar.gz 1961269 BLAKE2B 05c7635840f8461ab324f740f0cc554eb544ed91b00cdf39c80f861e6a8631f59afbdcc9fe958830b0f1e31eedb90f11d29c114ce4bbb612f1756264502f069f SHA512 a90549a2709490482d70559073e505e669417a93abf16124b98c021e6d2bf08b91b53eb68e006df4f80fcee9fe4da2624bf8de979618953adb3f37eb1d471525 EBUILD simplescreenrecorder-0.4.3.ebuild 2804 BLAKE2B a126ce612b02720d487f3cee881bb0def3244f538d14a789ecdab0920e795801a88888f9df5570ca3a0588099cce56e8c93c8d64b78efedfa0c7ad66eb21fa27 SHA512 b9d8e773d680a2bb2f40ce19c0b8781009f8d1734f8f14bc22e891dd8582befb941bc5e358425151b5ed7d51f5c323f3bfef2ff6589a1198f9b97e24dc97a38e -EBUILD simplescreenrecorder-0.4.4.ebuild 2922 BLAKE2B f579d6fc82b09d1697abca25e69fd8d049aaebb489ab7ad3a1e18ba27a7dd6d8ae5181ddae3a85cc5fed8f30444c16805496e1cc046713caea4d568a28e3c6e6 SHA512 c99e945d9b09fc7ea220089bfcd1db9034901b6152ae3d3879ece709679ec1b99bc10f422b8f374ac40a758128367757399794b090519f655b17df7196b024d0 +EBUILD simplescreenrecorder-0.4.4.ebuild 2920 BLAKE2B 8e2abfb3f1203cd32bacc17845a0c76d6a3d57d7eafdd21ea8d3129d515a47fdb9d3478db8e902e654884ef72341e35007db3395fb33e0096d224e4f7b93322d SHA512 b4b30ea9d81838cea8530074abdcb2701aac3bb5f5526e7c282cdfca346a61fb26c6ea093ff7e4977946c2bc276363d5a723de71ef9fc1658572a4c7ba427d6e EBUILD simplescreenrecorder-9999.ebuild 2922 BLAKE2B f579d6fc82b09d1697abca25e69fd8d049aaebb489ab7ad3a1e18ba27a7dd6d8ae5181ddae3a85cc5fed8f30444c16805496e1cc046713caea4d568a28e3c6e6 SHA512 c99e945d9b09fc7ea220089bfcd1db9034901b6152ae3d3879ece709679ec1b99bc10f422b8f374ac40a758128367757399794b090519f655b17df7196b024d0 -MISC metadata.xml 509 BLAKE2B 7a7186a614ad537259b0478e457918c9ed4f06f6e69f3b6c71ddfe31d019cfb44cf9c73171deca2949f7279e6f9baf7100f843beaf8eaac0cc3066ba3ea21e45 SHA512 714073a20e3acb9e903891a96097b5963e8ef01f39c7a98fe1d18b8b3c1f25f525cbd07dcbac05f090948253113182be4813b6336baa297b2d3c99c8b190377e +MISC metadata.xml 420 BLAKE2B 2a645626005a1656fb4365970626c8b936ad6c8bfe501bd16fb2fc0a3450b56691ea69cf67ddeb3a5bc4aef2f544ddd300a5a8ae7801c2e71724f1e4d361d70b SHA512 68b6a0da9153a989618fbb7249d04e9d92cda87be16f8ecbdf3dbfc1af65d48ff7b15472087904e2dce47087eb6dc73cc1ebee6b49fcc63d492a5583c273830f diff --git a/media-video/simplescreenrecorder/metadata.xml b/media-video/simplescreenrecorder/metadata.xml index 0b6618a3b59b..633b6c6df0f1 100644 --- a/media-video/simplescreenrecorder/metadata.xml +++ b/media-video/simplescreenrecorder/metadata.xml @@ -1,10 +1,7 @@ - - polynomial-c@gentoo.org - Lars Wendler - + Enable x86 assembly optimisation. Enable VP8 codec support via media-libs/libvpx. diff --git a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild index 5c2e985195d7..3140f84c1dce 100644 --- a/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild +++ b/media-video/simplescreenrecorder/simplescreenrecorder-0.4.4.ebuild @@ -16,7 +16,7 @@ if [[ ${PV} = 9999 ]] ; then EGIT_BOOTSTRAP="" else SRC_URI="https://github.com/MaartenBaert/${PKGNAME}/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" S="${WORKDIR}/${PKGNAME}-${PV}" fi diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest index 215234fce96c..5429eb3717ea 100644 --- a/media-video/subtitlecomposer/Manifest +++ b/media-video/subtitlecomposer/Manifest @@ -1,5 +1,6 @@ +AUX subtitlecomposer-0.7.1-ffmpeg-5.patch 2218 BLAKE2B 5ceb17db99f0fa8579ef072365c801f7dfb5b6980386237473ebe44f9b43e7a58f0d1940bdf0bb29652624ea501f40e8b37fec27b6fa68afd161e60a800f9819 SHA512 fa310d2219cf114626c90ad1ce909f1865004321bb4b31692f7dc2c3f4707e0c3ace3df9f4b31263454c5b3c72682667588829f9ec0f7b58565fd3cfc120495c AUX subtitlecomposer-0.7.1-gles-support.patch 4291 BLAKE2B fe5e39720c89f6bed7cf66f23b793b53823f588e188f9e0487e8fd7ab034915da712944cfae79a5be090d810c77ade183291e09cb98777d2ebcae6bd28f28943 SHA512 f02a103eb61b8e2b02375d4b15939d836b53181365c79a3100f6c14d62c8b17598d169191ab400a57031fcbc922d62695692908564e4cc85c2a42f3a09cc69a4 AUX subtitlecomposer-0.7.1-tests-optional.patch 762 BLAKE2B cc8f7408e165422788ed9f6c3641e816237ef1230e64853ceb0fe83acbbe9a10b3cd2b5670270904984ab3e23ebfe6ea1d07278826a6ab89346ec7502076f477 SHA512 a02f847164f2f117f024c09311b00a55b268f80089c6304b29ffd5bb7166ea3b81c14e65befc36379124f18600cb6d57ae8f320261ecd25bb0e05c754d55cbcb DIST subtitlecomposer-0.7.1.tar.xz 636808 BLAKE2B 4c71277c9646a64d59a0cd6923084b39292916e9edf154c026a051253fe8aabab1bdfb9e10c6fab5eb0d754ba428567c2259c637915e93d8d391b7f247c6dc79 SHA512 b486a1be8b414409af4ec2d2ccc86a7e9f34040f114b0efbbf817b5157d85b5f9a37d80272b468a389128f10c12316bf028dd86e2a7434a2b001bfd185208b92 -EBUILD subtitlecomposer-0.7.1.ebuild 1503 BLAKE2B 137faa2e750391323816982db54cd03bf88562e3ae09a28ad71a0756fa532be15a8583684e1eb5ee8603b7acb2a6a0cf14d7d01c1db6a15dcb6e52482e24f74b SHA512 466f47a9c43405b54350ff6b2665fb787666f1b421430a3f9c5fcd569ef8598e611c2b2a9f4b30741fe1b79254eb0adbd34d1d6e4f21db4d3f60571d28f4bf73 +EBUILD subtitlecomposer-0.7.1.ebuild 1551 BLAKE2B f7e1457573720a3d6a0636be0529707ef5a2525dfbe30551988774cb2d3df2dc97c4721df3d50abc645a3f5c1fbb0a801a588f7bc66550301f717607a0f8db0e SHA512 d6f972f6286bab6d1e30b3371d71fd389573ad2ea2e78346bbae0d7c76418cb83d4df09f9fc5680526f50ce1178766d40932e9c01bda8d696cf20266a9a7a0be MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71 diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch new file mode 100644 index 000000000000..a0314fb06820 --- /dev/null +++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.7.1-ffmpeg-5.patch @@ -0,0 +1,65 @@ +From 4f4f560e40ba0b760cf688eb024be3cc734ca347 Mon Sep 17 00:00:00 2001 +From: Mladen Milinkovic +Date: Tue, 25 Jan 2022 14:01:56 +0100 +Subject: [PATCH] Fix compilation with ffmpeg5 #63 + +--- + src/streamprocessor/streamprocessor.cpp | 2 +- + src/videoplayer/backend/decoder.h | 1 + + src/videoplayer/backend/framequeue.h | 1 + + src/videoplayer/backend/streamdemuxer.cpp | 2 +- + 4 files changed, 4 insertions(+), 2 deletions(-) + +diff --git a/src/streamprocessor/streamprocessor.cpp b/src/streamprocessor/streamprocessor.cpp +index b86795e..8faf8a2 100644 +--- a/src/streamprocessor/streamprocessor.cpp ++++ b/src/streamprocessor/streamprocessor.cpp +@@ -195,7 +195,7 @@ StreamProcessor::findStream(int streamType, int streamIndex, bool imageSub) + int ret; + char errorText[1024]; + +- AVCodec *dec = avcodec_find_decoder(m_avStream->codecpar->codec_id); ++ const AVCodec *dec = avcodec_find_decoder(m_avStream->codecpar->codec_id); + if(!dec) { + qWarning() << "Failed to find decoder for stream" << i; + return false; +diff --git a/src/videoplayer/backend/decoder.h b/src/videoplayer/backend/decoder.h +index 4ab95b2..fb6840d 100644 +--- a/src/videoplayer/backend/decoder.h ++++ b/src/videoplayer/backend/decoder.h +@@ -11,6 +11,7 @@ + #include + + extern "C" { ++#include "libavcodec/avcodec.h" + #include "libavformat/avformat.h" + } + +diff --git a/src/videoplayer/backend/framequeue.h b/src/videoplayer/backend/framequeue.h +index dc9b2fa..ece1166 100644 +--- a/src/videoplayer/backend/framequeue.h ++++ b/src/videoplayer/backend/framequeue.h +@@ -9,6 +9,7 @@ + #define FRAMEQUEUE_H + + extern "C" { ++#include "libavcodec/avcodec.h" + #include "libavformat/avformat.h" + } + +diff --git a/src/videoplayer/backend/streamdemuxer.cpp b/src/videoplayer/backend/streamdemuxer.cpp +index 1e339b3..e8320ea 100644 +--- a/src/videoplayer/backend/streamdemuxer.cpp ++++ b/src/videoplayer/backend/streamdemuxer.cpp +@@ -230,7 +230,7 @@ StreamDemuxer::componentOpen(int streamIndex) + { + AVFormatContext *ic = m_vs->fmtContext; + AVCodecContext *avCtx; +- AVCodec *codec; ++ const AVCodec *codec; + AVDictionary *opts = nullptr; + AVDictionaryEntry *t = nullptr; + int sampleRate, nbChannels; +-- +GitLab + diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild index 3ff7e5e962a5..54143eba37a9 100644 --- a/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild +++ b/media-video/subtitlecomposer/subtitlecomposer-0.7.1.ebuild @@ -46,6 +46,7 @@ BDEPEND=" PATCHES=( "${FILESDIR}/${P}-tests-optional.patch" "${FILESDIR}/${P}-gles-support.patch" # bug 820035 + "${FILESDIR}/${P}-ffmpeg-5.patch" # bug 834416 ) src_configure() { diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index 03068d726164..806a13b1cc8c 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,7 +1,4 @@ AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53 -AUX 3.38.2-fix-build-with-meson-0.61.1.patch 1170 BLAKE2B 63303d911e4ace3025a9ded387afb033f7d2719be681d340d1f270fa82dbbc47382177102429e0f11fcc8d3f41773c900419e0b57dd4971d6cccaa2928ea86b3 SHA512 8bbe98c9974004ca5f933b13185356ca258d557263b3a9272a748f5bb52b777dda3fc98f487f80ab5a9ff8513264e3c072606c38293d1b50e277df650e6f5b04 -DIST totem-3.38.2.tar.xz 2190700 BLAKE2B 3b3b8166cf674b882a3a66a5729d794489fe779944bb277fad35fe027b56270e6ef578590924309b9fe28aca0544754696acd98d31a7243a33a533abe73ed6fd SHA512 1dac3a0afe31b47147a129c70dddf7480446fc1bb5432f9cd537384e3be25da6a9b87918fa7bcf7e7cd68c8dac45e75f6b1f7c1885edefac846c52f96b40567f DIST totem-42.0.tar.xz 2476952 BLAKE2B 45eac2e586c3c17eab9f570812ae2c79812859635d1ef6df1d0d2c526436558dbab9581699ce86d3e2cd3048f5d65bbd1927c3faa5f7575a5468d0813ce68bcc SHA512 67872d06a7d691a23b97255c5ee5f8d90a1fdf2b36f064f26c10fb4958733772eea456aab4f0fe2c89d23ec987cf5b9c2383c97ba5bec45247953296f1cd6c4b -EBUILD totem-3.38.2.ebuild 2890 BLAKE2B b14e07b5ebcfeabfe4c69fd8e662d377dd193524421ecf671d1fd8ecbf22ef2d805bfca147420403ce8ef4bc817dab1621127e1966f154c425596e4e0dc9de37 SHA512 a8f131f6967ade9636e03781502b4dd4c78797afaf733e2474c392b8af325ec6471585e1ad8857fe76e5e11db37ed18fba9ee12d7ce19c08b9e8f7ec61cee09d -EBUILD totem-42.0-r1.ebuild 2867 BLAKE2B 5458a5616a78c361ca8620cb4fde4ad0048e12f458a339089628e78d8786f69b86d9f6ba514bb1e08cac376b096f0edab2e99972bd77f6fb2866560283589a79 SHA512 1ad5ad3ad62907a07806bb493db41d1fcc1092a31d4633ada57d27fb110ff498597e2cbf9de0ea02bedb010f24315d5b01d0e74873228347f919a573763337d2 +EBUILD totem-42.0-r1.ebuild 2864 BLAKE2B 6e37f4c483fb85fd876f2303400b4dd645c923c060829cfe70b349dab33ae0c41034625a1257d79cf1ba86f1e52472ab50fb90007dba951251c70be8408f458a SHA512 e7bc37256d9dd2ceead0be928d2c578a7e5eb65a31f2af50944d479f327e5e7cc9a9c62a435dba730d796e12cb51fef691ecc70c0f19b732da8e178682ddd325 MISC metadata.xml 1018 BLAKE2B 1cb6fbaa86e0aa6bc60901e7e0b30765de1bea563666af206bfd75c8ed779332e1536dfebbe8d83d0a940bb4266157d0673b19f64021c76e3fa549a208945335 SHA512 3cb85a567ae7573ec0cf7cc12440ff3d879a3566b4773930752142b9e83ab366b983a470d3ae1f212acd78b217136c1ee681ff7d98d1e980e769867b1791d1d6 diff --git a/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch b/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch deleted file mode 100644 index da494e2b61b4..000000000000 --- a/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch +++ /dev/null @@ -1,41 +0,0 @@ -https://gitlab.gnome.org/GNOME/totem/-/commit/61e3a957cb7339c6614e764fcf1120d967d687e9 -https://bugs.gentoo.org/831931 - -From: Bastien Nocera -Date: Thu, 6 Jan 2022 17:21:28 +0100 -Subject: [PATCH] build: Remove unused i18n.merge_file() "name" - -data/meson.build:78:0: ERROR: Function does not take positional arguments. -data/appdata/meson.build:3:0: ERROR: Function does not take positional arguments. ---- - data/appdata/meson.build | 1 - - data/meson.build | 1 - - 2 files changed, 2 deletions(-) - -diff --git a/data/appdata/meson.build b/data/appdata/meson.build -index c4d17e927..c2e646327 100644 ---- a/data/appdata/meson.build -+++ b/data/appdata/meson.build -@@ -1,7 +1,6 @@ - appdata = 'org.gnome.Totem.appdata.xml' - - appdata_file = i18n.merge_file ( -- 'appdata', - input: appdata + '.in', - output: appdata, - install: true, -diff --git a/data/meson.build b/data/meson.build -index b31ce755c..8eebe3db1 100644 ---- a/data/meson.build -+++ b/data/meson.build -@@ -76,7 +76,6 @@ desktop_in = configure_file( - ) - - desktop_file = i18n.merge_file ( -- desktop, - type: 'desktop', - input: desktop_in, - output: desktop, --- -GitLab - diff --git a/media-video/totem/totem-3.38.2.ebuild b/media-video/totem/totem-3.38.2.ebuild deleted file mode 100644 index cbef3290c1d2..000000000000 --- a/media-video/totem/totem-3.38.2.ebuild +++ /dev/null @@ -1,121 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..10} ) -PYTHON_REQ_USE="threads(+)" - -inherit gnome.org gnome2-utils meson virtualx xdg python-single-r1 - -DESCRIPTION="Media player for GNOME" -HOMEPAGE="https://wiki.gnome.org/Apps/Videos" - -LICENSE="GPL-2+ LGPL-2+" -SLOT="0" -IUSE="gtk-doc +python test" -# see bug #359379 -REQUIRED_USE=" - python? ( ${PYTHON_REQUIRED_USE} ) -" -RESTRICT="!test? ( test )" - -KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86" - -DEPEND=" - >=dev-libs/glib-2.56.0:2 - >=x11-libs/gtk+-3.22.0:3[introspection] - >=media-libs/gstreamer-1.6.0:1.0 - >=media-libs/gst-plugins-base-1.6.0:1.0[pango] - >=media-libs/gst-plugins-good-1.6.0:1.0 - >=media-libs/grilo-0.3.0:0.3[playlist] - >=dev-libs/libpeas-1.1.0[gtk] - >=dev-libs/totem-pl-parser-3.26.5:0=[introspection] - >=media-libs/clutter-1.17.3:1.0[gtk] - >=media-libs/clutter-gst-2.99.2:3.0 - >=media-libs/clutter-gtk-1.8.1:1.0 - gnome-base/gnome-desktop:3= - gnome-base/gsettings-desktop-schemas - >=x11-libs/cairo-1.14 - x11-libs/gdk-pixbuf:2 - >=dev-libs/gobject-introspection-1.54:= - - python? ( - ${PYTHON_DEPS} - $(python_gen_cond_dep ' - >=dev-python/pygobject-2.90.3:3[${PYTHON_USEDEP}] - ') - ) -" -RDEPEND="${DEPEND} - media-plugins/grilo-plugins:0.3 - media-plugins/gst-plugins-meta:1.0 - media-plugins/gst-plugins-taglib:1.0 - x11-themes/adwaita-icon-theme - python? ( - x11-libs/pango[introspection] - >=dev-libs/libpeas-1.1.0[python,${PYTHON_SINGLE_USEDEP}] - $(python_gen_cond_dep ' - dev-python/dbus-python[${PYTHON_USEDEP}] - ') - ) -" -BDEPEND=" - dev-lang/perl - gtk-doc? ( >=dev-util/gtk-doc-1.14 - app-text/docbook-xml-dtd:4.5 ) - dev-util/glib-utils - dev-util/itstool - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto -" -# perl for pod2man -# Prevent dev-python/pylint dep, bug #482538 - -PATCHES=( - "${FILESDIR}"/3.38.0-gst-inspect-sandbox.patch # Allow disabling calls to gst-inspect (sandbox issue) - "${FILESDIR}/${PV}"-fix-build-with-meson-0.61.1.patch -) - -pkg_setup() { - use python && python-single-r1_pkg_setup -} - -src_prepare() { - # Drop pointless samplepython plugin from build - sed -e '/samplepython/d' -i src/plugins/meson.build || die - xdg_src_prepare -} - -src_configure() { - local emesonargs=( - -Denable-easy-codec-installation=yes - -Denable-python=$(usex python yes no) - -Dwith-plugins=all # in 3.34.1 only builtin and python plugins are left, and python is extra controlled by enable-python - $(meson_use gtk-doc enable-gtk-doc) - -Dgst-inspect=false - ) - meson_src_configure -} - -src_install() { - local -x GST_PLUGIN_SYSTEM_PATH_1_0= # bug 812170 - meson_src_install - if use python ; then - python_optimize "${ED}"/usr/$(get_libdir)/totem/plugins/ - fi -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} - -src_test() { - virtx meson_src_test -} diff --git a/media-video/totem/totem-42.0-r1.ebuild b/media-video/totem/totem-42.0-r1.ebuild index cbc4522cdc97..a91d7e1bcf24 100644 --- a/media-video/totem/totem-42.0-r1.ebuild +++ b/media-video/totem/totem-42.0-r1.ebuild @@ -19,7 +19,7 @@ REQUIRED_USE=" " RESTRICT="!test? ( test )" -KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~x86" +KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv x86" DEPEND=" >=dev-libs/glib-2.56.0:2 diff --git a/media-video/vdr/Manifest b/media-video/vdr/Manifest index db1ff8951f64..54ea6f58356e 100644 --- a/media-video/vdr/Manifest +++ b/media-video/vdr/Manifest @@ -20,7 +20,7 @@ DIST vdr-2.4.6_pinplugin.patch.bz2 5176 BLAKE2B 142ad6551b8e37d223acf86f8c2f511c DIST vdr-2.4.6_ttxtsubs_v2.patch.bz2 51971 BLAKE2B e4915314e8f659df1c3e0ff631fd0c3dcec89053ff727fd28400dc6eecc49c1d4743a9bedaf3b11fce03fc6082309d4b4658d00a5b01aa5cbe8686e05412f882 SHA512 14c7b4397ba65e0ff9a5fb0705872f1cb6f1cdd1752b14f83f260540da25b5957632900232f83904c3d4fd6759e537c85bda2cce61455729eab3050a96441548 DIST vdr-2.4.7.tbz2 919632 BLAKE2B be4e1ec365330855e4b2b26f44b1f35dc323e4783e96ef344a67b3e9fe2c0499760ab0f3d27c5e3bdddf5a65ebb65b0c81a62092301d34370aa19d0dd63bb1ab SHA512 41b8453bc6cdbb0db728b5d7d6624ab3ff9034b58ba443a8196f5fcc9fa78d18698cc91905890244e69d482ffc493374e6da2c97baed95fe742b888bdc63e42b DIST vdr-menuorg-2.3.x.diff 8852 BLAKE2B 19b98d51a69f52ecda5500f51ef1741a8397953b20c490055eab0393da5f56ff9598c3e1e8ed8b915f5877e08deeb9ba7a9ef8d9356ad3a1fa12e3778869174a SHA512 7b41c3a529858a4953a57f21619ea01864e140cc1755ee0b03caf1c4de41e80c3f805653502bc8d39d02a4dfcddf720acd4a8c8bd91f4871eef31d86e8e915c0 -EBUILD vdr-2.2.0-r6.ebuild 8168 BLAKE2B 4965d23936592348a37cdba6c6b89e0f651780b32436e113d94a79f1ba1b5d581a259d47160e499e28b5380a932e778b4d9a4c4a0cf675525031d19dd24e6110 SHA512 f47051d63715a36276ced33653928adc5d3378d3b3a28da3f6e68896c9d796b4887eaa78d76e9c6e8b42f65af1ebbd3019b56d8a1e912dddfe0c3e31d7212502 -EBUILD vdr-2.2.0-r7.ebuild 8210 BLAKE2B 004d8448d54dfe58ca1e83d6e1cfd9b84a22e8b0bb837900eba90666d55d4aae91e2e2d55095ab68665af104f52010b10268f5f730f451cedb54570d0271f8e9 SHA512 ca05beee04a50a8af95e4a990050c3430ac5a5829d4162e9c35f29bfd14deff2aa70e6ce6fcee10ceb506c48eca6a5bc15c418894e6d23ad5fb9d58da594e638 -EBUILD vdr-2.4.7-r1.ebuild 6169 BLAKE2B 006d0156bebd83ad5200e0f6587e3252d85fc0818203915c5af3d27e0f3e0b5f99cf272f11f855a344535be6dc4cc8a121a424369fda6bf5cb941a295e48642d SHA512 702c24d7dfda3d4664432ae93b5bfcc063093fb9e5fca2b2f8fd26f1daf8283a9a1dde0028d6a23ba97acf4a5cb3576c4234d7461e9e17c379bdcc8bdb5f4192 +EBUILD vdr-2.2.0-r6.ebuild 8172 BLAKE2B e6823542e56a5ae3bd4cb5d61840522b25ba9c0d1cb600b8a035a5e79f19c530e478751634130199aff157a8d32adc9b154b3d67d863eb54bfc0a8a4dcde8ed6 SHA512 f67d2c299f7e45cb398294735bdaf6fe2c23b06900aad8b9520bd7bab426cffff99d5be2861dfd0a9ac85215324c52b8a4130fd2b4ae6597c3d459f2c179fe3f +EBUILD vdr-2.2.0-r7.ebuild 8214 BLAKE2B 18aa70b506af3bd462850741e34019ba0d1d30b4f5a8b6aca7c286803721108efb658e18be82c2dfdb5a9acf517038672c9df0112a6518c17d8f9c9f9a14e99b SHA512 1baee9761c40be901a2ec4795775c89b44207622822535b13f91db33f4aec6e7a30b6f0dded4f10c000ea775cca2ce986dd10da4f1eb6afc1d55547db8ab7c9d +EBUILD vdr-2.4.7-r1.ebuild 6171 BLAKE2B 4ee4c05630a0a0133def40460d97839fe2c9346b162f7b9415c48e544c476cf4cf94a66e905f6176dc23478567aec2f0bf5a738cb1b5fe4a9e005f168e75e751 SHA512 c2e97f014040c1f0af8c56e1aeec947b3cd9f428bda0d8897f2de4531445593fabd53dca7e33c0be958147f7cdbb31f9fc8a15e91923d6317ddaf4f8a54f2e1a MISC metadata.xml 1780 BLAKE2B 179a1948c96a7b237b500a08861799c25ae084d5b9cd6702921acd04cfbf0111bbb11170e4d14bf31ad7355ef0899f285857350131badc411548a3611593ecb6 SHA512 6c8c2073c55f327d4dfe52cb22ae1622d936c43503caf2964594656e1281b07110187c139216a73ed10abd625b43509ecdfe41edb7439950653e038991abfb31 diff --git a/media-video/vdr/vdr-2.2.0-r6.ebuild b/media-video/vdr/vdr-2.2.0-r6.ebuild index 73bef819af6e..372355cbe09d 100644 --- a/media-video/vdr/vdr-2.2.0-r6.ebuild +++ b/media-video/vdr/vdr-2.2.0-r6.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -74,7 +74,7 @@ enable_patch() { # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp" cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE || die "cannot write to defines.tmp" - export DEFINES_IUSE=$( cat ${T}/defines.IUSE ) + export DEFINES_IUSE=$( cat "${T}"/defines.IUSE ) done } @@ -94,7 +94,7 @@ extensions_all_defines() { } lang_po() { - LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) + LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) } src_configure() { diff --git a/media-video/vdr/vdr-2.2.0-r7.ebuild b/media-video/vdr/vdr-2.2.0-r7.ebuild index ead539ebbd1f..63fed2e99446 100644 --- a/media-video/vdr/vdr-2.2.0-r7.ebuild +++ b/media-video/vdr/vdr-2.2.0-r7.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -74,7 +74,7 @@ enable_patch() { # codesnippet to bring the extpng defines into the vdr.pc CXXFLAGS CFLAGS echo "-DUSE_${ARG_UPPER}" >> "${T}"/defines.tmp || die "cannot write to defines.tmp" cat "${T}"/defines.tmp | tr \\\012 ' ' > "${T}"/defines.IUSE || die "cannot write to defines.tmp" - export DEFINES_IUSE=$( cat ${T}/defines.IUSE ) + export DEFINES_IUSE=$( cat "${T}"/defines.IUSE ) done } @@ -94,7 +94,7 @@ extensions_all_defines() { } lang_po() { - LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) + LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) } src_configure() { diff --git a/media-video/vdr/vdr-2.4.7-r1.ebuild b/media-video/vdr/vdr-2.4.7-r1.ebuild index 0e8eed4d4ee5..992581e9e7e2 100644 --- a/media-video/vdr/vdr-2.4.7-r1.ebuild +++ b/media-video/vdr/vdr-2.4.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2021 Gentoo Authors +# Copyright 2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -65,7 +65,7 @@ add_cap() { } lang_po() { - LING_PO=$( ls ${S}/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) + LING_PO=$( ls "${S}"/po | sed -e "s:.po::g" | cut -d_ -f1 | tr \\\012 ' ' ) } src_configure() { diff --git a/media-video/vidify-audiosync/Manifest b/media-video/vidify-audiosync/Manifest index 8478db1b4593..f126977dd1f2 100644 --- a/media-video/vidify-audiosync/Manifest +++ b/media-video/vidify-audiosync/Manifest @@ -1,3 +1,3 @@ DIST vidify-audiosync-0.3.0.tar.gz 61854604 BLAKE2B d6ffb65152044932d1e0a57d573c14d9378815c714d680d7a446e54ba6f4e572346165eb3c0f9b7793eb03fc5d0e1f2a07a8d0a64c76971892ad5c5d0ea4fc50 SHA512 b245dea22353acae94de1f0c0465d5d1040d19f372702eba52790bf6ace861ede497562957178aa40e7a9c30ba47061b9e23761900cc18a6c7b1e3579db6ccd0 -EBUILD vidify-audiosync-0.3.0.ebuild 977 BLAKE2B 622cc31b16bcc27b181980d70e9694ac9a271d084abec33517edaac8eaec7c8f96b07f613153eaf63c1590942f524197e929075fdd548be5ccc4ed8b48b9f608 SHA512 ec654b8083482ff1efc94add934401a04e31aada858f204417b6caf3ca7dc7ca64a31a55f67e1f71fc6c9fcf84e55f4af614ae7987e37c2758c4d919fc93c2ba +EBUILD vidify-audiosync-0.3.0-r1.ebuild 1008 BLAKE2B dc06ac00437680ace9102b1c63806d9c55c61b874a163e78fef27d992f1eff663af38a9f9d9d2b10fba69cb5b94f38d3f24c30a140b3b91da39d769842d296fe SHA512 6e87dc9265d04d9668b12504b7ef52ea0946926446e715f7277a9310e30a34a9cf3863833c9502a24cfddbf9a87c9a77851422e810c388145c13e9d9c06a842c MISC metadata.xml 524 BLAKE2B 9e2f9b899db9118cbae27dc47dc63d81ce75bc45dcfcca8d8f3d2675b30fcbe8e31cba034f9add557feccf255fc65a99862c95a3ca0d67060015e55eb4aa8b5d SHA512 1b69126e7ca2c60c33cc4a2781f2eedfa7bcc71ce51e2ed5ebb17e0ccc77db017081ba14c37ea9e7b0c156399cbab52d04e626c22a89f5d8c10496738835d2c9 diff --git a/media-video/vidify-audiosync/vidify-audiosync-0.3.0-r1.ebuild b/media-video/vidify-audiosync/vidify-audiosync-0.3.0-r1.ebuild new file mode 100644 index 000000000000..232e20ef4693 --- /dev/null +++ b/media-video/vidify-audiosync/vidify-audiosync-0.3.0-r1.ebuild @@ -0,0 +1,46 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit distutils-r1 + +DESCRIPTION="Audio synchronization feature for vidify" +HOMEPAGE="https://vidify.org" +SRC_URI="https://github.com/vidify/old-audiosync/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="debug test" +RESTRICT="!test? ( test )" + +RDEPEND=" + media-sound/pulseaudio + media-video/ffmpeg[openssl] + media-video/vidify[${PYTHON_USEDEP}] + sci-libs/fftw + debug? ( sci-visualization/gnuplot ) +" +BDEPEND="test? ( dev-util/cmake )" + +S="${WORKDIR}/old-audiosync-${PV}" + +python_prepare_all() { + if use debug; then + sed -i -e "/defines.append(('DEBUG', '1'))/s/^# *//" setup.py || die + fi + distutils-r1_python_prepare_all +} + +python_test() { + mkdir "test_build_${EPYTHON}" || die + cd "test_build_${EPYTHON}" || die + cmake .. -DBUILD_TESTING=YES || die + emake + emake test + cd .. || die +} diff --git a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild b/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild deleted file mode 100644 index d1c6330734f4..000000000000 --- a/media-video/vidify-audiosync/vidify-audiosync-0.3.0.ebuild +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..10} ) - -inherit distutils-r1 - -DESCRIPTION="Audio synchronization feature for vidify" -HOMEPAGE="https://vidify.org" -SRC_URI="https://github.com/vidify/old-audiosync/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="debug test" -RESTRICT="!test? ( test )" - -RDEPEND=" - media-sound/pulseaudio - media-video/ffmpeg[openssl] - media-video/vidify[${PYTHON_USEDEP}] - sci-libs/fftw - debug? ( sci-visualization/gnuplot ) -" -BDEPEND="test? ( dev-util/cmake )" - -S="${WORKDIR}/old-audiosync-${PV}" - -python_prepare_all() { - if use debug; then - sed -i -e "/defines.append(('DEBUG', '1'))/s/^# *//" setup.py || die - fi - distutils-r1_python_prepare_all -} - -python_test() { - mkdir "test_build_${EPYTHON}" || die - cd "test_build_${EPYTHON}" || die - cmake .. -DBUILD_TESTING=YES || die - emake - emake test - cd .. || die -} diff --git a/media-video/vidify/Manifest b/media-video/vidify/Manifest index 5adbc042437d..ccae409888b4 100644 --- a/media-video/vidify/Manifest +++ b/media-video/vidify/Manifest @@ -1,5 +1,5 @@ AUX vidify-2.2.6-python310.patch 743 BLAKE2B 143ae6532398038da83cf08fc95f25338cabd35f02213336b3e7e54944c2a49b1fd831a7d8ded957305b2b2a292f5bcfc64fb290888029c4859ce8f002db9809 SHA512 63b24e30e1159455411cf1aeaa8c2d2d88db6fa7c08536fb8cf95401c2f23ad68d2d67efdc8fc92d9decb3e2541154fb083a44aba1ba15f526333ff46a3bdf8a AUX vidify-2.2.6-yt-dlp.patch 4669 BLAKE2B 04f1c80702a495f732e617c5a1ad51a70dcaed82e9650c4ab21844d2aadeb58893889c575ed141fd9e8b8e2353f24b234217b1b9fad83d1b1d2b9e5f87e90474 SHA512 4ff0ca2d2c9999dae5b90abdd9554f8808b30b263a74f099d21c1de001736d1040e53e2ab55607fe6b0807ac4fbffb81cf10935f1419055a9ac136188ef90d84 DIST vidify-2.2.6.tar.gz 2906511 BLAKE2B 3df48ca57e102f664852e2fc2abeb3d19427673e1fec5144a8c0afda112a0f3b281b18db43b4326244266d6e9dfbcb2443319ddad3f864098a61bd1e3c966307 SHA512 15487ee9dcbe647b2b287bd2eb3c09962b557320313a9a3885fb3c0d6af945909531111d5297c1a5fb5b451af5df6fd968b3953bbf79af113980ed368a5674b5 -EBUILD vidify-2.2.6-r2.ebuild 2462 BLAKE2B 7579bb1bbcc9504468b147874a324ac3c366ca68c672b9b4f22173a85c80b0f98e73175ec7cdf2d31c6a21c1481ecd72a6e49738d7ec7f7bf0c3a77a772c025a SHA512 b934e7e5f27b22466fd117caad3ed51a85c16d33f814d93f803f494da4d7206c1e04d165087ce6add7bbf335de1a9a07c519bb3a04c413c911fa4ed8d995f746 +EBUILD vidify-2.2.6-r3.ebuild 2493 BLAKE2B a5288e867222385ca0505e7d79208942c207311f0240f52fc0318c8d3cd669b9864cd54942c8a63d939a69546b8bb167e87f9b014502bcf7bc85afa307e74391 SHA512 c4dbe2966af19a42db602d9113ee22509001abdca3a15f9e7036fa257fb312469bd429aaab34110177416655e223c5ae4edd6b562a98187112291a14687be823 MISC metadata.xml 792 BLAKE2B b06fd7f4c01b146b8dc6f45f4451ae592f59a7c917be4a315f4500e8a374670262614e500b7498d731e08ffd471b9da5983b22e79e538f67de914f4d43a7300e SHA512 5192430ceb4221ba5a97bd87d1c149d28dbf3613f3fff337b6fabb2b4452302ddd941765e20a3fc2975d74c5207fab728d59bbb7a80fb758ea74a0b391bea04e diff --git a/media-video/vidify/vidify-2.2.6-r2.ebuild b/media-video/vidify/vidify-2.2.6-r2.ebuild deleted file mode 100644 index fe640744473d..000000000000 --- a/media-video/vidify/vidify-2.2.6-r2.ebuild +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit xdg distutils-r1 optfeature virtualx - -DESCRIPTION="Watch music videos in real time for the songs playing on your device" -HOMEPAGE="https://vidify.org" -SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="LGPL-3" -SLOT="0" -KEYWORDS="~amd64" - -IUSE="dbus vlc mpv zeroconf" - -REQUIRED_USE="|| ( vlc mpv zeroconf )" - -RDEPEND=" - dev-python/appdirs[${PYTHON_USEDEP}] - dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}] - net-misc/lyricwikia[${PYTHON_USEDEP}] - net-misc/yt-dlp[${PYTHON_USEDEP}] - dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] ) - !dbus? ( dev-python/tekore[${PYTHON_USEDEP}] ) - mpv? ( dev-python/python-mpv[${PYTHON_USEDEP}] ) - vlc? ( dev-python/python-vlc[${PYTHON_USEDEP}] ) - zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] ) -" - -# use yt-dlp instead of youtube-dl, otherwise download is too slow for playback -PATCHES=( - "${FILESDIR}/${P}-yt-dlp.patch" - "${FILESDIR}/${P}-python310.patch" -) - -distutils_enable_tests unittest - -python_prepare_all() { - # skip online test - rm tests/api/test_spotify_web.py || die - rm tests/player/test_external.py || die - - # this needs dbus and a player running - rm tests/api/test_mpris.py || die - - # can't parse non-existent config - rm tests/test_api_and_player_data.py || die - - # do not hard depend on this - sed -i \ - -e '/qdarkstyle/d' \ - -e '/python-vlc/d' \ - -e '/python-mpv/d' \ - -e '/pydbus/d' \ - -e '/tekore/d' \ - -e '/zeroconf/d' \ - -e '/If PySide2 is installed and PyQt5/,/PyQtWebEngine/d' \ - setup.py || die - - distutils-r1_python_prepare_all -} - -python_test() { - virtx "${EPYTHON}" -m unittest discover -v -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors" - elog "and recompile media-video/vlc or media-video/mpv with the missing codecs" - - optfeature "using an MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus - optfeature "using the Spotify Web API as audio player" dev-python/tekore - optfeature "using an external network player" dev-python/zeroconf - optfeature "using media-video/mpv for video playback" dev-python/python-mpv - optfeature "using media-video/vlc for video playback" dev-python/python-vlc - optfeature "'vidify --dark-mode'" dev-python/qdarkstyle - optfeature "'vidify --audiosync'" media-video/vidify-audiosync -} diff --git a/media-video/vidify/vidify-2.2.6-r3.ebuild b/media-video/vidify/vidify-2.2.6-r3.ebuild new file mode 100644 index 000000000000..20e8ba49398e --- /dev/null +++ b/media-video/vidify/vidify-2.2.6-r3.ebuild @@ -0,0 +1,84 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) +DISTUTILS_USE_PEP517=setuptools +inherit xdg distutils-r1 optfeature virtualx + +DESCRIPTION="Watch music videos in real time for the songs playing on your device" +HOMEPAGE="https://vidify.org" +SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="LGPL-3" +SLOT="0" +KEYWORDS="~amd64" + +IUSE="dbus vlc mpv zeroconf" + +REQUIRED_USE="|| ( vlc mpv zeroconf )" + +RDEPEND=" + dev-python/appdirs[${PYTHON_USEDEP}] + dev-python/QtPy[gui,webengine,${PYTHON_USEDEP}] + net-misc/lyricwikia[${PYTHON_USEDEP}] + net-misc/yt-dlp[${PYTHON_USEDEP}] + dbus? ( dev-python/pydbus[${PYTHON_USEDEP}] ) + !dbus? ( dev-python/tekore[${PYTHON_USEDEP}] ) + mpv? ( dev-python/python-mpv[${PYTHON_USEDEP}] ) + vlc? ( dev-python/python-vlc[${PYTHON_USEDEP}] ) + zeroconf? ( dev-python/zeroconf[${PYTHON_USEDEP}] ) +" + +# use yt-dlp instead of youtube-dl, otherwise download is too slow for playback +PATCHES=( + "${FILESDIR}/${P}-yt-dlp.patch" + "${FILESDIR}/${P}-python310.patch" +) + +distutils_enable_tests unittest + +python_prepare_all() { + # skip online test + rm tests/api/test_spotify_web.py || die + rm tests/player/test_external.py || die + + # this needs dbus and a player running + rm tests/api/test_mpris.py || die + + # can't parse non-existent config + rm tests/test_api_and_player_data.py || die + + # do not hard depend on this + sed -i \ + -e '/qdarkstyle/d' \ + -e '/python-vlc/d' \ + -e '/python-mpv/d' \ + -e '/pydbus/d' \ + -e '/tekore/d' \ + -e '/zeroconf/d' \ + -e '/If PySide2 is installed and PyQt5/,/PyQtWebEngine/d' \ + setup.py || die + + distutils-r1_python_prepare_all +} + +python_test() { + virtx "${EPYTHON}" -m unittest discover -v +} + +pkg_postinst() { + xdg_pkg_postinst + + elog "If video playback is not working please check 'vidify --debug' for missing-codec-errors" + elog "and recompile media-video/vlc or media-video/mpv with the missing codecs" + + optfeature "using an MPRIS(D-Bus) audio player (e.g spotify)" dev-python/pydbus + optfeature "using the Spotify Web API as audio player" dev-python/tekore + optfeature "using an external network player" dev-python/zeroconf + optfeature "using media-video/mpv for video playback" dev-python/python-mpv + optfeature "using media-video/vlc for video playback" dev-python/python-vlc + optfeature "'vidify --dark-mode'" dev-python/qdarkstyle + optfeature "'vidify --audiosync'" media-video/vidify-audiosync +} diff --git a/media-video/vlc/Manifest b/media-video/vlc/Manifest index 87c4672056fa..55fdbe112abe 100644 --- a/media-video/vlc/Manifest +++ b/media-video/vlc/Manifest @@ -11,9 +11,10 @@ AUX vlc-9999-libupnp-slot-1.8.patch 763 BLAKE2B 6bc8cf46f029db27d6d30d96e871d3bc AUX vlc-configure_lua_version.patch 2057 BLAKE2B 995291bab038c912b5d76982da803da34afd4ddce4e21f2aeff8ebe2be760857d169f904a0ce96658b6810e1030031f0a33d0c57f7bc514b1bbdc17e0d67157c SHA512 119f2fff52b334cb073c73979a6bec8710695c67e5ab3ff80d846ede52e922138ac77f8f3f9cccb6f750c74a00baf1529e27c683f0b93a6698436bdcdd930e99 DIST vlc-3.0.16.tar.xz 26439328 BLAKE2B 1971b88f3faf6d3b019c3fcb83108242bb218f1472dc3c1763a8eaa996befcb36a685a75beb8c2513e3365e77a9df6623d194ef511b5271e3114f2f46588e1ff SHA512 35cdf191071224d0cf1b5a83c00773ff87b9e5bfcf0f5523f7edd53f75b23eda6b27bb49ffa97d69a1d176b8fe4786d959aeeb00d4380beab71c9f7e6b7c7298 DIST vlc-3.0.17.3.tar.xz 26393440 BLAKE2B 5079caa779335647394eb4af631ae89098b22545531ecf95ed81f9551f7004b8469a6e44de08f512e381164dc64e011d42be14d675d20c09ab043a00348f6b83 SHA512 99095b39ed600c3a89ebc0d377a2fc2522b3623a56b0f6de2df50a3c6e0148c67c28c0f2d8dec28bbdf5c62cf29b3579429a79ed00440570643778a9871022b6 -EBUILD vlc-3.0.16-r8.ebuild 13949 BLAKE2B 04f67e1a403aa00ecf8d79830428d749e5d7185a8ff351e8caccf0a4571b20176c1d557850769df0393046666ef56d4005126eb88a3f86ba6addd2ffd142b72e SHA512 a6f9942d8dfd05559e367af4d3e99c2c5255302d4528963960358b1d851bfc942c4046f7125dd2eff758bcf2d61fbe2e8a9819afc304772d249b211651dcad15 -EBUILD vlc-3.0.17.3-r1.ebuild 13605 BLAKE2B a8fb27aab81b7facd4f4c4d873b99c8f1cd8a05be7e0882eeeb1095d91a7cfb0608b6a65118b29e73cbfb9f7c6810de606fea6fc1b3fe57703db64c7c7636f9d SHA512 9a11f3360f61ae7fc93689d525f4d0576d8c441c6b7ef279416bbcb05fb62b3a347e416cff3db6b7e3d5920fb7ec2376e32cda713df200e9471a11dbdff7bbc4 -EBUILD vlc-3.0.17.3-r2.ebuild 13666 BLAKE2B 6c0738fe3545c9ec01ef6b0e3d9311f34d0efb90ad4016657ad98b8a636467b2b1ff187d58acab5b054dbbbf8a12c61d025d116a380ab1249865ec9da08e603e SHA512 a40320eaee890c1d8eb2dc409dbf91ff2669adff64e6e4da326c6cbca93e8dd86f8d64309013aa4bb7e8dd65700de393f2407a6594e230b35f2c4988ef40d759 -EBUILD vlc-3.0.9999.ebuild 13530 BLAKE2B 2559442319979fe086775639fa6be9e54457ddeda0ba863c8ea4fcaedef273fad3232f2c1bbec2b2419bd69de0460392a902b0b5d4848e1ecc6acf80944bbc67 SHA512 e97a1e90249a3901056428c3d1c38d994b7da10e39d10127fe09cf4671bb541f693d363c43d0a45f52194b9edddd311e40d087bd4e06310dc651977847a2c55f -EBUILD vlc-9999.ebuild 13585 BLAKE2B f5674a971f396451cca51456cd889941c41e4f88f83dc3ddf47114de2c7bd7aed4211542647e1a48ad90fd047d364e6bfb50510c07d006740febee8e941f0555 SHA512 6d98c79d19a82f7659a72505f5ca4e0043df497ac783982756e6334778eaf59eec19a21bee2b9d1e4986666136a860fa94e9736619107d643d4d7bd8d2079ca0 +DIST vlc-3.0.17.4.tar.xz 26567148 BLAKE2B 4f36e7a9695d9e839fbebe92ec85c9411fa5b980b18332caf3dacfe51c6fea30cae71ee4cb0dad8b5536dd7d9b8801987f87a3c978eec17e444eaeacda603881 SHA512 dac14c6586603c064294672eb878253e52b3a7bef431fb10303345e5400591b5c1f2d452a2af03f503db0ca186582a84be06fdf05ab011c33f7b0bd5389c51fb +EBUILD vlc-3.0.16-r8.ebuild 13840 BLAKE2B 7dfa1bf55d9ad0ccfb899f14c15479ad78c0eb6bd16061d6b78ce1b2ea6c131961ab56cfb485e57d85b62025d0f5ef4a999aeebb099a3b2db98a9d0af159202b SHA512 5c045d13dc3ca796a4ba670ea89ed3a5177bcd34af08e91ebd673d9bcf913b17d704aa29f0f03a507685a30730a1ba5469f01c92b04433726013fa21427589bb +EBUILD vlc-3.0.17.3-r2.ebuild 13552 BLAKE2B 16a9ecb6a011dd4d2f85e5d837edfb4d767a9c73d11b6c445d5351fa45ebb2f7888278fd02632d74c37a19aa63796219e20f292f7bab3cbfc2722529fb8f30db SHA512 df4818976c7082b590c1fda7ce7198649f229240412c012ddd8c9139c9e1d2697808d7edd7a78c09392dde57e686b3e6bc48ed41f2b69776272876c3f230c305 +EBUILD vlc-3.0.17.4.ebuild 13576 BLAKE2B 0405f7577bce265f0dba9fdec965d3f1c5d66b16f13d7ac6e092ac5deaccac2a4f8f79cd11f4bdf9fc10d9b74c27546502c8bde348fa0b8bd319fa37441d5474 SHA512 3630c11ee283000888729ac5424388ed3b4bf9e5786a3c371c4d2f0b9a95e9e6020f11549b8fbd33b581575b0b3a82f88949e8123a0b7577494851620236f59d +EBUILD vlc-3.0.9999.ebuild 13433 BLAKE2B 8712b957e2829bf0f33c2d4ea0c2164f82da322a50b44c0dbf1e6c670d63acb8704b9b4b754d94207b0e6a11038b42004ba46fdb7e2fce0bb7cb2b1a160b9729 SHA512 8c89645dd3a33133a19dde64faaf76fd4bfe5ff1e3b1fb34901d92849aed9f3d65b5c09e9d1ca63f4ef9159bf71902448b9ed7782d1c173c7650d388dda64e4d +EBUILD vlc-9999.ebuild 13488 BLAKE2B 006133119bf236b523954aae0172a87e4c8db79b8d986d408cd262fb17c439d419c941ad9135ead5099a2b33f465ee15bc76d07b6addd2cce1ce6dcfe3a8c0b8 SHA512 298dc503c597272872a3537232a8e40d381fa082c23533aa66e1d27ab4c506feec94e8b5a5d76cf1ac6d19b6d1f91d3873077ad025885086f8e25054d1459da5 MISC metadata.xml 4912 BLAKE2B 97661f54c1c16cb3084e12ce7899c080e7e69b203c1539b90048cf3d7c1f673b29051fd68216b6bed54f8842990f0c47e2c67038d85e911dcd1c905b54093719 SHA512 c24db55603932f9b52808e0b9d5687a333078d1735c05e1b561d91c08b99246b321b5b60f8111b286041c524d5913ec6f4f321a79c0773cbb9aaaa3fea9a50d6 diff --git a/media-video/vlc/vlc-3.0.16-r8.ebuild b/media-video/vlc/vlc-3.0.16-r8.ebuild index e4cf9a519934..5ac73bb5c456 100644 --- a/media-video/vlc/vlc-3.0.16-r8.ebuild +++ b/media-video/vlc/vlc-3.0.16-r8.ebuild @@ -448,9 +448,6 @@ src_configure() { replace-flags -Os -O2 fi - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 - append-cxxflags -std=c++11 - if use omxil; then # bug #723006 # https://trac.videolan.org/vlc/ticket/24617 diff --git a/media-video/vlc/vlc-3.0.17.3-r1.ebuild b/media-video/vlc/vlc-3.0.17.3-r1.ebuild deleted file mode 100644 index b4f720f589d4..000000000000 --- a/media-video/vlc/vlc-3.0.17.3-r1.ebuild +++ /dev/null @@ -1,514 +0,0 @@ -# Copyright 2000-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -LUA_COMPAT=( lua5-{1..2} ) - -MY_PV="${PV/_/-}" -MY_PV="${MY_PV/-beta/-test}" -MY_P="${PN}-${MY_PV}" -if [[ ${PV} = *9999 ]] ; then - if [[ ${PV%.9999} != ${PV} ]] ; then - EGIT_BRANCH="3.0.x" - fi - EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git" - inherit git-r3 -else - if [[ ${MY_P} = ${P} ]] ; then - SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" - else - SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" - fi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv -sparc ~x86" -fi -inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg - -DESCRIPTION="Media player and framework with support for most multimedia files and streaming" -HOMEPAGE="https://www.videolan.org/vlc/" - -LICENSE="LGPL-2.1 GPL-2" -SLOT="0/5-9" # vlc - vlccore - -IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus - dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth - fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate - libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua - macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg - omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image - sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame - udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi - cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse -" -REQUIRED_USE=" - chromecast? ( encode ) - directx? ( ffmpeg ) - fontconfig? ( truetype ) - libcaca? ( X ) - libtar? ( skins ) - libtiger? ( kate ) - lua? ( ${LUA_REQUIRED_USE} ) - skins? ( gui truetype X xml ) - ssl? ( gcrypt ) - vaapi? ( ffmpeg X ) - vdpau? ( ffmpeg X ) -" -BDEPEND=" - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - lua? ( ${LUA_DEPS} ) - amd64? ( dev-lang/yasm ) - x86? ( dev-lang/yasm ) -" -RDEPEND=" - media-libs/libvorbis - net-dns/libidn:= - sys-libs/zlib[minizip] - virtual/libintl - virtual/opengl - a52? ( media-libs/a52dec ) - alsa? ( media-libs/alsa-lib ) - aom? ( media-libs/libaom:= ) - archive? ( app-arch/libarchive:= ) - aribsub? ( media-libs/aribb24 ) - bidi? ( - dev-libs/fribidi - media-libs/freetype:2[harfbuzz] - media-libs/harfbuzz:= - virtual/ttf-fonts - ) - bluray? ( >=media-libs/libbluray-1.3.0:= ) - cddb? ( media-libs/libcddb ) - chromaprint? ( media-libs/chromaprint:= ) - chromecast? ( - >=dev-libs/protobuf-2.5.0:= - >=net-libs/libmicrodns-0.1.2:= - ) - dav1d? ( media-libs/dav1d:= ) - dbus? ( sys-apps/dbus ) - dc1394? ( - media-libs/libdc1394:2 - sys-libs/libraw1394 - ) - dts? ( media-libs/libdca ) - dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) - dvd? ( - >=media-libs/libdvdnav-6.1.1:0= - >=media-libs/libdvdread-6.1.2:0= - ) - faad? ( media-libs/faad2 ) - fdk? ( media-libs/fdk-aac:= ) - ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) - flac? ( - media-libs/flac - media-libs/libogg - ) - fluidsynth? ( media-sound/fluidsynth:= ) - fontconfig? ( media-libs/fontconfig:1.0 ) - gcrypt? ( - dev-libs/libgcrypt:0= - dev-libs/libgpg-error - ) - gme? ( media-libs/game-music-emu ) - gnome-keyring? ( app-crypt/libsecret ) - gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) - gui? ( - dev-qt/qtcore:5 - dev-qt/qtgui:5 - dev-qt/qtsvg:5 - dev-qt/qtwidgets:5 - X? ( - dev-qt/qtx11extras:5 - x11-libs/libX11 - ) - ) - ieee1394? ( - sys-libs/libavc1394 - sys-libs/libraw1394 - ) - jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) - kate? ( media-libs/libkate ) - libass? ( - media-libs/fontconfig:1.0 - media-libs/libass:= - ) - libcaca? ( media-libs/libcaca ) - libnotify? ( - dev-libs/glib:2 - x11-libs/gdk-pixbuf:2 - x11-libs/gtk+:3 - x11-libs/libnotify - ) - libsamplerate? ( media-libs/libsamplerate ) - libtar? ( dev-libs/libtar ) - libtiger? ( media-libs/libtiger ) - linsys? ( media-libs/zvbi ) - lirc? ( app-misc/lirc ) - live? ( media-plugins/live:= ) - lua? ( ${LUA_DEPS} ) - mad? ( media-libs/libmad ) - matroska? ( - >=dev-libs/libebml-1.4.2:= - media-libs/libmatroska:= - ) - modplug? ( >=media-libs/libmodplug-0.8.9.0 ) - mp3? ( media-sound/mpg123 ) - mpeg? ( media-libs/libmpeg2 ) - mtp? ( media-libs/libmtp:= ) - musepack? ( media-sound/musepack-tools ) - ncurses? ( sys-libs/ncurses:=[unicode(+)] ) - nfs? ( >=net-fs/libnfs-0.10.0:= ) - ogg? ( media-libs/libogg ) - opus? ( >=media-libs/opus-1.0.3 ) - png? ( media-libs/libpng:0= ) - projectm? ( - media-fonts/dejavu - >=media-libs/libprojectm-3.1.12:0= - ) - pulseaudio? ( media-sound/pulseaudio ) - rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) - samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) - sdl-image? ( media-libs/sdl-image ) - sftp? ( net-libs/libssh2 ) - shout? ( media-libs/libshout ) - sid? ( media-libs/libsidplay:2 ) - skins? ( - x11-libs/libXext - x11-libs/libXinerama - x11-libs/libXpm - ) - soxr? ( >=media-libs/soxr-0.1.2 ) - speex? ( - >=media-libs/speex-1.2.0 - media-libs/speexdsp - ) - srt? ( >=net-libs/srt-1.4.2:= ) - ssl? ( net-libs/gnutls:= ) - svg? ( - gnome-base/librsvg:2 - x11-libs/cairo - ) - taglib? ( >=media-libs/taglib-1.9 ) - theora? ( media-libs/libtheora ) - tremor? ( media-libs/tremor ) - truetype? ( - media-libs/freetype:2 - virtual/ttf-fonts - !fontconfig? ( media-fonts/dejavu ) - ) - twolame? ( media-sound/twolame ) - udev? ( virtual/udev ) - upnp? ( net-libs/libupnp:=[ipv6] ) - v4l? ( media-libs/libv4l:= ) - vaapi? ( x11-libs/libva:=[drm(+),wayland?,X?] ) - vdpau? ( x11-libs/libvdpau ) - vnc? ( net-libs/libvncserver ) - vpx? ( media-libs/libvpx:= ) - wayland? ( - >=dev-libs/wayland-1.15 - dev-libs/wayland-protocols - ) - X? ( - x11-libs/libX11 - x11-libs/libxcb - x11-libs/xcb-util - x11-libs/xcb-util-keysyms - ) - x264? ( >=media-libs/x264-0.0.20190214:= ) - x265? ( media-libs/x265:= ) - xml? ( dev-libs/libxml2:2 ) - zeroconf? ( net-dns/avahi[dbus] ) - zvbi? ( media-libs/zvbi ) -" -DEPEND="${RDEPEND} - X? ( x11-base/xorg-proto ) -" - -PATCHES=( - "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system - "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 - "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 - "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch - "${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 835072 -) - -DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) - -S="${WORKDIR}/${MY_P}" - -pkg_setup() { - if use lua; then - lua-single_pkg_setup - fi -} - -src_prepare() { - xdg_src_prepare # bug 608256 - - has_version 'net-libs/libupnp:1.8' && \ - eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch - - # Bootstrap when we are on a git checkout. - if [[ ${PV} = *9999 ]] ; then - ./bootstrap - fi - - # Make it build with libtool 1.5 - rm m4/lt* m4/libtool.m4 || die - - # We are not in a real git checkout due to the absence of a .git directory. - touch src/revision.txt || die - - # Don't use --started-from-file when not using dbus. - if ! use dbus ; then - sed -i 's/ --started-from-file//' share/vlc.desktop.in || die - fi - - # Disable running of vlc-cache-gen, we do that in pkg_postinst - sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ - -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" - - # Fix gettext version mismatch errors. - sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die - - eautoreconf - - # Disable automatic running of tests. - find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die -} - -src_configure() { - local -x BUILDCC="$(tc-getBUILD_CC)" - - local myeconfargs=( - --disable-aa - --disable-optimizations - --disable-rpath - --disable-update-check - --enable-fast-install - --enable-screen - --enable-vcd - --enable-vlc - --enable-vorbis - $(use_enable a52) - $(use_enable alsa) - $(use_enable aom) - $(use_enable archive) - $(use_enable aribsub) - $(use_enable bidi fribidi) - $(use_enable bidi harfbuzz) - $(use_enable bluray) - $(use_enable cddb libcddb) - $(use_enable chromaprint) - $(use_enable chromecast) - $(use_enable chromecast microdns) - $(use_enable cpu_flags_arm_neon neon) - $(use_enable cpu_flags_ppc_altivec altivec) - $(use_enable cpu_flags_x86_mmx mmx) - $(use_enable cpu_flags_x86_sse sse) - $(use_enable dav1d) - $(use_enable dbus) - $(use_enable dbus kwallet) - $(use_enable dc1394) - $(use_enable debug) - $(use_enable directx) - $(use_enable directx d3d11va) - $(use_enable directx dxva2) - $(use_enable dts dca) - $(use_enable dvbpsi) - $(use_enable dvd dvdnav) - $(use_enable dvd dvdread) - $(use_enable encode sout) - $(use_enable encode vlm) - $(use_enable faad) - $(use_enable fdk fdkaac) - $(use_enable ffmpeg avcodec) - $(use_enable ffmpeg avformat) - $(use_enable ffmpeg postproc) - $(use_enable ffmpeg swscale) - $(use_enable flac) - $(use_enable fluidsynth) - $(use_enable fontconfig) - $(use_enable gcrypt libgcrypt) - $(use_enable gme) - $(use_enable gnome-keyring secret) - $(use_enable gstreamer gst-decode) - $(use_enable gui qt) - $(use_enable ieee1394 dv1394) - $(use_enable jack) - $(use_enable jpeg) - $(use_enable kate) - $(use_enable libass) - $(use_enable libcaca caca) - $(use_enable libnotify notify) - $(use_enable libsamplerate samplerate) - $(use_enable libtar) - $(use_enable libtiger tiger) - $(use_enable linsys) - $(use_enable lirc) - $(use_enable live live555) - $(use_enable lua) - $(use_enable macosx-notifications osx-notifications) - $(use_enable mad) - $(use_enable matroska) - $(use_enable modplug mod) - $(use_enable mp3 mpg123) - $(use_enable mpeg libmpeg2) - $(use_enable mtp) - $(use_enable musepack mpc) - $(use_enable ncurses) - $(use_enable nfs) - $(use_enable ogg) - $(use_enable omxil) - $(use_enable omxil omxil-vout) - $(use_enable optimisememory optimize-memory) - $(use_enable opus) - $(use_enable png) - $(use_enable projectm) - $(use_enable pulseaudio pulse) - $(use_enable rdp freerdp) - $(use_enable run-as-root) - $(use_enable samba smbclient) - $(use_enable sdl-image) - $(use_enable sftp) - $(use_enable shout) - $(use_enable sid) - $(use_enable skins skins2) - $(use_enable soxr) - $(use_enable speex) - $(use_enable srt) - $(use_enable ssl gnutls) - $(use_enable svg) - $(use_enable svg svgdec) - $(use_enable taglib) - $(use_enable theora) - $(use_enable tremor) - $(use_enable twolame) - $(use_enable udev) - $(use_enable upnp) - $(use_enable v4l v4l2) - $(use_enable vaapi libva) - $(use_enable vdpau) - $(use_enable vnc) - $(use_enable vpx) - $(use_enable wayland) - $(use_with X x) - $(use_enable X xcb) - $(use_enable X xvideo) - $(use_enable x264) - $(use_enable x264 x26410b) - $(use_enable x265) - $(use_enable xml libxml2) - $(use_enable zeroconf avahi) - $(use_enable zvbi) - $(use_enable !zvbi telx) - --with-kde-solid="${EPREFIX}"/usr/share/solid/actions - --disable-asdcp - --disable-coverage - --disable-cprof - --disable-crystalhd - --disable-decklink - --disable-gles2 - --disable-goom - --disable-kai - --disable-kva - --disable-libplacebo - --disable-maintainer-mode - --disable-merge-ffmpeg - --disable-mfx - --disable-mmal - --disable-opencv - --disable-opensles - --disable-oss - --disable-rpi-omxil - --disable-schroedinger - --disable-shine - --disable-sndio - --disable-spatialaudio - --disable-vsxu - --disable-wasapi - --disable-wma-fixed - ) - # ^ We don't have these disabled libraries in the Portage tree yet. - - # Compatibility fix for Samba 4. - use samba && append-cppflags "-I/usr/include/samba-4.0" - - if use x86; then - # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 - append-cflags $(test-flags-CC -fno-stack-check) - # Bug 569774 - replace-flags -Os -O2 - fi - - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 - append-cxxflags -std=c++11 - - if use omxil; then - # bug #723006 - # https://trac.videolan.org/vlc/ticket/24617 - append-cflags -fcommon - fi - - # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... - append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/" - - if use riscv; then - # bug #803473 - append-libs -latomic - fi - - if use truetype || use bidi; then - myeconfargs+=( --enable-freetype ) - else - myeconfargs+=( --disable-freetype ) - fi - - if use truetype || use projectm; then - local dejavu="${EPREFIX}/usr/share/fonts/dejavu/" - myeconfargs+=( - --with-default-font=${dejavu}/DejaVuSans.ttf - --with-default-font-family=Sans - --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf - --with-default-monospace-font-family=Monospace - ) - fi - - econf "${myeconfargs[@]}" - - # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. - # Other values may break the build (bug 523144), so definition should not be removed. - # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h - sed -i '1i#undef _FORTIFY_SOURCE' config.h || die -} - -src_test() { - virtx emake check-TESTS -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} - -pkg_postinst() { - if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then - einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/" - "${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/" - else - ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" - ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually" - ewarn "If you do not do it, vlc will take a long time to load." - fi - - xdg_pkg_postinst -} - -pkg_postrm() { - if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then - rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" - fi - - xdg_pkg_postrm -} diff --git a/media-video/vlc/vlc-3.0.17.3-r2.ebuild b/media-video/vlc/vlc-3.0.17.3-r2.ebuild index 33d9f2b17a26..052013029e2f 100644 --- a/media-video/vlc/vlc-3.0.17.3-r2.ebuild +++ b/media-video/vlc/vlc-3.0.17.3-r2.ebuild @@ -20,7 +20,7 @@ else else SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" fi - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv -sparc ~x86" + KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv -sparc x86" fi inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg @@ -443,9 +443,6 @@ src_configure() { replace-flags -Os -O2 fi - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 - append-cxxflags -std=c++11 - if use omxil; then # bug #723006 # https://trac.videolan.org/vlc/ticket/24617 diff --git a/media-video/vlc/vlc-3.0.17.4.ebuild b/media-video/vlc/vlc-3.0.17.4.ebuild new file mode 100644 index 000000000000..86411c523f71 --- /dev/null +++ b/media-video/vlc/vlc-3.0.17.4.ebuild @@ -0,0 +1,512 @@ +# Copyright 2000-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +LUA_COMPAT=( lua5-{1..2} ) + +MY_PV="${PV/_/-}" +MY_PV="${MY_PV/-beta/-test}" +MY_P="${PN}-${MY_PV}" +if [[ ${PV} = *9999 ]] ; then + if [[ ${PV%.9999} != ${PV} ]] ; then + EGIT_BRANCH="3.0.x" + fi + EGIT_REPO_URI="https://code.videolan.org/videolan/vlc.git" + inherit git-r3 +else + if [[ ${MY_P} = ${P} ]] ; then + SRC_URI="https://download.videolan.org/pub/videolan/${PN}/${PV}/${P}.tar.xz" + else + SRC_URI="https://download.videolan.org/pub/videolan/testing/${MY_P}/${MY_P}.tar.xz" + fi + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv -sparc ~x86" +fi +inherit autotools flag-o-matic lua-single toolchain-funcs virtualx xdg + +DESCRIPTION="Media player and framework with support for most multimedia files and streaming" +HOMEPAGE="https://www.videolan.org/vlc/" + +LICENSE="LGPL-2.1 GPL-2" +SLOT="0/5-9" # vlc - vlccore + +IUSE="a52 alsa aom archive aribsub bidi bluray cddb chromaprint chromecast dav1d dbus + dc1394 debug directx dts +dvbpsi dvd +encode faad fdk +ffmpeg flac fluidsynth + fontconfig +gcrypt gme gnome-keyring gstreamer +gui ieee1394 jack jpeg kate + libass libcaca libnotify +libsamplerate libtar libtiger linsys lirc live lua + macosx-notifications mad matroska modplug mp3 mpeg mtp musepack ncurses nfs ogg + omxil optimisememory opus png projectm pulseaudio rdp run-as-root samba sdl-image + sftp shout sid skins soxr speex srt ssl svg taglib theora tremor truetype twolame + udev upnp vaapi v4l vdpau vnc vpx wayland +X x264 x265 xml zeroconf zvbi + cpu_flags_arm_neon cpu_flags_ppc_altivec cpu_flags_x86_mmx cpu_flags_x86_sse +" +REQUIRED_USE=" + chromecast? ( encode ) + directx? ( ffmpeg ) + fontconfig? ( truetype ) + libcaca? ( X ) + libtar? ( skins ) + libtiger? ( kate ) + lua? ( ${LUA_REQUIRED_USE} ) + skins? ( gui truetype X xml ) + ssl? ( gcrypt ) + vaapi? ( ffmpeg X ) + vdpau? ( ffmpeg X ) +" +BDEPEND=" + >=sys-devel/gettext-0.19.8 + virtual/pkgconfig + lua? ( ${LUA_DEPS} ) + amd64? ( dev-lang/yasm ) + x86? ( dev-lang/yasm ) +" +RDEPEND=" + media-libs/libvorbis + net-dns/libidn:= + sys-libs/zlib[minizip] + virtual/libintl + virtual/opengl + a52? ( media-libs/a52dec ) + alsa? ( media-libs/alsa-lib ) + aom? ( media-libs/libaom:= ) + archive? ( app-arch/libarchive:= ) + aribsub? ( media-libs/aribb24 ) + bidi? ( + dev-libs/fribidi + media-libs/freetype:2[harfbuzz] + media-libs/harfbuzz:= + virtual/ttf-fonts + ) + bluray? ( >=media-libs/libbluray-1.3.0:= ) + cddb? ( media-libs/libcddb ) + chromaprint? ( media-libs/chromaprint:= ) + chromecast? ( + >=dev-libs/protobuf-2.5.0:= + >=net-libs/libmicrodns-0.1.2:= + ) + dav1d? ( media-libs/dav1d:= ) + dbus? ( sys-apps/dbus ) + dc1394? ( + media-libs/libdc1394:2 + sys-libs/libraw1394 + ) + dts? ( media-libs/libdca ) + dvbpsi? ( >=media-libs/libdvbpsi-1.2.0:= ) + dvd? ( + >=media-libs/libdvdnav-6.1.1:0= + >=media-libs/libdvdread-6.1.2:0= + ) + faad? ( media-libs/faad2 ) + fdk? ( media-libs/fdk-aac:= ) + ffmpeg? ( >=media-video/ffmpeg-3.1.3:0=[postproc,vaapi?,vdpau?] ) + flac? ( + media-libs/flac + media-libs/libogg + ) + fluidsynth? ( media-sound/fluidsynth:= ) + fontconfig? ( media-libs/fontconfig:1.0 ) + gcrypt? ( + dev-libs/libgcrypt:0= + dev-libs/libgpg-error + ) + gme? ( media-libs/game-music-emu ) + gnome-keyring? ( app-crypt/libsecret ) + gstreamer? ( >=media-libs/gst-plugins-base-1.4.5:1.0 ) + gui? ( + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + X? ( + dev-qt/qtx11extras:5 + x11-libs/libX11 + ) + ) + ieee1394? ( + sys-libs/libavc1394 + sys-libs/libraw1394 + ) + jack? ( virtual/jack ) + jpeg? ( media-libs/libjpeg-turbo:0 ) + kate? ( media-libs/libkate ) + libass? ( + media-libs/fontconfig:1.0 + media-libs/libass:= + ) + libcaca? ( media-libs/libcaca ) + libnotify? ( + dev-libs/glib:2 + x11-libs/gdk-pixbuf:2 + x11-libs/gtk+:3 + x11-libs/libnotify + ) + libsamplerate? ( media-libs/libsamplerate ) + libtar? ( dev-libs/libtar ) + libtiger? ( media-libs/libtiger ) + linsys? ( media-libs/zvbi ) + lirc? ( app-misc/lirc ) + live? ( media-plugins/live:= ) + lua? ( ${LUA_DEPS} ) + mad? ( media-libs/libmad ) + matroska? ( + >=dev-libs/libebml-1.4.2:= + media-libs/libmatroska:= + ) + modplug? ( >=media-libs/libmodplug-0.8.9.0 ) + mp3? ( media-sound/mpg123 ) + mpeg? ( media-libs/libmpeg2 ) + mtp? ( media-libs/libmtp:= ) + musepack? ( media-sound/musepack-tools ) + ncurses? ( sys-libs/ncurses:=[unicode(+)] ) + nfs? ( >=net-fs/libnfs-0.10.0:= ) + ogg? ( media-libs/libogg ) + opus? ( >=media-libs/opus-1.0.3 ) + png? ( media-libs/libpng:0= ) + projectm? ( + media-fonts/dejavu + >=media-libs/libprojectm-3.1.12:0= + ) + pulseaudio? ( media-sound/pulseaudio ) + rdp? ( >=net-misc/freerdp-2.0.0_rc0:=[client(+)] ) + samba? ( >=net-fs/samba-4.0.0:0[client,-debug(-)] ) + sdl-image? ( media-libs/sdl-image ) + sftp? ( net-libs/libssh2 ) + shout? ( media-libs/libshout ) + sid? ( media-libs/libsidplay:2 ) + skins? ( + x11-libs/libXext + x11-libs/libXinerama + x11-libs/libXpm + ) + soxr? ( >=media-libs/soxr-0.1.2 ) + speex? ( + >=media-libs/speex-1.2.0 + media-libs/speexdsp + ) + srt? ( >=net-libs/srt-1.4.2:= ) + ssl? ( net-libs/gnutls:= ) + svg? ( + gnome-base/librsvg:2 + x11-libs/cairo + ) + taglib? ( >=media-libs/taglib-1.9 ) + theora? ( media-libs/libtheora ) + tremor? ( media-libs/tremor ) + truetype? ( + media-libs/freetype:2 + virtual/ttf-fonts + !fontconfig? ( media-fonts/dejavu ) + ) + twolame? ( media-sound/twolame ) + udev? ( virtual/udev ) + upnp? ( net-libs/libupnp:=[ipv6] ) + v4l? ( media-libs/libv4l:= ) + vaapi? ( x11-libs/libva:=[drm(+),wayland?,X?] ) + vdpau? ( x11-libs/libvdpau ) + vnc? ( net-libs/libvncserver ) + vpx? ( media-libs/libvpx:= ) + wayland? ( + >=dev-libs/wayland-1.15 + dev-libs/wayland-protocols + ) + X? ( + x11-libs/libX11 + x11-libs/libxcb + x11-libs/xcb-util + x11-libs/xcb-util-keysyms + ) + x264? ( >=media-libs/x264-0.0.20190214:= ) + x265? ( media-libs/x265:= ) + xml? ( dev-libs/libxml2:2 ) + zeroconf? ( net-dns/avahi[dbus] ) + zvbi? ( media-libs/zvbi ) +" +DEPEND="${RDEPEND} + X? ( x11-base/xorg-proto ) +" + +PATCHES=( + "${FILESDIR}"/${PN}-2.1.0-fix-libtremor-libs.patch # build system + "${FILESDIR}"/${PN}-2.2.8-freerdp-2.patch # bug 590164 + "${FILESDIR}"/${PN}-3.0.6-fdk-aac-2.0.0.patch # bug 672290 + "${FILESDIR}"/${PN}-3.0.11.1-configure_lua_version.patch + "${FILESDIR}"/${PN}-3.0.14-fix-live-address-api.patch # bug 835072 + "${FILESDIR}"/${PN}-3.0.17.3-dav1d-1.0.0.patch # bug 835787 +) + +DOCS=( AUTHORS THANKS NEWS README doc/fortunes.txt ) + +S="${WORKDIR}/${MY_P}" + +pkg_setup() { + if use lua; then + lua-single_pkg_setup + fi +} + +src_prepare() { + xdg_src_prepare # bug 608256 + + has_version 'net-libs/libupnp:1.8' && \ + eapply "${FILESDIR}"/${PN}-2.2.8-libupnp-slot-1.8.patch + + # Bootstrap when we are on a git checkout. + if [[ ${PV} = *9999 ]] ; then + ./bootstrap + fi + + # Make it build with libtool 1.5 + rm m4/lt* m4/libtool.m4 || die + + # We are not in a real git checkout due to the absence of a .git directory. + touch src/revision.txt || die + + # Don't use --started-from-file when not using dbus. + if ! use dbus ; then + sed -i 's/ --started-from-file//' share/vlc.desktop.in || die + fi + + # Disable running of vlc-cache-gen, we do that in pkg_postinst + sed -e "/test.*build.*host/s/\$(host)/nothanks/" \ + -i Makefile.am -i bin/Makefile.am || die "Failed to disable vlc-cache-gen" + + # Fix gettext version mismatch errors. + sed -i -e s/GETTEXT_VERSION/GETTEXT_REQUIRE_VERSION/ configure.ac || die + + eautoreconf + + # Disable automatic running of tests. + find . -name 'Makefile.in' -exec sed -i 's/\(..*\)check-TESTS/\1/' {} \; || die +} + +src_configure() { + local -x BUILDCC="$(tc-getBUILD_CC)" + + local myeconfargs=( + --disable-aa + --disable-optimizations + --disable-rpath + --disable-update-check + --enable-fast-install + --enable-screen + --enable-vcd + --enable-vlc + --enable-vorbis + $(use_enable a52) + $(use_enable alsa) + $(use_enable aom) + $(use_enable archive) + $(use_enable aribsub) + $(use_enable bidi fribidi) + $(use_enable bidi harfbuzz) + $(use_enable bluray) + $(use_enable cddb libcddb) + $(use_enable chromaprint) + $(use_enable chromecast) + $(use_enable chromecast microdns) + $(use_enable cpu_flags_arm_neon neon) + $(use_enable cpu_flags_ppc_altivec altivec) + $(use_enable cpu_flags_x86_mmx mmx) + $(use_enable cpu_flags_x86_sse sse) + $(use_enable dav1d) + $(use_enable dbus) + $(use_enable dbus kwallet) + $(use_enable dc1394) + $(use_enable debug) + $(use_enable directx) + $(use_enable directx d3d11va) + $(use_enable directx dxva2) + $(use_enable dts dca) + $(use_enable dvbpsi) + $(use_enable dvd dvdnav) + $(use_enable dvd dvdread) + $(use_enable encode sout) + $(use_enable encode vlm) + $(use_enable faad) + $(use_enable fdk fdkaac) + $(use_enable ffmpeg avcodec) + $(use_enable ffmpeg avformat) + $(use_enable ffmpeg postproc) + $(use_enable ffmpeg swscale) + $(use_enable flac) + $(use_enable fluidsynth) + $(use_enable fontconfig) + $(use_enable gcrypt libgcrypt) + $(use_enable gme) + $(use_enable gnome-keyring secret) + $(use_enable gstreamer gst-decode) + $(use_enable gui qt) + $(use_enable ieee1394 dv1394) + $(use_enable jack) + $(use_enable jpeg) + $(use_enable kate) + $(use_enable libass) + $(use_enable libcaca caca) + $(use_enable libnotify notify) + $(use_enable libsamplerate samplerate) + $(use_enable libtar) + $(use_enable libtiger tiger) + $(use_enable linsys) + $(use_enable lirc) + $(use_enable live live555) + $(use_enable lua) + $(use_enable macosx-notifications osx-notifications) + $(use_enable mad) + $(use_enable matroska) + $(use_enable modplug mod) + $(use_enable mp3 mpg123) + $(use_enable mpeg libmpeg2) + $(use_enable mtp) + $(use_enable musepack mpc) + $(use_enable ncurses) + $(use_enable nfs) + $(use_enable ogg) + $(use_enable omxil) + $(use_enable omxil omxil-vout) + $(use_enable optimisememory optimize-memory) + $(use_enable opus) + $(use_enable png) + $(use_enable projectm) + $(use_enable pulseaudio pulse) + $(use_enable rdp freerdp) + $(use_enable run-as-root) + $(use_enable samba smbclient) + $(use_enable sdl-image) + $(use_enable sftp) + $(use_enable shout) + $(use_enable sid) + $(use_enable skins skins2) + $(use_enable soxr) + $(use_enable speex) + $(use_enable srt) + $(use_enable ssl gnutls) + $(use_enable svg) + $(use_enable svg svgdec) + $(use_enable taglib) + $(use_enable theora) + $(use_enable tremor) + $(use_enable twolame) + $(use_enable udev) + $(use_enable upnp) + $(use_enable v4l v4l2) + $(use_enable vaapi libva) + $(use_enable vdpau) + $(use_enable vnc) + $(use_enable vpx) + $(use_enable wayland) + $(use_with X x) + $(use_enable X xcb) + $(use_enable X xvideo) + $(use_enable x264) + $(use_enable x264 x26410b) + $(use_enable x265) + $(use_enable xml libxml2) + $(use_enable zeroconf avahi) + $(use_enable zvbi) + $(use_enable !zvbi telx) + --with-kde-solid="${EPREFIX}"/usr/share/solid/actions + --disable-asdcp + --disable-coverage + --disable-cprof + --disable-crystalhd + --disable-decklink + --disable-gles2 + --disable-goom + --disable-kai + --disable-kva + --disable-libplacebo + --disable-maintainer-mode + --disable-merge-ffmpeg + --disable-mfx + --disable-mmal + --disable-opencv + --disable-opensles + --disable-oss + --disable-rpi-omxil + --disable-schroedinger + --disable-shine + --disable-sndio + --disable-spatialaudio + --disable-vsxu + --disable-wasapi + --disable-wma-fixed + ) + # ^ We don't have these disabled libraries in the Portage tree yet. + + # Compatibility fix for Samba 4. + use samba && append-cppflags "-I/usr/include/samba-4.0" + + if use x86; then + # We need to disable -fstack-check if use >=gcc 4.8.0. bug #499996 + append-cflags $(test-flags-CC -fno-stack-check) + # Bug 569774 + replace-flags -Os -O2 + fi + + if use omxil; then + # bug #723006 + # https://trac.videolan.org/vlc/ticket/24617 + append-cflags -fcommon + fi + + # FIXME: Needs libresid-builder from libsidplay:2 which is in another directory... + append-ldflags "-L${ESYSROOT}/usr/$(get_libdir)/sidplay/builders/" + + if use riscv; then + # bug #803473 + append-libs -latomic + fi + + if use truetype || use bidi; then + myeconfargs+=( --enable-freetype ) + else + myeconfargs+=( --disable-freetype ) + fi + + if use truetype || use projectm; then + local dejavu="${EPREFIX}/usr/share/fonts/dejavu/" + myeconfargs+=( + --with-default-font=${dejavu}/DejaVuSans.ttf + --with-default-font-family=Sans + --with-default-monospace-font=${dejavu}/DejaVuSansMono.ttf + --with-default-monospace-font-family=Monospace + ) + fi + + econf "${myeconfargs[@]}" + + # _FORTIFY_SOURCE is set to 2 in config.h, which is also the default value on Gentoo. + # Other values may break the build (bug 523144), so definition should not be removed. + # To prevent redefinition warnings, we undefine _FORTIFY_SOURCE at the start of config.h + sed -i '1i#undef _FORTIFY_SOURCE' config.h || die +} + +src_test() { + virtx emake check-TESTS +} + +src_install() { + default + find "${ED}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ -z "${ROOT}" ]] && [[ -x "${EROOT}/usr/$(get_libdir)/vlc/vlc-cache-gen" ]] ; then + einfo "Running ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen on ${EROOT}/usr/$(get_libdir)/vlc/plugins/" + "${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen" "${EROOT}/usr/$(get_libdir)/vlc/plugins/" + else + ewarn "We cannot run vlc-cache-gen (most likely ROOT != /)" + ewarn "Please run ${EPREFIX}/usr/$(get_libdir)/vlc/vlc-cache-gen manually" + ewarn "If you do not do it, vlc will take a long time to load." + fi + + xdg_pkg_postinst +} + +pkg_postrm() { + if [[ -e "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat ]]; then + rm "${EROOT}"/usr/$(get_libdir)/vlc/plugins/plugins.dat || die "Failed to rm plugins.dat" + fi + + xdg_pkg_postrm +} diff --git a/media-video/vlc/vlc-3.0.9999.ebuild b/media-video/vlc/vlc-3.0.9999.ebuild index 9f650bcfa31d..fb3f446fd030 100644 --- a/media-video/vlc/vlc-3.0.9999.ebuild +++ b/media-video/vlc/vlc-3.0.9999.ebuild @@ -127,7 +127,7 @@ RDEPEND=" sys-libs/libraw1394 ) jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:0 ) kate? ( media-libs/libkate ) libass? ( media-libs/fontconfig:1.0 @@ -441,9 +441,6 @@ src_configure() { replace-flags -Os -O2 fi - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 - append-cxxflags -std=c++11 - if use omxil; then # bug #723006 # https://trac.videolan.org/vlc/ticket/24617 diff --git a/media-video/vlc/vlc-9999.ebuild b/media-video/vlc/vlc-9999.ebuild index 23316e6cba59..3d05e9b5c9c8 100644 --- a/media-video/vlc/vlc-9999.ebuild +++ b/media-video/vlc/vlc-9999.ebuild @@ -127,7 +127,7 @@ RDEPEND=" sys-libs/libraw1394 ) jack? ( virtual/jack ) - jpeg? ( virtual/jpeg:0 ) + jpeg? ( media-libs/libjpeg-turbo:0 ) kate? ( media-libs/libkate ) kms? ( x11-libs/libdrm ) libass? ( @@ -441,9 +441,6 @@ src_configure() { replace-flags -Os -O2 fi - # VLC now requires C++11 after commit 4b1c9dcdda0bbff801e47505ff9dfd3f274eb0d8 - append-cxxflags -std=c++11 - if use omxil; then # bug #723006 # https://trac.videolan.org/vlc/ticket/24617 diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index 21993bd9f6f1..51dd01897706 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -1,9 +1,15 @@ +AUX wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch 3969 BLAKE2B 9d9fcdf2327834329e120e2322f03acb0a541b3095bba194be132b153769120e59d617bf4b64ebeb4cbc73caaf2fcbe2c6345da3aeef43ab88891edb93750f87 SHA512 406159756795c208ff809489dcd88fd0095681d9867a8c193f73e40709a27ce33a22a635bada6b5594f097113a5af47375d8814016554cbd6ad809ae18ad1502 +AUX wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch 4475 BLAKE2B baa62d342e3a5f753044f4f4f757064792424e05535b540c09ecef4ac70edf32edbae6a4a36ee87d9c041cccdd24d229ba828e50cdc303c50b1f6d4afef7b075 SHA512 4cce604cd7aa754b53d7473f0a12e764449f76932f7ee0fea6e2b5f6b1f11bc2a38a28eedea5f003a112836ecc6a209c3d5e4b29a582749be742d075e51e6518 +AUX wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch 7122 BLAKE2B bd4eee8b49d7bff9bb309c954576340ed336004a91240ebe96ed6e2cf46ffb2cef3c4546847bcd3ae911eea4ad62c65b7154555771524525512ffbee5eae4257 SHA512 cd241cfd3578fff49b9f6be8fbbb291ccdcfc9e65ceb45a3a92410a7914557614ff57959d94fa9954bf5933b61632b430410860887b6d7578182cbd9b7be75e1 +AUX wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch 1256 BLAKE2B 0e3148edf9811b2a090c1127afee5c8c9094e1b80fb2186980b38faf08b3eedc11d394261676a1416b7d22a9f21b45c5b1522a60a1a2383474cd5d7c4bf93da3 SHA512 2e9b94dcb5daa8e85a56222d2570c5085d322c4bfe251edad1792e8fe870686473bb52a4ef43be034bccb68093e01b5c0bf1e035778edb985568d9f01b45afbb +AUX wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch 1200 BLAKE2B ee73f3555418dad6a5c20e401e6f77ec22673b7079d04babe517617771c3d3b29e69ec37a933b1993fc5cfaa0200ee0a70178b7383b4086d9a63765a0d986301 SHA512 fa9fb26868b96742c972574eb2e82e91f54a3a3fe3911136b0c4886ff6324fcf35683059801113a0cc409f9a79383155e7cac1f4b18e0566da724c1fd3679d3d AUX wireplumber-0.4.9-config-document-which-options-need-to-be-turned-off-.patch 3610 BLAKE2B d473e299a6c22de630786ea4e8ff739aae2975614c79b6fc195a908b4431cc0eba57cfd688865f5c9fe91adf105b75fd6bbe8c00872b8640a8a7a36caabcb620 SHA512 f9770ec2afd83908d473d28cb8972212f57e7e12a64490417f5c301872e3c4cec644090480e60ad9085bbea8f0fc86c521e90b8853534acfe6959dfd5ed9a832 AUX wireplumber-0.4.9-scripts-policy-device-profile-clear-tables-when-devi.patch 1102 BLAKE2B 2a1e2cbe901e6284002f1393621f26d9c7eebee9eb4edc334dc9712095724a32de9f5a3def5121c28f1690b9ed634c9d3fe843c4ae221567e60f6140fe6b9339 SHA512 25a70e02e403cf155a4aaa6bc63a8f3d4cae712814932a5529366ea4ad2ef31d6c14080294ae4b9a1bab7ad433c26dde71df88123815159206d3f3c76481824a DIST wireplumber-0.4.10.tar.gz 395588 BLAKE2B 6df1af17d1e53ab1449a2f6f9af5a0c4f7b1cd981e07556e5ea3c6b4d5d624e66b97ce4f945f7ccccebbf72b75d35d10990fac11b5228275f27e5320885ff1ec SHA512 342e8bba2cf00faab71ef39bb361b5ada66ff3a68ccf7a756ea1ca402da6e94784eece277ca02992bc7573c51cb8b1bad33aa9c593b3d1bfe0bb0286e2f4506f DIST wireplumber-0.4.9.tar.gz 376170 BLAKE2B 50f552c730ac543fc2e8b0e054c861bcd22ed281a62f2921fb956f39b917cce6eb53287dfcfc81db240476f82f5cf1d7556fa34be8bf507ff847089536b81f44 SHA512 39b9e9be014489042fe480219b99d7591e0b68dd44b889bd5c6aeee73e771adb807bc21f48d031217f097182827bd2f48b68d52291036d52e95d4fa75e7f9929 -EBUILD wireplumber-0.4.10.ebuild 3554 BLAKE2B 5fffbb92a92c479a326e111215ebecfcc675494cb804913eede2252193629fdf09cd11bcaf63bcb0cd7767926b931e3041b6a9eee1a775e9e144525da673c8d1 SHA512 d3e0cb716523df0ff5be7491992b71d7d576d9929dd75434abcf00e81a46e17e2a11a228b897c25b669a0e2df4151b3595f14c2330fabf53935cb4c9e78e387f -EBUILD wireplumber-0.4.9-r1.ebuild 3689 BLAKE2B fbc08a9345afaabe31c270b60ce69daf78834a165c64aadf0eb6e6ad7ad5a300676107c377ee11f720df9cd11a8ca300cfea902679679ba1a0e67b0fdd043b5c SHA512 738d760ede5bd05047f399987e7266ee0c732e62f5449468c90dab39385e11e37d67d7559d96229467550e380ba30afbbbb72c08e0c733872ef6f961c4169e27 -EBUILD wireplumber-0.4.9.ebuild 3512 BLAKE2B edd21937127291c47bf9d87566172a22cde8a1aeb24eda1be76355abf5c734192c1b18cb62eade6fab59df8cb1cbf590201a77f9e4eee1e806384f7d9b2b10d6 SHA512 9751335866a253c0598653638600dc3b713adc7377d5f453a2286b7ef0d0a75751f32819c3bdb76a91e7d874109c5e9d511c12c882971c7ff716928c42119081 -EBUILD wireplumber-9999.ebuild 3554 BLAKE2B 5fffbb92a92c479a326e111215ebecfcc675494cb804913eede2252193629fdf09cd11bcaf63bcb0cd7767926b931e3041b6a9eee1a775e9e144525da673c8d1 SHA512 d3e0cb716523df0ff5be7491992b71d7d576d9929dd75434abcf00e81a46e17e2a11a228b897c25b669a0e2df4151b3595f14c2330fabf53935cb4c9e78e387f +EBUILD wireplumber-0.4.10-r1.ebuild 3654 BLAKE2B 43f15fe7997b85dd0cade5c0393f7088766482914e7767926a2d714dc73b17efee6614984200a694c3ce2bcdd2325a6a63768d958fefc044c513d516b6981129 SHA512 dba2d1bff0f1a90bfce06df57e9464a71a27aad3ffe1720cd39402da76579aafb363e3a0fe450d392dff57d3c12f6a1480141c5cb95f7e510b948b654faa63a4 +EBUILD wireplumber-0.4.10-r3.ebuild 3948 BLAKE2B 19ffa6b1593b745fc0fc29a106e0587f286170513833ba7dd6288afd2cadc16c5ca0e54022958948f4ef6bb557313ffbbe6af808c1fd06c5cd3684b9bab5b8d6 SHA512 7140723b2261c05eefc08edef705af56a2a1631d9124e7f4a489c7bc4aeae1ee1a92ab67afad0d6b701a9f92fd6db5b5c80d252c1142a89e05a376f6b5b7d431 +EBUILD wireplumber-0.4.9-r1.ebuild 3691 BLAKE2B 63ffe1aa2c86a4fe5cccb29e294189341aa9f70264a2026f16475e52fc6c313c8370dce17753206b7be4ce760f374ad38c8ee3621591e77b6eaa9f84bc75922e SHA512 f37f3130a79ea3898e79ca6abfee456c85b4357620b82aa80f8a119e3c12fcbabf5af55527bf0bee9cc40d5b98a6d707579b8f9be95609fe6abc0ce9071616f4 +EBUILD wireplumber-0.4.9.ebuild 3514 BLAKE2B fcd3cc2a795ba63c467fc46c7480553f9472e6c75f3bb54cd7701c0b28af294afeebdbad4b68f63a1c4adcab4a879c80465c00eb280cbf8db91604a67c493959 SHA512 0284553b29d7ac9b1f7df8f7b99207de4314601ded59df7f2bab33c6d8c538516b8041462221386e477217d43615462f28df6a2ecc81c0d3a2923f506fe565ab +EBUILD wireplumber-9999.ebuild 3563 BLAKE2B bbd86c4a9cfaaec2dc039b486b6737fc9770783860c755ae6d0bd9b1d9c803f608627273e95d8df68a6acfe81e5080258549ae08f0890f605eaf9c1a66a03bc7 SHA512 1bb23ba5ceff7f46934d0312040d594ab8a33007a15be3a71f5e16f07b8e70f15a3dee3bafa6553fca0cf53522b035df3ecb0468832ba0655223f8b81ce9f81a MISC metadata.xml 803 BLAKE2B d05f76db401a8f71c5c1504d17dd8c0a87686f4b0ab2da450a47f71b1a15eeee2aef17107a3a987af70a097c3004c582fdda4c46e37c89466bfb470d032446dd SHA512 cfa42b1862175344b23fe65fb97d86783ded19352988790aefc6a062da212423dd81d8147525e4256025cdcfc6850909ca61d77d6b4243add0a3339b2eb319ee diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch b/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch new file mode 100644 index 000000000000..610db0e11e89 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-alsa.lua-fix-device-name-deduplication-when-reserva.patch @@ -0,0 +1,117 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c00c5a6675b6640db13111c808eaa3251917c412 + +From c00c5a6675b6640db13111c808eaa3251917c412 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Wed, 18 May 2022 10:51:41 -0400 +Subject: [PATCH] alsa.lua: fix device name deduplication when reservation is + enabled + +Fixes #241 +--- + src/scripts/monitors/alsa.lua | 47 +++++++++++++++++++---------------- + 1 file changed, 25 insertions(+), 22 deletions(-) + +diff --git a/src/scripts/monitors/alsa.lua b/src/scripts/monitors/alsa.lua +index 01d241db..7beed3a8 100644 +--- a/src/scripts/monitors/alsa.lua ++++ b/src/scripts/monitors/alsa.lua +@@ -11,6 +11,10 @@ local config = ... or {} + -- ensure config.properties is not nil + config.properties = config.properties or {} + ++-- unique device/node name tables ++device_names_table = nil ++node_names_table = nil ++ + -- preprocess rules and create Interest objects + for _, r in ipairs(config.rules or {}) do + r.interests = {} +@@ -41,16 +45,6 @@ function rulesApplyProperties(properties) + end + end + +-function findDuplicate(parent, id, property, value) +- for i = 0, id - 1, 1 do +- local obj = parent:get_managed_object(i) +- if obj and obj.properties[property] == value then +- return true +- end +- end +- return false +-end +- + function nonempty(str) + return str ~= "" and str or nil + end +@@ -125,11 +119,11 @@ function createNode(parent, id, type, factory, properties) + + -- deduplicate nodes with the same name + for counter = 2, 99, 1 do +- if findDuplicate(parent, id, "node.name", properties["node.name"]) then +- properties["node.name"] = name .. "." .. counter +- else ++ if node_names_table[properties["node.name"]] ~= true then ++ node_names_table[properties["node.name"]] = true + break + end ++ properties["node.name"] = name .. "." .. counter + end + end + +@@ -186,6 +180,10 @@ function createDevice(parent, id, factory, properties) + local device = SpaDevice(factory, properties) + if device then + device:connect("create-object", createNode) ++ device:connect("object-removed", function (parent, id) ++ local node = parent:get_managed_object(id) ++ node_names_table[node.properties["node.name"]] = nil ++ end) + device:activate(Feature.SpaDevice.ENABLED | Feature.Proxy.BOUND) + parent:store_managed_object(id, device) + else +@@ -205,11 +203,11 @@ function prepareDevice(parent, id, type, factory, properties) + + -- deduplicate devices with the same name + for counter = 2, 99, 1 do +- if findDuplicate(parent, id, "device.name", properties["device.name"]) then +- properties["device.name"] = name .. "." .. counter +- else ++ if device_names_table[properties["device.name"]] ~= true then ++ device_names_table[properties["device.name"]] = true + break + end ++ properties["device.name"] = name .. "." .. counter + end + + -- ensure the device has a description +@@ -337,16 +335,21 @@ function createMonitor () + -- handle create-object to prepare device + m:connect("create-object", prepareDevice) + +- -- if dbus reservation, handle object-removed to destroy device reservations +- if rd_plugin then +- m:connect("object-removed", function (parent, id) +- local device = parent:get_managed_object(id) ++ -- handle object-removed to destroy device reservations and recycle device name ++ m:connect("object-removed", function (parent, id) ++ local device = parent:get_managed_object(id) ++ if rd_plugin then + local rd_name = device.properties["api.dbus.ReserveDevice1"] + if rd_name then + rd_plugin:call("destroy-reservation", rd_name) + end +- end) +- end ++ end ++ device_names_table[device.properties["device.name"]] = nil ++ end) ++ ++ -- reset the name tables to make sure names are recycled ++ device_names_table = {} ++ node_names_table = {} + + -- activate monitor + Log.info("Activating ALSA monitor") +-- +GitLab + diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch b/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch new file mode 100644 index 000000000000..40a486616580 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-config-fix-enabled-property-to-default-to-true-when.patch @@ -0,0 +1,129 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/1f045309208ab5d927883b5adc2b7d1623fae162 + +From 1f045309208ab5d927883b5adc2b7d1623fae162 Mon Sep 17 00:00:00 2001 +From: George Kiagiadakis +Date: Thu, 12 May 2022 12:19:38 +0300 +Subject: [PATCH] config: fix enabled property to default to "true" when not + defined + +Fixes backwards compatibility with older config files + +Fixes: #254 +--- + src/config/bluetooth.lua.d/30-bluez-monitor.lua | 2 +- + src/config/main.lua.d/20-default-access.lua | 2 +- + src/config/main.lua.d/30-alsa-monitor.lua | 2 +- + src/config/main.lua.d/30-libcamera-monitor.lua | 2 +- + src/config/main.lua.d/30-v4l2-monitor.lua | 2 +- + src/config/main.lua.d/40-device-defaults.lua | 2 +- + src/config/main.lua.d/40-stream-defaults.lua | 2 +- + src/config/policy.lua.d/10-default-policy.lua | 2 +- + 8 files changed, 8 insertions(+), 8 deletions(-) + +diff --git a/src/config/bluetooth.lua.d/30-bluez-monitor.lua b/src/config/bluetooth.lua.d/30-bluez-monitor.lua +index b40026c2..a870aa5d 100644 +--- a/src/config/bluetooth.lua.d/30-bluez-monitor.lua ++++ b/src/config/bluetooth.lua.d/30-bluez-monitor.lua +@@ -3,7 +3,7 @@ bluez_monitor.properties = {} + bluez_monitor.rules = {} + + function bluez_monitor.enable() +- if not bluez_monitor.enabled then ++ if bluez_monitor.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/20-default-access.lua b/src/config/main.lua.d/20-default-access.lua +index a6ffb2ee..0a7eb955 100644 +--- a/src/config/main.lua.d/20-default-access.lua ++++ b/src/config/main.lua.d/20-default-access.lua +@@ -3,7 +3,7 @@ default_access.properties = {} + default_access.rules = {} + + function default_access.enable() +- if not default_access.enabled then ++ if default_access.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/30-alsa-monitor.lua b/src/config/main.lua.d/30-alsa-monitor.lua +index da0b2c70..8e45e434 100644 +--- a/src/config/main.lua.d/30-alsa-monitor.lua ++++ b/src/config/main.lua.d/30-alsa-monitor.lua +@@ -3,7 +3,7 @@ alsa_monitor.properties = {} + alsa_monitor.rules = {} + + function alsa_monitor.enable() +- if not alsa_monitor.enabled then ++ if alsa_monitor.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/30-libcamera-monitor.lua b/src/config/main.lua.d/30-libcamera-monitor.lua +index 4a8257ff..cd820a83 100644 +--- a/src/config/main.lua.d/30-libcamera-monitor.lua ++++ b/src/config/main.lua.d/30-libcamera-monitor.lua +@@ -3,7 +3,7 @@ libcamera_monitor.properties = {} + libcamera_monitor.rules = {} + + function libcamera_monitor.enable() +- if not libcamera_monitor.enabled then ++ if libcamera_monitor.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/30-v4l2-monitor.lua b/src/config/main.lua.d/30-v4l2-monitor.lua +index 7cfd4bcd..3fbdc9e7 100644 +--- a/src/config/main.lua.d/30-v4l2-monitor.lua ++++ b/src/config/main.lua.d/30-v4l2-monitor.lua +@@ -3,7 +3,7 @@ v4l2_monitor.properties = {} + v4l2_monitor.rules = {} + + function v4l2_monitor.enable() +- if not v4l2_monitor.enabled then ++ if v4l2_monitor.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/40-device-defaults.lua b/src/config/main.lua.d/40-device-defaults.lua +index 55aafe85..2204c4ac 100644 +--- a/src/config/main.lua.d/40-device-defaults.lua ++++ b/src/config/main.lua.d/40-device-defaults.lua +@@ -38,7 +38,7 @@ device_defaults.persistent_profiles = { + } + + function device_defaults.enable() +- if not device_defaults.enabled then ++ if device_defaults.enabled == false then + return + end + +diff --git a/src/config/main.lua.d/40-stream-defaults.lua b/src/config/main.lua.d/40-stream-defaults.lua +index 2975f4f6..307d83df 100644 +--- a/src/config/main.lua.d/40-stream-defaults.lua ++++ b/src/config/main.lua.d/40-stream-defaults.lua +@@ -25,7 +25,7 @@ stream_defaults.rules = { + } + + function stream_defaults.enable() +- if not stream_defaults.enabled then ++ if stream_defaults.enabled == false then + return + end + +diff --git a/src/config/policy.lua.d/10-default-policy.lua b/src/config/policy.lua.d/10-default-policy.lua +index 7b00e94e..edfdeb1c 100644 +--- a/src/config/policy.lua.d/10-default-policy.lua ++++ b/src/config/policy.lua.d/10-default-policy.lua +@@ -38,7 +38,7 @@ bluetooth_policy.policy = { + } + + function default_policy.enable() +- if not default_policy.enabled then ++ if default_policy.enabled == false then + return + end + +-- +GitLab + diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch new file mode 100644 index 000000000000..d9c51489a893 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-m-default-nodes-don-t-check-if-all-device-nodes-are.patch @@ -0,0 +1,187 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/392cce2136e81ac3146078eacbbae85b694c917a + +From 392cce2136e81ac3146078eacbbae85b694c917a Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Fri, 20 May 2022 07:38:24 -0400 +Subject: [PATCH] m-default-nodes: don't check if all device nodes are ready + when finding default node + +This check was originally added to avoid a small audio glitch when changing +default nodes while also changing the device profile (eg Gnome Sound Settings). +The check is removed because it causes issues when disabling alsa nodes. There +are plans to fix the audio glitch issue in the future with the planned +event-dispatcher architecture. + +Fixes #279 +--- + modules/module-default-nodes.c | 136 --------------------------------- + 1 file changed, 136 deletions(-) + +diff --git a/modules/module-default-nodes.c b/modules/module-default-nodes.c +index 0fdaed5..577f9bb 100644 +--- a/modules/module-default-nodes.c ++++ b/modules/module-default-nodes.c +@@ -345,135 +345,6 @@ reevaluate_default_node (WpDefaultNodes * self, WpMetadata *m, gint node_t) + } + } + +-static guint +-get_device_total_nodes (WpPipewireObject * proxy) +-{ +- g_autoptr (WpIterator) profiles = NULL; +- g_auto (GValue) item = G_VALUE_INIT; +- +- profiles = wp_pipewire_object_enum_params_sync (proxy, "Profile", NULL); +- if (!profiles) +- return 0; +- +- for (; wp_iterator_next (profiles, &item); g_value_unset (&item)) { +- WpSpaPod *pod = g_value_get_boxed (&item); +- gint idx = -1; +- const gchar *name = NULL; +- g_autoptr (WpSpaPod) classes = NULL; +- +- /* Parse */ +- if (!wp_spa_pod_get_object (pod, NULL, +- "index", "i", &idx, +- "name", "s", &name, +- "classes", "?P", &classes, +- NULL)) +- continue; +- if (!classes) +- continue; +- +- /* Parse profile classes */ +- { +- g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (classes); +- g_auto (GValue) v = G_VALUE_INIT; +- gint total_nodes = 0; +- for (; wp_iterator_next (it, &v); g_value_unset (&v)) { +- WpSpaPod *entry = g_value_get_boxed (&v); +- g_autoptr (WpSpaPodParser) pp = NULL; +- const gchar *media_class = NULL; +- gint n_nodes = 0; +- g_return_val_if_fail (entry, 0); +- if (!wp_spa_pod_is_struct (entry)) +- continue; +- pp = wp_spa_pod_parser_new_struct (entry); +- g_return_val_if_fail (pp, 0); +- g_return_val_if_fail (wp_spa_pod_parser_get_string (pp, &media_class), 0); +- g_return_val_if_fail (wp_spa_pod_parser_get_int (pp, &n_nodes), 0); +- wp_spa_pod_parser_end (pp); +- +- total_nodes += n_nodes; +- } +- +- if (total_nodes > 0) +- return total_nodes; +- } +- } +- +- return 0; +-} +- +-static gboolean +-nodes_ready (WpDefaultNodes * self) +-{ +- g_autoptr (WpIterator) it = NULL; +- g_auto (GValue) val = G_VALUE_INIT; +- +- /* Get the total number of nodes for each device and make sure they exist +- * and have at least 1 port */ +- it = wp_object_manager_new_filtered_iterator (self->rescan_om, +- WP_TYPE_DEVICE, NULL); +- for (; wp_iterator_next (it, &val); g_value_unset (&val)) { +- WpPipewireObject *device = g_value_get_object (&val); +- guint total_nodes = get_device_total_nodes (device); +- if (total_nodes > 0) { +- guint32 device_id = wp_proxy_get_bound_id (WP_PROXY (device)); +- g_autoptr (WpIterator) node_it = NULL; +- g_auto (GValue) node_val = G_VALUE_INIT; +- guint ready_nodes = 0; +- +- node_it = wp_object_manager_new_filtered_iterator (self->rescan_om, +- WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, +- PW_KEY_DEVICE_ID, "=i", device_id, NULL); +- for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) { +- WpPipewireObject *node = g_value_get_object (&node_val); +- g_autoptr (WpPort) port = +- wp_object_manager_lookup (self->rescan_om, +- WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY, +- PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)), +- NULL); +- if (port) +- ready_nodes++; +- } +- +- if (ready_nodes < total_nodes) { +- const gchar *device_name = wp_pipewire_object_get_property ( +- WP_PIPEWIRE_OBJECT (device), PW_KEY_DEVICE_NAME); +- wp_debug_object (self, "device '%s' is not ready (%d/%d)", device_name, +- ready_nodes, total_nodes); +- return FALSE; +- } +- } +- } +- +- /* Make sure Audio and Video virtual sources have ports */ +- { +- g_autoptr (WpIterator) node_it = NULL; +- g_auto (GValue) node_val = G_VALUE_INIT; +- node_it = wp_object_manager_new_filtered_iterator (self->rescan_om, +- WP_TYPE_NODE, WP_CONSTRAINT_TYPE_PW_PROPERTY, PW_KEY_DEVICE_ID, "-", +- NULL); +- for (; wp_iterator_next (node_it, &node_val); g_value_unset (&node_val)) { +- WpPipewireObject *node = g_value_get_object (&node_val); +- const gchar *media_class = wp_pipewire_object_get_property ( +- WP_PIPEWIRE_OBJECT (node), PW_KEY_MEDIA_CLASS); +- g_autoptr (WpPort) port = +- wp_object_manager_lookup (self->rescan_om, +- WP_TYPE_PORT, WP_CONSTRAINT_TYPE_PW_PROPERTY, +- PW_KEY_NODE_ID, "=u", wp_proxy_get_bound_id (WP_PROXY (node)), +- NULL); +- if (!port && +- (g_strcmp0 ("Audio/Source/Virtual", media_class) == 0 || +- g_strcmp0 ("Video/Source/Virtual", media_class) == 0)) { +- const gchar *node_name = wp_pipewire_object_get_property ( +- WP_PIPEWIRE_OBJECT (node), PW_KEY_NODE_NAME); +- wp_debug_object (self, "virtual node '%s' is not ready", node_name); +- return FALSE; +- } +- } +- } +- +- return TRUE; +-} +- + static void + sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self) + { +@@ -491,10 +362,6 @@ sync_rescan (WpCore * core, GAsyncResult * res, WpDefaultNodes * self) + if (!metadata) + return; + +- /* Make sure nodes are ready for current profile */ +- if (!nodes_ready (self)) +- return; +- + wp_trace_object (self, "re-evaluating defaults"); + reevaluate_default_node (self, metadata, AUDIO_SINK); + reevaluate_default_node (self, metadata, AUDIO_SOURCE); +@@ -584,13 +451,10 @@ on_metadata_added (WpObjectManager *om, WpMetadata *metadata, gpointer d) + self->rescan_om = wp_object_manager_new (); + wp_object_manager_add_interest (self->rescan_om, WP_TYPE_DEVICE, NULL); + wp_object_manager_add_interest (self->rescan_om, WP_TYPE_NODE, NULL); +- wp_object_manager_add_interest (self->rescan_om, WP_TYPE_PORT, NULL); + wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_DEVICE, + WP_OBJECT_FEATURES_ALL); + wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_NODE, + WP_OBJECT_FEATURES_ALL); +- wp_object_manager_request_object_features (self->rescan_om, WP_TYPE_PORT, +- WP_OBJECT_FEATURES_ALL); + g_signal_connect_object (self->rescan_om, "objects-changed", + G_CALLBACK (schedule_rescan), self, G_CONNECT_SWAPPED); + g_signal_connect_object (self->rescan_om, "object-added", +-- +2.35.1 + diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch new file mode 100644 index 000000000000..c319ac4a617b --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-allow-converting-GValue-holding-NUL.patch @@ -0,0 +1,36 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c2f31bb550755acba31da2e9f5bbdf646ed5e805 + +From c2f31bb550755acba31da2e9f5bbdf646ed5e805 Mon Sep 17 00:00:00 2001 +From: Julian Bouzas +Date: Mon, 16 May 2022 15:41:10 -0400 +Subject: [PATCH] m-lua-scripting: allow converting GValue holding NULL objects + to Lua + +--- + modules/module-lua-scripting/wplua/value.c | 9 +++++++-- + 1 file changed, 7 insertions(+), 2 deletions(-) + +diff --git a/modules/module-lua-scripting/wplua/value.c b/modules/module-lua-scripting/wplua/value.c +index 133051a4..e31ae4ac 100644 +--- a/modules/module-lua-scripting/wplua/value.c ++++ b/modules/module-lua-scripting/wplua/value.c +@@ -314,9 +314,14 @@ wplua_gvalue_to_lua (lua_State *L, const GValue *v) + wplua_pushboxed (L, G_VALUE_TYPE (v), g_value_dup_boxed (v)); + break; + case G_TYPE_OBJECT: +- case G_TYPE_INTERFACE: +- wplua_pushobject (L, g_value_dup_object (v)); ++ case G_TYPE_INTERFACE: { ++ GObject *object = g_value_dup_object (v); ++ if (object) ++ wplua_pushobject (L, g_value_dup_object (v)); ++ else ++ lua_pushnil (L); + break; ++ } + case G_TYPE_ENUM: + wplua_enum_to_lua (L, g_value_get_enum (v), G_VALUE_TYPE (v)); + break; +-- +GitLab + diff --git a/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch new file mode 100644 index 000000000000..0b86979ce732 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.4.10-m-lua-scripting-fix-object-refcounting.patch @@ -0,0 +1,32 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/7908b8d7be2a2992c57cd549054eda7ce46e4b44 + +From 13b85bd4a25ab374f5e5e90b7288e6987996856e Mon Sep 17 00:00:00 2001 +From: Michael Olbrich +Date: Tue, 24 May 2022 11:35:15 +0200 +Subject: [PATCH] m-lua-scripting: fix object refcounting + +7908b8d7be2a2992c57cd549054eda7ce46e4b44 ("m-lua-scripting: allow +converting GValue holding NULL objects to Lua") accidentally added a second +refcount. As a result, the objects are never freeded. + +Remove the second refcount to fix this. +--- + modules/module-lua-scripting/wplua/value.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/modules/module-lua-scripting/wplua/value.c b/modules/module-lua-scripting/wplua/value.c +index e31ae4a..a7927dc 100644 +--- a/modules/module-lua-scripting/wplua/value.c ++++ b/modules/module-lua-scripting/wplua/value.c +@@ -317,7 +317,7 @@ wplua_gvalue_to_lua (lua_State *L, const GValue *v) + case G_TYPE_INTERFACE: { + GObject *object = g_value_dup_object (v); + if (object) +- wplua_pushobject (L, g_value_dup_object (v)); ++ wplua_pushobject (L, object); + else + lua_pushnil (L); + break; +-- +2.35.1 + diff --git a/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild new file mode 100644 index 000000000000..4c9a4ce04761 --- /dev/null +++ b/media-video/wireplumber/wireplumber-0.4.10-r1.ebuild @@ -0,0 +1,122 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson systemd + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +DESCRIPTION="Replacement for pipewire-media-session" +HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" + +LICENSE="MIT" +SLOT="0/0.4" +IUSE="elogind system-service systemd test" + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + ?? ( elogind systemd ) + system-service? ( systemd ) +" + +RESTRICT="!test? ( test )" + +# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building +BDEPEND=" + dev-libs/glib + dev-util/gdbus-codegen + dev-util/glib-utils + sys-devel/gettext +" + +DEPEND=" + ${LUA_DEPS} + >=dev-libs/glib-2.62 + >=media-video/pipewire-0.3.48:= + virtual/libc + virtual/libintl + elogind? ( sys-auth/elogind ) + systemd? ( sys-apps/systemd ) +" + +# Any dev-lua/* deps get declared like this inside RDEPEND: +# $(lua_gen_cond_dep ' +# dev-lua/[${LUA_USEDEP}] +# ') +RDEPEND="${DEPEND} + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) +" + +DOCS=( {NEWS,README}.rst ) + +PATCHES=( + "${FILESDIR}"/${P}-config-fix-enabled-property-to-default-to-true-when.patch +) + +src_configure() { + local emesonargs=( + -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) + -Dintrospection=disabled # Only used for Sphinx doc generation + -Dsystem-lua=true # We always unbundle everything we can + -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) + $(meson_feature elogind) + $(meson_feature systemd) + $(meson_use system-service systemd-system-service) + $(meson_use systemd systemd-user-service) + -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) + -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) + $(meson_use test tests) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + # We copy the default config, so that Gentoo tools can pick up on any + # updates and /etc does not end up with stale overrides. + # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files + # will not actually get stored twice until modified. + insinto /etc + doins -r "${ED}"/usr/share/wireplumber +} + +pkg_postinst() { + if systemd_is_booted ; then + ewarn "pipewire-media-session.service is no longer installed. You must switch" + ewarn "to wireplumber.service user unit before your next logout/reboot:" + ewarn "systemctl --user disable pipewire-media-session.service" + ewarn "systemctl --user --force enable wireplumber.service" + else + ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" + ewarn "is started (a replacement for directly calling pipewire binary)." + ewarn + ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" + ewarn "or, if it does exist, that any reference to" + ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." + fi + if use system-service; then + ewarn + ewarn "WARNING: you have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable WirePlumber to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of" + ewarn "box, and you are on your own with configuration." + ewarn + fi +} diff --git a/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild new file mode 100644 index 000000000000..ae1bbb1ec14c --- /dev/null +++ b/media-video/wireplumber/wireplumber-0.4.10-r3.ebuild @@ -0,0 +1,126 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson systemd + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" + KEYWORDS="amd64 arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86" +fi + +DESCRIPTION="Replacement for pipewire-media-session" +HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" + +LICENSE="MIT" +SLOT="0/0.4" +IUSE="elogind system-service systemd test" + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + ?? ( elogind systemd ) + system-service? ( systemd ) +" + +RESTRICT="!test? ( test )" + +# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building +BDEPEND=" + dev-libs/glib + dev-util/gdbus-codegen + dev-util/glib-utils + sys-devel/gettext +" + +DEPEND=" + ${LUA_DEPS} + >=dev-libs/glib-2.62 + >=media-video/pipewire-0.3.48:= + virtual/libc + virtual/libintl + elogind? ( sys-auth/elogind ) + systemd? ( sys-apps/systemd ) +" + +# Any dev-lua/* deps get declared like this inside RDEPEND: +# $(lua_gen_cond_dep ' +# dev-lua/[${LUA_USEDEP}] +# ') +RDEPEND="${DEPEND} + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) +" + +DOCS=( {NEWS,README}.rst ) + +PATCHES=( + "${FILESDIR}"/${P}-config-fix-enabled-property-to-default-to-true-when.patch + "${FILESDIR}"/${P}-m-lua-scripting-allow-converting-GValue-holding-NUL.patch + "${FILESDIR}"/${P}-alsa.lua-fix-device-name-deduplication-when-reserva.patch + "${FILESDIR}"/${P}-m-default-nodes-don-t-check-if-all-device-nodes-are.patch + "${FILESDIR}"/${P}-m-lua-scripting-fix-object-refcounting.patch +) + +src_configure() { + local emesonargs=( + -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) + -Dintrospection=disabled # Only used for Sphinx doc generation + -Dsystem-lua=true # We always unbundle everything we can + -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) + $(meson_feature elogind) + $(meson_feature systemd) + $(meson_use system-service systemd-system-service) + $(meson_use systemd systemd-user-service) + -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) + -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) + $(meson_use test tests) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + # We copy the default config, so that Gentoo tools can pick up on any + # updates and /etc does not end up with stale overrides. + # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files + # will not actually get stored twice until modified. + insinto /etc + doins -r "${ED}"/usr/share/wireplumber +} + +pkg_postinst() { + if systemd_is_booted ; then + ewarn "pipewire-media-session.service is no longer installed. You must switch" + ewarn "to wireplumber.service user unit before your next logout/reboot:" + ewarn "systemctl --user disable pipewire-media-session.service" + ewarn "systemctl --user --force enable wireplumber.service" + else + ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" + ewarn "is started (a replacement for directly calling pipewire binary)." + ewarn + ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" + ewarn "or, if it does exist, that any reference to" + ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." + fi + if use system-service; then + ewarn + ewarn "WARNING: you have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable WirePlumber to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of" + ewarn "box, and you are on your own with configuration." + ewarn + fi +} diff --git a/media-video/wireplumber/wireplumber-0.4.10.ebuild b/media-video/wireplumber/wireplumber-0.4.10.ebuild deleted file mode 100644 index 9bae3695faf2..000000000000 --- a/media-video/wireplumber/wireplumber-0.4.10.ebuild +++ /dev/null @@ -1,118 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -LUA_COMPAT=( lua5-{3,4} ) - -inherit lua-single meson systemd - -if [[ ${PV} == 9999 ]]; then - EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" - EGIT_BRANCH="master" - inherit git-r3 -else - SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" -fi - -DESCRIPTION="Replacement for pipewire-media-session" -HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" - -LICENSE="MIT" -SLOT="0/0.4" -IUSE="elogind system-service systemd test" - -REQUIRED_USE=" - ${LUA_REQUIRED_USE} - ?? ( elogind systemd ) - system-service? ( systemd ) -" - -RESTRICT="!test? ( test )" - -# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building -BDEPEND=" - dev-libs/glib - dev-util/gdbus-codegen - dev-util/glib-utils - sys-devel/gettext -" - -DEPEND=" - ${LUA_DEPS} - >=dev-libs/glib-2.62 - >=media-video/pipewire-0.3.48:= - virtual/libc - virtual/libintl - elogind? ( sys-auth/elogind ) - systemd? ( sys-apps/systemd ) -" - -# Any dev-lua/* deps get declared like this inside RDEPEND: -# $(lua_gen_cond_dep ' -# dev-lua/[${LUA_USEDEP}] -# ') -RDEPEND="${DEPEND} - system-service? ( - acct-user/pipewire - acct-group/pipewire - ) -" - -DOCS=( {NEWS,README}.rst ) - -src_configure() { - local emesonargs=( - -Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?) - -Dintrospection=disabled # Only used for Sphinx doc generation - -Dsystem-lua=true # We always unbundle everything we can - -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) - $(meson_feature elogind) - $(meson_feature systemd) - $(meson_use system-service systemd-system-service) - $(meson_use systemd systemd-user-service) - -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) - -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) - $(meson_use test tests) - ) - - meson_src_configure -} - -src_install() { - meson_src_install - - # We copy the default config, so that Gentoo tools can pick up on any - # updates and /etc does not end up with stale overrides. - # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files - # will not actually get stored twice until modified. - insinto /etc - doins -r ${ED}/usr/share/wireplumber -} - -pkg_postinst() { - if systemd_is_booted ; then - ewarn "pipewire-media-session.service is no longer installed. You must switch" - ewarn "to wireplumber.service user unit before your next logout/reboot:" - ewarn "systemctl --user disable pipewire-media-session.service" - ewarn "systemctl --user --force enable wireplumber.service" - else - ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" - ewarn "is started (a replacement for directly calling pipewire binary)." - ewarn - ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" - ewarn "or, if it does exist, that any reference to" - ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." - fi - if use system-service; then - ewarn - ewarn "WARNING: you have enabled the system-service USE flag, which installs" - ewarn "the system-wide systemd units that enable WirePlumber to run as a system" - ewarn "service. This is more than likely NOT what you want. You are strongly" - ewarn "advised not to enable this mode and instead stick with systemd user" - ewarn "units. The default configuration files will likely not work out of" - ewarn "box, and you are on your own with configuration." - ewarn - fi -} diff --git a/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild b/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild index f269c7faf59c..b2cb2a7e4d87 100644 --- a/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.9-r1.ebuild @@ -91,7 +91,7 @@ src_install() { # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files # will not actually get stored twice until modified. insinto /etc - doins -r ${ED}/usr/share/wireplumber + doins -r "${ED}"/usr/share/wireplumber } pkg_postinst() { diff --git a/media-video/wireplumber/wireplumber-0.4.9.ebuild b/media-video/wireplumber/wireplumber-0.4.9.ebuild index 4f4c698eaf54..0c71a9ba7f9b 100644 --- a/media-video/wireplumber/wireplumber-0.4.9.ebuild +++ b/media-video/wireplumber/wireplumber-0.4.9.ebuild @@ -86,7 +86,7 @@ src_install() { # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files # will not actually get stored twice until modified. insinto /etc - doins -r ${ED}/usr/share/wireplumber + doins -r "${ED}"/usr/share/wireplumber } pkg_postinst() { diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild index 9bae3695faf2..ca50e19600e4 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-9999.ebuild @@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86" fi DESCRIPTION="Replacement for pipewire-media-session" @@ -88,7 +88,7 @@ src_install() { # If a reflinking CoW filesystem is used (e.g. Btrfs), then the files # will not actually get stored twice until modified. insinto /etc - doins -r ${ED}/usr/share/wireplumber + doins -r "${ED}"/usr/share/wireplumber } pkg_postinst() { diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest index 9684451fdb09..7c4bb97a93bd 100644 --- a/media-video/yle-dl/Manifest +++ b/media-video/yle-dl/Manifest @@ -1,5 +1,5 @@ -DIST yle-dl-20220213.tar.gz 67754 BLAKE2B 41ba361883440f48f60d2bb85959ed9ef18a4d6544dd8d35fa0f29ad90662ad180238af85a34415f99c77ca4d12fb8c0c51817497944bda1cd9d446bb48d10da SHA512 b15d3b5b9e2fb5cffd9e19f203cebfd6d6580d70022571ac900d51717f0d5d019a54eadbeb43e7f513d4a0db9c509f765ea1d8681f8c7a249b9ef7b283272b87 -DIST yle-dl-20220425.tar.gz 67993 BLAKE2B 907a14d3588c6d2ea0ba5c89955062e160f648e5149f798ab3e719a32355441a39b6d2c15e6be51f17f2fb170c7cd8150c3cf2aa63367184e638f547f55a975b SHA512 62931f076236407a193eec56a6e446bfe8472ae6d33e0f6a72dfa5b87e45a744432f154c402ad5e43f966f334c8b4e57e356a7435031c16ce26c9440cf5a9ded -EBUILD yle-dl-20220213.ebuild 1692 BLAKE2B b33f444392f8d6482ba6ce16a5559c2e966b9b9a2f6288a9985b3f8e175b932828f568348717208af9802c44792260fdf049f8e5b801cb41f9b739e483834ee9 SHA512 c08a434455c4b4d0a393f17a1635a766ed2606650e51c1b49b40bf533da0cebc30384da1ef6d7826ee6028e140bbd689954adc6b2ed1683ae5d5206b52272213 -EBUILD yle-dl-20220425.ebuild 1430 BLAKE2B 5c0b6903a43875adebcb66aadbbbe917df80ff28e0e000499ae22dac2da1fab4f04d8638055aa08a4bdff632648cf87890f2231c7ab93a0479c1d488b6324413 SHA512 ff3031fe9db49be4733fba8c80375959df29b212aef01dd7fed59eebd00608078e7e71c0b35c9456e89888772ec4a5b91f372d905d1ebed460800cf2745d7a27 +DIST yle-dl-20220531.tar.gz 68985 BLAKE2B 66a011a741089aeb5a1247d9d4571341b0584b859831460c1ed39db8df0c0838e5271b5d5d9004f6c62134235cd881bc6a24752ef1a88ace95158b00803d5c13 SHA512 499929a8411c515259890fd228970718a357a19b221605cd882d9baa0c8ac688241a4cf8eeb2e75dbc26c28536579db1a5c0ae9db29fb4796b2ca1e093a8de36 +DIST yle-dl-20220610.tar.gz 69065 BLAKE2B 6b61351b23d1ea3f351a237bcf31aa9f542e15e621f88350f4758a97016631713b0a4e45c3878139e1040ab8dca671a91dff82c7f1c044de5493890ba0894d87 SHA512 87b8b5a63eb68f60a6b0de47c06ab3f6efd018767138f3da33fa51ecc4a8e56017fedfba20a190b451db3e862ce5a3abc7e9c7f485e9042e300913d47e8ed735 +EBUILD yle-dl-20220531.ebuild 1430 BLAKE2B df52215bd90baea2e5d45cb414e2b473dc6ae430d102b0e835d062c1e1d2db0c7d416fc5345b2331f78eba263e39ee34fed5b100db1945b81cbd7f24a528775d SHA512 3b2ff4856e660cb5a56a13fde396ea97644fff320e307d8a5def0149b768933e61be9d3582d868d84c20698cc06cfb5b0c5ff6ba437ece12214623c0980b027e +EBUILD yle-dl-20220610.ebuild 1430 BLAKE2B df52215bd90baea2e5d45cb414e2b473dc6ae430d102b0e835d062c1e1d2db0c7d416fc5345b2331f78eba263e39ee34fed5b100db1945b81cbd7f24a528775d SHA512 3b2ff4856e660cb5a56a13fde396ea97644fff320e307d8a5def0149b768933e61be9d3582d868d84c20698cc06cfb5b0c5ff6ba437ece12214623c0980b027e MISC metadata.xml 280 BLAKE2B 30756c19f90277ebe700cf4641848ae376453c6031a019f348f04ee8d4c30146947ec383fa4bf12b669df790417eec9285df363210138e39f611d345d127ed27 SHA512 cf301b82fada2d4ca02e1dd9ba7b5234c42b7c63f87b96d81cb06ebc7853934533b75d0fc77eff0dc39f3c0a9e2d468b6bc03ac98fcb3834da67a11b254a0b77 diff --git a/media-video/yle-dl/yle-dl-20220213.ebuild b/media-video/yle-dl/yle-dl-20220213.ebuild deleted file mode 100644 index ff4143bd16a1..000000000000 --- a/media-video/yle-dl/yle-dl-20220213.ebuild +++ /dev/null @@ -1,63 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Download media files from Yle Areena" -HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl" -SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Requires an active internet connection during tests, -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND="media-video/ffmpeg - net-misc/wget - >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] - >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/progress[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}]" -BDEPEND="test? ( - ${RDEPEND} - media-video/ffmpeg[gnutls] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" - -distutils_enable_tests setup.py - -DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample ) - -src_prepare() { - distutils-r1_src_prepare - - # https://github.com/aajanki/yle-dl/issues/297 - sed -i -e \ - "/def test_uutiset_headline_metadata():/i@pytest.mark.xfail(reason='Media file removed from Areena.')" \ - tests/integration/test_uutiset_it.py || die -} - -src_install() { - docompress -x "/usr/share/doc/${PF}/yledl.conf.sample" - distutils-r1_src_install -} - -pkg_postinst() { - elog "Sample configuration file has been installed to " - elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample" - elog - optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp -} diff --git a/media-video/yle-dl/yle-dl-20220425.ebuild b/media-video/yle-dl/yle-dl-20220425.ebuild deleted file mode 100644 index 6c229c005229..000000000000 --- a/media-video/yle-dl/yle-dl-20220425.ebuild +++ /dev/null @@ -1,54 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8..10} ) - -inherit distutils-r1 optfeature - -DESCRIPTION="Download media files from Yle Areena" -HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl" -SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Requires an active internet connection during tests, -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND="media-video/ffmpeg - net-misc/wget - >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] - >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/progress[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}]" -BDEPEND="test? ( - ${RDEPEND} - media-video/ffmpeg[gnutls] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample ) - -src_install() { - docompress -x "/usr/share/doc/${PF}/yledl.conf.sample" - distutils-r1_src_install -} - -pkg_postinst() { - elog "Sample configuration file has been installed to " - elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample" - elog - optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp -} diff --git a/media-video/yle-dl/yle-dl-20220531.ebuild b/media-video/yle-dl/yle-dl-20220531.ebuild new file mode 100644 index 000000000000..b715582199de --- /dev/null +++ b/media-video/yle-dl/yle-dl-20220531.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="Download media files from Yle Areena" +HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl" +SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Requires an active internet connection during tests, +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND="media-video/ffmpeg + net-misc/wget + >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] + >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/progress[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}]" +BDEPEND="test? ( + ${RDEPEND} + media-video/ffmpeg[gnutls] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample ) + +src_install() { + docompress -x "/usr/share/doc/${PF}/yledl.conf.sample" + distutils-r1_src_install +} + +pkg_postinst() { + elog "Sample configuration file has been installed to " + elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample" + elog + optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp +} diff --git a/media-video/yle-dl/yle-dl-20220610.ebuild b/media-video/yle-dl/yle-dl-20220610.ebuild new file mode 100644 index 000000000000..b715582199de --- /dev/null +++ b/media-video/yle-dl/yle-dl-20220610.ebuild @@ -0,0 +1,54 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..11} ) + +inherit distutils-r1 optfeature + +DESCRIPTION="Download media files from Yle Areena" +HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl" +SRC_URI="https://github.com/aajanki/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="amd64 x86" + +IUSE="test" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +# Requires an active internet connection during tests, +PROPERTIES="test_network" +RESTRICT="test" + +RDEPEND="media-video/ffmpeg + net-misc/wget + >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] + >=dev-python/configargparse-0.13.0[${PYTHON_USEDEP}] + dev-python/lxml[${PYTHON_USEDEP}] + dev-python/progress[${PYTHON_USEDEP}] + dev-python/requests[${PYTHON_USEDEP}]" +BDEPEND="test? ( + ${RDEPEND} + media-video/ffmpeg[gnutls] + dev-python/pip[${PYTHON_USEDEP}] + dev-python/pytest[${PYTHON_USEDEP}] + dev-python/wheel[${PYTHON_USEDEP}] + )" + +distutils_enable_tests pytest + +DOCS=( COPYING ChangeLog README.fi README.md yledl.conf.sample ) + +src_install() { + docompress -x "/usr/share/doc/${PF}/yledl.conf.sample" + distutils-r1_src_install +} + +pkg_postinst() { + elog "Sample configuration file has been installed to " + elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample" + elog + optfeature "youtube-dl download engine" net-misc/youtube-dl net-misc/yt-dlp +} -- cgit v1.2.3