diff options
Diffstat (limited to 'media-video')
46 files changed, 1508 insertions, 682 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 3b70c5d0d4f9..85d12cdbf376 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest index bf6630623b1d..5608c3e7fcfa 100644 --- a/media-video/atomicparsley/Manifest +++ b/media-video/atomicparsley/Manifest @@ -1,5 +1,7 @@ AUX atomicparsley-0.9.0-environment.patch 6195 BLAKE2B 86b8f11524c5f1011ea66fefc84ceb2559ce51824ef17c951640ba63c1fe59b3cc0b0f738754d0ad23ffa4cb395bf4bcae140d39f17a79a5b6b85d07a107271a SHA512 99e871d3ec76a4d6ff0c254241a9eca591786712ddce906d4f6df26a57142e28e489c4d289b4d24977cbbe2352d5e537532f82a561d57476cc63e07d2c7e2eb3 AUX atomicparsley-0.9.0-glibc-2.10.patch 1988 BLAKE2B 5f1304e85beed2697787511641a4043d989e532b3aaf0b61c9e50576a2276bae0d60757a35884bcb7dad8b322e9248d33d963d6223c8d51732366c38958ff5b3 SHA512 a139ec08b6918d1a879c97a294f6ec7cafe7c98eb81db977987ca274334347c7954a3f71d9facad72642654e79b3de742ea7ea2c5ec008b79ac89cfb6c936874 DIST AtomicParsley-source-0.9.0.zip 172616 BLAKE2B 6e2fa904cde622524ec51e3d084d89dd86c04db9942a27fae67b0d12db0542705d28e723c26db94d234f26c7249c6b8d4fd01a2bce891d2310a3a912667e1d84 SHA512 a4733893bb0d8bf824ee46d7da7f8c2ab9338ae56ea89810db1ac40282554e7e095b3e88631786b248a66aba878f166b9ac403769c66ef3ad45ac8ff7d411982 +DIST atomicparsley-0.9.6_p20210715_p151551.tar.gz 230214 BLAKE2B 986058a8e80b84f30df03f5dfc6e2019ef6949469d8554a5a06ecc75716463b3047820265fd22556f9087a64498e07e994fa2162660f440086eab276be496a9d SHA512 9f58fe7426c9728f8e5624250ff57d7707a4b040365135fa5149909d84c536ecbddaa3820dae85ca8a4c31fc8009685bf56875f1d4ff6f5c854f05a30da6974a EBUILD atomicparsley-0.9.0.ebuild 837 BLAKE2B 728dc681ca62e254a0fbd525d5ce0642226c85a9e478a554cd2ff7e78139e76ce5ab2e567198ea6e87b689eed84baaefb202fa4cb0f67de0da1ed2ac2139e2d6 SHA512 7459d82fd113b6c86f8eff3eac07815338719e24200e1dd4d8d12cf7f29d6259508710b3cd8a2967227eedac2dbf3767dd9852fec497195b4d4c62eb56daa3e0 +EBUILD atomicparsley-0.9.6_p20210715_p151551.ebuild 1010 BLAKE2B 8fe9379a1323160076104670c16079dde12d5dd90d5295e72917b7ac473cf2efdfe9a4418c2d5b1d87ed7818279b4ef4b19a6223c732d3a57f7d1dd93dd6d7e1 SHA512 4abd0fdacb6d43773cb5adee330c884ed3d7bd4f197d27bf420a8e1376ac3d58103eb18a61fb1090e23ae4c6c49236172ac505b2f48aecc85fbb8b3b6a7e8b74 MISC metadata.xml 307 BLAKE2B 3640f77bf82eb56de11af0ff0bbd29c7e4ea63b24c5aa1a53010b1fca6a85941c659fe069679b6d7fd11bce1b4a120a4e93e0b128f4c5bdd5e8574a5e8e67c99 SHA512 35d4d49d8c98be6ce817c5bff2a744fbbe3f996996946ad6f4aa0a0025ab3063bc028f397ac704cd01b449b8f652927a243b3c4418cdcc8c8ca7ee2d463fafe2 diff --git a/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild b/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild new file mode 100644 index 000000000000..c7c7cea6bd6c --- /dev/null +++ b/media-video/atomicparsley/atomicparsley-0.9.6_p20210715_p151551.ebuild @@ -0,0 +1,32 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# The fork at https://github.com/wez/atomicparsley uses unusual versioning, so +# we sadly need to hardcode the hash and update it per-release. +MY_COMMIT_HASH="e7ad03a" +MY_PV="$(ver_cut 5).$(ver_cut 7).${MY_COMMIT_HASH}" +inherit cmake flag-o-matic + +DESCRIPTION="Command line program for manipulating iTunes-style metadata in MPEG4 files" +HOMEPAGE="https://github.com/wez/atomicparsley http://atomicparsley.sourceforge.net" +SRC_URI="https://github.com/wez/atomicparsley/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}"/${PN}-${MY_PV} + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + +src_configure() { + # APar_sha1.cpp:116:47 and 117:43: warning: dereferencing type-punned + # pointer will break strict-aliasing rules + append-flags -fno-strict-aliasing + + cmake_src_configure +} + +src_test() { + ln -s "${BUILD_DIR}"/AtomicParsley || die + tests/test.sh || die +} diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest index 4f9f9709c296..1c6d1c402fc0 100644 --- a/media-video/cheese/Manifest +++ b/media-video/cheese/Manifest @@ -4,6 +4,5 @@ AUX cheese-3.38.0-vala-genericarray.patch 6731 BLAKE2B 83f283e629106eba1174197f4 DIST cheese-3.38.0.tar.xz 1086428 BLAKE2B b26a19a019de0385bdd7adbc55c873ebceca90a8f477d2041ef4a5045654f46ee8f7fdfc64f5fd34e059116528cc790610353791a7cbd13d7927a8c3abf38132 SHA512 210b50fc79a7b3a72c94163fe0dd76f7f29f576c1085c671c2c6c3b7f59ee362aec288f885a590ebfd9530534b6a6bad569c6df57874b9fcecf7e9f1ba9531ae DIST cheese-41.1.tar.xz 1092912 BLAKE2B 9bbfbc59868f39b344b1102f819ca647d82e9dee327f1d2a2e6b30fcfd2c59dd5f79236355d7148e01a4b07d80d630406708d2a152535b5732cfb52690f9f402 SHA512 2c0922dda97f4ce701add45977b405eff9ddbc24eb286e9e05a9f9bfbd7998e8e77ef2a8f1bbce9f8349ff522ee3cb6d6566fa5df80d782e6d844bff69a30074 EBUILD cheese-3.38.0-r1.ebuild 2328 BLAKE2B 692671c66e723ef87f83efd05db51d0f3e595170892bf17b8b437458acd0b337610a2a395548b1da96c17c863b5a34c537f4f490b64f1ad43f96eb0f2521dbac SHA512 d54cb3648889ba2a88d889c38704b1e2fc070b1341d411e2e97375a97f621234de74d4585009b20c46989216ae00b70ee6c1e1fcf1bc197b600a42152e4f7339 -EBUILD cheese-3.38.0.ebuild 2120 BLAKE2B c28699d5912d6bcf91c9c95b02f00bb1e2c5c88964b67dd46681549eccc0570fe1cd55a3d21bacf5b557ba0bb4c4cd9ac1e4ecea4d13cd067577bca19abda7fa SHA512 5af98575aafab5be072e221cc54d4f317cca56fd1bb60a17c80b5811760d2f63c4140ffeecaa350677491737c2bc4bd66ffc2ca7d7d6be835b978246aad62b4b EBUILD cheese-41.1.ebuild 2274 BLAKE2B 71ba3eb63b7fcb3b946bfa019934e5f2c1938cb8dc2f5b1b42b79ffd415206c6c70d1b40cadc364c6145f79cb7477ffc223a8a21728e382d5ad024605bc1dcc5 SHA512 793812e8f393525b57e2196036c9992100bb98fc4a67286d7b19e3195590e024819d1cea4259dd392a7dde7500e51bc4c5e610f11f42ddd9a0324b7666e0f0be MISC metadata.xml 429 BLAKE2B 7874cf680a041c34e7c5f29b164552d311d333853050e5486aa0f8bdae3fce50316cd00038ba8cbbd102912cdb0c8c7fd5d6370af0004c8977e053eb89be9687 SHA512 ea2a94d4981bc40d13235bfa9a544855cdeb638e46293c84bfaf14f13dc255651c0eb01752b5987b42e285765ed2dbd65dbd58eb23c730e4cbd7fc31e0003fc8 diff --git a/media-video/cheese/cheese-3.38.0.ebuild b/media-video/cheese/cheese-3.38.0.ebuild deleted file mode 100644 index 1044f8b7f629..000000000000 --- a/media-video/cheese/cheese-3.38.0.ebuild +++ /dev/null @@ -1,96 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -VALA_MAX_API_VERSION="0.50" - -inherit gnome.org gnome2-utils meson vala virtualx xdg - -DESCRIPTION="A cheesy program to take pictures and videos from your webcam" -HOMEPAGE="https://wiki.gnome.org/Apps/Cheese" - -LICENSE="GPL-2+" -SLOT="0/8" # subslot = libcheese soname version -KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86" -IUSE="gtk-doc +introspection test" -RESTRICT="!test? ( test )" - -DEPEND=" - >=media-libs/clutter-1.13.2:1.0[introspection?] - media-libs/clutter-gst:3.0 - >=media-libs/clutter-gtk-0.91.8:1.0 - x11-libs/gdk-pixbuf:2[jpeg,introspection?] - >=dev-libs/glib-2.39.90:2 - >=gnome-base/gnome-desktop-2.91.6:3= - >=media-libs/gstreamer-1.4:1.0[introspection?] - >=media-libs/gst-plugins-base-1.4:1.0[ogg,pango,theora,vorbis] - >=media-libs/gst-plugins-bad-1.4:1.0 - >=x11-libs/gtk+-3.13.4:3 - >=media-libs/libcanberra-0.26[gtk3] - x11-libs/libX11 - sys-apps/dbus - media-video/gnome-video-effects - introspection? ( >=dev-libs/gobject-introspection-1.56:= ) - - media-libs/cogl:1.0=[introspection?] - -" -RDEPEND="${DEPEND} - >=media-libs/gst-plugins-good-1.4:1.0 - - >=media-plugins/gst-plugins-jpeg-1.4:1.0 - >=media-plugins/gst-plugins-v4l2-1.4:1.0 - >=media-plugins/gst-plugins-vpx-1.4:1.0 -" - -BDEPEND=" - gtk-doc? ( dev-util/gtk-doc ) - dev-libs/libxslt - app-text/docbook-xml-dtd:4.3 - dev-util/itstool - dev-libs/appstream-glib - dev-libs/libxml2:2 - dev-util/glib-utils - >=sys-devel/gettext-0.19.8 - virtual/pkgconfig - x11-base/xorg-proto - test? ( x11-libs/libXtst ) - $(vala_depend) -" - -PATCHES=( - "${FILESDIR}"/${P}-buildfix.patch -) - -src_prepare() { - xdg_src_prepare - vala_src_prepare -} - -src_configure() { - local emesonargs=( - $(meson_use gtk-doc gtk_doc) - $(meson_use introspection) - $(meson_use test tests) - -Dman=true - ) - - meson_src_configure - - # Hack: version.xml is not generated if gtk-doc is not enabled - echo ${PV} > docs/reference/version.xml -} - -src_test() { - virtx meson_src_test -} - -pkg_postinst() { - xdg_pkg_postinst - gnome2_schemas_update -} - -pkg_postrm() { - xdg_pkg_postrm - gnome2_schemas_update -} diff --git a/media-video/devedeng/Manifest b/media-video/devedeng/Manifest index 107d55bbb09c..979eb1aaf7f7 100644 --- a/media-video/devedeng/Manifest +++ b/media-video/devedeng/Manifest @@ -1,4 +1,5 @@ AUX devedeng-4.14.0-no_compress_man.patch 878 BLAKE2B f3460e0b28e1a1a80c3f9c1c41e26e608f203e4f9fa59ed93ff837e430ad14231b7375efaf14886fba16ac4f1a1f7247f03a43775441579c364ab91e6b830515 SHA512 d669cd0f55215e90f622acb1ec1895e25b29850ecb1ec5ebe2c5cbf9283f63f8448d064a5938cef250c748feeee0c0da25cdd5370f85d9a61b89532b2e5915cb DIST devedeng-4.16.0.tar.bz2 1763318 BLAKE2B ab3e5b3a94ed8f1dfe0482218786a8ab131c16259635c1297c7fb01a0eb7f7106d53ff24665e056f18796d87cf0430d375278e1c074026b134be9308aa8a3f3f SHA512 032c276eeecc3d85b53bf72ee2a3132aac41c2496cabfd1e30cbee7316f1ce3136c8b476bf03bb88930a532a06f6fad7a098d91f0b9a85e4ecabf9f728783f8a EBUILD devedeng-4.16.0-r1.ebuild 1153 BLAKE2B 642e2162657eaf4d1066be8ce862c4739a698cc79e8b21e936634e3a413b2d81e7c6df351b4c2c4924ea68bcfbb8bd7b13e1de1e06e4075d03d62945be859de7 SHA512 d26caea8136a97ba0a670d86948958f413bb784d9a82cfff0879e25943024bfbb978eebbd10463b3c0ae4f0682848c0609caeed4eafb739049520922e41c02a7 +EBUILD devedeng-4.16.0-r2.ebuild 1257 BLAKE2B 6a4aceffb5a7e791be86aafac80ff443d69420ecd67cae0960ebe6f5f2a1007a0ce0108c423de42da577b25d07ded56191cc41f05d83b7fcd3cd3546e59ce267 SHA512 ccaf932c304b283ecf72c70fb514223e482c0dfc343f1c7525cbd905f1050d699c8e894f55a8a8ecc829ea7787b5c4849a4e9bbebde85d9e72aa7c24389c5c75 MISC metadata.xml 944 BLAKE2B 1dd92770403fc8ea2d4b6032341a0b7591d4f01e067c4d3196895da9c5a294db79961a5451673e03f4cfa6f647a8d35f74e95cb3255a52f3b95771195e826196 SHA512 140cc1c7ef35dfac691fffafec4f72d5badd0eaf074ec95aa7924401ce76fd511f4fd0309606d9d420e5a277b9210680ec83c783d736fc28a702bd2b557a8f2f diff --git a/media-video/devedeng/devedeng-4.16.0-r2.ebuild b/media-video/devedeng/devedeng-4.16.0-r2.ebuild new file mode 100644 index 000000000000..bca23b638370 --- /dev/null +++ b/media-video/devedeng/devedeng-4.16.0-r2.ebuild @@ -0,0 +1,53 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DISTUTILS_USE_SETUPTOOLS=no +PYTHON_COMPAT=( python3_{8..10} ) + +inherit distutils-r1 xdg + +DESCRIPTION="DevedeNG is a program to create video DVDs and CDs (VCD, sVCD or CVD)" +HOMEPAGE="https://www.rastersoft.com/programas/devede.html" +SRC_URI="https://gitlab.com/rastersoft/${PN}/-/archive/${PV}/${P}.tar.bz2" + +LICENSE="GPL-3" +SLOT="0" +KEYWORDS="~amd64 ~x86" + +RDEPEND=" + app-cdr/cdrtools + dev-python/pycairo[${PYTHON_USEDEP}] + dev-python/pygobject:3[${PYTHON_USEDEP}] + x11-libs/gtk+:3 + || ( media-video/vlc media-video/mpv media-video/mplayer ) + media-video/ffmpeg + media-video/dvdauthor + media-video/vcdimager + || ( app-cdr/brasero kde-apps/k3b app-cdr/xfburn )" + +DEPEND="${PYTHON_DEPS}" + +PATCHES=( "${FILESDIR}"/${PN}-4.14.0-no_compress_man.patch ) + +distutils_enable_tests unittest + +src_prepare() { + default + + # Documentation path + sed -e "s#/usr/share/doc/devedeng#/usr/share/doc/${P}#" \ + -i src/devedeng/configuration_data.py || die + sed -e "/'doc'/s/devedeng/${P}/" -i setup.py || die + + # Desktop icon + sed -e "/^Icon/s/.svg$//#" -i data/devede_ng.py.desktop || die +} + +python_test() { + pushd src/unitests || die + eunittest + popd || die + +} diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index 9e65d2a87319..a05010a8068e 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -9,10 +9,12 @@ DIST ffmpeg-4.3.1.tar.bz2 11301038 BLAKE2B 3b0eb332459921435b60e72f5c572034abf65 DIST ffmpeg-4.3.2.tar.bz2 11307134 BLAKE2B 97e1e598e4abe397b06298d545c3073ea2303e11c01e98343fe09d99174e02ca94f52c4df0d389fbefe7814686221446d30f107092f00cb0b69275c8747d6f32 SHA512 ec5566f8684f0ceb18184d59786ea1fc166ab28c46260ebcca5b919ad53137ba7317fd0c537e97df28553572a0d5e42c558773c808cf76995d67985aec2d6d4d DIST ffmpeg-4.4.1.tar.bz2 11494996 BLAKE2B 050b0501cb21f44451d59bf3b20b18d55234636b5a69a4962103d63f80ce9af172cc2cecb1e33b92334fcf635b283afddbdfa20cbd6deb526008cdb34ae01c16 SHA512 c41e63ffa9f5465ea3a7f4a8b255b299a2f49d5868ada4310a2344b8fea02476365c44871defd5609da55c805cbb58f34063dbdd4b203ade932cba8b3cfefc72 DIST ffmpeg-4.4.tar.bz2 11489948 BLAKE2B a8dc007e260896228789d27339402e846cd21758e02c7a8d66a745ced2d1bbef4aa9c18c9b7cefef004b5ffa3fc859e2a2474c957bdf9ff27e82cec72ed4a5bf SHA512 212c330f477e9452b9d7873d6d3c452a5c946b6b9c17b01d94c60fda66e61e53b78388ef7686b8d9415a27cd3e05d5f0d6639a02a22467dbf1ed483b5594c80f +DIST ffmpeg-5.0.tar.bz2 11821587 BLAKE2B 76abc243707712b7974552cfbd703b5059487ac05b76744dcaacab45924598bffe173b41354a41718a7b5bd0933e71e95a11f9e715b9127b49cc19a88124a3d6 SHA512 2e7f05d3218201869602a32fc473ae55f9b8bc22d2710ebe7523953c27d39cf459e91e34d3b940d8ffe90677b028cea04c5b189775b1718a83b2b73943ba3f61 EBUILD ffmpeg-4.2.4-r1.ebuild 17692 BLAKE2B 9654b34fbc80bf66dd03a8bb42a4aa2756475d4ca28ca9a731edb7b4bdffff675d7e707b5cba41260d76a7de2f7c580e7a450751cbc6aaf6ff0e3e9395583785 SHA512 cf4d863cbab82eb754de7820a5601d2682ded18e95ad620635067b803d6df12e12c5102c433b5367713af07cc4b6cfe94482b08852dd30c748ef396ab828389a EBUILD ffmpeg-4.3.1-r1.ebuild 17796 BLAKE2B 501db0e6e695fb6c92125d2fcaf1253b6cfb1b1de1c5c8e206693562ad82e6c3512aced041b08b05084cff7d201180cb941c69f372851e0b86d2a37aaad2bfab SHA512 a6ef98fdce4c6fc41bb82ea5fbc22e0f4ecaa34be21b78725b52a0aef37c92a99d03bb11505a3704d0c2526648d1f1525a9ff90942aae8bc7e3c56e3b1bb542b EBUILD ffmpeg-4.3.2-r1.ebuild 17779 BLAKE2B 05bff39a27b13816694c986c804688c41c9f30330bd7f059e18e0a0e7d723ea5280635107569cf8ba8e6197c462f243cf3e570bde495faba6299294abdfb5bdd SHA512 dad26631f5af6b5976728c2e882283c20ca24d5b64c27baccafcb960b0bd4d2327e25429bb807900ac731f2c7232df0459bb567cf7f42c175ed688d3adb6f372 EBUILD ffmpeg-4.4-r1.ebuild 17847 BLAKE2B 4342e8ccc15388a2456f45a166f22449956755b718a769c757de73e897504b8cad1cd011f2e7265b5ea9ae14c72728e917bfcae98dc7155a9f5e3d9636b5356e SHA512 9a0dd4cb24d7955de560acd3e15285b7e1c72a86e0701137e233163b45e85757eefab20c3d372428a019f0d781ff6d24484750ba7c36e1429f7d2e76bb4889e5 EBUILD ffmpeg-4.4.1-r1.ebuild 17968 BLAKE2B 8d08046835a635d0b86e6bc2c337d96e1a1aab43dfee7fd6a9f7c3a5f5e81df74633994e9a1a935c7651dc3886adad27c3739f4c02b8f055298eb81cc2f4bbaf SHA512 3d290d855935ce01573c52e0fe7f6af790cdac5ecdd746e4c068f0f59c37f5d3a5a12c4d5b5321a9e9ad31577d8b0f5b52bedd00df64827b39202a6ac07dd4f5 -EBUILD ffmpeg-9999.ebuild 17926 BLAKE2B 50fc3d229c161a3be3ffacfd8556f091aebda173d07fa1f428bc91173c287c07c7a7d6fa73f549bb4c8111a9def2d3e31c6f1ee39e2c881922f902740c23f68c SHA512 0915a7272bddb986678b76a6e41fd2a570dde154da1538449441b352e37fcd0698ac2002426259e94dde7161f93ea579999062839e72c6cac402fd9c640cb2cb +EBUILD ffmpeg-5.0.ebuild 17995 BLAKE2B 4bd1e4a798418575f0cc513690d2aea28b059bda02353a8127117ca24a4f9f916e5aaf12e3dbdd5aa3a3d75b8e97c3aea08e41f59ecd877358bf9f55842c1342 SHA512 dfc649ce3c587809cc59422f468be6595bd73d1a0e273de336a9bf075b6c526ee55d71138e8ca04d0f26e8f989f627cb9d19eec2e45a8fd4abd0788940c292ff +EBUILD ffmpeg-9999.ebuild 17995 BLAKE2B 4bd1e4a798418575f0cc513690d2aea28b059bda02353a8127117ca24a4f9f916e5aaf12e3dbdd5aa3a3d75b8e97c3aea08e41f59ecd877358bf9f55842c1342 SHA512 dfc649ce3c587809cc59422f468be6595bd73d1a0e273de336a9bf075b6c526ee55d71138e8ca04d0f26e8f989f627cb9d19eec2e45a8fd4abd0788940c292ff MISC metadata.xml 6049 BLAKE2B 77d1c140a727f7502524b496badb024052581862093b141d743673c96f59a600cfc10796ef8af249dd1b66350a71ae7681232d13a4599c8f2c50995ddc57d9d7 SHA512 edee49b0166843a4a1f79e8c2ba413182498a7aa703715fc5de6babe2b74417fc27ae506221175047a604b57308d5a9862dc4e832a631f4891499e09f0e181ff diff --git a/media-video/ffmpeg/ffmpeg-5.0.ebuild b/media-video/ffmpeg/ffmpeg-5.0.ebuild new file mode 100644 index 000000000000..a6be1e984dff --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-5.0.ebuild @@ -0,0 +1,560 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +# Subslot: libavutil major.libavcodec major.libavformat major +# Since FFmpeg ships several libraries, subslot is kind of limited here. +# Most consumers will use those three libraries, if a "less used" library +# changes its soname, consumers will have to be rebuilt the old way +# (preserve-libs). +# If, for example, a package does not link to libavformat and only libavformat +# changes its ABI then this package will be rebuilt needlessly. Hence, such a +# package is free _not_ to := depend on FFmpeg but I would strongly encourage +# doing so since such a case is unlikely. +FFMPEG_SUBSLOT=57.59.59 + +SCM="" +if [ "${PV#9999}" != "${PV}" ] ; then + SCM="git-r3" + EGIT_MIN_CLONE_TYPE="single" + EGIT_REPO_URI="https://git.ffmpeg.org/ffmpeg.git" +fi + +inherit flag-o-matic multilib multilib-minimal toolchain-funcs ${SCM} + +DESCRIPTION="Complete solution to record/convert/stream audio and video. Includes libavcodec" +HOMEPAGE="https://ffmpeg.org/" +if [ "${PV#9999}" != "${PV}" ] ; then + SRC_URI="" +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI="mirror://gentoo/${P}.tar.bz2" +else # Release + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.bz2" +fi +FFMPEG_REVISION="${PV#*_p}" + +SLOT="0/${FFMPEG_SUBSLOT}" +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) + amr? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + gmp? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + libaribb24? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + encode? ( + amrenc? ( + gpl? ( GPL-3 ) + !gpl? ( LGPL-3 ) + ) + ) + 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" +fi + +# 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=( + +bzip2:bzlib cpudetection:runtime-cpudetect debug gcrypt +gnutls gmp + +gpl hardcoded-tables +iconv libxml2 lzma +network opencl + openssl +postproc samba:libsmbclient sdl:ffplay sdl:sdl2 vaapi vdpau vulkan + X:xlib X:libxcb X:libxcb-shm X:libxcb-xfixes +zlib + # libavdevice options + cdio:libcdio iec61883:libiec61883 ieee1394:libdc1394 libcaca openal + opengl + # indevs + libv4l:libv4l2 pulseaudio:libpulse libdrm jack:libjack + # decoders + amr:libopencore-amrwb amr:libopencore-amrnb codec2:libcodec2 +dav1d:libdav1d fdk:libfdk-aac + jpeg2k:libopenjpeg bluray:libbluray gme:libgme gsm:libgsm + libaribb24 mmal modplug:libmodplug opus:libopus libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg video_cards_nvidia:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r + fribidi:libfribidi fontconfig ladspa libass libtesseract lv2 truetype:libfreetype vidstab:libvidstab + rubberband:librubberband zeromq:libzmq zimg:libzimg + # libswresample options + libsoxr + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +# Same as above but for encoders, i.e. they do something only with USE=encode. +FFMPEG_ENCODER_FLAG_MAP=( + amrenc:libvo-amrwbenc mp3:libmp3lame + kvazaar:libkvazaar libaom + openh264:libopenh264 rav1e:librav1e snappy:libsnappy svt-av1:libsvtav1 theora:libtheora twolame:libtwolame + webp:libwebp x264:libx264 x265:libx265 xvid:libxvid +) + +IUSE=" + alsa chromium doc +encode oss pic sndio static-libs test v4l + ${FFMPEG_FLAG_MAP[@]%:*} + ${FFMPEG_ENCODER_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 ) +" +MIPS_CPU_FEATURES=( mipsdspr1:mipsdsp mipsdspr2 mipsfpu ) +PPC_CPU_FEATURES=( cpu_flags_ppc_altivec:altivec cpu_flags_ppc_vsx:vsx cpu_flags_ppc_vsx2:power8 ) +PPC_CPU_REQUIRED_USE=" + cpu_flags_ppc_vsx? ( cpu_flags_ppc_altivec ) + cpu_flags_ppc_vsx2? ( cpu_flags_ppc_vsx ) +" +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[@]} + ${MIPS_CPU_FEATURES[@]} + ${PPC_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${PPC_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +FFTOOLS=( aviocat cws2fws ffescape ffeval ffhash fourcc2pixfmt graph2dot ismindex pktdumper qt-faststart sidxindex trasher ) +IUSE="${IUSE} ${FFTOOLS[@]/#/+fftools_}" + +RDEPEND=" + alsa? ( >=media-libs/alsa-lib-1.0.27.2[${MULTILIB_USEDEP}] ) + amr? ( >=media-libs/opencore-amr-0.1.3-r1[${MULTILIB_USEDEP}] ) + bluray? ( >=media-libs/libbluray-0.3.0-r1:=[${MULTILIB_USEDEP}] ) + bs2b? ( >=media-libs/libbs2b-3.1.0-r1[${MULTILIB_USEDEP}] ) + bzip2? ( >=app-arch/bzip2-1.0.6-r4[${MULTILIB_USEDEP}] ) + cdio? ( >=dev-libs/libcdio-paranoia-0.90_p1-r1[${MULTILIB_USEDEP}] ) + chromaprint? ( >=media-libs/chromaprint-1.2-r1[${MULTILIB_USEDEP}] ) + codec2? ( media-libs/codec2[${MULTILIB_USEDEP}] ) + dav1d? ( >=media-libs/dav1d-0.4.0:0=[${MULTILIB_USEDEP}] ) + encode? ( + amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + kvazaar? ( >=media-libs/kvazaar-1.2.0[${MULTILIB_USEDEP}] ) + mp3? ( >=media-sound/lame-3.99.5-r1[${MULTILIB_USEDEP}] ) + openh264? ( >=media-libs/openh264-1.4.0-r1:=[${MULTILIB_USEDEP}] ) + rav1e? ( >=media-video/rav1e-0.4:=[capi] ) + snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) + theora? ( + >=media-libs/libtheora-1.1.1[encode,${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + twolame? ( >=media-sound/twolame-0.3.13-r1[${MULTILIB_USEDEP}] ) + webp? ( >=media-libs/libwebp-0.3.0:=[${MULTILIB_USEDEP}] ) + x264? ( >=media-libs/x264-0.0.20130506:=[${MULTILIB_USEDEP}] ) + x265? ( >=media-libs/x265-1.6:=[${MULTILIB_USEDEP}] ) + xvid? ( >=media-libs/xvid-1.3.2-r1[${MULTILIB_USEDEP}] ) + ) + fdk? ( >=media-libs/fdk-aac-0.1.3:=[${MULTILIB_USEDEP}] ) + flite? ( >=app-accessibility/flite-1.4-r4[${MULTILIB_USEDEP}] ) + fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] ) + frei0r? ( media-plugins/frei0r-plugins[${MULTILIB_USEDEP}] ) + fribidi? ( >=dev-libs/fribidi-0.19.6[${MULTILIB_USEDEP}] ) + gcrypt? ( >=dev-libs/libgcrypt-1.6:0=[${MULTILIB_USEDEP}] ) + gme? ( >=media-libs/game-music-emu-0.6.0[${MULTILIB_USEDEP}] ) + gmp? ( >=dev-libs/gmp-6:0=[${MULTILIB_USEDEP}] ) + gsm? ( >=media-sound/gsm-1.0.13-r1[${MULTILIB_USEDEP}] ) + iconv? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] ) + iec61883? ( + >=media-libs/libiec61883-1.2.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + >=sys-libs/libavc1394-0.5.4-r1[${MULTILIB_USEDEP}] + ) + ieee1394? ( + >=media-libs/libdc1394-2.2.1:2=[${MULTILIB_USEDEP}] + >=sys-libs/libraw1394-2.1.0-r1[${MULTILIB_USEDEP}] + ) + jack? ( virtual/jack[${MULTILIB_USEDEP}] ) + jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) + libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) + libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) + libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] ) + libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) + libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) + libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) + librtmp? ( >=media-video/rtmpdump-2.4_p20131018[${MULTILIB_USEDEP}] ) + libsoxr? ( >=media-libs/soxr-0.1.0[${MULTILIB_USEDEP}] ) + libtesseract? ( >=app-text/tesseract-4.1.0-r1[${MULTILIB_USEDEP}] ) + libv4l? ( >=media-libs/libv4l-0.9.5[${MULTILIB_USEDEP}] ) + libxml2? ( dev-libs/libxml2:=[${MULTILIB_USEDEP}] ) + lv2? ( media-libs/lv2[${MULTILIB_USEDEP}] media-libs/lilv[${MULTILIB_USEDEP}] ) + lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] ) + mmal? ( media-libs/raspberrypi-userland ) + modplug? ( >=media-libs/libmodplug-0.8.8.4-r1[${MULTILIB_USEDEP}] ) + openal? ( >=media-libs/openal-1.15.1[${MULTILIB_USEDEP}] ) + opencl? ( virtual/opencl[${MULTILIB_USEDEP}] ) + opengl? ( >=virtual/opengl-7.0-r1[${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( >=media-sound/pulseaudio-2.1-r1[${MULTILIB_USEDEP}] ) + rubberband? ( >=media-libs/rubberband-1.8.1-r1[${MULTILIB_USEDEP}] ) + samba? ( >=net-fs/samba-3.6.23-r1[client,${MULTILIB_USEDEP}] ) + sdl? ( media-libs/libsdl2[sound,video,${MULTILIB_USEDEP}] ) + sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + speex? ( >=media-libs/speex-1.2_rc1-r1[${MULTILIB_USEDEP}] ) + srt? ( >=net-libs/srt-1.3.0:=[${MULTILIB_USEDEP}] ) + ssh? ( >=net-libs/libssh-0.5.5[${MULTILIB_USEDEP}] ) + svg? ( + gnome-base/librsvg:2=[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + ) + svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=x11-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) + video_cards_nvidia? ( >=media-libs/nv-codec-headers-9.1.23.1[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vorbis? ( + >=media-libs/libvorbis-1.3.3-r1[${MULTILIB_USEDEP}] + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + ) + vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] ) + X? ( + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] + >=x11-libs/libXv-1.0.10[${MULTILIB_USEDEP}] + >=x11-libs/libxcb-1.4:=[${MULTILIB_USEDEP}] + ) + zeromq? ( >=net-libs/zeromq-4.1.6 ) + zimg? ( >=media-libs/zimg-2.7.4:=[${MULTILIB_USEDEP}] ) + zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] ) + zvbi? ( >=media-libs/zvbi-0.2.35[${MULTILIB_USEDEP}] ) + postproc? ( !media-libs/libpostproc ) +" + +RDEPEND="${RDEPEND} + openssl? ( >=dev-libs/openssl-1.0.1h-r2:0=[${MULTILIB_USEDEP}] ) + !openssl? ( gnutls? ( >=net-libs/gnutls-2.12.23-r6:=[${MULTILIB_USEDEP}] ) ) +" + +DEPEND="${RDEPEND} + ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) + v4l? ( sys-kernel/linux-headers ) +" +BDEPEND=" + >=sys-devel/make-3.81 + virtual/pkgconfig + 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 ) + test? ( net-misc/wget sys-devel/bc ) +" + +# Code requiring FFmpeg to be built under gpl license +GPL_REQUIRED_USE=" + postproc? ( gpl ) + frei0r? ( gpl ) + cdio? ( gpl ) + rubberband? ( gpl ) + vidstab? ( gpl ) + samba? ( gpl ) + encode? ( + x264? ( gpl ) + x265? ( gpl ) + xvid? ( gpl ) + ) +" +REQUIRED_USE=" + cuda? ( video_cards_nvidia ) + libv4l? ( v4l ) + fftools_cws2fws? ( zlib ) + test? ( encode ) + ${GPL_REQUIRED_USE} + ${CPU_REQUIRED_USE}" +RESTRICT=" + !test? ( test ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) +" + +S=${WORKDIR}/${P/_/-} + +PATCHES=( + "${FILESDIR}"/chromium-r1.patch +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libavutil/avconfig.h +) + +build_separate_libffmpeg() { + use opencl +} + +src_prepare() { + if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot + export revision=git-N-${FFMPEG_REVISION} + fi + default + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die +} + +multilib_src_configure() { + local myconf=( ) + + local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) + use openssl && myconf+=( --enable-nonfree ) + use samba && myconf+=( --enable-version3 ) + + # Encoders + if use encode ; then + ffuse+=( "${FFMPEG_ENCODER_FLAG_MAP[@]}" ) + + # Licensing. + if use amrenc ; then + myconf+=( --enable-version3 ) + fi + else + myconf+=( --disable-encoders ) + fi + + # Indevs + use v4l || myconf+=( --disable-indev=v4l2 --disable-outdev=v4l2 ) + for i in alsa oss jack sndio ; do + use ${i} || myconf+=( --disable-indev=${i} ) + done + + # Outdevs + for i in alsa oss sndio ; do + use ${i} || myconf+=( --disable-outdev=${i} ) + done + + # Decoders + use amr && myconf+=( --enable-version3 ) + use gmp && myconf+=( --enable-version3 ) + use libaribb24 && myconf+=( --enable-version3 ) + use fdk && use gpl && myconf+=( --enable-nonfree ) + + for i in "${ffuse[@]#+}" ; do + myconf+=( $(use_enable ${i%:*} ${i#*:}) ) + done + + if use openssl ; then + myconf+=( --disable-gnutls ) + has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 ) + fi + + # (temporarily) disable non-multilib deps + if ! multilib_is_native_abi; then + for i in librav1e libzmq ; do + myconf+=( --disable-${i} ) + done + fi + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + if use pic ; then + myconf+=( --enable-pic ) + # disable asm code if PIC is required + # as the provided asm decidedly is not PIC for x86. + [[ ${ABI} == x86 ]] && myconf+=( --disable-asm ) + fi + [[ ${ABI} == x32 ]] && myconf+=( --disable-asm ) #427004 + + # 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=( + --enable-avfilter + --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 + + # doc + myconf+=( + $(multilib_native_use_enable doc) + $(multilib_native_use_enable doc htmlpages) + $(multilib_native_enable manpages) + ) + + 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)" \ + --docdir="${EPREFIX}/usr/share/doc/${PF}/html" \ + --mandir="${EPREFIX}/usr/share/man" \ + --enable-shared \ + --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}" \ + $(use_enable static-libs static) \ + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} + echo "${@}" + "${@}" || die + + if multilib_is_native_abi && use chromium && build_separate_libffmpeg; then + einfo "Configuring for Chromium" + mkdir -p ../chromium || die + pushd ../chromium >/dev/null || die + set -- "${@}" \ + --disable-shared \ + --enable-static \ + --enable-pic \ + --disable-opencl + echo "${@}" + "${@}" || die + popd >/dev/null || die + fi +} + +multilib_src_compile() { + emake V=1 + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + emake V=1 tools/${i}$(get_exeext) + fi + done + + if use chromium; then + if build_separate_libffmpeg; then + einfo "Compiling for Chromium" + pushd ../chromium >/dev/null || die + emake V=1 libffmpeg + popd >/dev/null || die + else + emake V=1 libffmpeg + fi + fi + fi +} + +multilib_src_test() { + LD_LIBRARY_PATH="${BUILD_DIR}/libpostproc:${BUILD_DIR}/libswscale:${BUILD_DIR}/libswresample:${BUILD_DIR}/libavcodec:${BUILD_DIR}/libavdevice:${BUILD_DIR}/libavfilter:${BUILD_DIR}/libavformat:${BUILD_DIR}/libavutil" \ + emake V=1 fate +} + +multilib_src_install() { + emake V=1 DESTDIR="${D}" install install-doc + + if multilib_is_native_abi; then + for i in "${FFTOOLS[@]}" ; do + if use fftools_${i} ; then + dobin tools/${i}$(get_exeext) + fi + done + + if use chromium; then + if build_separate_libffmpeg; then + einfo "Installing for Chromium" + pushd ../chromium >/dev/null || die + emake V=1 DESTDIR="${D}" install-libffmpeg + popd >/dev/null || die + else + emake V=1 DESTDIR="${D}" install-libffmpeg + + # When not built separately, libffmpeg has no code of + # its own so this QA check raises a false positive. + QA_FLAGS_IGNORED+=" usr/$(get_libdir)/chromium/.*" + fi + fi + fi +} + +multilib_src_install_all() { + dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges + [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" +} diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 4a5d570d6c24..a6be1e984dff 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -220,7 +220,7 @@ RDEPEND=" jpeg2k? ( >=media-libs/openjpeg-2:2[${MULTILIB_USEDEP}] ) libaom? ( >=media-libs/libaom-1.0.0-r1:=[${MULTILIB_USEDEP}] ) libaribb24? ( >=media-libs/aribb24-1.0.3-r2[${MULTILIB_USEDEP}] ) - libass? ( >=media-libs/libass-0.10.2:=[${MULTILIB_USEDEP}] ) + libass? ( >=media-libs/libass-0.11.0:=[${MULTILIB_USEDEP}] ) libcaca? ( >=media-libs/libcaca-0.99_beta18-r1[${MULTILIB_USEDEP}] ) libdrm? ( x11-libs/libdrm[${MULTILIB_USEDEP}] ) libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) @@ -260,7 +260,7 @@ RDEPEND=" >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] ) vpx? ( >=media-libs/libvpx-1.4.0:=[${MULTILIB_USEDEP}] ) - vulkan? ( >=media-libs/vulkan-loader-1.1.97:=[${MULTILIB_USEDEP}] ) + vulkan? ( >=media-libs/vulkan-loader-1.2.189:=[${MULTILIB_USEDEP}] ) X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] >=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}] @@ -382,6 +382,7 @@ multilib_src_configure() { if use openssl ; then myconf+=( --disable-gnutls ) + has_version dev-libs/openssl:0/3 && myconf+=( --enable-version3 ) fi # (temporarily) disable non-multilib deps diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index 0cd677989578..d6a835567d63 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -2,12 +2,13 @@ AUX handbrake-1.3.0-dont-search-for-python.patch 691 BLAKE2B 623654494bf61cedb53 AUX handbrake-1.3.3-libhb-fix-audio-encoders-when-linking-to-FFmpeg-4.4.patch 1016 BLAKE2B ffe0a1dc7d693352010eeeafbc61c9d4df43f148ae2a67449c252d71dfc888589161aa88938ee333d9f082aed6873a2d8f2461c0da14d1af388e311a3f8f6058 SHA512 d6237cf24e97a80a6f407209199af281f31f3b2745051db270f9ff2e887a5da98323c6c48be5d7aa3e59a5da17f2691e503b00137c670a6569baed67d8bd39a0 AUX handbrake-1.3.3-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6e884637c8dc9a900774db9db07d1c0686a1b5c2db9276ca1c14612615e3974a7f9b05cb48c23f8f30ed0851238b92c32 SHA512 a74a2d20972a01b89dbfd7b81c070608d57e646de2ce63d9ae2d2e1486d31ca63e96d5ec803052b52e68bee157d5a1882914e0009ae480d1f8192031d79852eb +AUX handbrake-1.5.1-ffmpeg-5.0.patch 1338 BLAKE2B b4cd48ac769858779b8870eef7b7a4f66d67cce42d2c3e5c4cbbe7012c9f3f5622eae5b708f88300108539e683218292f395e0d6e32702e5ea3f2039556f9204 SHA512 cec727b44485847f20abb25d2ec6a8d1f59165c984a118f60803bdd70fd42b1b8209b76fe097961a4197e939720443979d5ba92df0857d195d918cd38ba2b733 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0 AUX handbrake-9999-remove-faac-dependency.patch 4037 BLAKE2B fa3d059198f79334d2b4e8109fd5d39d9f02ded8e46c287009bb8486d9c968b5387813f894fb78ccdd584e4f72fbcc4ee42cd00fc834933f90601c7fb08d0737 SHA512 155b8f5585a66167ae39d568d4c12227ffb7cf327707b556ed28532e6f8adce1a81601ae35403e14d6850e3c9411b1b9142c90dc2af50be1083abe21fa3d68f7 AUX handbrake-9999-system-tools.patch 1489 BLAKE2B 2a3286dc1cd37d85e1edb1312688a354f000d560a767dc4c4fc23b7874bec46692f21a5b7e2c2b6cc7b6efb221a00084355659ee9d9965a28a23c7012adfbd3d SHA512 eb07b8e675cf6a8b4eee1d0fcb682ae7d61c9ec8423202b6c8672fc94f6b011b1e01a5e9654b2e63d15b66c122e8c2c57b385e36a43d3c68fba69bf144beb508 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 4073 BLAKE2B 67d8825b04fe1ee55254e5b602a8f8c9c1e7c4818eaa9ffd90729ae9f2b9897af50dc30c093c64d85b3cc7470dc09f001e1d58f53ec678767d27375e6aa4d549 SHA512 34e63623fe7e6bf8c0bcde6b4308130ef97214aab742cdbd20d1704084c4707023edf30cc9c99fe7fccb303b222874800188654767dc8664977b85d1fa2cd8ac +EBUILD handbrake-1.5.1.ebuild 4155 BLAKE2B 1aaf12dd8fa6f6f74655f860c9fd50d7bb4e2ca23d86d413f7bd4966fbce4d62238beda0b127c3654e80906dce185ccb8a7c65b7dafb7867c10fd547d473e92f SHA512 ebc2c2885b711c014df56dbc8a132f6fed4c3b92b718420225817f61e5e6912feb4edfeb10360f0090ce965a84c13db7506ed2f57a62bd2d3aaae084fa0210f8 EBUILD handbrake-9999.ebuild 4073 BLAKE2B 8b2d6db78de39f0d96a3ebd2f5c1a2a68c683f59a7e0bcbc26e62f9c75c81d7f16f371e6d468b4295e5a1bd13d580ddb4681c5ce8becc38f0e6bcb72ce4735e3 SHA512 aefa37c8343d79e4bf283f7198a096356665f72c1387458f17ed905ff61b32c52c076eebcc265062edc808a555489bc8284bb39fee7c4f9eda7e16dc0bbef525 MISC metadata.xml 1111 BLAKE2B af0af39468b2c04ae8e9f4005ee813eec2c707fe0e39f28df0b18d7836f7b6c2b46cbe9a790ca5ff2d67e15548707dc080b2fb5a4028ebed711b92f0df09ad41 SHA512 e6adea6ce757118935546923c6073b6764e8ad93e2ed6cc96789f3fc0236c762f461f31fbf94cc49b4e191ec99ac903070b1496adff79fe3af91082dbc5bc4d1 diff --git a/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch new file mode 100644 index 000000000000..643605076294 --- /dev/null +++ b/media-video/handbrake/files/handbrake-1.5.1-ffmpeg-5.0.patch @@ -0,0 +1,40 @@ +# https://git.exherbo.org/media.git/commit/?id=b7a022928103184b7528d0e40ad0a4edcfbbd7a4 + +From 8a9d11e96b771422247c458ae6b07f3a13848f3a Mon Sep 17 00:00:00 2001 +From: Timo Gurr <timo.gurr@gmail.com> +Date: Sat, 15 Jan 2022 20:44:53 +0100 +Subject: [PATCH] FFmpeg deprecations fixes for FFmpeg >= 5 + +avcodec.h stopped including bsf.h per FFmpeg commit +57b5ec6ba7df [1]. Fixes compilation error against +FFmpeg later than the mentioned commit. +[1] https://github.com/FFmpeg/FFmpeg/commit/57b5ec6ba7df442caebc401c4a7ef3ebc066b519 +--- + libhb/decavcodec.c | 1 + + libhb/muxavformat.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/libhb/decavcodec.c b/libhb/decavcodec.c +index 372f86f82cf..e7a63289c0f 100644 +--- a/libhb/decavcodec.c ++++ b/libhb/decavcodec.c +@@ -41,6 +41,7 @@ + #include "handbrake/handbrake.h" + #include "handbrake/hbffmpeg.h" + #include "handbrake/hbavfilter.h" ++#include "libavcodec/bsf.h" + #include "libavfilter/avfilter.h" + #include "libavfilter/buffersrc.h" + #include "libavfilter/buffersink.h" +diff --git a/libhb/muxavformat.c b/libhb/muxavformat.c +index 232edd0942a..ad8e2a1d8fa 100644 +--- a/libhb/muxavformat.c ++++ b/libhb/muxavformat.c +@@ -8,6 +8,7 @@ + */ + + #include <ogg/ogg.h> ++#include "libavcodec/bsf.h" + #include "libavformat/avformat.h" + #include "libavutil/avstring.h" + #include "libavutil/intreadwrite.h" diff --git a/media-video/handbrake/handbrake-1.5.1.ebuild b/media-video/handbrake/handbrake-1.5.1.ebuild index e8bee8b1fe39..c5f8eebf74a2 100644 --- a/media-video/handbrake/handbrake-1.5.1.ebuild +++ b/media-video/handbrake/handbrake-1.5.1.ebuild @@ -96,6 +96,9 @@ PATCHES=( # Fix x265 linkage... again again #730034 "${FILESDIR}/${PN}-1.3.3-x265-link.patch" + + # Fix compatability with ffmpeg-5.0 + "${FILESDIR}/${PN}-1.5.1-ffmpeg-5.0.patch" ) src_prepare() { diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index 885ccaf9dfaf..52946a1e0d13 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -1,5 +1,5 @@ DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b SHA512 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830 EBUILD mjpegtools-2.2.0-r1.ebuild 2679 BLAKE2B 5f67591a0b27b85095b1522d1de4efe1373f1ba67a552cab271d5a933c7da6d5e42f3f53ab8daaf9a84c522ac71bc1cddf13869ffce7fe4b7a2f14adee1decea SHA512 58a9ae7d7a37ccfce311668a532b98aa0c28fc86b05cc41369f5f983e74413f3feaa360af57ff20ad62ed4f94f76f2cdaf7b6cf2dae95b0e28c3024df73ec609 -EBUILD mjpegtools-2.2.1.ebuild 2683 BLAKE2B 96dd3dad40d964f0a9951ea9ac88a22f818de2fb67c4fdf869196eb04327cccab6d00a0f9cb361d244fcaa5e207d71727886c763149348be214135c79b7f1380 SHA512 c318d9c10e1a9b2822e40be8d1f9631b982dcc720e93ad6c46a4ee33c444272287d94a9838f8659a22a6fdf3dfafdd78d6ae30f5447fe0b1df7c6a7c6e6d1b06 +EBUILD mjpegtools-2.2.1.ebuild 2678 BLAKE2B 29638b99460d472a4d8c71641e0ce1c2b3b0377d64332ca2f4eac9e6a731b8832e94429bbcd736a6142aa4fb34cd11f886ec3e52e1e854c7d84d599e242840fc SHA512 33fae3bf926b6f36a575dc703dde5f10bd30b0e4eb550712a8eb12d9e135031611763c23b07efd1412366ddc5d9547b54d6cbe670c4d6bc863f44ffe27e06987 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 54975b16164c..91c3b73db7fd 100644 --- a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild +++ b/media-video/mjpegtools/mjpegtools-2.2.1.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 @@ -12,7 +12,7 @@ SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" LICENSE="GPL-2" # Compare with version in SONAME on major bumps (e.g. 2.1 -> 2.2) SLOT="1/2.2" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86" IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs" REQUIRED_USE="sdlgfx? ( sdl )" diff --git a/media-video/movit/Manifest b/media-video/movit/Manifest index 82cc6e7cb576..ede85320633a 100644 --- a/media-video/movit/Manifest +++ b/media-video/movit/Manifest @@ -1,7 +1,4 @@ -DIST gtest-1.7.0.zip 1164254 BLAKE2B ba8cf5dc336e3a6889b58922b62497cdac94d9f77bc5cbac3d72e4a88f33cbe572b6f61b5323acb7ea6dfc67f92c0ba231bedc5251c276831ea7a9e77ab6d570 SHA512 8859369f2dd32cbc2ac01aba029aa3ff20a321f40658b9643aff442d34c33468221866b801b28c66a28af47dbcd362d26941fc98db92b6efb7e41ea5b7be1a07 -DIST movit-1.6.2.tar.gz 878822 BLAKE2B 02b1a5d9b05c944d0b39f93e6c4ea0ced26128e9067db91b93f47fdda154cb7650217a821b077742ae555e6464579f95ad7a5976bcfea319e3dd2d515add83c4 SHA512 005e75712fcb83b0e9c0301925afe2c87a6d99856e7c6fe6468c93de5cbdd633507179c79a7536bb7acb1246c71302d98a92289a0a618b07d920b4620fd6abc7 DIST movit-1.6.3.tar.gz 605922 BLAKE2B b207e587a20aeccc16017b7b1a7334d88381d4268dfb516d0a030b864e41eb06771e6e2c466699ee6ff01a2c972456152b6450bed654e1961dacc9ff2b800c5d SHA512 6f7169710fbb60f79c44393aea57619f4c83d64fb296ea946d591e78fb9a71b513869dc6325f90e4c2dc843b7ed4841eaef41ca69f64787c8a57f4fde583b1e5 DIST movit-googletest-1.8.1.tar.gz 992298 BLAKE2B 40ef3417fe424205c0617f07207347ce671ac87605f8ac9b8a333b0b06e3fbef9f556041ee324c18f957f3258ab9fe06704f31cdd038355fb7890180eb77ced1 SHA512 e6283c667558e1fd6e49fa96e52af0e415a3c8037afe1d28b7ff1ec4c2ef8f49beb70a9327b7fc77eb4052a58c4ccad8b5260ec90e4bceeac7a46ff59c4369d7 -EBUILD movit-1.6.2.ebuild 911 BLAKE2B 2d96623c830c9d35355684d5c87cbda78b1714cdf963c3402542e87b2be248af5d0cf50de216d86067715b21365757ad4aeefa70a924fda3f8bf3aa5088d2189 SHA512 06110a012dd7782c377eb99186facc4daa81ce178e900d18a3b03fd3ff42a6305682cf95a4ef645815c1f262df752f43f46c2de17fa62c919c1df4951cb25df9 EBUILD movit-1.6.3.ebuild 1038 BLAKE2B 957903208f0c430d6e83fc29844147cd7467fc4c9e4a1551470e5ef74bed145d09bcdf433ad4652f437d6c6b0571f82695c630be5ddd14020c2e8e9e87cd28c1 SHA512 720efd9ce1c7cb25561ddd8fda2370a41615aa7af92c1a17c83470a8d4e885c4a486d9ec26c22be1fae6c8657b83e592a584d2912ab9ecdbab9d7e4902c8fd91 MISC metadata.xml 169 BLAKE2B 25149b73446be31f3ea3dd3a6394230987e7d4c601d1605fd3827b37bd99b3301c2e0edb95d0f59a4577ed27919f43c2cc02b1edf62c4012b935a82e709e0c05 SHA512 55c53f74b001bae56ba8c54581a4168335b6b3a28dac23a2102b76795d5fd41de33b8b3e1ec03f9acc6e7a3a77e93b1a6ff3e3967c3156dcbf22b5b5a6245ef5 diff --git a/media-video/movit/movit-1.6.2.ebuild b/media-video/movit/movit-1.6.2.ebuild deleted file mode 100644 index f84a2283a7fa..000000000000 --- a/media-video/movit/movit-1.6.2.ebuild +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils - -# no sane way to use OpenGL from within tests? -RESTRICT="test" - -DESCRIPTION="Modern Video Toolkit" -HOMEPAGE="https://movit.sesse.net/" -# Tests need gtest, makefile unconditionally builds tests, so ... yey! -SRC_URI="https://movit.sesse.net/${P}.tar.gz - https://googletest.googlecode.com/files/gtest-1.7.0.zip" -LICENSE="GPL-2+" -SLOT="0" - -KEYWORDS="amd64 arm64 ~ppc64 x86" -IUSE="" - -RDEPEND="media-libs/mesa[X(+)] - >=dev-cpp/eigen-3.2.0:3 - media-libs/libepoxy[egl] - >=sci-libs/fftw-3 - media-libs/libsdl2 - " -DEPEND=" - ${RDEPEND} - app-arch/unzip -" - -src_configure() { - econf --disable-static -} - -src_compile() { - GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake -} - -src_test() { - GTEST_DIR="${WORKDIR}/gtest-1.7.0" emake check -} - -src_install() { - default - find "${ED}" -name '*.la' -delete || die -} diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 8295419a9a37..2010835711bf 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,10 +1,11 @@ AUX obs-studio-26.1.2-python-3.8.patch 653 BLAKE2B 6fbafacb2b2a7dc7dbb15f63eea9463e7c26744caab9399146bd404227d6b7e4119cbeb8f93b4b5c81399d342f02b002d79ad72d2a8dde3317d8f5a67f163dc9 SHA512 598701d227feab450d2f8db40d18b7380dcbedb13b6586deb481b7164c33e12e04b1d5babdadbe073d5af0ac899d783f7a2a2d2ed020f19edb6146cfd00798af +AUX obs-studio-27.1.3-ffmpeg-5.0.patch 11768 BLAKE2B 35bf91bf2921ea1a8007a6eb973f60724de5b53485d429199af5ea63b290313066367f83bd2f2b8cbd5a31a0186d9c2cce0b1ba9f98cc346209ae50a0bae955a SHA512 04332aab35aed3ced4bab6a5b9e267224a816ba4fea190272e3516358ff96714dc1fe087d0092bcad753f87b62c500cac62398fc93f9ae04fd2de742ec1a6413 DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e98cbc3da2b7cd81b3c19c4f52cfa3efcca01dce40528018996c65f026eb97520d78040165d1906b0d19236a86e76ec39c58c26 SHA512 060a5a8716a75b4b96dfb6ac28c132e22b93107915d680311c1b9d4fd12c7712a9e3497338eac6d2b9f4e74f2dc005a75d195c597bba049e4731fe3724f519ba DIST obs-browser-aee43000bd994022cd73e32dc50938ab777d4a06.tar.gz 89603 BLAKE2B a51b92f829ecb7055dcf969d6d5bdc4632b51288f0bc7e2ab66fda087da608869ddffccda83aa925f049c79e745a6f67e70ec72303184b970f5009fe37b34054 SHA512 8159ca02b5c30d2733ce8e566f21d6b77d6b7beabd0a5898049ee83b0b4d720b967fc55fcf876cd772fdaa12ca08163a0f8cabf249a9b3b6eb56b7666d1192c7 DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e SHA512 3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179 DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4 SHA512 c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3 DIST obs-studio-27.1.3.tar.gz 15994678 BLAKE2B 5544a1ecdb04dca7f6422936ea5499a206b4beb8e5332605c18cd72a91ce73aa74ff06c49a106931822c1c413ee94d383942f173a71f2b21168a00495b4e301f SHA512 04c11c79e3b091aa9ea8fc6674c9fbcaa1c924fe049f68e9be63f63724c31305d6e4fb33aecdd4d0095d20013e2ee188983f6938b175257368d2260681c2fb39 EBUILD obs-studio-27.0.1-r1.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34 -EBUILD obs-studio-27.1.3-r1.ebuild 5234 BLAKE2B 35fc725fac43cf84baf45c5d17395016db51eede74f8291d3bb59bfc5631978e32d0c5b83e053137a40f1c95a2c443534721dd03ca0fc57fbd91f220f31b3628 SHA512 c0c8af0ee7c22958ca8c5396eb9c5f223e3676dbadca29ef32b687a78afff66241511c8603a6d424489cf3b8b6a4ef21442880fe4e46a35dffa294f7e0e65591 +EBUILD obs-studio-27.1.3-r1.ebuild 5279 BLAKE2B 7636a5ef254693b7f1608e6f3540dece35cce32806a13100556be6e2065be9b583f80c616c6c23b3ecc703d06ace8ca40109ff237b7524eed92394242c8a54e0 SHA512 11a8ae601952cf07ecd9ab3ac83acd678c15b5214ab786443e958b066d7383459d114c1f28e64c029358888a84c46ab56dde11636a11fab6eb6634e01f2c2fcf EBUILD obs-studio-9999.ebuild 5234 BLAKE2B e89b74d8a6bf22634981acc3c6dfbbc6dbb1c9bd00356ee87afbe45c182014779bd54cc3666c06dfd7c888ada0b467d2bb471cdcd00edb44e326422e52750283 SHA512 1dde6de38391affd8d3b4c20e6ee8902f88dcdf53c9e134e43d658f28ee6470d05b346aa9b44611c9e0936dd8d431760043080567e65698be69e306974e28dbb -MISC metadata.xml 1492 BLAKE2B 640e009dbc42a2f994c0737bf7e301738a52b541cc21b3a569d8988aa75614bf36541a0560fd6c690fca2d65134d8e71e8dae5ee8c19ab6d471dc431c7e2d38b SHA512 47de7d50138f441074dc81157410345790e4def50abe109b961781aba36f47fe413642f44143398be3a23ab8e8c40479622654b8d845bf976468ac8c994007fa +MISC metadata.xml 1503 BLAKE2B 38225fe9539f6afe086377e5bbdd88b918aebe921e293617ba1bd142507be63394c9e861f34f85ee5adb8760eca7e44209175716a4f47ede40f0c0e2c69f3f69 SHA512 157a2bcf17d7330d6a93ab9935cd05fd6c4b303074df781daa2b38ed4ab16714e273bde07345ac1040404dc9276e763e0681852272f38e180e2d171ed32c3e8b diff --git a/media-video/obs-studio/files/obs-studio-27.1.3-ffmpeg-5.0.patch b/media-video/obs-studio/files/obs-studio-27.1.3-ffmpeg-5.0.patch new file mode 100644 index 000000000000..a529dca715a9 --- /dev/null +++ b/media-video/obs-studio/files/obs-studio-27.1.3-ffmpeg-5.0.patch @@ -0,0 +1,314 @@ +# https://git.exherbo.org/media.git/commit/?id=10c891cb37f4f7e42e95a00b27a5d4636266353e +# https://git.exherbo.org/media.git/commit/?id=e888c31724357431dbd0e73014ca87a552850d45 + +From 08547a1696fa381d0bda18aed57b9f87a6b1b334 Mon Sep 17 00:00:00 2001 +From: Ryan Foster <RytoEX@gmail.com> +Date: Sat, 6 Nov 2021 18:57:35 -0400 +Subject: [PATCH] obs-ffmpeg: Include avcodec header for AVCodecContext + +FFmpeg commit e67e02d15672 [1] drops avcodec.h from avformat.h includes. +Therefore we need to include it explicitly. + +[1]: https://github.com/FFmpeg/FFmpeg/commit/e67e02d15672a87da1b0566e197a1e19dc7e1e33 + lavf/avformat.h: drop the avcodec.h include +--- + plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 1 + + plugins/obs-ffmpeg/obs-ffmpeg-formats.h | 2 ++ + plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c | 1 + + plugins/obs-ffmpeg/obs-ffmpeg-output.h | 1 + + 4 files changed, 5 insertions(+) + +diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +index 1c160ced4b1f..e4c6cdb9fa2f 100644 +--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c ++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +@@ -27,6 +27,7 @@ + #include "ffmpeg-mux.h" + + #include <util/dstr.h> ++#include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> + + #define ANSI_COLOR_RED "\x1b[0;91m" +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-formats.h b/plugins/obs-ffmpeg/obs-ffmpeg-formats.h +index 62e3866d037a..b40ef37293b4 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-formats.h ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-formats.h +@@ -1,5 +1,7 @@ + #pragma once + ++#include <libavcodec/avcodec.h> ++ + static inline int64_t rescale_ts(int64_t val, AVCodecContext *context, + AVRational new_base) + { +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c +index f2d93d2def89..e66010ce5f9c 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-nvenc.c +@@ -24,6 +24,7 @@ + + #include <libavutil/opt.h> + #include <libavutil/pixdesc.h> ++#include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> + + #include "obs-ffmpeg-formats.h" +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.h b/plugins/obs-ffmpeg/obs-ffmpeg-output.h +index 99f4dcd13b44..72d89dfacc4c 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-output.h ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.h +@@ -2,6 +2,7 @@ + + #include <libavutil/opt.h> + #include <libavutil/pixdesc.h> ++#include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> + #include <libswscale/swscale.h> + +From abf1d609d29196921df8f09ab6e07340b7cf9660 Mon Sep 17 00:00:00 2001 +From: Ryan Foster <RytoEX@gmail.com> +Date: Sat, 6 Nov 2021 18:58:05 -0400 +Subject: [PATCH] obs-ffmpeg: Include channel_layout.h + +avcodec.h stopped including channel_layout.h per FFmpeg commit +1be3d8a0cb77 [1]. avformat.h stopped including avcodec.h per FFmpeg +commit e67e02d15672 [2]. As a result, we need to explicitly include +avutil/channel_layout.h when needed. Fixes compilation error against +FFmpeg later than the two mentioned commits. + +[1]: https://github.com/FFmpeg/FFmpeg/commit/1be3d8a0cb77f8d34c1f39b47bf5328fe10c82d7 +[2]: https://github.com/FFmpeg/FFmpeg/commit/e67e02d15672a87da1b0566e197a1e19dc7e1e33 +--- + plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c | 1 + + 1 file changed, 1 insertion(+) + +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c b/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c +index 2e3899464362..cbcb9ac31bcb 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-audio-encoders.c +@@ -21,6 +21,7 @@ + #include <util/dstr.h> + #include <obs-module.h> + ++#include <libavutil/channel_layout.h> + #include <libavutil/opt.h> + #include <libavformat/avformat.h> + +From ce734366bc0b95ff91930f463e7ebe528cf8eabf Mon Sep 17 00:00:00 2001 +From: Ryan Foster <RytoEX@gmail.com> +Date: Sat, 6 Nov 2021 18:58:36 -0400 +Subject: [PATCH] obs-ffmpeg: Respect AVFormatContext and AVOutputFormat + constness + +AVFormatContext::oformat was made const on April 27, 2021 [1]. If we +respect the constness of AVOutputFormat and do not cast results from +FFmpeg functions to non-const, we cannot modify the results after the +fact. Our choices are either to cast them to non-const (and presumably +have them implicitly casted back to const on later function calls), or +only try to modify the results in versions of FFmpeg where these are not +expected to be const. + +Instead of relying on casts, we can set the encoder values in the +ffmpeg_cfg struct, which are later passed to new_stream. + +Also modifies deps/media-playback. Removes compiler warnings. +Some avformat functions return const AV(In/Out)putFormat per [1], so +ifdef as needed. + +[1]: https://github.com/FFmpeg/FFmpeg/commit/56450a0ee4fdda160f4039fc2ae33edfd27765c9 + lavf 59.0.100 avformat.h + avformat: Constify the API wrt AV(In|Out)putFormat + + Also constify AVProbeData. +--- + deps/media-playback/media-playback/media.c | 4 ++++ + plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 10 ++++++++++ + plugins/obs-ffmpeg/obs-ffmpeg-output.c | 19 ++++++++++++++++++- + 3 files changed, 32 insertions(+), 1 deletion(-) + +diff --git a/deps/media-playback/media-playback/media.c b/deps/media-playback/media-playback/media.c +index 9041b62e9cdd..a09b58ed5d10 100644 +--- a/deps/media-playback/media-playback/media.c ++++ b/deps/media-playback/media-playback/media.c +@@ -608,7 +608,11 @@ static int interrupt_callback(void *data) + + static bool init_avformat(mp_media_t *m) + { ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) + AVInputFormat *format = NULL; ++#else ++ const AVInputFormat *format = NULL; ++#endif + + if (m->format_name && *m->format_name) { + format = av_find_input_format(m->format_name); +diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +index e4c6cdb9fa2f..ffce3ee33eec 100644 +--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c ++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +@@ -565,7 +565,11 @@ static inline bool ffmpeg_mux_get_extra_data(struct ffmpeg_mux *ffm) + + static inline int open_output_file(struct ffmpeg_mux *ffm) + { ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) + AVOutputFormat *format = ffm->output->oformat; ++#else ++ const AVOutputFormat *format = ffm->output->oformat; ++#endif + int ret; + + if ((format->flags & AVFMT_NOFILE) == 0) { +@@ -631,7 +635,11 @@ static bool ffmpeg_mux_is_network(struct ffmpeg_mux *ffm) + + static int ffmpeg_mux_init_context(struct ffmpeg_mux *ffm) + { ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) + AVOutputFormat *output_format; ++#else ++ const AVOutputFormat *output_format; ++#endif + int ret; + bool is_http = false; + is_http = (strncmp(ffm->params.file, HTTP_PROTO, +@@ -665,8 +673,10 @@ static int ffmpeg_mux_init_context(struct ffmpeg_mux *ffm) + return FFM_ERROR; + } + ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) + ffm->output->oformat->video_codec = AV_CODEC_ID_NONE; + ffm->output->oformat->audio_codec = AV_CODEC_ID_NONE; ++#endif + + if (!init_streams(ffm)) { + free_avformat(ffm); +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c +index 6bc1637b1796..7447e952b9c2 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c +@@ -543,6 +543,7 @@ static enum AVCodecID get_codec_id(const char *name, int id) + return codec->id; + } + ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) + static void set_encoder_ids(struct ffmpeg_data *data) + { + data->output->oformat->video_codec = get_codec_id( +@@ -551,6 +552,7 @@ static void set_encoder_ids(struct ffmpeg_data *data) + data->output->oformat->audio_codec = get_codec_id( + data->config.audio_encoder, data->config.audio_encoder_id); + } ++#endif + + bool ffmpeg_data_init(struct ffmpeg_data *data, struct ffmpeg_cfg *config) + { +@@ -570,7 +572,13 @@ bool ffmpeg_data_init(struct ffmpeg_data *data, struct ffmpeg_cfg *config) + + is_rtmp = (astrcmpi_n(config->url, "rtmp://", 7) == 0); + +- AVOutputFormat *output_format = av_guess_format( ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) ++ AVOutputFormat *output_format; ++#else ++ const AVOutputFormat *output_format; ++#endif ++ ++ output_format = av_guess_format( + is_rtmp ? "flv" : data->config.format_name, data->config.url, + is_rtmp ? NULL : data->config.format_mime_type); + +@@ -596,6 +604,7 @@ bool ffmpeg_data_init(struct ffmpeg_data *data, struct ffmpeg_cfg *config) + goto fail; + } + ++#if LIBAVFORMAT_VERSION_INT < AV_VERSION_INT(59, 0, 100) + if (is_rtmp) { + data->output->oformat->video_codec = AV_CODEC_ID_H264; + data->output->oformat->audio_codec = AV_CODEC_ID_AAC; +@@ -603,6 +612,14 @@ bool ffmpeg_data_init(struct ffmpeg_data *data, struct ffmpeg_cfg *config) + if (data->config.format_name) + set_encoder_ids(data); + } ++#else ++ if (is_rtmp) { ++ data->config.audio_encoder = "aac"; ++ data->config.audio_encoder_id = AV_CODEC_ID_AAC; ++ data->config.video_encoder = "libx264"; ++ data->config.video_encoder_id = AV_CODEC_ID_H264; ++ } ++#endif + + if (!init_streams(data)) + goto fail; + +From d78971b4db34d5fffbd11d2acabf37a65e11cd58 Mon Sep 17 00:00:00 2001 +From: pkv <pkv@obsproject.com> +Date: Fri, 17 Dec 2021 20:52:11 +0100 +Subject: [PATCH] obs-ffmpeg: Further FFmpeg deprecations fixes for FFmpeg 4.4+ + +avcodec.h stopped including channel_layout.h per FFmpeg commit +1be3d8a0cb77 [1]. Fixes compilation error on macOS against +FFmpeg later than the mentioned commit. +[1] https://github.com/FFmpeg/FFmpeg/commit/1be3d8a0cb77f8d34c1f39b47bf5328fe10c82d7 +--- + plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c | 1 + + plugins/obs-ffmpeg/obs-ffmpeg-output.c | 1 + + 2 files changed, 2 insertions(+) + +diff --git a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +index c07e22abe266..db26cb425ce5 100644 +--- a/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c ++++ b/plugins/obs-ffmpeg/ffmpeg-mux/ffmpeg-mux.c +@@ -29,6 +29,7 @@ + #include <util/dstr.h> + #include <libavcodec/avcodec.h> + #include <libavformat/avformat.h> ++#include <libavutil/channel_layout.h> + + #define ANSI_COLOR_RED "\x1b[0;91m" + #define ANSI_COLOR_MAGENTA "\x1b[0;95m" +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-output.c b/plugins/obs-ffmpeg/obs-ffmpeg-output.c +index d3637ebbb59b..7d1f12a60393 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg-output.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg-output.c +@@ -25,6 +25,7 @@ + #include "obs-ffmpeg-output.h" + #include "obs-ffmpeg-formats.h" + #include "obs-ffmpeg-compat.h" ++#include <libavutil/channel_layout.h> + + struct ffmpeg_output { + obs_output_t *output; + +From c398ac9739a82bc95632eef9544dd0fb5bc5f0cf Mon Sep 17 00:00:00 2001 +From: pkv <pkv@obsproject.com> +Date: Sat, 6 Nov 2021 18:59:37 -0400 +Subject: [PATCH] obs-ffmpeg: Fix NVENC old codec naming removed in FFmpeg + +Per FFmpeg commit 337f777f378c [1], FFmpeg removed nvenc_h264_encoder +and nvenc_hevc_encoder after deprecation in FFmpeg commit 888a5c794778 +[2]. The names to be used are ff_h264_nvenc_encoder and +ff_hevc_nvenc_encoder. So we must allow alternative search of codec as +h264_nvenc or nvenc_h264 in obs-ffmpeg.c. + +[1]: https://github.com/FFmpeg/FFmpeg/commit/337f777f378cfcc0d6f0d01fb7125905e8b0da55 +[2]: https://github.com/FFmpeg/FFmpeg/commit/888a5c794778a2f2aad22e9b4a3952dff92b11fa +--- + plugins/obs-ffmpeg/obs-ffmpeg.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) + +diff --git a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/obs-ffmpeg.c +index 7330b2273544..399c5bfa64b6 100644 +--- a/plugins/obs-ffmpeg/obs-ffmpeg.c ++++ b/plugins/obs-ffmpeg/obs-ffmpeg.c +@@ -180,7 +180,9 @@ static bool nvenc_supported(void) + bool success = false; + + if (!nvenc) { +- goto cleanup; ++ nvenc = avcodec_find_encoder_by_name("h264_nvenc"); ++ if (!nvenc) ++ goto cleanup; + } + + #if defined(_WIN32) diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml index b16a1b2e5db5..a68f46af24b8 100644 --- a/media-video/obs-studio/metadata.xml +++ b/media-video/obs-studio/metadata.xml @@ -5,9 +5,9 @@ <email>chiitoo@gentoo.org</email> <name>Jimi Huotari</name> </maintainer> - <maintainer type="person" proxied="proxy"> - <email>ionen@gentoo.org</email> - <name>Ionen Wolkens</name> + <maintainer type="project" proxied="proxy"> + <email>proxy-maint@gentoo.org</email> + <name>Proxy Maintainers</name> </maintainer> <longdescription> A rewrite of what was formerly known as "Open Broadcaster Software", diff --git a/media-video/obs-studio/obs-studio-27.1.3-r1.ebuild b/media-video/obs-studio/obs-studio-27.1.3-r1.ebuild index 9cd43053e715..34b197508564 100644 --- a/media-video/obs-studio/obs-studio-27.1.3-r1.ebuild +++ b/media-video/obs-studio/obs-studio-27.1.3-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=8 @@ -121,6 +121,7 @@ QA_PREBUILT=" PATCHES=( "${FILESDIR}/${PN}-26.1.2-python-3.8.patch" + "${FILESDIR}/${PN}-27.1.3-ffmpeg-5.0.patch" ) pkg_setup() { diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 843b4bf5ec8a..ea82d1c0ba25 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -8,6 +8,7 @@ AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407 AUX pipewire-0.3.36-non-systemd-integration.patch 911 BLAKE2B 6c6df1080821cefa1786da4db762a78011672226836525413d10fed3a18d43457277b6b868dfe0ee8e189143f76c971dd9c53809794864bcc642c804bf962ab8 SHA512 08b4998a3129f824c68310d2fc87245311e1d4b85a09a57f1d9bab76f990aa5d95686f22f3835a1072b7e6c0b6eb0246cc9c81884588f0146d26f9c215d9c565 AUX pipewire-0.3.43-systemd-user-unit-dir.patch 1310 BLAKE2B 7068220b1581b73c2c63adc698d09cf9da16d084d189cb9d3d8ecb7d7d79fa4c55548688e2e3718ca48e38388688ae96d340316df850b506bf079fe6c466c24e SHA512 033d1c54447466c18a921060d62f1b8e21221d324862cbf643a777fa2f7386543a51aaf7fdbeb2d698779d7a342eceda069f05d5cc07d8d8813b96ce35a1fdef +AUX pipewire-0.3.44-musl-build.patch 802 BLAKE2B 906313a422d477f28e69bec2fb2e931999e9875dd595c7c040bccdd2a34223fffbc303861d215f618053b899a386af32dc7192271d3e3b8d4751ac16e0088eef SHA512 9290ae00017df0eec1c41e4528bc4f4fb53df5779e83086e4f1fdfaef5aaf27a20a5cedf92382a22304c9266b6c40997af811212d54fb65ddc188acc0d34d792 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 @@ -15,9 +16,11 @@ DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203ef DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14 DIST pipewire-0.3.42.tar.gz 1705295 BLAKE2B afd397e75be4f776b9d3042258e8091d6e1722f374e62417274238e5017e268c986ac7624e1b91ec8a97fc9078e8aa6d46a22f30c0834f99e5cd3112a096aded SHA512 bbf00ad5cee8ac872d8c2ef6b9499233100dba04c127b435894cf16c349188ae11edf918479a58039becc1b493c6f53a318d8fb483043dde074dc21ec32984c1 DIST pipewire-0.3.43.tar.gz 1713131 BLAKE2B 3fa167d74e6104685760a9eac721bc359f1245897e1a5f9b09b4b9591fc459d19549e209990ca478a10ad6c2a4dfaecc3546d996ab7f7d64fe880fb0c1c1dfca SHA512 d3804cdb1d94977bb4e2757e46829e1e51fca52b018007afa3bbfabff4dc33538cedad015c91154e28b879fc2edeb4e1fadf633b0af9a0d3bfd930c53b1bc2c0 +DIST pipewire-0.3.44.tar.gz 1731260 BLAKE2B 5dd4fbffa21c34984836d097028e48654e2c9005e2f167b964bba2a8a2b9a7aad658853f03acce2f7967f884cfbea740ca427e9d373f00bcea2f122337835e02 SHA512 9a356b1d63e996e3725b6d126d7f0a972f83d0db0a95e923d9a7ec5432ff04688d51332f5c83826069e593e021bf514937ae5daf9cc6ad7307fe8baab964a244 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.42-r1.ebuild 11066 BLAKE2B d61bdc505e7fd86172392d0e1e7f3fe3166883fd0c76260d92c4ef832de67ce9d1e8c12d2a66874153e8c255801d9c852084a297204cbf6939acbe969e9b920a SHA512 878f82b0046e3a92881e313083f2e245f9833c0b1852ed87b54c60b0eb5a1927c3f1f6d534f2d257176ecd685fde7c3c67a4e3caa95810b7ed58cf688f0a94a0 EBUILD pipewire-0.3.43-r3.ebuild 11620 BLAKE2B 64ff8aaaec2894008dfb32bbbcd6f8e6f9c0480089d3f19b5b1b2dec57b2ddf5880a11f9b4e383efd0ce05e1a4480671042947586deae5a849404dc7d9de17b7 SHA512 86e838d0792b78b46186e1645acc241e0bce35bae2ff58e3bf41c41f491cbf24e9cb82fa68f18adb1016d5df51659963e74c66578bdefe599f6f7c0f6ceade98 -EBUILD pipewire-9999.ebuild 11541 BLAKE2B c4b222450ce0612d7d03e03f75153564da47df72578b1e5f9d4659f2cfbe45805591845cefa5c5ec69355d4ccbed8ba9479dc6ce2428977d8ba7f87c8e4d36a5 SHA512 8520448226ede358041382373ab113f035ed224f7133a1ebf2744a5ae3de16cb70406e7e180de63aa06fb4afc7093f7a2cc55459f895ea3e2394f27c85de1fb4 -MISC metadata.xml 1451 BLAKE2B 2d30343eb8d6e5911491a2814287666a371adb1be2069f2afb30d69031b5ab19865a92fde4f478b78914a4c9e5cd15f59ad7ef6487ed94b0f0838ab29bedfe40 SHA512 68fdbacf47f006ee4a20bec6fe2bfc35d0a6509344bd410f0236d68f695401083f932e30769a1a61055b62b7626f3ca3065df352677af469c6ed83d3ca3b855b +EBUILD pipewire-0.3.44-r1.ebuild 11766 BLAKE2B bbd2c2da083e950bc17440871c8d5120e6b375f5111d3b23387472b46769511958132c57aa7ff389c62f40dd7e925dc704c9f0df0a24f0476d27739246c606a6 SHA512 c93720c87b01a6fe777a5fbb88ec2f8c11dad853522a4d0cb3e2c27f8c6c00eb73d40231099350ebfc73a9c1c62db54df3b1e73d452aea34b6109bbb83aa5bbf +EBUILD pipewire-9999.ebuild 11720 BLAKE2B 3c911f74804d2a954c871e3a38a1f0bf07026b788a23f47f73466dd1b2b4dccf8fb9d1f64d3c869a79d7af08db9336c1200f633877060501a3538e514e17b27c SHA512 103bf28f0b552a1b82a1d6612f123448f2f82279a20b6734b4c404d570fe359d9bdec8452e1c96ae6da182c178943204a5f41a5e399b9342364247f0b20ba2cc +MISC metadata.xml 1503 BLAKE2B 83f04aa01f7843a0fc6173caab89e413f12ff93d28d21b30e8748ae4c08bd2df5040597fffb1b85c5cb5f9708c29f9da005e6a31070ae194f1a4d69f05f8dfe9 SHA512 65883678c5b762e0f998cbcd58532b441e5f092aa0ac560886851c4f3dd9d89cdec2f9bbecae35c2a4d03a8a8b7dd4413e14e0182d3da8ef41705436814cdfe2 diff --git a/media-video/pipewire/files/pipewire-0.3.44-musl-build.patch b/media-video/pipewire/files/pipewire-0.3.44-musl-build.patch new file mode 100644 index 000000000000..6ebcc5db8feb --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.44-musl-build.patch @@ -0,0 +1,33 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/3256c6e5e7e2cef1f765dc05a001114359cc3134 + +From: Wim Taymans <wtaymans@redhat.com> +Date: Thu, 27 Jan 2022 14:59:11 +0100 +Subject: [PATCH] tools: fix compilation with musl + +--- a/src/tools/pw-cli.c ++++ b/src/tools/pw-cli.c +@@ -36,6 +36,10 @@ + #include <readline/readline.h> + #include <readline/history.h> + ++#if !defined(FNM_EXTMATCH) ++#define FNM_EXTMATCH 0 ++#endif ++ + #define spa_debug(...) fprintf(stdout,__VA_ARGS__);fputc('\n', stdout) + + #include <spa/utils/result.h> +--- a/src/tools/pw-dump.c ++++ b/src/tools/pw-dump.c +@@ -32,6 +32,10 @@ + #include <math.h> + #include <fnmatch.h> + ++#if !defined(FNM_EXTMATCH) ++#define FNM_EXTMATCH 0 ++#endif ++ + #include <spa/utils/result.h> + #include <spa/utils/string.h> + #include <spa/pod/iter.h> +GitLab diff --git a/media-video/pipewire/metadata.xml b/media-video/pipewire/metadata.xml index ca29532fdfbe..a61d898b80e4 100644 --- a/media-video/pipewire/metadata.xml +++ b/media-video/pipewire/metadata.xml @@ -30,5 +30,6 @@ <flag name="lv2">Allow loading LV2 plugins via <pkg>media-libs/lv2</pkg></flag> <flag name="pipewire-alsa">Replace PulseAudio's ALSA plugin with PipeWire's plugin</flag> <flag name="ssl">Enable raop-sink support (needs <pkg>dev-libs/openssl</pkg>)</flag> + <flag name="X">Enable audible bell for X11</flag> </use> </pkgmetadata> diff --git a/media-video/pipewire/pipewire-0.3.44-r1.ebuild b/media-video/pipewire/pipewire-0.3.44-r1.ebuild new file mode 100644 index 000000000000..14762acb4998 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.44-r1.ebuild @@ -0,0 +1,321 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit 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 + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" + 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 systemd test 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 )" + +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}] + virtual/libudev[${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 ) + v4l? ( media-libs/libv4l ) + X? ( + media-libs/libcanberra + x11-libs/libX11 + ) + 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" + +# 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.44-musl-build.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 + + # End of ${limitsdfile} from ${P} + EOF +} + +multilib_src_configure() { + 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) + + -Dsystemd-system-service=disabled # Matches upstream + -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) + -Dudev=enabled + -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 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() { + 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 <youruser>" + 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 <application> 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 +} diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index de92d3ebfb8e..033d3614a241 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -21,7 +21,7 @@ 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 systemd test v4l zeroconf" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa ssl systemd test v4l X zeroconf" # Once replacing system JACK libraries is possible, it's likely that # jack-client IUSE will need blocking to avoid users accidentally @@ -82,6 +82,10 @@ RDEPEND=" ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) v4l? ( media-libs/libv4l ) + X? ( + media-libs/libcanberra + x11-libs/libX11 + ) zeroconf? ( net-dns/avahi ) " @@ -131,6 +135,7 @@ src_prepare() { multilib_src_configure() { 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 @@ -185,6 +190,10 @@ multilib_src_configure() { -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 libcanberra) ) meson_src_configure diff --git a/media-video/pitivi/Manifest b/media-video/pitivi/Manifest index ecc3190fffb3..1dc02e01c60d 100644 --- a/media-video/pitivi/Manifest +++ b/media-video/pitivi/Manifest @@ -3,6 +3,5 @@ AUX pitivi-0.999-metainfo.patch 734 BLAKE2B 6187b6d596c80e3ea00e5b79df6f9092f6be AUX pitivi-0.999-optional-tests.patch 638 BLAKE2B 7d43b76384250b091908369ed274d93d3dde9365df1a6fb31d30bcb35c824cd9dfae8802346ee3019625a83cf4fcf9a249cecae9f670594b1d7f9b73c42f4efd SHA512 d564ab01b702bf30486c3fa947fa62ef9021b00816f3d2759ace16590e3b4ea3d6423ef4f41acc78bf857c2d54a4402fd8da8a4a14762067b26f25396a216e1f AUX pitivi-0.999-python38.patch 1809 BLAKE2B fe95c44a409f0a629602d4656cfc90a02e2e676a40d3d3f232457e2a506225f25ab86d585f26ddbaf8551c5efc54e13f474b8b259dd05c2a8285c0b98b9249ba SHA512 f90523242fd8acaa4f0637b8facc5a528186c5dd371f67049b11b307bd6f06c693dd79bb305f2163bed4bd0140bd7fcee86fe7d4b2239be82a7dea47c6038026 DIST pitivi-0.999.tar.xz 12296928 BLAKE2B 16736fef4f2d16c02b64f8eba56f8c9ddb26f49742ee577da4e4c47077f8d5d71ce653dba366a041ba523153532728c5eb37cb2b76e11e9c51827efb990bd99d SHA512 663db84a00634f0e83f0c1dd80a4f3a6603a50826905adb24fdd567c6e8bb58e20de04c7753fa04a36692cdcf5bbbcc9a87327fd3b56ebb70caffcff13835fc8 -EBUILD pitivi-0.999-r4.ebuild 2739 BLAKE2B 551e39afea4389eb5d7c928b8c4990536542bdfe791f9de6a020bca0a3a6cbfbb0b2fe645b54123feb4c7c9b9d666565a2ef3723411db9aeff7103803d22a059 SHA512 57dd791c91816f6c06dd3705e08fef1175400057a910b055af61fd190ba6966633d6579077339fbc4d040291b3fc458f800535dc34370dcd311db007b87d2c87 EBUILD pitivi-0.999-r5.ebuild 2908 BLAKE2B d87fc4e7fbf9147bf2bf280ce9128a973ebdac9daeba82f41045641fb311f22b885fa684667d816b420021cd16edd1862b610100754da6adefb4f49fb0736c83 SHA512 4f59f61f9e039d42cd962c4917b3906ec55739dca4994ede2420b7a23cbb5a70c519edc52085f237ca22973b49f9bd2a8e0103f8bd09dc15343b513c05fb5da8 MISC metadata.xml 380 BLAKE2B 3ba78024c7a1f5dd825bdb63ea42c4a4c6fef74a881f5acbfb6d707c27f9e0bddab88470f03cb663f564e26a3343e8a849d9f000ba7cf3e1df437ba5ae66086a SHA512 2c728bee57e023b734c64c65824c25ab02744bf49b33f91bc231a5a2ea47f821e5951f628fd558de55e0cad0cc6b95faecb924e226c581008ee342b4e58d6459 diff --git a/media-video/pitivi/pitivi-0.999-r4.ebuild b/media-video/pitivi/pitivi-0.999-r4.ebuild deleted file mode 100644 index 111b1146a2ea..000000000000 --- a/media-video/pitivi/pitivi-0.999-r4.ebuild +++ /dev/null @@ -1,116 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_{8..9} ) -PYTHON_REQ_USE="sqlite" - -inherit gnome.org meson python-single-r1 virtualx xdg - -DESCRIPTION="A non-linear video editor using the GStreamer multimedia framework" -HOMEPAGE="http://www.pitivi.org" - -LICENSE="LGPL-2.1" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="v4l test" -RESTRICT="!test? ( test )" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# XXX: recommends gst-plugins-libav and frei0r-plugins - -# Do not forget to check pitivi/check.py for dependencies!!! -# pycanberra, libav, libnotify and liwnck are optional -GST_VER="1.14.2" - -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] - || ( - >media-libs/gst-plugins-bad-1.18 - >=media-plugins/gst-transcoder-1.14.1 - ) -" -RDEPEND="${COMMON_DEPEND} - >=dev-libs/glib-2.30.0:2 - - >=dev-libs/gobject-introspection-1.34:= - $(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/gsound-1.0 - - >=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] - - v4l? ( >=media-plugins/gst-plugins-v4l2-${GST_VER}:1.0 ) -" -DEPEND="${RDEPEND}" -BDEPEND=" - app-text/yelp-tools - dev-python/setuptools - >=dev-util/intltool-0.35.5 - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig - test? ( - $(python_gen_cond_dep ' - dev-python/nose2[${PYTHON_USEDEP}] - ') - ) -" - -PATCHES=( - # https://gitlab.gnome.org/GNOME/pitivi/-/merge_requests/245 - # support python 3.8 - "${FILESDIR}"/${P}-python38.patch - - # use /usr/share/metainfo - "${FILESDIR}"/${P}-metainfo.patch - - # Make tests optional, bug #594096 - # https://gitlab.gnome.org/GNOME/pitivi/issues/2303 - "${FILESDIR}"/${P}-optional-tests.patch -) - -src_configure() { - local emesonargs=( - -Denable-tests=$(usex test true false) - ) - meson_src_configure -} - -src_compile() { - meson_src_compile -} - -src_test() { - export PITIVI_TOP_LEVEL_DIR="${S}" - virtx meson_src_test -} - -src_install() { - meson_src_install - python_fix_shebang "${D}" -} diff --git a/media-video/popcorntime-bin/Manifest b/media-video/popcorntime-bin/Manifest index e94c6bd36401..5f098e004a8c 100644 --- a/media-video/popcorntime-bin/Manifest +++ b/media-video/popcorntime-bin/Manifest @@ -1,4 +1,4 @@ DIST Popcorn-Time-0.4.6-amd64.deb 101425596 BLAKE2B 267cdad781702773b7241d8abd683062cbebe495802d0845e16028cd679344f6916ed9f15f4d14c00a73bae0ca92c377d02e5785bf098a407297ec7ae8b365bf SHA512 38feca591658794ccb0b91ea753c99a776195f2e746e1c5108114fccc88fa2290dd6955cd3d962f35f9653cbb2c48502bcd8c4ac2172cc5b83aa777fd3db6fb3 DIST Popcorn-Time-0.4.6-i386.deb 104385136 BLAKE2B 736808eb90e52d5703264cdb7e4c3a7e6458ceb608f122484c91ff51cb38ff21ae7f615a00aeab6b1688bab36fbf7acf2bb546b58be679d518715f4c1fc0513b SHA512 9b9321d2e3b1cbb37f290f7221b0611632bdacd7b3fac12a2e9400022d19e5b4f6fff87b969b62638f9a478e7bd0b04c6bd1e13699e812647af944d042443f2b -EBUILD popcorntime-bin-0.4.6.ebuild 1416 BLAKE2B 780cdb9f0ebc5612506702c26a3e7011353a8425abe2801cc3857e2d0290332de114d86d4cff5d684dd407e292a7bfcd52147c3a34ac0cafe629ea922dc11ab7 SHA512 ba53ef364d33981aa6e374ba588dcbeaeb905344ff07c709bea5928a503602066aace52a1af2a41b82c826641cbda4d3e79ab0a39a04ff783300128c93b6320d +EBUILD popcorntime-bin-0.4.6.ebuild 1432 BLAKE2B 85d5feda6d7f5917149b318112f06fe253d08845bd33f950b25cac02f239a8f822868b6ddca7132d64780d198052ed895844f967f4b460e955e9b1bf5a13c828 SHA512 dd24a211bcd11374955640b3871d13bed894308be42580df178c89d21bba197c3a2762bff7984efe33ebede6247f16a128156b57e9464bbcda3f33ec9fc4d9f8 MISC metadata.xml 436 BLAKE2B da1f7867d1f3a3b6a04a0975899b592976adb0299e2c370fa613d025993aeed81f719d1bde50565f3e8da15cfdd4ed6cd7f1bf4abb77c3d9371fdcfe7f4e9d13 SHA512 fec3c45b96ed58c61fb5454edc2351384b67bb52e156542bd0d71ce51f36b5943c1bee083a05c5c99917630da6ca5ffe0b87cfacde3a07d521a3c2032e42985e diff --git a/media-video/popcorntime-bin/popcorntime-bin-0.4.6.ebuild b/media-video/popcorntime-bin/popcorntime-bin-0.4.6.ebuild index be67597435bd..e47c9e68c4c9 100644 --- a/media-video/popcorntime-bin/popcorntime-bin-0.4.6.ebuild +++ b/media-video/popcorntime-bin/popcorntime-bin-0.4.6.ebuild @@ -25,6 +25,7 @@ RDEPEND=" media-libs/alsa-lib net-print/cups sys-apps/dbus + sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:3 diff --git a/media-video/qmplay2/Manifest b/media-video/qmplay2/Manifest index d8669bbabf13..f43edba141b6 100644 --- a/media-video/qmplay2/Manifest +++ b/media-video/qmplay2/Manifest @@ -1,8 +1,6 @@ -DIST QMPlay2-src-20.07.04.tar.xz 1552680 BLAKE2B cc53ef842f91312f72e8d347a2d6d2e4239fe9435d0b7ac39e47e9f1f48a9a570ce614dd496512079d3701e1823ab75123b40ad752fdd2348cdb7bc8de425225 SHA512 4a6316f03d1b77bcd6c08de0daefc3f29b4c8c575eae9f901951e2b43f2739904136b9455f567b66fc9a4e4c64fe92584608f1878dd8c30c0352ea9ee1e2e314 -DIST QMPlay2-src-21.03.09.tar.xz 1568600 BLAKE2B da3a185ae2e372b0bad697e4ad7d836647c5b4bb376f0ee3f7e85e387c10b86f1a3fdaf8eb13a2c9a8d3b7d56105e282cc82f22d31043e9e418ee907776f1db2 SHA512 311fe45a9ee237556faeee29633be6161407a31b19fd3bceca5a164e92ff1757824094d20f6b556c0a4beaac07a14179e812faafc5e41ee904cf1ce1827fb138 DIST QMPlay2-src-21.06.07.tar.xz 1579640 BLAKE2B f687cf19ce8d4a606b5271c2e5789d5194233bd300f29d165354cc8784808a148e02536ea8a593c036cd75d1e40a335177f1b9db33016008bbb2f9516daf7e61 SHA512 41558e2df09a188cef05c2a24393e67ce4d1ef1268ff1bdd1ac97ec666d9f8f849817b0c64e384624403a8f6f60cb985dde188cb3c75afd731e42f776076d282 -EBUILD qmplay2-20.07.04.ebuild 3577 BLAKE2B 01d9a11780e3ef63e9c5e60cd65cd2649090f1e9cd8f4928b8f00296fa99c602458622dab63f282d3e5ab143d0f2e7b422be783d16bc75c37603e97c05633454 SHA512 3e60673d0c778b37ecb80390b2dc7d21b3e6997b7593cefd8730244b17220ba9b87d0ef03b050b2ec8c41968a97ed856f617791e677cedbedcfbddfd273b4c85 -EBUILD qmplay2-21.03.09.ebuild 3457 BLAKE2B 33657ed63ead83ea84d42a5a5afa6756733d496c7429fb80d7150326f463ed4e0f470b67a38814f16144053eaf2727a2586e21b2c809fc858554d47a47b8568f SHA512 af380f84264bbb4de17f1a7bdaf0fb1c338ce2b404e9accfed9d95cdab8601c67e2a1a4429b6fe664a9d30234a5da715ba2ea117aaf5f7ac26363c7082025427 +DIST QMPlay2-src-21.12.24.tar.xz 1609604 BLAKE2B 0b2e1ddc0a089ee0d8d37d3d14f2273b53b4df078c6f1571a5ed44c1234133c3eb21461287eb12027ccb686d844f28939b8dfe236c11fd6cb5831dc825708301 SHA512 fddd1d28a0c7f8ad7fa8ef02bb1181ee2fe4babfd8b9c026d2b1d518c1cf28528c64d296b0050d7c51b1ae558baf2d04fe808b276816d98e839a85dbc67ac136 EBUILD qmplay2-21.06.07-r2.ebuild 3332 BLAKE2B 28e7d5b00a174fe3bd56e9e36376ff2ed57c271c9e182bfbce2994f33eaa4277d837ba64dbfe37851b320cab5cc1ac8ab1598e78a08a9d533ada64d4065ba448 SHA512 08ea23ec11101dee122d4ea0b7c541c322bc4b037a232dd37270381ba2221f6354005ebf5c9457af8aaf316fbf8963af1d47f1cbadb68e22d66f369295d64aff -EBUILD qmplay2-9999.ebuild 3351 BLAKE2B 102feaa9743194172b1006cf402caa3fb2acba7e8e7b90fd3bdc7377b2a4a313621b718e3f46596a7e5c46c8405cb4bef75b184db13a437d0e203ccef366d3e5 SHA512 84fa72ce81bbc824fbbde3f1f14423aa4161db358400aff2eca141549e36dc35202d872fa9fd74dffa43fc04305960af17400329667053977c59b73e4b76513b +EBUILD qmplay2-21.12.24.ebuild 3336 BLAKE2B 3d8976098e21861788cd780ff3f3e305dd87f9ede70210b121500f4acb1d9c23ca06558056f9df5107d632ba090f6548720b750e9b3306be08caf60518566ff1 SHA512 ccd37998da35fcb75b16d8b3387d4234b5990a25f52d552f83f64123275af069077a09179d0817495825d22d3312dce4bf5c75f6c8685044513e74998063f048 +EBUILD qmplay2-9999.ebuild 3336 BLAKE2B 3d8976098e21861788cd780ff3f3e305dd87f9ede70210b121500f4acb1d9c23ca06558056f9df5107d632ba090f6548720b750e9b3306be08caf60518566ff1 SHA512 ccd37998da35fcb75b16d8b3387d4234b5990a25f52d552f83f64123275af069077a09179d0817495825d22d3312dce4bf5c75f6c8685044513e74998063f048 MISC metadata.xml 1342 BLAKE2B c3e3b0477c49c00aec65e05ec5d940f8fc126efe074460a1f67c39b98654ccc3819669e47ad5ba83ed977a72f9ee41606d9409ef3a377cfb511bdc01aff0ce70 SHA512 2eb6b7c2b72abf37a2165f35ed7cab51653a425d294f4ec866d0c6b4dd53ffbf8b30306a987bb4bba1e952ea246815dc59e22a6e9141151a844ae1b7cbd36bde diff --git a/media-video/qmplay2/qmplay2-20.07.04.ebuild b/media-video/qmplay2/qmplay2-20.07.04.ebuild deleted file mode 100644 index 264d28c79f26..000000000000 --- a/media-video/qmplay2/qmplay2-20.07.04.ebuild +++ /dev/null @@ -1,149 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake xdg-utils - -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" - KEYWORDS="~amd64 ~x86" - S="${WORKDIR}/QMPlay2-src-${PV}" -fi - -LICENSE="LGPL-3" -SLOT="0" - -IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions - gme inputs libass modplug notifications opengl portaudio - pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv" - -REQUIRED_USE=" - audiofilters? ( || ( alsa portaudio pulseaudio ) ) - extensions? ( dbus ) - shaders? ( vulkan )" - -RDEPEND=" - dev-qt/qtcore: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] ) - dbus? ( dev-qt/qtdbus:5 ) - extensions? ( - dev-qt/qtdeclarative:5 - media-libs/taglib - ) - gme? ( media-libs/game-music-emu ) - libass? ( media-libs/libass ) - opengl? ( virtual/opengl ) - portaudio? ( media-libs/portaudio ) - pulseaudio? ( media-sound/pulseaudio ) - sid? ( media-libs/libsidplayfp ) - shaders? ( >=media-libs/shaderc-2020.1 ) - vaapi? ( - >=media-video/ffmpeg-4.1.3[vaapi] - x11-libs/libva[drm,opengl] - ) - 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 - virtual/pkgconfig" - -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_ALSA=$(usex alsa) - -DUSE_AUDIOCD=$(usex cdio) - -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134 - -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_PORTAUDIO=$(usex portaudio) - -DUSE_PULSEAUDIO=$(usex pulseaudio) - -DUSE_VIDEOFILTERS=$(usex videofilters) - -DUSE_VISUALIZATIONS=$(usex visualizations) - - # extensions - -DUSE_EXTENSIONS=$(usex extensions) - -DUSE_TAGLIB=$(usex extensions) - -DUSE_LASTFM=$(usex extensions) - -DUSE_LYRICS=$(usex extensions) - -DUSE_MEDIABROWSER=$(usex extensions) - -DUSE_MPRIS2=$(usex extensions) - ) - - # find and link vulkan libs permanently - if use vulkan; then - mycmakeargs+=( -DQMVK_FIND_VULKAN=true ) - fi - - if [[ ${PV} == *9999 ]]; then - mycmakeargs+=( USE_GIT_VERSION=true ) - else - mycmakeargs+=( USE_GIT_VERSION=false ) - fi - - cmake_src_configure -} - -pkg_postinst() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} - -pkg_postrm() { - xdg_icon_cache_update - xdg_mimeinfo_database_update - xdg_desktop_database_update -} diff --git a/media-video/qmplay2/qmplay2-21.03.09.ebuild b/media-video/qmplay2/qmplay2-21.12.24.ebuild index b626780caa01..7f6b9471ab08 100644 --- a/media-video/qmplay2/qmplay2-21.03.09.ebuild +++ b/media-video/qmplay2/qmplay2-21.12.24.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 cmake xdg @@ -13,24 +13,24 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/zaps166/QMPlay2" else SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz" - KEYWORDS="~amd64 ~x86" S="${WORKDIR}/QMPlay2-src-${PV}" + KEYWORDS="~amd64 ~x86" fi LICENSE="LGPL-3" SLOT="0" -IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions - gme inputs libass modplug notifications opengl pipewire portaudio - pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv" +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 ) ) - extensions? ( dbus ) shaders? ( vulkan )" RDEPEND=" dev-qt/qtcore:5 + dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 @@ -41,11 +41,7 @@ RDEPEND=" ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) - dbus? ( dev-qt/qtdbus:5 ) - extensions? ( - dev-qt/qtdeclarative:5 - media-libs/taglib - ) + extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) @@ -54,6 +50,7 @@ RDEPEND=" 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[drm,opengl] @@ -64,12 +61,10 @@ RDEPEND=" >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) - xv? ( x11-libs/libXv )" - + xv? ( x11-libs/libXv ) +" DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig" +BDEPEND="dev-qt/linguist-tools:5" src_prepare() { # disable compress man pages @@ -85,9 +80,11 @@ src_configure() { local mycmakeargs=( # core -DUSE_LINK_TIME_OPTIMIZATION=false + -DUSE_UPDATES=OFF -DUSE_ALSA=$(usex alsa) -DUSE_AUDIOCD=$(usex cdio) - -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134 + -DUSE_DBUS_SUSPEND=ON + -DUSE_FREEDESKTOP_NOTIFICATIONS=ON -DUSE_LIBASS=$(usex libass) -DUSE_NOTIFY=$(usex notifications) -DUSE_OPENGL=$(usex opengl) @@ -112,27 +109,28 @@ src_configure() { -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) - -DUSE_TAGLIB=$(usex extensions) - -DUSE_LASTFM=$(usex extensions) - -DUSE_LYRICS=$(usex extensions) - -DUSE_MEDIABROWSER=$(usex extensions) - -DUSE_MPRIS2=$(usex extensions) ) - # find and link vulkan libs permanently - if use vulkan; then - mycmakeargs+=( -DQMVK_FIND_VULKAN=true ) + 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+=( USE_GIT_VERSION=true ) + mycmakeargs+=( -DUSE_GIT_VERSION=true ) else - mycmakeargs+=( USE_GIT_VERSION=false ) + mycmakeargs+=( -DUSE_GIT_VERSION=false ) fi cmake_src_configure diff --git a/media-video/qmplay2/qmplay2-9999.ebuild b/media-video/qmplay2/qmplay2-9999.ebuild index d6a9054ddf1c..7f6b9471ab08 100644 --- a/media-video/qmplay2/qmplay2-9999.ebuild +++ b/media-video/qmplay2/qmplay2-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 cmake xdg @@ -13,24 +13,24 @@ if [[ ${PV} == *9999 ]]; then EGIT_REPO_URI="https://github.com/zaps166/QMPlay2" else SRC_URI="https://github.com/zaps166/QMPlay2/releases/download/${PV}/QMPlay2-src-${PV}.tar.xz" - KEYWORDS="~amd64 ~x86" S="${WORKDIR}/QMPlay2-src-${PV}" + KEYWORDS="~amd64 ~x86" fi LICENSE="LGPL-3" SLOT="0" -IUSE="avdevice +audiofilters +alsa cdio cuvid dbus extensions - gme inputs libass modplug notifications opengl pipewire portaudio - pulseaudio sid shaders vaapi vdpau +videofilters visualizations vulkan xv" +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 ) ) - extensions? ( dbus ) shaders? ( vulkan )" RDEPEND=" dev-qt/qtcore:5 + dev-qt/qtdbus:5 dev-qt/qtsvg:5 dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 @@ -41,11 +41,7 @@ RDEPEND=" ) alsa? ( media-libs/alsa-lib ) cdio? ( dev-libs/libcdio[cddb] ) - dbus? ( dev-qt/qtdbus:5 ) - extensions? ( - dev-qt/qtdeclarative:5 - media-libs/taglib - ) + extensions? ( dev-qt/qtdeclarative:5 ) gme? ( media-libs/game-music-emu ) libass? ( media-libs/libass ) opengl? ( virtual/opengl ) @@ -54,6 +50,7 @@ RDEPEND=" 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[drm,opengl] @@ -64,12 +61,10 @@ RDEPEND=" >=dev-qt/qtgui-5.14.1:5[vulkan] >=media-libs/vulkan-loader-1.2.133 ) - xv? ( x11-libs/libXv )" - + xv? ( x11-libs/libXv ) +" DEPEND="${RDEPEND}" -BDEPEND=" - dev-qt/linguist-tools:5 - virtual/pkgconfig" +BDEPEND="dev-qt/linguist-tools:5" src_prepare() { # disable compress man pages @@ -85,9 +80,11 @@ src_configure() { local mycmakeargs=( # core -DUSE_LINK_TIME_OPTIMIZATION=false + -DUSE_UPDATES=OFF -DUSE_ALSA=$(usex alsa) -DUSE_AUDIOCD=$(usex cdio) - -DUSE_FREEDESKTOP_NOTIFICATIONS=$(usex dbus) # https://github.com/zaps166/QMPlay2/issues/134 + -DUSE_DBUS_SUSPEND=ON + -DUSE_FREEDESKTOP_NOTIFICATIONS=ON -DUSE_LIBASS=$(usex libass) -DUSE_NOTIFY=$(usex notifications) -DUSE_OPENGL=$(usex opengl) @@ -112,18 +109,24 @@ src_configure() { -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) - -DUSE_TAGLIB=$(usex extensions) - -DUSE_LASTFM=$(usex extensions) - -DUSE_LYRICS=$(usex extensions) - -DUSE_MEDIABROWSER=$(usex extensions) - -DUSE_MPRIS2=$(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 diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest index 37faf3f89736..47cfe940772e 100644 --- a/media-video/shotcut/Manifest +++ b/media-video/shotcut/Manifest @@ -1,6 +1,6 @@ DIST shotcut-21.09.20.tar.gz 4358591 BLAKE2B 3919cb0f5c3f0aaa665729227d077cdeac1569102509bbf6be7f9451cadda8e22b38a8e796ef5fd2f5dd84bff2abbd98103a0917eb9acacdc9db771968f723ef SHA512 6c2463c8d81c4e61b59d97ba2ee8f9aba5c420ee50b6c46c0e5f1c177e44cea6bc1fab5a7184ce8b13d2818b207efffe3c12f4d1682ce002279ba16c1c9bd624 DIST shotcut-21.10.31.tar.gz 4408987 BLAKE2B 88c77503475de21a4989d0e412a214c2d5c2c30d60abf11e06326a599e14c4b1a7d7b678c494d13223cf7e11c6dd12c810e7d112750f4f18308250693316a8cd SHA512 de5d9992a41217323b3d96cc7618ed5adc633e7d0e65b6f8f189405008f6faba011a80f38cda0126b18ab28a359f6784078cb298b2ee29dcdfdc6769963714f3 EBUILD shotcut-21.09.20.ebuild 1382 BLAKE2B d498cffb6d88936881ea8a4140b9db4cadd12b78c5520a2cf0a911d52cdba7d7c85365b6e7cdd22a6baf02dd3472e3fc5c28fd20f50ee27bc60a3e7e51527d30 SHA512 1c1786983c05577e57ddbc35d4733214c417b3e3566b0575e6839e6e24bcd5cf7a7546214cc75731c936bc3a743a9dcf08b3cb2648731b4c613add6b85ed1e68 -EBUILD shotcut-21.10.31.ebuild 1382 BLAKE2B d498cffb6d88936881ea8a4140b9db4cadd12b78c5520a2cf0a911d52cdba7d7c85365b6e7cdd22a6baf02dd3472e3fc5c28fd20f50ee27bc60a3e7e51527d30 SHA512 1c1786983c05577e57ddbc35d4733214c417b3e3566b0575e6839e6e24bcd5cf7a7546214cc75731c936bc3a743a9dcf08b3cb2648731b4c613add6b85ed1e68 -EBUILD shotcut-9999.ebuild 1382 BLAKE2B d498cffb6d88936881ea8a4140b9db4cadd12b78c5520a2cf0a911d52cdba7d7c85365b6e7cdd22a6baf02dd3472e3fc5c28fd20f50ee27bc60a3e7e51527d30 SHA512 1c1786983c05577e57ddbc35d4733214c417b3e3566b0575e6839e6e24bcd5cf7a7546214cc75731c936bc3a743a9dcf08b3cb2648731b4c613add6b85ed1e68 +EBUILD shotcut-21.10.31.ebuild 1385 BLAKE2B 28908cfda2e9cfa163cf0dc240c150324265ae344074dea1175d16ee20f2e76ba323e33172f3563de6d7e4d41042d8e862f2f7b548da099b4c81076c27e43200 SHA512 8b8352a3ec366c19910793424b51b1bbd4c5a9709ec97fd737e45f456eeceed6ad0637cfcf2df5431c2a15e93f6461f02e1c64cb4801a34c7e5484ae664ced7d +EBUILD shotcut-9999.ebuild 1385 BLAKE2B 28908cfda2e9cfa163cf0dc240c150324265ae344074dea1175d16ee20f2e76ba323e33172f3563de6d7e4d41042d8e862f2f7b548da099b4c81076c27e43200 SHA512 8b8352a3ec366c19910793424b51b1bbd4c5a9709ec97fd737e45f456eeceed6ad0637cfcf2df5431c2a15e93f6461f02e1c64cb4801a34c7e5484ae664ced7d MISC metadata.xml 481 BLAKE2B 183f296894a3deb21038399eec0a637f2080d029fb8ea539a5a165206868704e472ed554bec67325fb54a4d8aeea54c01857635e32abdd229c91f3ba7855d095 SHA512 95af90837128290393f798b1561ebcbad057da1b5dafb583f9f9ba56878ff1d48245438ea3605601fad608e749235619d2195290c04c5c31eb8bbe627b58f4a7 diff --git a/media-video/shotcut/shotcut-21.10.31.ebuild b/media-video/shotcut/shotcut-21.10.31.ebuild index c758f989295d..288a54c92b74 100644 --- a/media-video/shotcut/shotcut-21.10.31.ebuild +++ b/media-video/shotcut/shotcut-21.10.31.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 @@ -36,7 +36,7 @@ COMMON_DEPEND=" dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - >=media-libs/mlt-7.0.1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] + >=media-libs/mlt-7.2.0-r1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg " DEPEND="${COMMON_DEPEND} diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild index c758f989295d..288a54c92b74 100644 --- a/media-video/shotcut/shotcut-9999.ebuild +++ b/media-video/shotcut/shotcut-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 @@ -36,7 +36,7 @@ COMMON_DEPEND=" dev-qt/qtwebsockets:5 dev-qt/qtwidgets:5 dev-qt/qtxml:5 - >=media-libs/mlt-7.0.1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] + >=media-libs/mlt-7.2.0-r1[ffmpeg,frei0r,fftw(+),jack,opengl,qt5,sdl,xml] media-video/ffmpeg " DEPEND="${COMMON_DEPEND} diff --git a/media-video/subtitleeditor/Manifest b/media-video/subtitleeditor/Manifest index acc8a1025c9a..50c8b3f6308b 100644 --- a/media-video/subtitleeditor/Manifest +++ b/media-video/subtitleeditor/Manifest @@ -1,6 +1,5 @@ AUX subtitleeditor-0.52.1-disable-nls-fix.patch 1080 BLAKE2B fe400d4c2a16508e2889539ca963839f1118b1df916c9cb6c3b2e8d575aa40fa61e32eeb2612406c51ef5f3d56296a42b0980919a14e1f0290ccea3cf4821c94 SHA512 7775e9527a5e1b7f2a469eb3ea5f3d5422797c4ca61f02b486578f60e5a118ab1d6479079cae35ed29324a1579ed3363ed77b18ceda1dad5b10f8def1a11b650 DIST subtitleeditor-0.54.0.tar.gz 1783077 BLAKE2B a802124c9b81ad5fecc4914b6231e7efaf3326f231115f334fd53b79d8a851bf2f09fdccdee85c53b0cc828fe67c72e9924f47f0881d0438e563b18b1f77f00b SHA512 4458d579775a504b22f955c41d0e95ed722c1cb6bcf715ef493988a85397d5e0d4c3327e129f49b160d398dc73257026a92bbe5104c30d2004c16b7e12dd113c DIST subtitleeditor_0.54.0-5.debian.tar.xz 9100 BLAKE2B 249048228aab601524bb1f6e222863d1d3f96e3be4a05e08196a164d0e4ed3ff4b662fbac5a468a546f871e314a99f68ed9132692a5be8997d8338810ab91808 SHA512 9e15c0f6d4ddc88650f6f7962b09175fddbae1c1ac295a83c33e29e1212f09a1d88711a4e1250c5f125d72ea02f4b77c3ca9f62594ee0010f0cf8d383fbe0832 -EBUILD subtitleeditor-0.54.0-r1.ebuild 1372 BLAKE2B 4a99b55ac6c225eb8e68fce93582d54da3668219ae7fb6c3d069e67f534e064bee29c36c7333769e30346df9e9c46cacd1e98a2cfa9b7573878da4d7e146859e SHA512 2a3e552a168960397346d3f511d2845f78f824952aa2ffbfac62a252746886e120dc428c11fb6e89e1bd6e2a6097226eba17a7a376d2eed575a1a79c799892dc -EBUILD subtitleeditor-0.54.0_p5.ebuild 1742 BLAKE2B b97d8fc74bf51e2f781170c5b35f537e8cd08f5f1c37c737b2d1f2dad52084d57fefca21b88d533c705514e00062fb704b2e12a72cb75a965ac259afb332ed5d SHA512 95d33c0e2211623fe5005c2eddfd697ff3e48678a3df5b667206e58c640de71162418d0a0e2135f6179c97b01b9d19d241a3ce3013e8aebe6a7d2e9a4cc937f1 +EBUILD subtitleeditor-0.54.0_p5.ebuild 1740 BLAKE2B 0adfad909c5a0d40f8c21059dc920eac20f6983b3d131bb752f9a4040f7072764d00cb65e194447bb231547a2cfd51674bf80a38ac56c52b5d311b9c35d7e690 SHA512 fab174aa09cbb3de2df628025bb393fae7c2caf5b2a59d9080f649d7ac5c7647cc397692ccd2d09badbbf7194ac00bef7ac9c51bf796f5152463911c5b311bba MISC metadata.xml 566 BLAKE2B b09b71c48220f14cd4011d478827db5be88f445816a0ce948b63351ff3de904c2fe477cc876ba2fba82f366a6e78d25c94fb220e4603a964fa4d0116fe9ca612 SHA512 846fae1386c767aaa2f9521ebc93a7cd91c4df52ffdf6d973552ddcc9d89b0591d9ee6c2a406fd1a0d3207fa393c783cd024c4c66847354b865dbb0977469cea diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild b/media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild deleted file mode 100644 index 83ce58f4ad78..000000000000 --- a/media-video/subtitleeditor/subtitleeditor-0.54.0-r1.ebuild +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -GNOME2_LA_PUNT="yes" - -inherit flag-o-matic gnome2 - -DESCRIPTION="GTK+3 subtitle editing tool" -HOMEPAGE="https://kitone.github.io/subtitleeditor" -SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" -IUSE="debug nls" -# opengl would mix gtk+:2 and :3 which is not possible - -RDEPEND=" - >=app-text/enchant-1.4:0 - app-text/iso-codes - >=dev-cpp/cairomm-1.12:0 - >=dev-cpp/glibmm-2.46:2 - >=dev-cpp/gtkmm-3.18:3.0 - >=dev-cpp/gstreamermm-1.0:1.0= - >=dev-cpp/libxmlpp-2.40:2.6 - dev-libs/glib:2 - >=dev-libs/libsigc++-2.6:2 - media-libs/gst-plugins-base:1.0[X,pango] - media-libs/gst-plugins-good:1.0 - media-libs/gstreamer:1.0 - media-plugins/gst-plugins-meta:1.0 - x11-libs/gtk+:3 - nls? ( virtual/libintl ) -" -# opengl? ( -# >=dev-cpp/gtkglextmm-1.2.0-r2:1.0 -# virtual/opengl ) -# X needed for video output and pango needed for text overlay -DEPEND="${RDEPEND} - >=dev-util/intltool-0.40 - virtual/pkgconfig -" - -PATCHES=( - "${FILESDIR}"/${PN}-0.52.1-disable-nls-fix.patch -) - -src_configure() { - # Avoid using --enable-debug as it mocks with CXXFLAGS and LDFLAGS - use debug && append-cxxflags -DDEBUG - - gnome2_src_configure \ - --disable-debug \ - --disable-gl \ - $(use_enable nls) -# $(use_enable opengl gl) -} diff --git a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild index 5929fb7bc8c0..21f2d7e2a70d 100644 --- a/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.ebuild +++ b/media-video/subtitleeditor/subtitleeditor-0.54.0_p5.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 @@ -14,7 +14,7 @@ SRC_URI="https://github.com/kitone/${PN}/releases/download/${PV}/${P/_p*}.tar.gz LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="debug nls" # opengl would mix gtk+:2 and :3 which is not possible diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index bfa0cdf3e825..4ec954bc079b 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,6 +1,5 @@ AUX 3.38.0-gst-inspect-sandbox.patch 1823 BLAKE2B 14be244c4bd9d96264ff776fb68381df5ea153fac41bf358e2253628bdb09733846a9331e6b129a1abd9186b967357549d6247d5ac021a37362a34206d8e17d8 SHA512 45f7602233b2f64debe1624442a2f6a21e0bf0b2cddf06b49dcdae7dcf0fc0ae6c3f16e5ec2603340df7cd89271501be70a31a0e0b0a737f85f667ac10c3ad53 -DIST totem-3.38.1.tar.xz 2196156 BLAKE2B a9f5771d7406df9490b6eb0f9dc03ef449bee05d6ff038fce9adbac63692b5555de6ff36fe90b3b63cf4bc59739d91b23e57b3a03bf953594567e6a21060b509 SHA512 f33583b0890bfdd0dfff0722f73242b1d38605564a3055b587a30eae4c0ba51159c105ef577ab144792ca1994f385c2b8a9375a356b7cdf2b93bfeb6317f6040 +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 -EBUILD totem-3.38.1.ebuild 2829 BLAKE2B a0cafb192ae7fc7d6416d48be2d8d04590a7ec786c3f81bad2f02848b1e7cfd77842171f5a75f67f793f75b5d2e6e3c91ffaaa95672cc0f2826f9410f51e24b4 SHA512 d4a50e2a85e822faef1ad4f7692c0bfbbf5f1ed13459ac20fe1863884aa19d9f55827706a9daa7692d2b0077205437c2a96281f2978b4a715122704a4a2f0116 -EBUILD totem-3.38.2.ebuild 2838 BLAKE2B b235beee881627b24f4321047aa4ed0a5c474bed76320d02ba9bb40546b91121a94e2d2a8d43ae2a35574835f137591ba22a64e6d527d2770e0a68d67b47cca8 SHA512 7e675edb9a9ec1072572aa4a3cfc71fd938f90b364262f210bbc7c5cea97c4960c0d25dcb6e1558bbe95bd4c4df3bcf9f6b57e502defe98bec176e082994568e +EBUILD totem-3.38.2.ebuild 2891 BLAKE2B 26903d0e3ce3d5fc404b8675d1896ab0bdfe0ede4bed28cc4254882941b98f7ef3c1250b7f6d5d9f2f383777c3155164dc3d869b7d8e78a6b4c65d0c67f88ad5 SHA512 130628959c125d3f65a71465901f389f709796a6048b412a6cc373773c03f1c5f4d34c9d18351c19852e76b12dcf420dce410365cae860fae338e8bf41dd4a2d 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 new file mode 100644 index 000000000000..da494e2b61b4 --- /dev/null +++ b/media-video/totem/files/3.38.2-fix-build-with-meson-0.61.1.patch @@ -0,0 +1,41 @@ +https://gitlab.gnome.org/GNOME/totem/-/commit/61e3a957cb7339c6614e764fcf1120d967d687e9 +https://bugs.gentoo.org/831931 + +From: Bastien Nocera <hadess@hadess.net> +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.1.ebuild b/media-video/totem/totem-3.38.1.ebuild deleted file mode 100644 index 717a1d6b7eff..000000000000 --- a/media-video/totem/totem-3.38.1.ebuild +++ /dev/null @@ -1,120 +0,0 @@ -# Copyright 1999-2021 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 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) -) - -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-3.38.2.ebuild b/media-video/totem/totem-3.38.2.ebuild index 60670a33c80f..086dd67eb632 100644 --- a/media-video/totem/totem-3.38.2.ebuild +++ b/media-video/totem/totem-3.38.2.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 @@ -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 @@ -74,6 +74,7 @@ BDEPEND=" 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() { diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index 266439408229..52da3bcbd778 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -18,4 +18,4 @@ EBUILD wireplumber-0.4.5-r4.ebuild 3271 BLAKE2B f69305218c798f6f34aa3e3716d8abfe EBUILD wireplumber-0.4.6-r1.ebuild 2885 BLAKE2B 9c1d9494281187560add126aef3642133220f7032118863e9ff3e7eec1e9f5e665907960accc089ba325040a3390147887a95532d6c04a59afa01f4c325cc2d7 SHA512 119aec5c069a3766725829e3db98340e281982d13502ba7759d9a4be345074d2b889ef0e3f14112c68368eb2e4154cff54536288914391cc7c994c81e0192c96 EBUILD wireplumber-0.4.7-r1.ebuild 2644 BLAKE2B 68ddc0730654f5f112d388aca3ee40d5770b5e3c55944c09a5a3a3503e15b752fc0e05856e72a683718106ab83932240fbb59235af860981cbf78058bd86fade SHA512 8e8bcda79de1d7ca4b044049ac2cbb6e5b596f6f8a351b8f67d4dc237252e6ca31f894c069966213c1c85ec85a76643a5a8da268768e69faa696c6b4cd6cf45c EBUILD wireplumber-9999.ebuild 2563 BLAKE2B cb53fa8c1fe7b0dadd01ae5b703b10d1b3202104039bff37a06e22777e822fe3178a89f42a3172acccb575c0c9dda14c420095587b66ee2baa530a41fe2a5235 SHA512 6558a682dfff705adf1aa10c2e3e2b6cc2efed6330b0b57a9744e6e620bd264f4c1cf236770f1178f668a7931c5fa710b51cb195a5b6911200ae8fb404fa5a05 -MISC metadata.xml 673 BLAKE2B 71a411815b61a970653e39cf33ef56e04268805b98d5d5fbc405f4739b71adee9137e0198bf4ebaad208b4e878ab3087766ee223e1e18aaff90fac14d2c5dc23 SHA512 ba6121c54e9f6208b0b5c471790b005c51105d479a0dd2464563b7320530b3d8c176ff38bdb6c760d3f31a18fb993647244d944a222991110f14508ce63c4a96 +MISC metadata.xml 674 BLAKE2B 8e33f665afefd33f81db16c58e39297a772c0abb035f7a7ef1d7bbac4a4d4cf96b6526d2d7757054bb04e03991199688317c8899b62153408c2aab3c9ac21834 SHA512 fa32a4e5023716b6792481df78f1541d46974b934f43e9ed5d8b67a79ad8eb553cda041db546e747328bc8d0935eb6fddfbe73731fa0d68555b5149a69e680bb diff --git a/media-video/wireplumber/metadata.xml b/media-video/wireplumber/metadata.xml index b9b45abb671e..6c8e29d33878 100644 --- a/media-video/wireplumber/metadata.xml +++ b/media-video/wireplumber/metadata.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> +<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> <maintainer type="person" proxied="yes"> <email>89q1r14hd@relay.firefox.com</email> |