diff options
Diffstat (limited to 'media-video')
103 files changed, 3304 insertions, 1427 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex cb5fa37b0c3a..af0a3a9dd8a1 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/bdsup2sub/Manifest b/media-video/bdsup2sub/Manifest deleted file mode 100644 index b50df73f4276..000000000000 --- a/media-video/bdsup2sub/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX bdsup2sub-4.0.0-xdg.patch 1036 BLAKE2B c87a7b82a66c6bccc4b283a13ecef0d54b15d4b89479192c014ca31b037b8be9d8d7be1584a6a4421a94a056eb0ce98c3c4642651dcace57a0ab2ff31f1e772e SHA512 4f0232f5906cd685daf2b86cbd24a284a96939c653d36479ff271902af1dae0c558391bbf302fcdaac8a01f29aecfe56850407798d2520e22a1f227664e7c254 -AUX build-4.0.0.xml 1836 BLAKE2B 39b481344bee30e17f5a825b8d6eced1f6c410468da5382978a6f07bd9b081d12ba04f7973d3cc127cb6353b7cc1853f8ad196bd1e46994fbffcc42058cbc190 SHA512 ec2f7c82dd00243a692182e8ecf363674703a11fcc59b81bb290bb9ef2afb0617da506459f7dc7e50018560364b2e5bddfb40e766e33cc15111b6984c18c6119 -DIST bdsup2sub-4.0.0.tar.xz 199796 BLAKE2B 293c7d0433103a3087fb057b938b1cf2d42acc01ccdeb8c815f124c3a6b61f20bb211d88f9f4a7e516f4f7aa54200d2c1ec36adbfe700321543f27a9408269f4 SHA512 d12f5ddde2b9fec9dc50a43212db52f068852c972c0ee559dbe7f56490d7082eb1f603413a17737f791450d7f1458ed5ba39fda9a7a1349af03c07a0173c13a6 -DIST xdg-20100731.java.xz 648 BLAKE2B 8bd082c445d64051c65c66e8a22b61e582d04f1f650e3b15ee2f3400d47b10f137d245bd8a7633d96299e2c688f7bf836b59a4dd49ea3c181684a78fa55304c3 SHA512 8b5d8e695f3f052f889002dc93742da8ba9eada173cb10ad1db525e1ad89d1c8f44200d79dc02068ccf93fdbf2e8daa5bb359dae77bacbc89cb6d4895732774b -EBUILD bdsup2sub-4.0.0-r3.ebuild 1165 BLAKE2B 846d42f26b56867205a74b1d046be73239ee9aaefad681fbed20fb972188015390a3fb554fe4c0603e283d3acb603ae59cdbc70f10a2a10d6286d37568ae6c6b SHA512 82341a030f59dfaa2ef7e7a89ee8994eb37e9b2b8561c290c81e37ff986fa016e51886f0639bcd8515f1519c17a1cae39f499a57af0b2208d8b906e7719d771f -MISC metadata.xml 260 BLAKE2B ee10cc021112a6e67381cc76d642cabfe9876b9e2da97243070551179a9f8eb2bcb67d8bf96822d40239c350808a8a129882914f1ce9b5f924c99d16ba1300a6 SHA512 0bc4c52638ab97c96d6e1ea6b8199201567dbdac880349e8ab501de49bbfba142e4f2f60baac9c0bc48df6f5d170d81d641277cc01762d720b720764bb162c1a diff --git a/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild b/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild deleted file mode 100644 index 8246c205b408..000000000000 --- a/media-video/bdsup2sub/bdsup2sub-4.0.0-r3.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -JAVA_PKG_IUSE="doc source" - -inherit desktop java-pkg-2 java-ant-2 - -XDG_P="xdg-20100731" - -MY_PN="BDSup2Sub" - -DESCRIPTION="A tool to convert and tweak bitmap based subtitle streams" -HOMEPAGE="http://bdsup2sub.javaforge.com/help.htm" -SRC_URI=" - http://sbriesen.de/gentoo/distfiles/${P}.tar.xz - http://sbriesen.de/gentoo/distfiles/${XDG_P}.java.xz" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - >=virtual/jre-1.8:*" - -DEPEND=" - >=virtual/jdk-1.8:*" - -S="${WORKDIR}/${PN}/${PV}" - -PATCHES=( "${FILESDIR}/${P}-xdg.patch" ) - -src_prepare() { - default - - # apply XDG patch - cp -v "${WORKDIR}/${XDG_P}.java" "${S}/src/xdg.java" || die - - # copy build.xml - cp -f "${FILESDIR}/build-${PV}.xml" build.xml || die -} - -src_compile() { - eant build $(use_doc) -} - -src_install() { - java-pkg_dojar "dist/${MY_PN}.jar" - java-pkg_dolauncher "${PN}" --main "${MY_PN}" --java_args -Xmx256m - newicon bin_copy/icon_32.png "${MY_PN}.png" - make_desktop_entry "${MY_PN}" "${MY_PN}" "${MY_PN}" - use doc && java-pkg_dojavadoc apidocs - use source && java-pkg_dosrc src -} diff --git a/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch b/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch deleted file mode 100644 index 3f68beb6d495..000000000000 --- a/media-video/bdsup2sub/files/bdsup2sub-4.0.0-xdg.patch +++ /dev/null @@ -1,40 +0,0 @@ ---- a/src/deadbeef/SupTools/Core.java 2010-07-29 13:01:48.000000000 +0200 -+++ b/src/deadbeef/SupTools/Core.java 2010-08-01 02:19:25.215473885 +0200 -@@ -22,6 +22,8 @@ - import deadbeef.Tools.Props;
- import deadbeef.Tools.ToolBox;
-
-+import xdg.*;
-+
- /*
- * Copyright 2009 Volker Oth (0xdeadbeef)
- *
-@@ -750,6 +752,7 @@ - cliMode = false;
- String s = c.getClass().getName().replace('.','/') + ".class";
- URL url = c.getClass().getClassLoader().getResource(s);
-+ /*
- int pos;
- try {
- fnameProps = URLDecoder.decode(url.getPath(),"UTF-8");
-@@ -767,6 +770,8 @@ - fnameProps = fnameProps.substring(0,pos+1);
- }
- fnameProps += Core.iniName;
-+ */
-+ fnameProps = xdg.config_home() + "/" + Core.iniName;
-
- // read properties from ini file
- props = new Props();
-@@ -905,8 +910,10 @@ - * Write properties
- */
- public static void storeProps() {
-- if (props != null)
-+ if (props != null) {
-+ xdg.mkdirs_file(fnameProps);
- props.save(fnameProps);
-+ }
- }
-
- /**
diff --git a/media-video/bdsup2sub/files/build-4.0.0.xml b/media-video/bdsup2sub/files/build-4.0.0.xml deleted file mode 100644 index 9aab31c3a5e1..000000000000 --- a/media-video/bdsup2sub/files/build-4.0.0.xml +++ /dev/null @@ -1,68 +0,0 @@ -<?xml version="1.0"?> - -<project name="BDSup2Sub" default="jar"> - <!-- some properties --> - <property name="src.dir" value="src" /> - <property name="build.dir" value="build" /> - <property name="docs.dir" value="apidocs" /> - <property name="dist.dir" value="dist" /> - <property name="resources.dir" value="bin_copy" /> - <property name="project.jar" value="${dist.dir}/${ant.project.name}.jar" /> - <property name="target.jdk" value="1.6" /> - - <!-- init --> - <target name="init"> - <mkdir dir="${dist.dir}" /> - <mkdir dir="${docs.dir}" /> - <mkdir dir="${build.dir}" /> - </target> - - <!-- compile everything --> - <target name="compile" depends="init"> - <javac srcdir="${src.dir}" - destdir="${build.dir}" - source="${target.jdk}" - target="${target.jdk}" - encoding="ISO-8859-1"/> - <copy todir="${build.dir}"> - <fileset dir="${resources.dir}" /> - </copy> - </target> - - <!-- build the jar files --> - <target name="build" depends="compile"> - <jar jarfile="${project.jar}" basedir="${build.dir}"> - <manifest> - <attribute name="Main-Class" value="${ant.project.name}" /> - </manifest> - </jar> - </target> - - <!-- generate javadocs --> - <target name="javadoc" depends="init"> - <javadoc sourcepath="${src.dir}" - packagenames="*" - destdir="${docs.dir}" - author="true" - version="true" - use="true" - charset="UTF-8" - encoding="ISO-8859-1" - windowtitle="${ant.project.name} API" /> - </target> - - <!-- clean up --> - <target name="clean"> - <delete dir="${build.dir}" /> - <delete dir="${docs.dir}" /> - <delete dir="${dist.dir}" /> - </target> - - <!-- zip the sources --> - <target name="sourcezip"> - <zip destfile="${dist.dir}/${ant.project.name}-src.zip"> - <zipfileset dir="${src.dir}" /> - </zip> - </target> - -</project> diff --git a/media-video/bdsup2sub/metadata.xml b/media-video/bdsup2sub/metadata.xml deleted file mode 100644 index a2dfee954457..000000000000 --- a/media-video/bdsup2sub/metadata.xml +++ /dev/null @@ -1,8 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>media-video@gentoo.org</email> - <name>Gentoo Video project</name> - </maintainer> -</pkgmetadata> diff --git a/media-video/cheese/Manifest b/media-video/cheese/Manifest index 6cb17ae29bce..7d6eb8e4c32d 100644 --- a/media-video/cheese/Manifest +++ b/media-video/cheese/Manifest @@ -1,4 +1,4 @@ AUX cheese-43.0-buildfix.patch 762 BLAKE2B be49440d95b627586523da823085c1048186177881ee29f3d378d9d3fa49dac3799bc143cd594e10ecde9539b1e8a4defa1c6559d28376f8af2e8de0c4c24fd8 SHA512 8abb9a01b5b101fc8d6550db9b935ecaabe9eeec75527c189c9f3bb90c928637b953996966164517e71d084bc25c3997a2487771be4713276730013eecfb43e3 DIST cheese-44.1.tar.xz 1095916 BLAKE2B 7558b43a28bc5323a6ccd6e50c86611ee572d32cf190dde401c5d347b70b269ce05875e8a0d2d59e174a66d2cf5330b2530890969445eab00d7da0b4f02ce3e7 SHA512 106f02c0bd6e21039e3d1cdbcb8111c8d76638666b3a3ee65bc81295deaf50acf49023f3f7bf2ca244a9b7f4ac95d04fbc5864c1ded8698c52665c23c3640dc1 -EBUILD cheese-44.1.ebuild 2285 BLAKE2B 9891f74edc0826dbdbbff1298fa2d3ea34fed9b46e75503647a1ff1b6dd0b518bb8ce03d75c60df8cd05dc657f012bce6fdef9280d84ecf5c293457548305e3c SHA512 c119f063676ba926a77520e82e7017e645dfdd5eaf0e281ab060525a0b0c8fc3891a64b5d25d69789e55927e3ac426a1c3295dd9b2bc47af29a3d0bbee060244 +EBUILD cheese-44.1.ebuild 2279 BLAKE2B 243ede3dec3602f1c64852c0a8d8f435d86b043888368db7e4772d5a65167c5f1427bd255f7cb9d79eaaf6639ce441872b1d4279fc826dfedbf78df541b413d8 SHA512 53c04038536ddc75950dd526bd5a29cbdb302320acb45c1c7d0c09ed1bcc2fadea708932376392e0546e9c1e5e5a1af07d7176b7c2ab372c64a2db459874f9f2 MISC metadata.xml 528 BLAKE2B 8bb571eba870c101ab13171963f52397177155b00f7c251542267340c18193db8cfb62162fa3a2b3238c4d759f6252195907ebf6db4e2693cd44da7990f5a52d SHA512 6751fe57feca587302400f15019a00e735a952c9e11bdc8518f0d288b0a5655a9440a092677eecea5279804dab84ed0c1e4043435da901b5211356242452fee0 diff --git a/media-video/cheese/cheese-44.1.ebuild b/media-video/cheese/cheese-44.1.ebuild index b6998ae2db97..b229a7621fcd 100644 --- a/media-video/cheese/cheese-44.1.ebuild +++ b/media-video/cheese/cheese-44.1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Apps/Cheese" LICENSE="GPL-2+" SLOT="0/8" # subslot = libcheese soname version -KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86" IUSE="gtk-doc +introspection test" RESTRICT="!test? ( test )" diff --git a/media-video/dirac/Manifest b/media-video/dirac/Manifest index 6a72e152a8e3..d37cd84c31b2 100644 --- a/media-video/dirac/Manifest +++ b/media-video/dirac/Manifest @@ -1,4 +1,4 @@ AUX dirac-0.5.2-doc.patch 2304 BLAKE2B 1753b2645553deac3479ffc776eba95e9c100ce2d1ee18fd5a43af1d333608ac1df885ff6d10954414357b0cf76110c101d246d9ef66e7691bf4ff03a9387ea1 SHA512 1cac4ce26efd5f28b1d671258d5b8b0612815ac41dff230eda0db2c3a0f7414e2266ed1f92de728c97c40319e5d035f42fd1882233f85e3ccfd83b36b84ac099 DIST dirac-1.0.2.tar.gz 918366 BLAKE2B 16fb215958e0d772c0c7a89ee25603b25115b422a2e669d3256ea1384b5376e4df2bbf3303000ff26f08c3290a96958ace3391898bebe086b29116cf04180046 SHA512 71d49fe17da4069ea28581565d5a4c4f64565848b51d04b39a646bdaa9afc899a265e9ace34af57fba64b03562e8c2259f882f6f17c1e49d1057cd8e69d1250c -EBUILD dirac-1.0.2-r2.ebuild 1138 BLAKE2B b0559a63e674a2d388963a7cf1a892a6ab9f83f19ba83a9f8c99ee93241358f9457d6a52ee4458628a4578750186a595f57867a9b3c09dc3e9dc17a031def438 SHA512 6f20f92c2722bf6f4e72f161d958d267e58994e856d66c8aa5b0608f9a91bc3389c44adb42dc137ee45ccce05965720c82fa7d6898616558a58f7e62c5680965 +EBUILD dirac-1.0.2-r2.ebuild 1132 BLAKE2B 9dc18aff6c214987e056b01bd2fb1b1bd24d9c6e1eb95416d48c8e696d35d4b75a9ae8223081cfaa88ae10c3dd06d2d5a619ce32db136f4251bb718fea56ec81 SHA512 b99b92e816f28b1872f92d5a717b0f36e05b5b92364663073140b034c67714221092f697cd5f305f60753ff310b8adb2b2d45d84c4c4e33a6e3fa3824e8f516d MISC metadata.xml 299 BLAKE2B c422a088126043b93d6200f1b0c5d2689b8e74c6ad0f8b13931f68ef5b85c3876c495e080676c19b78fb2730c59d0e8f73683e948d5bd28a68cc2e5c285828f8 SHA512 7bc9431cd2068b8af841d4e63873e6ecfb95e1372017c738eedbc4741212fbbffb46afbb38ee4a9f434090a3e32d37d6d97091601cbdd8de7c713c3bc4fceb6f diff --git a/media-video/dirac/dirac-1.0.2-r2.ebuild b/media-video/dirac/dirac-1.0.2-r2.ebuild index c69be76aff2a..180b12111cfa 100644 --- a/media-video/dirac/dirac-1.0.2-r2.ebuild +++ b/media-video/dirac/dirac-1.0.2-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="MPL-1.1" SLOT="0" -KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" +KEYWORDS="~alpha amd64 arm ~hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos" IUSE="debug doc cpu_flags_x86_mmx" BDEPEND=" diff --git a/media-video/ffmpeg-chromium/Manifest b/media-video/ffmpeg-chromium/Manifest index ffe021842a16..70982f9c96bb 100644 --- a/media-video/ffmpeg-chromium/Manifest +++ b/media-video/ffmpeg-chromium/Manifest @@ -4,8 +4,10 @@ DIST ffmpeg-chromium-125.tar.xz 10372892 BLAKE2B 53b805354b55f1dfbe2341b767aaccc DIST ffmpeg-chromium-126.tar.xz 10402160 BLAKE2B 96a92ff2a5ece8668693f5ef7ed5da3e61a523b98a91d00316494df91edfc42c1622663719a3c192de2a4ebf7a6258f08c53393201ee3fc3261f162e1b529dcd SHA512 8fc10b1d5fe159a1dd718229bf8ec50ed0bea1fedd917859b3a0703f15e94809087e67ccf2031eb14ae8b06ad32d958ed71ff54621fd667f5507abd9738a6f0c DIST ffmpeg-chromium-127.tar.xz 10418192 BLAKE2B 2a623ee8e2c0940e4067e6ebecaecdc64c45b16022327a84d77323348c210b091c58eb52b4afea1f2918cd29a27c3457a3294f561a5e6ee2db28c63f432b23bd SHA512 0cddb21761ad3b54f5393d3963ca94518cb4ab8183f2bbe975f8419bd94d8b20131750a22d75fd56b304a2b83be364993a839f727342b7eed6a2d1868f79af4c DIST ffmpeg-chromium-128.tar.xz 10420280 BLAKE2B 0b5b3ca891445042c9c1a27713b57a0d99f75fd2d57116b89afa1020dde61a1b2d3d14e0c6d639a17fd0b45359e803580100c600e6ac99eb383630512ab8402b SHA512 a420da69c49c11bf49229066f7f08d837d8bfacfa47c659b8c3e5bb28426b65749a16ce221bf2996541902f2d55750c43e75596102a6449cdf4a845cbad777dc -EBUILD ffmpeg-chromium-125.ebuild 6657 BLAKE2B db9582314b61909de311d3287577cad8d087a96eb9fd2ac1c9fd8ba0f89622ec8cfbb5790069af68e1f6b42efe0b4be5aea5d6f99425bfa4f99e8ace553ba4d2 SHA512 ec6d625c3d5d6007a3f0f5bea98cf684ddde7087db030e7dacaa93a673a279edf74d62c475c3112927e4a7ab68d3f80621378ad0db77ac7ff3e5b56cc5d6e88d -EBUILD ffmpeg-chromium-126.ebuild 6657 BLAKE2B 3e08ce545199da60565e97f1328e4c9e31f14fc169aa0e36aeb7f6c772497d1f92c98f0039ce8968a551e9e38bf4acf3f86db0ac5bbeb9f59837a6851adc0d78 SHA512 7f50b01df708adfc2a94509a606f47b2f119a0af4671c7020c7dc21a0ccf24780f340059532cf5eb45cc30859c7394432d7b2f56cb529fb739bea8e8ab7b4480 -EBUILD ffmpeg-chromium-127.ebuild 6657 BLAKE2B 1ef9acdaeba4acd40879caae346d541b0f9f7a57c6f578ae7e506adb4a23638ce81065b07fcdc9062afb2e2533542d5584a6867181862677bf0058d1bd2bf00b SHA512 71a12e7f7d9551f84cb53b343776949f488421678655ebdafe851a0d388f0bcd8e17fbb0ef9dfab5cd9bc14d1a365451b959bcd196c75a8c83ba27448439ee98 -EBUILD ffmpeg-chromium-128.ebuild 6659 BLAKE2B 5a5f16409dbe409c8e9c33c4f47a8d22b7f14a964801176d049ea3390cc175eb7aeaa7650a8fc257c5c01a823392dd4c9ca073a3e3265dda5bead39980c97962 SHA512 34120ab25a9269927e892183977dc16ee93819d02cbc1401de6cd145a7a6c35fe458d65cafa11348a05a1cd8b1b7109e8d64b245176f924319360e0bc30123ce +DIST ffmpeg-chromium-129.tar.xz 10424032 BLAKE2B dbe0b8c2d799958660b6a3ca0f1a8e68a8f5b81ef813f2837b1c66bc03a9200cc8273b6c077fec5402157701cd341ce75055d39aac7b78e5af39537285a0bb8a SHA512 c6ac36f41cc7eed353b92809a481dd783ca52eabc15a10d6a41cb241e2ad8a25cb2467b62c671f303f90b6b3bb1497a196b4488457832fb5b51a796de20ca49c +EBUILD ffmpeg-chromium-125.ebuild 6479 BLAKE2B f71dbdd8922f14df1bca7a085645fdf48b843efe57c022bb31e2728e886c57f80b7993c675a71fd25641b995332d6a8b8015ff6eef988d2b005fb8a1ae980878 SHA512 21c167a3ba28277ac66a400fce531848a5a04a4be344ac94a7de421b8e8814f3c7f3b5612ba91c5ef1607bba371211655f7dfc87a44b8c239b473c8a7f7062a1 +EBUILD ffmpeg-chromium-126.ebuild 6479 BLAKE2B 31d1f47cf086e7617bcabc9b342c0155a0bc2782c569e65c391a4d15161165ec6869027b7498d5a20cad433f00d5bc4d64944498170b8b408be4147390ea3910 SHA512 8e7fe997f6ab7ebe4a3e24ab695b8d978296cb368ba2aeda0e5acd4e0dba5ed32bb95b4ae4210ebeef6b178004da153d4fd530ed509c050e777924f786752c37 +EBUILD ffmpeg-chromium-127.ebuild 6479 BLAKE2B 7357fe026fd686a96c6098e5259cbbd745b9b3e16afe088f3f0001a40994599439b2638d387b3dbc2aa66eba28a366ec3d032a4ed5d18948d501f8ab8cad086b SHA512 59380fcf97cc23930f8c3ff4023a8351881e8cf11dcfdad16d8c40ebb9891074ae6661455cd3395f0ca55552e8c0782458a9409bb175401d0af2e8a4222b82f4 +EBUILD ffmpeg-chromium-128.ebuild 6479 BLAKE2B 9b7d9a1d995d0a925979ba122a51821d98e5299329f5453bcf3f80587ebc0e760afc9d9b65a3a444bf3dc00bd3bf495cc1d0fcbd6daa25ad477e2f2ae39c6beb SHA512 8c6b99f807c0b7b6bc6fe9d5c2ff436ffaab41ac4e20c7567f17d8ac6a66ec1007353a1f383052dc707da692002a05cc3a2f447947fce6c5b224e08de3a4eef5 +EBUILD ffmpeg-chromium-129.ebuild 6481 BLAKE2B f39cdc8c06d6fb791f885d28bbbf5c5a679bc6dde02a32c6eb051ce66bd1e74e31fc3001713b700aa938ae3907c8ed2a8ad35e3722f7068763fa4bec358ac344 SHA512 b1ad095fa5d5d6f5583a9011d75d0f466b6f3455fd5f91c480649ee65ded0a371b2b80683fffe0a6b82bff93dcfb9beb72259cb3da31a2f2320e61cc8b717aa8 MISC metadata.xml 695 BLAKE2B 84fa4967572665812d4da8bb1a86a8b28a749892570cb1fca5c0515f860fbe8c472a91240f1d3b7b3109ccdbd32cf8da941c438cd9f332b763f2824e0e193ac8 SHA512 0069bcf32d2aa083c66e13579295e8ef96b9ac72b02f1436620000c71c4d1e335391838f9a9e56f7768bd13dbe13ce6f3f3674a303cf90cc658360825867c3f9 diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild index 3186f0ec2b6a..7112d7b23cff 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-125.ebuild @@ -140,15 +140,6 @@ src_configure() { # Bug #918997. Will probably be fixed upstream in the next release. use vulkan && append-ldflags -Wl,-z,muldefs - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) for i in "${ffuse[@]#+}" ; do diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild index e4db10a00285..30123f9c2d1f 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-126.ebuild @@ -140,15 +140,6 @@ src_configure() { # Bug #918997. Will probably be fixed upstream in the next release. use vulkan && append-ldflags -Wl,-z,muldefs - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) for i in "${ffuse[@]#+}" ; do diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild index 91d93d2a4d58..f67cb20d79f3 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-127.ebuild @@ -140,15 +140,6 @@ src_configure() { # Bug #918997. Will probably be fixed upstream in the next release. use vulkan && append-ldflags -Wl,-z,muldefs - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) for i in "${ffuse[@]#+}" ; do diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild index 6b5bd6600a97..0669dac8dc36 100644 --- a/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-128.ebuild @@ -16,7 +16,7 @@ LICENSE=" " SLOT="${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64" # Options to use as use_enable in the foo[:bar] form. # This will feed configure with $(use_enable foo bar) @@ -140,15 +140,6 @@ src_configure() { # Bug #918997. Will probably be fixed upstream in the next release. use vulkan && append-ldflags -Wl,-z,muldefs - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) for i in "${ffuse[@]#+}" ; do diff --git a/media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild b/media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild new file mode 100644 index 000000000000..b17b9937116a --- /dev/null +++ b/media-video/ffmpeg-chromium/ffmpeg-chromium-129.ebuild @@ -0,0 +1,239 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit flag-o-matic toolchain-funcs + +COMMIT=14d16cd143ad1993900c276e37592956702443a9 +DESCRIPTION="FFmpeg built specifically for codec support in Chromium-based browsers" +HOMEPAGE="https://ffmpeg.org/" +SRC_URI="https://deps.gentoo.zip/media-video/${P}.tar.xz" + +LICENSE=" + !gpl? ( LGPL-2.1 ) + gpl? ( GPL-2 ) +" +SLOT="${PV}" + +KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64" + +# Options to use as use_enable in the foo[:bar] form. +# This will feed configure with $(use_enable foo bar) +# or $(use_enable foo foo) if no :bar is set. +# foo is added to IUSE. +FFMPEG_FLAG_MAP=( + cpudetection:runtime-cpudetect debug + +gpl + vaapi vdpau vulkan + nvenc:ffnvcodec + # Threads; we only support pthread for now but ffmpeg supports more + +threads:pthreads +) + +IUSE=" + ${FFMPEG_FLAG_MAP[@]%:*} +" + +# Strings for CPU features in the useflag[:configure_option] form +# if :configure_option isn't set, it will use 'useflag' as configure option +ARM_CPU_FEATURES=( + cpu_flags_arm_thumb:armv5te + cpu_flags_arm_v6:armv6 + cpu_flags_arm_thumb2:armv6t2 + cpu_flags_arm_neon:neon + cpu_flags_arm_vfp:vfp + cpu_flags_arm_vfpv3:vfpv3 + cpu_flags_arm_v8:armv8 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm +) +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_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( cpu_flags_arm_thumb ) + ) +" +X86_CPU_FEATURES_RAW=( 3dnow:amd3dnow 3dnowext:amd3dnowext aes:aesni avx:avx avx2:avx2 fma3:fma3 fma4:fma4 mmx:mmx + mmxext:mmxext sse:sse sse2:sse2 sse3:sse3 ssse3:ssse3 sse4_1:sse4 sse4_2:sse42 xop:xop ) +X86_CPU_FEATURES=( ${X86_CPU_FEATURES_RAW[@]/#/cpu_flags_x86_} ) +X86_CPU_REQUIRED_USE=" + cpu_flags_x86_avx2? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma4? ( cpu_flags_x86_avx ) + cpu_flags_x86_fma3? ( cpu_flags_x86_avx ) + cpu_flags_x86_xop? ( cpu_flags_x86_avx ) + cpu_flags_x86_avx? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_aes? ( cpu_flags_x86_sse4_2 ) + cpu_flags_x86_sse4_2? ( cpu_flags_x86_sse4_1 ) + cpu_flags_x86_sse4_1? ( cpu_flags_x86_ssse3 ) + cpu_flags_x86_ssse3? ( cpu_flags_x86_sse3 ) + cpu_flags_x86_sse3? ( cpu_flags_x86_sse2 ) + cpu_flags_x86_sse2? ( cpu_flags_x86_sse ) + cpu_flags_x86_sse? ( cpu_flags_x86_mmxext ) + cpu_flags_x86_mmxext? ( cpu_flags_x86_mmx ) + cpu_flags_x86_3dnowext? ( cpu_flags_x86_3dnow ) + cpu_flags_x86_3dnow? ( cpu_flags_x86_mmx ) +" + +CPU_FEATURES_MAP=( + ${ARM_CPU_FEATURES[@]} + ${X86_CPU_FEATURES[@]} +) +IUSE="${IUSE} + ${CPU_FEATURES_MAP[@]%:*}" + +CPU_REQUIRED_USE=" + ${ARM_CPU_REQUIRED_USE} + ${X86_CPU_REQUIRED_USE} +" + +RDEPEND=" + >=media-libs/opus-1.0.2-r2 + vaapi? ( >=media-libs/libva-1.2.1-r1:0= ) + nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) + vdpau? ( >=x11-libs/libvdpau-0.7 ) + vulkan? ( >=media-libs/vulkan-loader-1.3.277:= ) +" + +DEPEND="${RDEPEND} + vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) +" +BDEPEND=" + >=dev-build/make-3.81 + virtual/pkgconfig + cpu_flags_x86_mmx? ( || ( >=dev-lang/nasm-2.13 >=dev-lang/yasm-1.3 ) ) +" + +REQUIRED_USE=" + vulkan? ( threads ) + ${CPU_REQUIRED_USE}" +RESTRICT=" + test +" + +PATCHES=( + "${FILESDIR}"/${PN}-120.patch + "${FILESDIR}"/chromium.patch +) + +src_prepare() { + export revision=git-N-g${COMMIT:0:10} + default + + # -fdiagnostics-color=auto gets appended after user flags which + # will ignore user's preference. + sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die +} + +src_configure() { + local myconf=( ) + + # Bug #918997. Will probably be fixed upstream in the next release. + use vulkan && append-ldflags -Wl,-z,muldefs + + local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) + + for i in "${ffuse[@]#+}" ; do + myconf+=( $(use_enable ${i%:*} ${i#*:}) ) + done + + # CPU features + for i in "${CPU_FEATURES_MAP[@]}" ; do + use ${i%:*} || myconf+=( --disable-${i#*:} ) + done + + # Try to get cpu type based on CFLAGS. + # Bug #172723 + # We need to do this so that features of that CPU will be better used + # If they contain an unknown CPU it will not hurt since ffmpeg's configure + # will just ignore it. + for i in $(get-flag mcpu) $(get-flag march) ; do + [[ ${i} = native ]] && i="host" # bug #273421 + myconf+=( --cpu=${i} ) + break + done + + # LTO support, bug #566282, bug #754654, bug #772854 + if [[ ${ABI} != x86 ]] && tc-is-lto; then + # Respect -flto value, e.g -flto=thin + local v="$(get-flag flto)" + [[ -n ${v} ]] && myconf+=( "--enable-lto=${v}" ) || myconf+=( "--enable-lto" ) + fi + filter-lto + + # Mandatory configuration + myconf=( + --disable-stripping + # This is only for hardcoded cflags; those are used in configure checks that may + # interfere with proper detections, bug #671746 and bug #645778 + # We use optflags, so that overrides them anyway. + --disable-optimizations + --disable-libcelt # bug #664158 + "${myconf[@]}" + ) + + # cross compile support + if tc-is-cross-compiler ; then + myconf+=( --enable-cross-compile --arch=$(tc-arch-kernel) --cross-prefix=${CHOST}- --host-cc="$(tc-getBUILD_CC)" ) + case ${CHOST} in + *mingw32*) + myconf+=( --target-os=mingw32 ) + ;; + *linux*) + myconf+=( --target-os=linux ) + ;; + esac + fi + + # Use --extra-libs if needed for LIBS + set -- "${S}/configure" \ + --prefix="${EPREFIX}/usr" \ + --libdir="${EPREFIX}/usr/$(get_libdir)" \ + --shlibdir="${EPREFIX}/usr/$(get_libdir)" \ + --cc="$(tc-getCC)" \ + --cxx="$(tc-getCXX)" \ + --ar="$(tc-getAR)" \ + --nm="$(tc-getNM)" \ + --strip="$(tc-getSTRIP)" \ + --ranlib="$(tc-getRANLIB)" \ + --pkg-config="$(tc-getPKG_CONFIG)" \ + --optflags="${CFLAGS}" \ + --disable-all \ + --disable-autodetect \ + --disable-error-resilience \ + --disable-everything \ + --disable-faan \ + --disable-iconv \ + --disable-network \ + --enable-avcodec \ + --enable-avformat \ + --enable-avutil \ + --enable-libopus \ + --enable-decoder=aac,flac,h264,libopus,mp3,pcm_alaw,pcm_f32le,pcm_mulaw,pcm_s16be,pcm_s16le,pcm_s24be,pcm_s24le,pcm_s32le,pcm_u8,theora,vorbis,vp8 \ + --enable-demuxer=aac,flac,matroska,mov,mp3,ogg,wav \ + --enable-parser=aac,flac,h264,mpegaudio,opus,vorbis,vp3,vp8,vp9 \ + --enable-pic \ + --enable-static \ + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} + + echo "${@}" + "${@}" || die +} + +src_compile() { + emake V=1 libffmpeg +} + +src_install() { + emake V=1 DESTDIR="${D}" install-libffmpeg +} diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index df47279325cc..a35758537112 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -9,13 +9,12 @@ AUX ffmpeg-4.4.4-fix-build-svt-av1-1.5.0.patch 1882 BLAKE2B e60bb09566cf61018a0e AUX ffmpeg-4.4.4-glslang.patch 1526 BLAKE2B d64d95f089c3d3aeafb7cc3fb08700641b6252c3cdbfac2e9b16431819007a8fa7b52ae156a1c9727671f00c9281024596183b85f7f74864ef997f660aa47296 SHA512 2bca3ca62bece6696dd6bd30c8cf57e31b9da551ee1f698a09d0a00ecdc96da51b519a8a42c85d1f572d26db92bec72a717d75c1a6e3c8f59a4a0066e6a332b8 AUX ffmpeg-4.4.4-opencl-parallel-gmake-fix.patch 362 BLAKE2B 709a5a79aea781258998f295e539620651dce08820db345ab3d1d8996b076907db5157bfc7cd1fe15b8ce86bd1f6d073f79a2343f74a2548e9a699b92b4efe6f SHA512 0a5ecb29c19505564b4d3d6f362b8885d055c5a93688f3671509764194fb851aaf51483a956b8a150ec6ea17cc7ca2e5e0cca25d5f476f26c3bbdcb3ebd8ce05 AUX ffmpeg-4.4.4-wint-conversion-vulkan.patch 1066 BLAKE2B 1409c97a31ae59500df944ced7efc064486e325e1658ac8f30d74ac926c63de51b610eebb5be9951adcd8ad02c8c143429c6eff57ce789a1c187e0b24221aa6d SHA512 58e33b2f0e94e75ef7acebb221332dc4d618846f8a968011da370743ce80a4ab688112411d3f2a5320d144c25db567780c870a0eb4045152b73957e2d7fe747e +AUX ffmpeg-4.4.5-incmptbl-pntr-types.patch 502 BLAKE2B 2c4d4416b112d1b4b0c985be7765e18e5d52586252834dd47052e13caa8554fd28dcbc88b37013f36134d5dba06b0c917f485f42a8e12d5cda37a6b13dd48827 SHA512 d3e9730467d52cb75999fa2494996e2b1515cdfb22d134be50240308f2c1167569033c7aaa821efe10dc0ee252863ff3c8826b58fbf2a727639c1bee652edc14 AUX ffmpeg-5.0-backport-ranlib-build-fix.patch 2224 BLAKE2B 1af6c5eee3f2c69c0630a73ec3885b9302cb045a03623ff138939348d6ba7e7deef1bb07c33c5bef5834040c4f6abcd7d22af8b0b849b28efde3d5753b776108 SHA512 e82cd400488ba86e5d039f088e3798b5a66245a8753d275d608284081f4b260fb7a4d8d1310f43acdf81258cc507943c8f07e431c497411744a62ba98c88c5bb AUX ffmpeg-5.1.2-get_cabac_inline_x86-32-bit.patch 999 BLAKE2B 736a85e60d3ee9b48346e1d7795bd8e075e8bcc2556695ec9db0a48a8d7356d20795ed31e1d6dcda7615e5ad3ff9faf7edf7563ba6e1f822a99d3cd442bd8a72 SHA512 f16c7185a3265710b6638e35322895590b58dffaffcb8fb436b08f945e19c44a1b66a17902b73e89fd53cf5e4cd9e7f2256bef4df4c82be16a807eb6bf663f5a AUX ffmpeg-5.1.3-binutils-2.41.patch 2217 BLAKE2B f013c5df1cc3495830d101e551e42dfd07b016913c7cfed82920e85e69d857fb8081e19503d7f0306ca2e0313683d00e3b20293fc8ddab491eb10ffdd3a92b1a SHA512 2db666d4e5f3e9e4f32b6a34e537b5af2229c744eebdbc6680e883b88e5d937ab59f8a0fd7da812a28d9d0a3955853cb594ac5352d31a9655da95b735bbc46c0 -AUX ffmpeg-6.0-binutils-2.41.patch 2217 BLAKE2B 2c8e96610fe1d198613405941b8f6ce36c1e8a543769a0dcfa5498dc0b4638e2e936dde8ad6c81a24b31dfc674ab7a2484e1a692f1ea911a1141276c05a5b13e SHA512 ec082acaaeb42061e2c6054f26fb6483170684f148200219ec8bc1fc04cf56a0d9bb31becd367c2cfdde3a9bc6bcf4d9fcdb646a57df3cda6935951e18759f6e AUX ffmpeg-6.0-fix-lto-type-mismatch.patch 1782 BLAKE2B 4cafd0244136c645e8da072b21c906fba97579f667e57f678b450410759fddc834e5a2428b7d0f078130cfc7ab267cad82a46d369951efddcfc5853dd2118837 SHA512 170114d57af0a0b5fc5da71ae76f4725b8cf1a604b5eca10e60761ef22fb0cdb35a166d1dd5ebc4ef990c383e1d1331f8ef2ceccb8dc7bf4adcc7e9ebb2ba899 AUX ffmpeg-6.0-libplacebo-remove-deprecated-field.patch 4733 BLAKE2B eba46b33bdbb387b90f89491aa638cb941e7fb72d522945394e540fdfadaf83efc6837a13eefedc285b6bce3ef4443ef32f2c04754209c4a47c4d2216574d597 SHA512 0673dab6043466eecf79048f1da8879d89a014b207910bfd6ec6ebf151fe77edf35460035583f803133969d90ab202ce31aaddf322501ac4e34e1270a66f09fe -AUX ffmpeg-6.0-wint-conversion-vulkan.patch 1647 BLAKE2B 3d0f0de065a615f199cd3a3074f5038bf6652f41afa8f8754ade5f0112327f069d4cf8eddf3bc25139122d258caceb102dad7c2825b99f35c273e993caae817d SHA512 1fa7506eb393e44ba98ebaea1e98831912279d365ef8909f247913b912973f7782cb0ad869da4244b6a09b91f5cbb5a5207cbc5a4de8ec61fc313714ea663a80 AUX ffmpeg-6.0.1-alignment.patch 5048 BLAKE2B 9a9345b84b68442c97258a71b49ed773e40d985ea8f2525a8749a7562d787634ff0b0e5e1d257e94f7cf68fab81790ca2f0b64cfcb27453e1e6912de30c560e9 SHA512 575b71b2d69b0c7b4e0498b9375dad55945adc7178c72ed5fd12addeae3ffb0081ab59d743a2a6da1a3b67d84642c7dd3d04e2fdb9ae2d992968ba52aa1aee41 AUX ffmpeg-6.0.1-libjxl-0.9.patch 5209 BLAKE2B 52c393c8e9b15382dbaf06f0c4651927f9dd87ac5437eb333f84689fafea841aeccf6ce9a43a522e2d4a1ec7e56074b8ee394f8c4b12c521cd48f293d36530f1 SHA512 bd114c62a4692fce9d625acb519900bee48fb604b0b7d7a2dba0a8f6648511be2019612ea8bafde95fa3b115bc9b527ab3267477327ce6e41d34b816f24a2654 AUX ffmpeg-6.1-gcc-14.patch 523 BLAKE2B b82fc06a7eee0c7ab68ef78f3ac205f45a68a7799dc241f0a574afa48e4dbd477c0d67f7c5a7ff46971adc821ef1507f4957156200167a2c59f8c7f7867ac048 SHA512 092cd9bad652ab82c3b160a37c0c92b561577d56b33776e30b79b7abf487fffeb1ef1273b950c4d4eff62d3cd7fec2a6dc2c294285b0b32eda364e47834a4ff9 @@ -29,21 +28,30 @@ AUX vmaf-models-default-path.patch 1126 BLAKE2B 71f83765dc89b85e929af393f9d1415d DIST ffmpeg-4.4.4-texinfo.patch.xz 19136 BLAKE2B 591b46180fccdb58c5b6b102c5e12075ff4388dc6bc0ab1752531d4f9f2802c1fd09ed1353ed70a539fdc5c2298f9cfc84ec24e3a04d371ef0d9f3f30d8e8f38 SHA512 f86a324efe261801a5192d4f204f48de581466550cca49b54432fdf5430f1b3bc9a9d31b9b52e2f23481def67ad55b5ad315752c482709aa67b1f3a3e6c17a4f DIST ffmpeg-4.4.4.tar.xz 9565584 BLAKE2B 8cd76a91ae6e485e56c6e5ae7b31d678e2fc2d634b1c56240619a4b6924dae4ec7adb445932bf4455f409dbc03fdc6d52b4fc270da55393e329ccd3d129f5770 SHA512 253799eccd129dad331db85def5352178ae22303e42af47fc013a6adfd4b60d1e59ff5f9ac6118fe3b403affa56ea1f3ba658042f526a914fba27050c3065daf DIST ffmpeg-4.4.4.tar.xz.asc 520 BLAKE2B c8bf944883e375555b6dd69029fe863c23f68a3584d84aa3e9c4278ae45aee0bfa3697cc1d8a768b95a1ebd7a9cb91553671072f88f46f6a9c947faa74344a44 SHA512 47afa042d8b529d0bfce391455a25cda261f39f8510601d7de2aba6398483ecb623992626e8489aa2a636e3cb93008f26b32080e526143254226d4e2651accea +DIST ffmpeg-4.4.5.tar.xz 9575596 BLAKE2B 546df09f7731d22e532a18d9ba9be184283f62b7a2e9470e745e536802bc2263a00f11ed6ab0aee8fc60c5f728826311cbf3542084ba3a64b65a61d76295cd64 SHA512 70df4e63ef507a7ec76da34438142499139769728fd5130d9cf48d56c110ec82c3d6a7e6d1622da03c70167fa861d901d016bbe52c21d2b284b8a0d9f30811dc +DIST ffmpeg-4.4.5.tar.xz.asc 520 BLAKE2B 505987208ed58b548f910299adb1324e6eba655cc37e6f03cac32c8623e16a4a884e822c745fb72b1934129a8c0a2706bb8bfb785715e6a68e43f737cb8ed365 SHA512 bcfee8986681dfbefd3add741fcbbc5e223bb06c9800797e68fde968c114055ac3fc02ce8731ed269bf30c92d6c990c7f636f82d42379920012e8a0ace8d527e DIST ffmpeg-6.0.1.tar.xz 10240172 BLAKE2B 1e21862f1f4eac04b8e9ef5597853d9e105bac4e858960c07e244ec3dbcea8f9e9fbdec4ff20b64227afad5ea5d0b05eff79a905f8002314ab4e9c37116c1908 SHA512 8a86b2db4a9abb68bb86d770ba1babb76c8b8313cfb0258ae70c88e736a93b99c342a6ecda94b739e8e7c103bed75d4afd756dd94e08c6255f424ef62c264741 DIST ffmpeg-6.0.1.tar.xz.asc 520 BLAKE2B dc7222c7c55e9af28c54dcfae4fce33fb44aa2a7e9d2ca4af85a961568b67f63116a6597234cd7ce009669b8ecf6576defd9380c389356435ffc3026b1126f03 SHA512 314f9ef996b85bc93c9fb823d582697c7415ac35f56bfc9cd906893491c8076df90bd852cf6e5e757b1fa94bd415ed108488c1220add49eb1f4854fc253c178c DIST ffmpeg-6.1.1.tar.xz 10458600 BLAKE2B 77827ff92b47c773ed82e7b7793dbb135c370fe23501169cb1eab08ff5ede77cfd5b397e8fb1d38756812cc82277898fd5c74b7d8495842556570c0c5570daeb SHA512 fca3f8635f29182e3ae0fe843a8a53614e4b47e22c11508df3ff7cdbafbb4b5ee0d82d9b3332871f7c1032033b1cad2f67557d7c5f7f7d85e2adadca122965d5 DIST ffmpeg-6.1.1.tar.xz.asc 520 BLAKE2B 801cd976d10363d1f9fc302351b330cb57e609a266407627ef378172f28974f4a18435b8a77b9cc7a8ff7b75701185211739f685629bbda961c3588c15af1221 SHA512 0e10c1f560bab0812d759d286656593dea5940f02bb52d88d9ba7f10b12b9cc3d7aa2a41c5f7a45b319069e04dce22dc1286b3c1ba685b35cd6d04cd81c5a0f5 +DIST ffmpeg-6.1.2.tar.xz 10466152 BLAKE2B ff1f2b2bb60ccc4c37b6ffda2a0e6a0be80c451dc99f6d4a99bd95a1bdc44c494d62377c53383ccfb5b818573a1971948d7db34119099dbc56d7258724831d3c SHA512 3a009184d971fc3168e1322d1d724aae787ed0e9c152d8d1813ea0b9099bda3b35c41fcabbd7b140560e7a8fa9fa1ffd7f0938432d5d498c43829fc6cc3d9e08 +DIST ffmpeg-6.1.2.tar.xz.asc 520 BLAKE2B f26a2d6f5423f93090f2a448172e49f3858aeb5a00f326207d374bbb70fa8942c7ee1a7c55338b2db664b647c983cd5ab4fd8d71efe5c37af4c90385ca17d0ab SHA512 a26dba1f4870b964080b45f8468f5ce3591eb6aa69be426bf4afbe5a60c3cbd0fe5056dc86ca7bb817c04ae30d39160cb7773772a9a2123ae7f095b18a6d7050 DIST ffmpeg-7.0.1.tar.xz 10793572 BLAKE2B 7468bb0768da56794c57b43db5fb8a1c5471f86dc7789ba342e494907b2f05fd0edbaa93159b05927a749d878c431ad8ac56cafc2434b54c5190b91ca6a6116a SHA512 94e06c4ce64ed3888620547db0e33b29c68a9e78b3ea748346f34280f69723a6d4b7485911f45f1849f9aa3036c0699334abbcf7126d2763bdaa7276673b7daa DIST ffmpeg-7.0.1.tar.xz.asc 520 BLAKE2B 3fe3bdd8da390591849ac3784bf8e68e021124715de1a8d142a42096d625df9d9a27b224258f2f0c24b20397bfea7a8035ced4202904ca12fe0eef109516dbf1 SHA512 bd787bfa6dbb147800f5f79a3fe5e4c20054d48ea9e6af4d5c84ace68c19459f4ea677f5921b084eab889ed7b9f81dc138fa2ecf9ae306ac7fb19434a68aeced +DIST ffmpeg-7.0.2.tar.xz 10795332 BLAKE2B f6536f41f784f1b49ed0728d80a522676dfe1facbeb7fec3f7796683ce28c73e41508f9a5dd1e5cd18d3ff787d562bb1e6a5085ee0660076b84a76040587e5a8 SHA512 2fc66e919db53f6b12f845c0f9b92f3d8a7ec1db1ff533d29e679a6524f32567babf2d0791da039dcf2918c4d4cbb3f99c2898d3795345f03112238af8edcbd9 +DIST ffmpeg-7.0.2.tar.xz.asc 520 BLAKE2B edaadb45588938a524b64d82f96d224c2060648c10649adeba4a3546863eea45b674ebca80e7839e92138ae0b375afd22e0b4552d4d5a68dbb021e706f965b6d SHA512 b41eeb8044754bfcf2cf67a3ed4a4e74194ee6e5f4ed5f03aa03bb68772f6bacd7a1839d8e9740573889230a71d3bc7d52b4625542f4c892e8de8c61deda2c51 DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b6845dbd18a619b844c841a97345ce24c7a5d7f4da05b08e3cb49668426b9044f3d3553d9c2ef3a50aec7199bfa3c09 SHA512 aeaf12afabf5f2192fb0b6ef47397d8477b109e49cee8c02a890d1656a27b1985c62c719ef72966d8c97b0709918233b65ea2e0ef988771507e4be137fcd9158 DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f DIST ffmpeg-rpi-7.0.patch 807653 BLAKE2B 2d7d4fb55313c0ea227bf714af08fe17c118969aef972cf85bd8bf33643da08b2a224b2ea7c369a58e62fb758c0e8747c6cc6694672b889016fdb16b3d33f530 SHA512 cf65f68f6b0fa351d273c1b4fd74fca63a40cbd802bcd14124018784164fd1c6a09de3d9b0e0631eaf4c8b4fbcb846cc47a7831ad70eb0cfac6d21a51bd09941 DIST ffmpeg-rpi-7.0.patch.asc 833 BLAKE2B 3086d77e2cc05b7c295fcaef26a9a0d32775999d1bab9075eeeb0a80804b35928698efe870a432558ece55d7873e016422a00013e7d0cca160b71172c31ab449 SHA512 cc885f01b9547f17c6ef1d26d7d1d053186fdf57aa31c0a411a2ab1c0246cec9c2aeef8687e7f8eb0c998d3379712541c60432bc2521a3db1b45d72d316c2d2b -EBUILD ffmpeg-4.4.4-r10.ebuild 20359 BLAKE2B a9352e224725b0d5e4ca168c8e79913f6b9c1ca18b9642b17eccf7caca9f2cb9792ec0f45bc0bfd9f1e4443d2803feaf0b813dbfaf880543aa820507614797bd SHA512 aac20cc2db18e995e08716ff1ea54a776c180a66ac0e42f0a412f8c490c8171a1fff16764ec0802011f71f60f8fbf68534a57cb919f3e82ffbfa4d31806e3fc5 -EBUILD ffmpeg-4.4.4-r9.ebuild 20312 BLAKE2B 50dd3e95cf6277261dc983dc3d807a4a5ed1a06c046fff5d6cb53ab7e17088e04fb62fd5bd45ffdf034a0bd7c419e69afef490145d1da4ac1c89d07d89a44db2 SHA512 9a7da74b1ef83289b697681e4e7f0e699865e156af24617dfabc88934b3374bf8aa8416759d120a016debfded168d3e9c0d4ef07e712e70f778a10d0af872c44 -EBUILD ffmpeg-6.0.1-r4.ebuild 20020 BLAKE2B c19d2af1c04d2c202fc84efda51da246f265b472ab414a3f613542cbc845e8d6e3e78d02ea4ef448866d6a711534ef181c4850bb75fc04c6c499755c0c4046ca SHA512 2f7e5866ce0f1d47332a1d8233b436a6d3680a75e5e406519387f177e3574cb9b7181169d8eb51273cf5fc5695f410ad12e1062ed3fc2d05fbdfa80c37d0a15e -EBUILD ffmpeg-6.1.1-r5.ebuild 20309 BLAKE2B 724f6222ac5999f1aa80296dcb90390fd854688d76acf9981eaed04652e41dbe6c982907f26d8d02b1240d220ac0c43c365ec0eda2bc8f52d50641762d2d7f7b SHA512 8dc0b5537bb702bf08a71103c5a38a004790432b6865f8f4e657d6f7d1b32152532fbd0bc717a4a2b237a48f80805b26f11674f2bd533f23110194ffde906140 -EBUILD ffmpeg-6.1.1-r8.ebuild 20611 BLAKE2B 5db7a08dac1782bf33a00a531df86657c1a3bbb7fb827ceaef3b92c45e9fb8f10decd7fa3dccb6e77d2ab6a96df14c2f62f55e4d11578698765c5dc5b2ec392f SHA512 80d9cf7e4668786634a5f0424db820d1f5c78df9bc0d1cda207e02b40c7e82b6f1a6089aef2a37afc35c2a681a03686f6258ccb72b1ae00fdea8d48aec4e1311 -EBUILD ffmpeg-7.0.1.ebuild 20557 BLAKE2B a1d849d9aded5d1c6a045b5691065e4da6a11930d448f805aabf83ed499d433b44957bc48ca2812227fd554d8f0b64a61b4e40a4afa4454d32a0654f6c443b8f SHA512 32aa9365b3bfa5c3fba0d0d292684c6cfa696e9913ffccf3c5f33efcb1b666a67df190a41bfb7f639b077410312ecf460d0992cf55db084a6b2eb2e4b16b40c1 -EBUILD ffmpeg-9999.ebuild 20619 BLAKE2B 015e7f0308fb8f7553c48270efa42dc08fd60236ac0ffad31ec22a174c4609acd16af29450d606e187151b4fe974902f868dc60949b5cebbd0428541b44f8f99 SHA512 4832eb520f6d9309762c6da27f4e2be6688330af18caeb8f77193a661816409a44403b9985f7b5ab9f5008a1a52e0e50589390a6b4306584c4f681bdb27f7db0 +EBUILD ffmpeg-4.4.4-r10.ebuild 20175 BLAKE2B 1b7a6853d7e09e6808488eef6fbd20ed6fe87907f7928ef5d7ad34b3c3d1103ed8e6e7a98527c9fcd0b5ab1227e8d7b8c99d70b7baf04760acbd5036ab4d8ac8 SHA512 281eaf4cee361c2af48057a202fb354900e569f97e249d29d7e483072a8f0998c035316aa8f959b66f6d4e3fe12d62e12ff5635b481f8a4e186679cd6e99cd02 +EBUILD ffmpeg-4.4.4-r9.ebuild 20128 BLAKE2B 21bbbed13d81617a9ed7fab67646c7cc21c39101a95d17ba1fd7d19820b4d9bef59f2061a3be49d11138c7cf16e3fb62bfefb75d07c70ee1f04725c4079d492b SHA512 46910d831e7a7f50b403425efb982464b7c75564e1ead9f2f0af25408e2f8f857f97dc890b8fd33974635f3453ca8de69ae7f7d8d0fb0b0c3bcc3ae6b7b2b3aa +EBUILD ffmpeg-4.4.5.ebuild 19938 BLAKE2B bcc9885825dda5387772cba857017c47902dc206a7314877d0cbea01141d7ae992061cffa34111b0ccaf632bdd4f3e51423cf7d7531287f49295293accb140cf SHA512 ea432de884741b93b62ab32fee95d44c508f7b41a6ff3275099758f1577a138289ac8ff12ab3ca8d267f89d8c976c3af4d04013baf612db3693e51d62eda7a38 +EBUILD ffmpeg-6.0.1-r4.ebuild 19836 BLAKE2B 67279c7430fb09cf4477d243d557c77d41e4cf70279537681bb819d21a9cc610642059f0de70a3336ea398a93d214bb05eb52daa498fe23aa74fcffe651a38a5 SHA512 a5948d7b86c1377b69897591106867b464d17ce4c03ad072bd6f98b5d9b7a31d00cac6c63b6628af55eda2528ec9c38cc6ecc5430ce88016123c1a4e70eff234 +EBUILD ffmpeg-6.1.1-r5.ebuild 20125 BLAKE2B d81aa43ede98fdede59d68854f7710282a74072c31e5aefbb61892a9fca8e9352134dc7d5bce749b87bb1e4345c78b32bb17a2556663bc1c5d925c3c5bbd6120 SHA512 f65d062670fe0e35d7f4ef2e2f627d13e02bf161636809d62996c24a5c226f6068e8eb2cb6c261ce7780d2f266e6c99eef09d24c0d3ade9ccdd87ffd2274fe63 +EBUILD ffmpeg-6.1.1-r8.ebuild 20429 BLAKE2B fd770021185f678c243070b30b0f4834a9d0a96db33f8a4496f3344578b6f67bcc23b4f86543c3677e83fb2c0f77990e5a879ed28c53e89452822196c5c1d22e SHA512 3fd6bc7915cd12cc58343a371dae0af0e464dfea7e4b43ae98c66aca267c26bba4916b97fd05016e04300999601671b06ea0ac27a2c34ba3095d1d676b7e5d40 +EBUILD ffmpeg-6.1.2.ebuild 20344 BLAKE2B 337814806b70e1bc1f8783188b768687602a5c5cf4d45d5cbe0a8c67094e350be2a3306c5680aad458e3ce025d88242d80037af7e0b1849693d8a3f2432d9ee6 SHA512 9adddd81d75d3b6a30e9afb55b814721d562f6b25e644061fc30d5c8567d5792cd8f4ff6dc290b095c2e1846710be8cd86b28c0ee35fd77e1519f49bf7bb0548 +EBUILD ffmpeg-7.0.1.ebuild 20375 BLAKE2B 10e81c8f0651cabf5a489870725f97bb7e96b84a48dcf5dd6f97b15098fb199900ff6a07a28f77849f6a39b3163b64187ca70b8ff17beb7952ff0020ac9a346a SHA512 a8a31b535a4a0d4b8d56b969dbb468245ba3cac0617363c35730f05c6310ad6dda10da352e5d3527b1a5332fc20699ba88889d53dd36e523f804ff4be9af5a44 +EBUILD ffmpeg-7.0.2.ebuild 20375 BLAKE2B 10e81c8f0651cabf5a489870725f97bb7e96b84a48dcf5dd6f97b15098fb199900ff6a07a28f77849f6a39b3163b64187ca70b8ff17beb7952ff0020ac9a346a SHA512 a8a31b535a4a0d4b8d56b969dbb468245ba3cac0617363c35730f05c6310ad6dda10da352e5d3527b1a5332fc20699ba88889d53dd36e523f804ff4be9af5a44 +EBUILD ffmpeg-9999.ebuild 20437 BLAKE2B 7ee1054896be123ee50b3a02ea2d9db4875a8f4d79a7181d2cea21a80c27f217a36783364ae04a4999faa3ce4910344764e074adaed19d4e519999a648aa5d55 SHA512 7c4370147dfe4e44868641c06d3c7a043ca3fb2fbd3a48eb56bf2f65cf52ccea2e9e409a7bb1d7dd29ac914947a1f6adf117aa63aa82de9f73fa39a714a59e2d MISC metadata.xml 8343 BLAKE2B 4fa89eaccf10b2b691d66fc20df7cc09b31b848d0c054040664f6d9b132ba422c3a9cae2b239a95f307b4f15d1a5432e751a72fe1e4239376252bee9b814c59a SHA512 9b085513512c323c524d88837a517ebeb6a9db7212e4353ae1330c1db763761aa8114a47337a2f85a18ad2adae210cb56fb0472b09dfd78fdcac0fecf08ea7b3 diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild index e54372178894..9e0ffd130260 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r10.ebuild @@ -65,7 +65,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -404,15 +404,6 @@ src_prepare() { multilib_src_configure() { local myconf=( ) - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) diff --git a/media-video/ffmpeg/ffmpeg-4.4.4-r9.ebuild b/media-video/ffmpeg/ffmpeg-4.4.4-r9.ebuild index 7eb94f61dbb6..155021576490 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.4-r9.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.4-r9.ebuild @@ -65,7 +65,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -403,15 +403,6 @@ src_prepare() { multilib_src_configure() { local myconf=( ) - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) diff --git a/media-video/ffmpeg/ffmpeg-4.4.5.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5.ebuild new file mode 100644 index 000000000000..fcdff1e2f2ef --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-4.4.5.ebuild @@ -0,0 +1,609 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# 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=56.58.58 + +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.xz" +else # Release + VERIFY_SIG_OPENPGP_KEY_PATH=/usr/share/openpgp-keys/ffmpeg.asc + inherit verify-sig + SRC_URI="https://ffmpeg.org/releases/${P/_/-}.tar.xz" + SRC_URI+=" verify-sig? ( https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc )" + + BDEPEND=" verify-sig? ( sec-keys/openpgp-keys-ffmpeg )" +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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos" +fi + +# Options to use as use_enable in the foo[:bar] form. +# 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 qsv:libmfx libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite frei0r fribidi:libfribidi + fontconfig glslang:libglslang ladspa libass libtesseract lv2 truetype:libfreetype + vidstab:libvidstab vmaf:libvmaf 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=( + amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame + 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_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( 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}] ) + amf? ( media-video/amdgpu-pro-amf:= ) + 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/libogg-1.3.0[${MULTILIB_USEDEP}] + >=media-libs/libtheora-1.1.1[encode,${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}] ) + glslang? ( dev-util/glslang:=[${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.10.2:=[${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}] ) + qsv? ( media-libs/intel-mediasdk[${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:=[sftp,${MULTILIB_USEDEP}] ) + svg? ( + gnome-base/librsvg:2=[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + ) + nvenc? ( <media-libs/nv-codec-headers-12 ) + svt-av1? ( >=media-libs/svt-av1-0.8.4[${MULTILIB_USEDEP}] ) + truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] ) + vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vmaf? ( media-libs/libvmaf:=[${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.1.97:=[${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}] ) +" + +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} + amf? ( media-libs/amf-headers ) + ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) + v4l? ( sys-kernel/linux-headers ) +" + +# += for verify-sig above +BDEPEND+=" + >=dev-build/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 app-alternatives/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? ( nvenc ) + fftools_cws2fws? ( zlib ) + glslang? ( vulkan ) + libv4l? ( v4l ) + test? ( encode ) + ${GPL_REQUIRED_USE} + ${CPU_REQUIRED_USE}" +RESTRICT=" + !test? ( test ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) +" + +S=${WORKDIR}/${P/_/-} + +PATCHES=( + "${FILESDIR}"/chromium-r1.patch + "${FILESDIR}"/${PN}-5.0-backport-ranlib-build-fix.patch + "${FILESDIR}"/${PN}-4.4.3-get_cabac_inline_x86-32-bit.patch + "${FILESDIR}"/${PN}-4.4.4-wint-conversion-vulkan.patch + "${FILESDIR}"/${PN}-4.4.4-opencl-parallel-gmake-fix.patch + "${FILESDIR}"/${PN}-4.4.4-glslang.patch + "${FILESDIR}"/${PN}-4.4.4-amd-av1-vaapi.patch + "${FILESDIR}"/${PN}-4.4.5-incmptbl-pntr-types.patch +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libavutil/avconfig.h +) + +build_separate_libffmpeg() { + use opencl +} + +pkg_setup() { + # ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg. + # May cause breakage while updating, #862996, #625210, #833821. + if has_version media-libs/chromaprint[tools] && use chromaprint; then + ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which " + ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, " + ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg." + ewarn "" + ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint " + ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable " + ewarn "'tools' USE flag for chromaprint. See #862996." + fi +} + +src_unpack() { + if use verify-sig ; then + # Needed for downloaded patch (which is unsigned, which is fine) + verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} + fi + + default +} + +src_prepare() { + if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot + export revision=git-N-${FFMPEG_REVISION} + fi + + eapply "${FILESDIR}/vmaf-models-default-path.patch" + + default + + # -fdiagnostics-color=auto gets appended after user flags which + # will ignore user's preference. + sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die +} + +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 ) + 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, bug #772854 + [[ ${ABI} != x86 ]] && tc-is-lto && myconf+=( "--enable-lto" ) + filter-lto + + # Mandatory configuration + myconf=( + --enable-avfilter + --enable-avresample + --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 + *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) + ) + + # Use --extra-libs if needed for LIBS + 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}" \ + $(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:${BUILD_DIR}/libavresample" \ + emake V=1 fate -k +} + +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" + + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override +} diff --git a/media-video/ffmpeg/ffmpeg-6.0.1-r4.ebuild b/media-video/ffmpeg/ffmpeg-6.0.1-r4.ebuild index 5609d999e0d2..d0a3bb596892 100644 --- a/media-video/ffmpeg/ffmpeg-6.0.1-r4.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.0.1-r4.ebuild @@ -64,7 +64,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -390,15 +390,6 @@ src_prepare() { multilib_src_configure() { local myconf=( ) - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild index 29d671d9c23a..8ca3ffa196ed 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r5.ebuild @@ -85,7 +85,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -427,15 +427,6 @@ multilib_src_configure() { # Conditional patch options use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand ) - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) diff --git a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild index 2c4afcc40118..f83fcb1a0176 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.1-r8.ebuild @@ -85,7 +85,7 @@ LICENSE=" samba? ( GPL-3 ) " if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -293,7 +293,7 @@ RDEPEND=" x11-libs/cairo[${MULTILIB_USEDEP}] ) nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) + svt-av1? ( >=media-libs/svt-av1-0.9.0:=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] media-libs/harfbuzz:=[${MULTILIB_USEDEP}] @@ -437,15 +437,6 @@ multilib_src_configure() { # Conditional patch options use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand ) - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) diff --git a/media-video/ffmpeg/ffmpeg-6.1.2.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild new file mode 100644 index 000000000000..cf2f2c615aaf --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-6.1.2.ebuild @@ -0,0 +1,612 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# 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=58.60.60 + +SOC_PATCH="ffmpeg-rpi-6.1-r3.patch" + +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/" +SRC_URI="soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH} )" +if [ "${PV#9999}" != "${PV}" ] ; then + : +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI+=" mirror://gentoo/${P}.tar.xz" +else # Release + inherit verify-sig + + SRC_URI+=" + https://ffmpeg.org/releases/${P/_/-}.tar.xz + verify-sig? ( + https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc + soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH}.asc ) + ) + " + + BDEPEND=" + verify-sig? ( + sec-keys/openpgp-keys-ffmpeg + soc? ( sec-keys/openpgp-keys-gentoo-developers ) + ) + " + + src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc + use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc + fi + default + } +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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +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 jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm + libaribb24 modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite fontconfig frei0r + fribidi:libfribidi glslang:libglslang ladspa lcms:lcms2 libass libplacebo + libtesseract lv2 rubberband:librubberband shaderc:libshaderc truetype:libfreetype + truetype:libharfbuzz vidstab:libvidstab vmaf:libvmaf 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=( + amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame + 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 soc + ${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 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm +) +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_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( 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}] ) + amf? ( media-video/amdgpu-pro-amf:= ) + 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.5.0:0=[${MULTILIB_USEDEP}] ) + encode? ( + amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + kvazaar? ( >=media-libs/kvazaar-2.0.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.5:=[capi] ) + snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) + theora? ( + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + >=media-libs/libtheora-1.1.1[encode,${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}] ) + glslang? ( dev-util/glslang:=[${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.1:2=[${MULTILIB_USEDEP}] ) + jpegxl? ( >=media-libs/libjxl-0.7.0:=[$MULTILIB_USEDEP] ) + lcms? ( >=media-libs/lcms-2.13: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}] ) + libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$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}] ) + 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? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) + qsv? ( media-libs/libvpl[${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}] ) + shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) + sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + soc? ( virtual/libudev:=[${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.6.0:=[sftp,${MULTILIB_USEDEP}] ) + svg? ( + gnome-base/librsvg:2=[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + ) + nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) + svt-av1? ( >=media-libs/svt-av1-0.9.0:=[${MULTILIB_USEDEP}] ) + truetype? ( + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + media-libs/harfbuzz:=[${MULTILIB_USEDEP}] + ) + vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vmaf? ( >=media-libs/libvmaf-2.0.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.3.255:=[${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.2.1:= ) + 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}] ) +" + +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} + amf? ( media-libs/amf-headers ) + ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) + v4l? ( sys-kernel/linux-headers ) + vulkan? ( >=dev-util/vulkan-headers-1.3.255 ) +" + +# += for verify-sig above +BDEPEND+=" + >=dev-build/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 app-alternatives/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=" + chromium? ( opus ) + cuda? ( nvenc ) + fftools_cws2fws? ( zlib ) + glslang? ( vulkan !shaderc ) + libv4l? ( v4l ) + shaderc? ( vulkan !glslang ) + soc? ( libdrm ) + test? ( encode ) + ${GPL_REQUIRED_USE} + ${CPU_REQUIRED_USE}" +RESTRICT=" + !test? ( test ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) +" + +S=${WORKDIR}/${P/_/-} + +PATCHES=( + "${FILESDIR}"/chromium-r2.patch + "${FILESDIR}"/${PN}-6.1-wint-conversion.patch + "${FILESDIR}"/${PN}-6.0-fix-lto-type-mismatch.patch + "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch + "${FILESDIR}"/${PN}-6.1-gcc-14.patch + "${FILESDIR}"/${PN}-6.0.1-alignment.patch + "${FILESDIR}"/${PN}-6.1.1-wint-inconversion-libgcrypt.patch + "${FILESDIR}"/${PN}-6.1.1-amd-av1-vaapi.patch +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libavutil/avconfig.h +) + +pkg_setup() { + # ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg. + # May cause breakage while updating, #862996, #625210, #833821. + if has_version media-libs/chromaprint[tools] && use chromaprint; then + ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which " + ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, " + ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg." + ewarn "" + ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint " + ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable " + ewarn "'tools' USE flag for chromaprint. See #862996." + fi +} + +src_prepare() { + if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot + export revision=git-N-${FFMPEG_REVISION} + fi + + use soc && + eapply "${DISTDIR}"/${SOC_PATCH} + + default + + # -fdiagnostics-color=auto gets appended after user flags which + # will ignore user's preference. + sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + + ln -snf "${FILESDIR}"/chromium.c chromium.c || die + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die + + # We need to detect LTO usage before multilib stuff and filter-lto is called (bug #923491) + if tc-is-lto ; then + # Respect -flto value, e.g -flto=thin + local v="$(get-flag flto)" + [[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto" + fi + filter-lto +} + +multilib_src_configure() { + local myconf=( ) + + # Conditional patch options + use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand ) + + 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, bug #772854 + if [[ ${ABI} != x86 && ! -z ${LTO_FLAG} ]]; then + myconf+=( ${LTO_FLAG} ) + fi + + # Mandatory configuration + myconf=( + --disable-libaribcaption # libaribcaption is not packaged (yet?) + --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 + *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) + ) + + # Use --extra-libs if needed for LIBS + 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}" \ + $(use_enable static-libs static) \ + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} + echo "${@}" + "${@}" || die +} + +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 + + use chromium && + emake V=1 libffmpeg + 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 -k +} + +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 + + use chromium && + emake V=1 DESTDIR="${D}" install-libffmpeg + fi +} + +multilib_src_install_all() { + dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges + [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" + + use amf && elog "To use AMF, prefix the ffmpeg call with the 'vk_pro' wrapper script, e.g. `vk_pro ffmpeg -vcodec h264_amf [...]`" +} diff --git a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild index 797aa00fb30e..467c8c4a6bb7 100644 --- a/media-video/ffmpeg/ffmpeg-7.0.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.0.1.ebuild @@ -86,7 +86,7 @@ LICENSE=" " SLOT="0/${FFMPEG_SUBSLOT}" if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -299,7 +299,7 @@ RDEPEND=" x11-libs/cairo[${MULTILIB_USEDEP}] ) nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) + svt-av1? ( >=media-libs/svt-av1-0.9.0:=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] media-libs/harfbuzz:=[${MULTILIB_USEDEP}] @@ -434,15 +434,6 @@ multilib_src_configure() { # Conditional patch options use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand ) - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) diff --git a/media-video/ffmpeg/ffmpeg-7.0.2.ebuild b/media-video/ffmpeg/ffmpeg-7.0.2.ebuild new file mode 100644 index 000000000000..467c8c4a6bb7 --- /dev/null +++ b/media-video/ffmpeg/ffmpeg-7.0.2.ebuild @@ -0,0 +1,614 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# 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=58.60.60 + +SOC_PATCH="ffmpeg-rpi-7.0.patch" + +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/" +SRC_URI="soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH} )" +if [ "${PV#9999}" != "${PV}" ] ; then + : +elif [ "${PV%_p*}" != "${PV}" ] ; then # Snapshot + SRC_URI+=" mirror://gentoo/${P}.tar.xz" +else # Release + inherit verify-sig + + SRC_URI+=" + https://ffmpeg.org/releases/${P/_/-}.tar.xz + verify-sig? ( + https://ffmpeg.org/releases/${P/_/-}.tar.xz.asc + soc? ( https://dev.gentoo.org/~chewi/distfiles/${SOC_PATCH}.asc ) + ) + " + + BDEPEND=" + verify-sig? ( + sec-keys/openpgp-keys-ffmpeg + soc? ( >=sec-keys/openpgp-keys-gentoo-developers-20240708 ) + ) + " + + src_unpack() { + if use verify-sig; then + verify-sig_verify_detached "${DISTDIR}"/${P/_/-}.tar.xz{,.asc} /usr/share/openpgp-keys/ffmpeg.asc + use soc && verify-sig_verify_detached "${DISTDIR}"/${SOC_PATCH}{,.asc} /usr/share/openpgp-keys/gentoo-developers.asc + fi + default + } +fi +FFMPEG_REVISION="${PV#*_p}" + +S=${WORKDIR}/${P/_/-} +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 ) +" +SLOT="0/${FFMPEG_SUBSLOT}" +if [ "${PV#9999}" = "${PV}" ] ; then + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" +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 libdvdnav libdvdread lzma +network + opencl openssl +postproc qrcode:libqrencode quirc:libquirc + 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 jpegxl:libjxl bluray:libbluray gme:libgme gsm:libgsm + libaribb24 modplug:libmodplug opus:libopus qsv:libvpl libilbc librtmp ssh:libssh + speex:libspeex srt:libsrt svg:librsvg nvenc:ffnvcodec + vorbis:libvorbis vpx:libvpx zvbi:libzvbi + # libavfilter options + appkit + bs2b:libbs2b chromaprint cuda:cuda-llvm flite:libflite fontconfig frei0r + fribidi:libfribidi glslang:libglslang ladspa lcms:lcms2 libass libplacebo + libtesseract lv2 rubberband:librubberband shaderc:libshaderc truetype:libfreetype + truetype:libharfbuzz vidstab:libvidstab vmaf:libvmaf 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=( + amf amrenc:libvo-amrwbenc kvazaar:libkvazaar libaom mp3:libmp3lame + 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 soc + ${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 + cpu_flags_arm_asimddp:dotprod + cpu_flags_arm_i8mm:i8mm +) +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_vfp + arm? ( cpu_flags_arm_thumb2 ) + ) + cpu_flags_arm_vfpv3? ( cpu_flags_arm_vfp ) + cpu_flags_arm_thumb2? ( cpu_flags_arm_v6 ) + cpu_flags_arm_v6? ( + arm? ( 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}] ) + amf? ( media-video/amdgpu-pro-amf:= ) + 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.5.0:0=[${MULTILIB_USEDEP}] ) + encode? ( + amrenc? ( >=media-libs/vo-amrwbenc-0.1.2-r1[${MULTILIB_USEDEP}] ) + kvazaar? ( >=media-libs/kvazaar-2.0.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.5:=[capi] ) + snappy? ( >=app-arch/snappy-1.1.2-r1:=[${MULTILIB_USEDEP}] ) + theora? ( + >=media-libs/libogg-1.3.0[${MULTILIB_USEDEP}] + >=media-libs/libtheora-1.1.1[encode,${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}] ) + glslang? ( dev-util/glslang:=[${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.1:2=[${MULTILIB_USEDEP}] ) + jpegxl? ( >=media-libs/libjxl-0.7.0:=[$MULTILIB_USEDEP] ) + lcms? ( >=media-libs/lcms-2.13: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}] ) + libdvdnav? ( media-libs/libdvdnav[${MULTILIB_USEDEP}] ) + libdvdread? ( media-libs/libdvdread:=[${MULTILIB_USEDEP}] ) + libilbc? ( >=media-libs/libilbc-2[${MULTILIB_USEDEP}] ) + libplacebo? ( >=media-libs/libplacebo-4.192.0:=[$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}] ) + 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? ( media-libs/libglvnd[X,${MULTILIB_USEDEP}] ) + opus? ( >=media-libs/opus-1.0.2-r2[${MULTILIB_USEDEP}] ) + pulseaudio? ( media-libs/libpulse[${MULTILIB_USEDEP}] ) + qsv? ( media-libs/libvpl[${MULTILIB_USEDEP}] ) + qrcode? ( media-gfx/qrencode:=[${MULTILIB_USEDEP}] ) + quirc? ( media-libs/quirc:=[${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}] ) + shaderc? ( media-libs/shaderc[${MULTILIB_USEDEP}] ) + sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] ) + soc? ( virtual/libudev:=[${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.6.0:=[sftp,${MULTILIB_USEDEP}] ) + svg? ( + gnome-base/librsvg:2=[${MULTILIB_USEDEP}] + x11-libs/cairo[${MULTILIB_USEDEP}] + ) + nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) + svt-av1? ( >=media-libs/svt-av1-0.9.0:=[${MULTILIB_USEDEP}] ) + truetype? ( + >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] + media-libs/harfbuzz:=[${MULTILIB_USEDEP}] + ) + vaapi? ( >=media-libs/libva-1.2.1-r1:0=[${MULTILIB_USEDEP}] ) + vdpau? ( >=x11-libs/libvdpau-0.7[${MULTILIB_USEDEP}] ) + vidstab? ( >=media-libs/vidstab-1.1.0[${MULTILIB_USEDEP}] ) + vmaf? ( >=media-libs/libvmaf-2.0.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.3.277:=[${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.2.1:= ) + 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}] ) +" + +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} + amf? ( media-libs/amf-headers ) + ladspa? ( >=media-libs/ladspa-sdk-1.13-r2[${MULTILIB_USEDEP}] ) + v4l? ( sys-kernel/linux-headers ) + vulkan? ( >=dev-util/vulkan-headers-1.3.277 ) +" + +# += for verify-sig above +BDEPEND+=" + >=dev-build/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 app-alternatives/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=" + chromium? ( opus ) + cuda? ( nvenc ) + fftools_cws2fws? ( zlib ) + glslang? ( vulkan !shaderc ) + libv4l? ( v4l ) + shaderc? ( vulkan !glslang ) + soc? ( libdrm ) + test? ( encode ) + vulkan? ( threads ) + ${GPL_REQUIRED_USE} + ${CPU_REQUIRED_USE}" +RESTRICT=" + !test? ( test ) + gpl? ( openssl? ( bindist ) fdk? ( bindist ) ) +" + +PATCHES=( + "${FILESDIR}"/chromium-r2.patch + "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch +) + +MULTILIB_WRAPPED_HEADERS=( + /usr/include/libavutil/avconfig.h +) + +pkg_setup() { + # ffmpeg[chromaprint] depends on chromaprint, and chromaprint[tools] depends on ffmpeg. + # May cause breakage while updating, #862996, #625210, #833821. + if has_version media-libs/chromaprint[tools] && use chromaprint; then + ewarn "You have media-libs/chromaprint installed with 'tools' USE flag, which " + ewarn "links to ffmpeg, and you have enabled 'chromaprint' USE flag for ffmpeg, " + ewarn "which links to chromaprint. This may cause issues while rebuilding ffmpeg." + ewarn "" + ewarn "If your build fails to 'ERROR: chromaprint not found', rebuild chromaprint " + ewarn "without the 'tools' use flag first, then rebuild ffmpeg, and then finally enable " + ewarn "'tools' USE flag for chromaprint. See #862996." + fi +} + +src_prepare() { + if [[ "${PV%_p*}" != "${PV}" ]] ; then # Snapshot + export revision=git-N-${FFMPEG_REVISION} + fi + + use soc && + eapply "${DISTDIR}"/${SOC_PATCH} + + default + + # -fdiagnostics-color=auto gets appended after user flags which + # will ignore user's preference. + sed -i -e '/check_cflags -fdiagnostics-color=auto/d' configure || die + + ln -snf "${FILESDIR}"/chromium.c chromium.c || die + echo 'include $(SRC_PATH)/ffbuild/libffmpeg.mak' >> Makefile || die + + # We need to detect LTO usage before multilib stuff and filter-lto is called (bug #923491) + if tc-is-lto ; then + # Respect -flto value, e.g -flto=thin + local v="$(get-flag flto)" + [[ ${v} != -flto ]] && LTO_FLAG="--enable-lto=${v}" || LTO_FLAG="--enable-lto" + fi + filter-lto +} + +multilib_src_configure() { + local myconf=( ) + + # Conditional patch options + use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand ) + + 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, bug #772854 + if [[ ${ABI} != x86 && ! -z ${LTO_FLAG} ]]; then + myconf+=( ${LTO_FLAG} ) + fi + + # Mandatory configuration + myconf=( + --disable-libaribcaption # libaribcaption is not packaged (yet?) + --disable-libxeve + --disable-libxevd + --disable-d3d12va + --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 + *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) + ) + + # Use --extra-libs if needed for LIBS + 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}" \ + $(use_enable static-libs static) \ + "${myconf[@]}" \ + ${EXTRA_FFMPEG_CONF} + echo "${@}" + "${@}" || die +} + +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 + + use chromium && + emake V=1 libffmpeg + 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 -k +} + +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 + + use chromium && + emake V=1 DESTDIR="${D}" install-libffmpeg + fi +} + +multilib_src_install_all() { + dodoc Changelog README.md CREDITS doc/*.txt doc/APIchanges + [ -f "RELEASE_NOTES" ] && dodoc "RELEASE_NOTES" + + use amf && newenvd "${FILESDIR}"/amf-env-vulkan-override 99amf-env-vulkan-override +} diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 8294c24da0d7..2c36d52fbafe 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -86,7 +86,7 @@ LICENSE=" " SLOT="0/${FFMPEG_SUBSLOT}" if [ "${PV#9999}" = "${PV}" ] ; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi # Options to use as use_enable in the foo[:bar] form. @@ -300,7 +300,7 @@ RDEPEND=" x11-libs/cairo[${MULTILIB_USEDEP}] ) nvenc? ( >=media-libs/nv-codec-headers-11.1.5.3 ) - svt-av1? ( >=media-libs/svt-av1-0.9.0[${MULTILIB_USEDEP}] ) + svt-av1? ( >=media-libs/svt-av1-0.9.0:=[${MULTILIB_USEDEP}] ) truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] media-libs/harfbuzz:=[${MULTILIB_USEDEP}] @@ -435,15 +435,6 @@ multilib_src_configure() { # Conditional patch options use soc && myconf+=( --enable-v4l2-request --enable-libudev --enable-sand ) - # bug 842201 - use ia64 && tc-is-gcc && append-flags \ - -fno-tree-ccp \ - -fno-tree-dominator-opts \ - -fno-tree-fre \ - -fno-code-hoisting \ - -fno-tree-pre \ - -fno-tree-vrp - local ffuse=( "${FFMPEG_FLAG_MAP[@]}" ) use openssl && myconf+=( --enable-nonfree ) use samba && myconf+=( --enable-version3 ) diff --git a/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch b/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch new file mode 100644 index 000000000000..a47a62917a29 --- /dev/null +++ b/media-video/ffmpeg/files/ffmpeg-4.4.5-incmptbl-pntr-types.patch @@ -0,0 +1,15 @@ +https://bugs.gentoo.org/936433 + +diff --git a/libavutil/hwcontext_vaapi.c b/libavutil/hwcontext_vaapi.c +index 4b81bd1..4e7f49f 100644 +--- a/libavutil/hwcontext_vaapi.c ++++ b/libavutil/hwcontext_vaapi.c +@@ -1032,7 +1032,7 @@ static int vaapi_map_from_drm(AVHWFramesContext *src_fc, AVFrame *dst, + uint32_t va_fourcc; + int err, i, j, k; + +- unsigned long buffer_handle; ++ uintptr_t buffer_handle; + VASurfaceAttribExternalBuffers buffer_desc; + VASurfaceAttrib attrs[2] = { + { diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch b/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch deleted file mode 100644 index a06b9119666f..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-6.0-binutils-2.41.patch +++ /dev/null @@ -1,76 +0,0 @@ -https://bugs.gentoo.org/911582 -https://trac.ffmpeg.org/ticket/10405 -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=cc703cf60759d9798f440a9417e4efa2fcbe2747 -https://sourceware.org/PR30578 -https://gcc.gnu.org/PR108941 - -From cc703cf60759d9798f440a9417e4efa2fcbe2747 Mon Sep 17 00:00:00 2001 -From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= <remi@remlab.net> -Date: Sun, 16 Jul 2023 18:18:02 +0300 -Subject: [PATCH] avcodec/x86/mathops: clip constants used with shift - instructions within inline assembly - -Fixes assembling with binutil as >= 2.41 - -Signed-off-by: James Almer <jamrial@gmail.com> -(cherry picked from commit effadce6c756247ea8bae32dc13bb3e6f464f0eb) ---- a/libavcodec/x86/mathops.h -+++ b/libavcodec/x86/mathops.h -@@ -35,12 +35,20 @@ - static av_always_inline av_const int MULL(int a, int b, unsigned shift) - { - int rt, dummy; -+ if (__builtin_constant_p(shift)) - __asm__ ( - "imull %3 \n\t" - "shrdl %4, %%edx, %%eax \n\t" - :"=a"(rt), "=d"(dummy) -- :"a"(a), "rm"(b), "ci"((uint8_t)shift) -+ :"a"(a), "rm"(b), "i"(shift & 0x1F) - ); -+ else -+ __asm__ ( -+ "imull %3 \n\t" -+ "shrdl %4, %%edx, %%eax \n\t" -+ :"=a"(rt), "=d"(dummy) -+ :"a"(a), "rm"(b), "c"((uint8_t)shift) -+ ); - return rt; - } - -@@ -113,19 +121,31 @@ __asm__ volatile(\ - // avoid +32 for shift optimization (gcc should do that ...) - #define NEG_SSR32 NEG_SSR32 - static inline int32_t NEG_SSR32( int32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("sarl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("sarl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - - #define NEG_USR32 NEG_USR32 - static inline uint32_t NEG_USR32(uint32_t a, int8_t s){ -+ if (__builtin_constant_p(s)) - __asm__ ("shrl %1, %0\n\t" - : "+r" (a) -- : "ic" ((uint8_t)(-s)) -+ : "i" (-s & 0x1F) - ); -+ else -+ __asm__ ("shrl %1, %0\n\t" -+ : "+r" (a) -+ : "c" ((uint8_t)(-s)) -+ ); - return a; - } - --- -2.30.2 diff --git a/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch b/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch deleted file mode 100644 index 2c71a189329a..000000000000 --- a/media-video/ffmpeg/files/ffmpeg-6.0-wint-conversion-vulkan.patch +++ /dev/null @@ -1,43 +0,0 @@ -https://git.videolan.org/?p=ffmpeg.git;a=commit;h=58f18df430d48e47a82c5e740d6e63a50c97d75f - -From 58f18df430d48e47a82c5e740d6e63a50c97d75f Mon Sep 17 00:00:00 2001 -From: =?utf8?q?Kacper=20Michaj=C5=82ow?= <kasper93@gmail.com> -Date: Thu, 2 Mar 2023 17:27:30 +0100 -Subject: [PATCH] lavu/vulkan: fix handle type for 32-bit targets -MIME-Version: 1.0 -Content-Type: text/plain; charset=utf8 -Content-Transfer-Encoding: 8bit - -Fixes compilation with clang which errors out on Wint-conversion. - -Signed-off-by: Kacper MichajÅow <kasper93@gmail.com> -Signed-off-by: Martin Storsjö <martin@martin.st> -(cherry picked from commit cc76e8340d28438c1ac56ee7dfd774d25e944264) -Signed-off-by: Martin Storsjö <martin@martin.st> ---- a/libavutil/hwcontext_vulkan.c -+++ b/libavutil/hwcontext_vulkan.c -@@ -1149,7 +1149,7 @@ static void free_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) - - av_freep(&cmd->queues); - av_freep(&cmd->bufs); -- cmd->pool = NULL; -+ cmd->pool = VK_NULL_HANDLE; - } - - static VkCommandBuffer get_buf_exec_ctx(AVHWFramesContext *hwfc, VulkanExecCtx *cmd) ---- a/libavutil/vulkan.h -+++ b/libavutil/vulkan.h -@@ -122,7 +122,11 @@ typedef struct FFVulkanPipeline { - VkDescriptorSetLayout *desc_layout; - VkDescriptorPool desc_pool; - VkDescriptorSet *desc_set; -+#if VK_USE_64_BIT_PTR_DEFINES == 1 - void **desc_staging; -+#else -+ uint64_t *desc_staging; -+#endif - VkDescriptorSetLayoutBinding **desc_binding; - VkDescriptorUpdateTemplate *desc_template; - int *desc_set_initialized; --- -2.30.2 diff --git a/media-video/ffmpegthumbnailer/Manifest b/media-video/ffmpegthumbnailer/Manifest index 907617d42a65..c332551c2903 100644 --- a/media-video/ffmpegthumbnailer/Manifest +++ b/media-video/ffmpegthumbnailer/Manifest @@ -9,5 +9,5 @@ AUX ffmpeg5-7.patch 1230 BLAKE2B 77b8f2825080d93278187e7abaaa27f558c1bbe52b6abb0 AUX ffmpeg5-8.patch 1953 BLAKE2B 18f207ae5f42be46d00d003add9c2432a086e0e65a799a88ba1bce99db7f9a21a8e74dbe698489161f67e55272cc7af604dbb82fe8479f98fcf07e07ae961a71 SHA512 fcfeb19a00859b0f69a4682300497bdc2e8d93ac66020430816271777216f74d1e79cb6807e4afdc10ab0af50ad4b404cffcfa78ea4e4dd304e2a91e537a0737 AUX ffmpeg5-9.patch 1855 BLAKE2B 7f85c786641825d9f722b63682e1fe63c4e7178890a0b05a02dd7af93ae057f7b259b0a1311df5553c4fbdfee60268036e4004253b395f87f87e27a6918c1264 SHA512 560d0018df15299d527a3a7f218f3899d03f264c434ec5d7d9f411c22f2467d9583d7a94e5c69da03c55abe9774119e1ee1685aa48dda525ab8aae0488c4ef2a DIST ffmpegthumbnailer-2.2.2.tar.bz2 1201838 BLAKE2B 449a876eaf56feb41c06dc5f3d123b138d66dfe8b6e1bc2e53f1742ef6fbd4ec5d14d77402e13cf8c369ee0cf0707ae5b100ac1d9fb02435b3c3a776cc9dc5f4 SHA512 52760dcf59430e5e85024c9f19dc1fac1d5f0edb4f937b33feac2b3ca8f12bbf549b5f658fc16fc07bf773717b9e10048aa3eb24bf52811c5c88c995ef492612 -EBUILD ffmpegthumbnailer-2.2.2-r1.ebuild 1367 BLAKE2B 606b57fc42dc917adfe8e0f71c32e0c543da7bff54e2dabf430b58df23b12e2227293caa69788f4b636667efa3c56ad5354a81707b2dbf3b4876f62749732d53 SHA512 b8ee92f1708bdd149be9e633c29b7a5c5ef07657923167a3fe916defceec3c0566f82361e33f5e8c8b10a226d37c44d2c656be28bcab910753907643cf116982 +EBUILD ffmpegthumbnailer-2.2.2-r1.ebuild 1361 BLAKE2B 1106d1c6661310e2e0e318e1cd4f679f8268c0b381ab9c2a1281922b0c15f689bb02278c41ceba4a9e6c981d91713174eea2a0372e2706557ae85c29e94ce3f0 SHA512 cd364aced2eb6ec7cf294270c1c7b6aaceefb9344a8fbe886311101f05280ed3c390bb216f81c3dfac433748fe399b0c7cea309972d3066c6ecbcaf781023610 MISC metadata.xml 376 BLAKE2B df0d1b58a98ba2ae162e809f763889e3f84a51363ebb65d7a530217f723198fada6c7e0445ac50057c8ac5a082ecfaada6f6b3479faf8294bf9ee5cef9db53c5 SHA512 b902ffa5d659e09df7635fa70ffde6cd31848bd5c20033b9933217c6331aa9e9a34cfdf90c3f10c5cded9bc9ba6e6601f21d752ad1eca287c4754c01e31bc43e diff --git a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild index fe3bdd09679e..6a940ef78356 100644 --- a/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild +++ b/media-video/ffmpegthumbnailer/ffmpegthumbnailer-2.2.2-r1.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://github.com/dirkvdb/${PN}/releases/download/${PV}/${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86" IUSE="gnome gtk jpeg png test" RESTRICT="!test? ( test )" diff --git a/media-video/gnome-video-effects/Manifest b/media-video/gnome-video-effects/Manifest index 252c6b73ba27..5bb0aafe8764 100644 --- a/media-video/gnome-video-effects/Manifest +++ b/media-video/gnome-video-effects/Manifest @@ -1,5 +1,5 @@ DIST gnome-video-effects-0.5.0.tar.xz 85424 BLAKE2B 6c3aad12bd3f7c00a0f800d62df0144a4ca1318dbcb771f038f83fd82e252ba79aba379f57dd259c41dac3ba197dd98f52b944b018e39a419bb48b77e3a1d475 SHA512 48d68984913e6732a097b4f235671ecb3442945ec843accfae4b4526ecd27641831a847ea193ac1e13a452700c4a76fa15fa84c2293cbaf7b1b2f4d1b85487ce DIST gnome-video-effects-0.6.0.tar.xz 91564 BLAKE2B d08e2bc09dc85371290c059a9adc05b5ba602a38bc0884167f3afb4d731fbe78719270cd320203ed17fcc545d012b87b26d3f83cb6f48476e70f42d65a5861ca SHA512 e5a87fd134adc1dce1422d20c47cb87ccbad99841672563ef393ea3816a7fa0a3c865d9fc16047e8fa0eccc8388c019b5a2f91844dc3e448e353bf1ad7a39c21 -EBUILD gnome-video-effects-0.5.0-r1.ebuild 503 BLAKE2B 3e2d915a89ecd4bafbc007bc5f51cbcc47d90d704ede0b9f737207e054e7ba27e08c5a6e2b0548d44bd033cbb513f504640a6b13688895c85eea93a35215ea4e SHA512 4cf715015347c87abbeba65fbc7478216459c65e0b55768b0b808b5df65f8de47ee2cb3b5b110e2a2c217b9a8d78a94f146e0f03540382a284074b0538f5800e +EBUILD gnome-video-effects-0.5.0-r1.ebuild 497 BLAKE2B 5956fd98e4b89720fbd22b05fbe80f173135027b92fc593fcd4f32c2c52fab39bf101ce44bc6d587534c8b7629783cf764573bcc701eaf63874aa3e029148e1c SHA512 5061fe7697aeba5d3b2dc6c75a1102ec014a1c48492b07a8a85863a9f0382e426d3f7f317b349330fc91af640d6860f391f2e08d82b327ac8d3efae2e6ef4a00 EBUILD gnome-video-effects-0.6.0.ebuild 593 BLAKE2B ea1106abc41f4c1fd2fc75fe75be78db7e854c636e4b48f7fbaa5e2415258e770f1a4df9a090f709bde2f46568b724b102cbb31214b9fb8013c4520c63a78aeb SHA512 072305130b74d3ae1394003117ef34dee105ef640db926ad915c8e0c2e38e554ce0b4415087ce51360866fa1bd0c9b77e4d60131541349ee327e3429e1b2d849 MISC metadata.xml 619 BLAKE2B 896632c544d3707df7e2f08f78f34dc8dae73bf7d69027b592fc6794456775a340eb1d3c0a0c58fe85fb8e0659f5b5259fb1020a5d1f5eeb817ca3a9cd4e2b5c SHA512 f8685c44835fdecdb6002b69e519a6fe207b6728603e7bd561396b81569f164257e3e348902f82bd5c5fa3e3914d6eadbaa7602229e2cedfd1313a56f1886682 diff --git a/media-video/gnome-video-effects/gnome-video-effects-0.5.0-r1.ebuild b/media-video/gnome-video-effects/gnome-video-effects-0.5.0-r1.ebuild index 9046f8687f34..5149615fad73 100644 --- a/media-video/gnome-video-effects/gnome-video-effects-0.5.0-r1.ebuild +++ b/media-video/gnome-video-effects/gnome-video-effects-0.5.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="https://wiki.gnome.org/Projects/GnomeVideoEffects" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86" +KEYWORDS="~alpha amd64 ~arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86" DEPEND="" RDEPEND="" diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index a402a20cbc9c..620d7bc156ba 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -11,6 +11,6 @@ DIST handbrake-1.5.1.tar.bz2 16137974 BLAKE2B 9ce1f1ae7b2fe514ba1fb6ed30a345d181 DIST handbrake-1.6.1.tar.bz2 15934833 BLAKE2B 027457c874bd49ff8a625233a5d09d70bdf76c45e6f2664f3ca65efcd0e1705d5575a81c5ac8f2237b8add7025314f12f0a19d6cc7337e2b0edd28c30ee3334b SHA512 e5cc0fee5bf063c4cdb8f64a772dac6800a7214bfdc65042c121e0e81878599fe615b499ebf6466bb78740314374ad8b8fa364fb24ff86852183e7dbbf565617 EBUILD handbrake-1.4.2-r2.ebuild 4072 BLAKE2B e8d02d4ba17fdea73fe53b242c9860ab450ec1221069aa3dd36b1b7e37c398aef66dca8e6ad6b2c410459b01dd3495f3793e3d5e6654000dd9520676efe21020 SHA512 06d292b5e1a455f9fdbc07bfded936653e892ea7bf1e05e8455a8c76a8b3e66dfa320d6fcd6d85cfaa22a987b1f243421681f947ce5b39c8a2eda2e994875c0d EBUILD handbrake-1.5.1-r1.ebuild 4246 BLAKE2B 6d29d5701826e2fb45a57b3a4aaab081571e8d0d1d2f506529bbd6ba04bcc94c8ed268989c61dda32a4617dcd87afe88f4eb6ee5ae383f5b88862b5418f64933 SHA512 d3caf8497dd139975729c29ac32b051e27e293ec585b0665b4974372418257d8d6d5763640601ce58ef8dbe84cd116b7bd451d59ff7166311183763e10be66da -EBUILD handbrake-1.6.1.ebuild 4195 BLAKE2B df1f8634daad66a1464c9284bcb6ff4747458fb54e69e77beaa15a506fdc934dfa47c3e7370271ed0c7e0f821bce4801c9e7763f68827a48f9f8c94eaa4805a6 SHA512 9d94b6d6cbcd0e0148e369b137fe0c029a61e7b67c99269c842e4d079945a238fb422b6a548bd12abc8e04cdf888877f0e37bbebf1e19a5afa0253aa44f2039d -EBUILD handbrake-9999.ebuild 4146 BLAKE2B f9fd388558262b7710ccda4db4cb80038a3f2ae133e9bdaa68226291fcfb5be39739d0e34940eedebda02832893d233013a951b6a478e9decc6ff05d9acb1843 SHA512 be8d7c514ed2602b961f77b46c8e0e69e927182d98a188b9542006c143fd1f150792222cdc618cf6bdaafed2967dd967e125d3850f7f9cf2dbfb9c7787477d40 +EBUILD handbrake-1.6.1.ebuild 4197 BLAKE2B 9ea44d080f1c0808f3bced34af7dc7cb4cd7d98f25bc322fa289553df928aa20922514793d5f71dc15258209e26c932685861e007db58dc4dad53d4121d7119d SHA512 b3da04d14b2294828f24b6681a6d39ae358ac4ac0ba3744ebc1d366f23e93d81452dd750e804a568d41c2448a67a8bd2ce6e7ea95b75980b74869227b870aac1 +EBUILD handbrake-9999.ebuild 4148 BLAKE2B 2ca9fa15b9c576e9b4494b782afb049069411c2c9916f3113c9790f311fd0139c18b5a3fc53e25104d838caf452c32aa37877ef2ebe4462ce1b3b00efe78860c SHA512 2e40ce634fcc90da415e4369beae5da02a28f2b394626dc6036cb085bc4a5354c6548e32195225e9432a1a600738d9c18c4d4f293c95701ac7800f834aeb28d7 MISC metadata.xml 764 BLAKE2B b55002f9d3df7bb894d64f6cbebcf5eb54298f160500a1ba46f132613a903c8a8cdcdd1bc6d425272b850e4142800dbdcec2fcf1208cc84a07961a31fc054ddb SHA512 ba170b59a2b96eb804e34a36845909b781fab783989db97f7c4c15b98d0b5497978bc7ae0b247958532031537d53e1878582d858b1c92a345b82fafecf98f7e1 diff --git a/media-video/handbrake/handbrake-1.6.1.ebuild b/media-video/handbrake/handbrake-1.6.1.ebuild index 427b5614f5b4..2fbb8d88ba6b 100644 --- a/media-video/handbrake/handbrake-1.6.1.ebuild +++ b/media-video/handbrake/handbrake-1.6.1.ebuild @@ -43,7 +43,7 @@ RDEPEND=" >=media-libs/libvpx-1.12.0:= media-libs/opus >=media-libs/speex-1.2.1 - >=media-libs/svt-av1-1.4.1 + >=media-libs/svt-av1-1.4.1:= >=media-libs/x264-0.0.20220222:= >=media-libs/zimg-3.0.4 media-sound/lame diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index 0201e9e8dd27..d12123f0bf5e 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.ebuild @@ -43,7 +43,7 @@ RDEPEND=" >=media-libs/libvpx-1.12.0:= media-libs/opus >=media-libs/speex-1.2.1 - >=media-libs/svt-av1-1.4.1 + >=media-libs/svt-av1-1.4.1:= >=media-libs/x264-0.0.20220222:= >=media-libs/zimg-3.0.4 media-sound/lame diff --git a/media-video/hevc-hm/Manifest b/media-video/hevc-hm/Manifest index bad7fdc6a432..bf94eef0f125 100644 --- a/media-video/hevc-hm/Manifest +++ b/media-video/hevc-hm/Manifest @@ -1,3 +1,3 @@ DIST HM-HM-17.0.tar.gz 1692323 BLAKE2B fa620ce66acbc634d9768303fe8d60711759a9d6d1ff91b69680993ae45e4581c9df4f0a4fe36719de9713fd29ba020278cf7ef9a51ebee6b01dc578bfbd8f2f SHA512 e8492ee63326da497d0731ef3f70e9f11043618ab5a7244aed94b248dba3f64e301f0ec2d12447a0ef22cc630cfa425341f65b4cacef184b453ba5125b7f8738 -EBUILD hevc-hm-17.0.ebuild 1177 BLAKE2B 041fb77466b02f1b62f0b2d1ab0972f178ead290ce3c17a7a5ffb4de88f1fa3f738b01964c3bf602448f3c530291a5201a2d09acf21aa8877e17f3f9b25c94bd SHA512 fd402d061521d4b409842ecc1b99b1e52460804e482d8517818c04878d8258caae09b7a22380264aa6a84553a4723f75abf8117c90e44873b35b48c1b4a58ede +EBUILD hevc-hm-17.0.ebuild 1171 BLAKE2B da5a0c65eb2dcc3433929fe15eaf6f1b3693ad75cfd0d01e6df5f5da167bdda6f9e7179b037f786725820d465155f350c1ff6e4b53e01c2b9b6ad91e10183c76 SHA512 7e12572e493c6151c4bea0e73d9938dcdc512badc20891a8e78beac84df8f0925109c854e828b0619fbe1e6f3988f9045276e8e001aad64147623202ec62fa18 MISC metadata.xml 260 BLAKE2B ee10cc021112a6e67381cc76d642cabfe9876b9e2da97243070551179a9f8eb2bcb67d8bf96822d40239c350808a8a129882914f1ce9b5f924c99d16ba1300a6 SHA512 0bc4c52638ab97c96d6e1ea6b8199201567dbdac880349e8ab501de49bbfba142e4f2f60baac9c0bc48df6f5d170d81d641277cc01762d720b720764bb162c1a diff --git a/media-video/hevc-hm/hevc-hm-17.0.ebuild b/media-video/hevc-hm/hevc-hm-17.0.ebuild index db7b1b83085a..958e4a2525ca 100644 --- a/media-video/hevc-hm/hevc-hm-17.0.ebuild +++ b/media-video/hevc-hm/hevc-hm-17.0.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://vcgit.hhi.fraunhofer.de/jvet/HM/-/archive/HM-${PV}/HM-HM-${PV}. LICENSE="BSD" SLOT="0" -KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" S="${WORKDIR}/HM-HM-${PV}" diff --git a/media-video/jellyfin-media-player/Manifest b/media-video/jellyfin-media-player/Manifest index 9a241aa0dea3..9b63f02ec7fe 100644 --- a/media-video/jellyfin-media-player/Manifest +++ b/media-video/jellyfin-media-player/Manifest @@ -1,7 +1,9 @@ +DIST jellyfin-media-player-1.11.1.tar.gz 514141 BLAKE2B 00984b9241613a94ab0c27f21c4202ca064ff42cba8ba3d01b7bda20af53e80aa4ce14df9a8e906574d94fb3146a68cc84bc61e2be94d4e16ce087c97494de5b SHA512 24616c36e92e168655f6c37ef214ad7aa46df1cb331e1bff225b83b83da18fa91fb66d13145744c20cf49d2b92132cff065f6e8429bc111fd1be1a3d68a9c8ec DIST jellyfin-media-player-1.7.1.tar.gz 575001 BLAKE2B b650f981427721a254fd1dcaa58ebf9f93aba47de50f8c24db27e917de8cd8ebb3da67afa68990845f9e019aac0c8d81f5440dd72f604aa74cdc71d8cc476d8f SHA512 7f8cd4c9094254a133430b1d1594d44a92696cd769323ecc51ef973dde1f09b013f9ade0affb9e364d922935994613f662667af46f90aae2ae04d6cb9deb86f0 DIST jellyfin-media-player-1.8.1.tar.gz 582343 BLAKE2B a5fa8d20cd3ec6e4444c1e9d90b93622f7435c2ccbf886c02ce744aa7aeb5a2440b07b3e5b3edb81bb6675d82958f5d63147412dd3d28fced60060de5724e52b SHA512 821bfa42e981d996c7f32f3951e625749a74636ebcb6a6c68c606282fb0db6d4c205419887828cc0dcdd3005d88b237977a01a82e2800a489c8bf3abac33630f DIST jellyfin-media-player-1.9.0.tar.gz 519208 BLAKE2B c64bb40011dd3761144e70c9549329c921156d9b0c46425e9812d6210baa8b90df7ac8f5af3379da76f6b8c6a55a3d8ac903ce5481895135eaea720d2ce936a2 SHA512 58c35530d61405ed5ff5a73c8a4f3869b21e0b0b0eb5cef7cf15b846543f1070d5c2b4dbfc102c6b4fbce5cb844fea711045d39c1a6bae9c882ad24c6ccd0333 DIST jellyfin-media-player-1.9.1.tar.gz 519515 BLAKE2B 0240d4f964a48e476531e0e601a62f270defa98ef2d4c0e63e2a552a03e6abf2e069e38b80fa9515b5c3cb62d789c3fc630a1f726cc4aa3bcab7e39869ef4b2f SHA512 c6df563ff343b8b6b570bdbaca9cd0111ed2b3f347c40888a83d338893a0523eb1614fd5fb2f4463e97f9656f71af23d94b110fff473c71226180530822ed0dd +EBUILD jellyfin-media-player-1.11.1.ebuild 1422 BLAKE2B 3b9715a683b74505d41c4602fdbe4251dca6c714ad48942cc89e0872bb8aa8269a77fa9df8548402211025869b8205cd652da80a876179822fa840ef1faa5463 SHA512 c916cf22629e2093c1ca835499b54a2437b6b4974029c5ae2d7c16529c79c67e4a2d0d8674f41b50beab655e056e8d51f2ae05a46ac8c13a884c2efebc97c05b EBUILD jellyfin-media-player-1.7.1-r1.ebuild 1751 BLAKE2B 6e08d01764a9543746cf1ac0ad154a37f915ef7a69ed9e2b09527dc7d3359e6a2d2246028ecb962e5e76347fd324992442041038852cf8697c5c69b433260dc1 SHA512 0b6824cd08a9619653ae3d153b674aa303be0bd50178ff3a1f1f7607f16c7ba5d2be8678502cd572e63cb80ca95278a82ec1d44267cb705a28f8c39c4994f6e3 EBUILD jellyfin-media-player-1.8.1.ebuild 1751 BLAKE2B 907c787b1386bdfe8743a692e18dc7b17b7491d545e2faf8f1c1b0a6a106a313eddf703d4d4236fae24cecb24116cbece8268819b22774c5b4754afcaae5ff6f SHA512 e09325b4bd3711c3d4fc312b90ccf765cf01a36d6bad44b1c479b95317dfea9f410ae39b18ab52aee87752e511d47e1fd988c6ccbf2dfee19e943386c7115117 EBUILD jellyfin-media-player-1.9.0.ebuild 1451 BLAKE2B acac909fefaf2258f9dbc6fca1c5ed98305488e2296e3f01fd454413652111b0dcfcdd9b31c1213ff142aa9f2a73994d79311af83d31f96c93ad69725f85bf55 SHA512 3b63895ecac4235327602d28492075d11ee42a3fb4069020ffef3200824abba78a11332c716c8b88c84d54095ba1987bc2b46fea49dbcb156e0c248a86208973 diff --git a/media-video/jellyfin-media-player/jellyfin-media-player-1.11.1.ebuild b/media-video/jellyfin-media-player/jellyfin-media-player-1.11.1.ebuild new file mode 100644 index 000000000000..f2716ede9ed4 --- /dev/null +++ b/media-video/jellyfin-media-player/jellyfin-media-player-1.11.1.ebuild @@ -0,0 +1,68 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake python-any-r1 + +DESCRIPTION="Jellyfin Desktop Client based on Plex Media Player" +HOMEPAGE="https://github.com/jellyfin/jellyfin-media-player" + +SRC_URI=" + https://github.com/jellyfin/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz +" + +LICENSE="GPL-2" +SLOT="0" + +KEYWORDS="~amd64" +IUSE="+dbus" + +DEPEND=" + dev-libs/libcec + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtquickcontrols:5 + dev-qt/qtwebchannel:5 + dev-qt/qtwebengine:5 + dev-qt/qtwidgets:5 + dev-qt/qtwidgets:5 + dev-qt/qtx11extras:5 + dev-qt/qtxml:5 + media-libs/libsdl2 + media-video/mpv:=[libmpv] + sys-libs/zlib + virtual/opengl + x11-libs/libX11 + x11-libs/libXrandr + dbus? ( dev-qt/qtdbus:5 ) +" + +BDEPEND=" + ${PYTHON_DEPS} + virtual/pkgconfig +" + +# x11-misc/xdg-utils is used for xdg-screensaver, which is used to inhibit +# screen locking + +RDEPEND=" + ${DEPEND} + !dbus? ( x11-misc/xdg-utils ) +" + +src_configure() { + local mycmakeargs=( + -DOpenGL_GL_PREFERENCE=GLVND + # PMP, at least prior to the fork into JMP, used to download codecs, + # for safe measure, disable that. + -DENABLE_CODECS=OFF + # LINUX_X11POWER instructs JMP to use xdg-screensaver instead of dbus + # for inhibiting screen saving. + -DLINUX_X11POWER="$(usex dbus OFF ON)" + ) + cmake_src_configure +} diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest index d83201e569ed..21a67dc85e90 100644 --- a/media-video/kaffeine/Manifest +++ b/media-video/kaffeine/Manifest @@ -5,5 +5,5 @@ DIST kaffeine-2.0.18-r3-scantable.dvb 1980400 BLAKE2B dcc43fcd04cc155ae99e35a32d DIST kaffeine-2.0.18-scantable.dvb 1880456 BLAKE2B e435309f0a11cb6ecb9671c0948c6afdf4c946bc0914c0809945002e353383bb539e1c5594a0a52f2968393623c56914b360b37e5b24a0c17a8f3a60b100ad6a SHA512 2d00987eb261e6f52df490dd44b43567f7d4e3bdcfd0eb2f62e064604d91661e9754cf9e5462b491009fcb35bdca681f4be2a9f06b6b6d47a5b44f5819dbf4fe DIST kaffeine-2.0.18.tar.xz 6033112 BLAKE2B c9a0fbd58f7ee4ed8ad44cbed59d95cde7df8ba9c2f5f341df74e6a771293756434e38adb7706baf224a684b56453601099fcac9bf27fd7ec935073a0c30ec19 SHA512 60854251f25e7de94928686f647e6e0f07ca40188e8dfd8140985f1dfbb53bb4d92ff42c29e216431500839d7eb83b81f386bac3a8a86dd8c986a611ec0db3a4 EBUILD kaffeine-2.0.18-r2.ebuild 1746 BLAKE2B 017a0a9f6e789a0e5001e19ee47a7704419a03a656f08f1984b72c3af644aac6cf7ef30326b35c9cf58f8adfe80eadde78e4ff20bfeb258435be99ab08cd58dc SHA512 7c64ae392aba349a2d0aa3dfe7d0a3393a0fda2c67ecdc3a7b0159208af97b34852a60a34146ddece737abd98033be35521518f8008840ab61f587cd7daeb625 -EBUILD kaffeine-2.0.18-r3.ebuild 1883 BLAKE2B e7d3831a383e983d44b0c9eba0648a5b24e179714240f8d2f36e53f532ee9880e55df7f1aa7faff01fe1609ddfe7905b01e6df3baeaa66494477431e796f985a SHA512 736e45092a5967c6a41b7a9c9780b4850bc0935cf9b3121f82f11957e308729fcc906bf7f300767591e4938e0b4c208aea65327a926149c59ba04c18695baa93 +EBUILD kaffeine-2.0.18-r3.ebuild 1882 BLAKE2B 07c5484e05a3631817c6ba23eaa52d494ddb573bdf541494b311bb20cb3363d960e5f1cbbfe57cf9e49d427216cad63bfd0fe544bd876566ca71dbcccac1bd44 SHA512 f9244eed63aa32dab7d8c57dc5f4378ed776a27e45dfe3784c5ec975b0a1edf6743f6d68fbe8fdae11728b50222e8caf334d291c38cd96a4c93a8b18a428285f MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71 diff --git a/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild b/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild index bb6e662ce6a2..58c3da6cd0ee 100644 --- a/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild +++ b/media-video/kaffeine/kaffeine-2.0.18-r3.ebuild @@ -14,7 +14,7 @@ if [[ ${KDE_BUILD_TYPE} == release ]]; then SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz https://linuxtv.org/downloads/dtv-scan-tables/${PN}/scantable.dvb -> ${SCANTABLE}" SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" - KEYWORDS="~amd64 ~x86" + KEYWORDS="~amd64 x86" fi DESCRIPTION="Media player with digital TV support by KDE" diff --git a/media-video/libva-utils/Manifest b/media-video/libva-utils/Manifest index f4c9c041ec28..5a611144df3f 100644 --- a/media-video/libva-utils/Manifest +++ b/media-video/libva-utils/Manifest @@ -1,6 +1,6 @@ DIST libva-utils-2.21.0.tar.gz 1281468 BLAKE2B 9b7027e5e9a46961af5da0883deb5dcde4bb2128ff73a99a4b71385a63afd44b9ce01ca863949c305d4c07ed9d02150e472fed5be42b6bce8f20ff993d2633a7 SHA512 b56b5c29e8210cb448cec34fd057865b9332d219e486a324a9fa716f791d8d10cd83e8c1e91248c11e6387b442142a7d1fafae0ded3caab44179fd6dca23fcbc DIST libva-utils-2.22.0.tar.gz 1281536 BLAKE2B 7544d318c5a0d1e353e5a895f31bd4499bc563a9cf57ed29c1e4044b44794a3e3381a332b155f5bc5e4ea0eb6dcc899f4af6b0c672daa0c6af8d553635fecd27 SHA512 30a7093a544f4081b412f7d9b1ef350426be95880b8eb342bd8c36d2c5ba10606e107587aafb930057e8db4bcec8f3c5e3c327645d7a84013673ff616d09325d EBUILD libva-utils-2.21.0.ebuild 1894 BLAKE2B 0699d208d7af8bca1692a98daefea2acd5c5602da7fc9f77376dddbfb3be381b1ca86ddbc7dc660fce445cbef0b6798c3220693018cf287d213d8c7162229364 SHA512 953a158fc3e4ab1582a57ddadaf064b910b50d3ed7c36d463ceb7dd7d005ed4798a52ac059c084ad4a4ec7d055c21f3eac7d6f00953aecd8f558058ccdd8ef07 -EBUILD libva-utils-2.22.0.ebuild 1898 BLAKE2B d055c2e615c6b198ffca2e1b23cbe2a9953c5d0c8d8d47f6d48aa8a59bed5b81d2df4f0deadaacb11debe96ad982f356d874b55ed01b8b6c252eac4a3da2c1c2 SHA512 9e98a7d0f5d2ec9161aaf20e4bccef9bcfa347b09c34bf920eff910ef3b0b3bf6b906082eca06e3f727cadf18d7e426c640db12be720dc4571e9a3c3b1418d1c +EBUILD libva-utils-2.22.0.ebuild 1894 BLAKE2B 0699d208d7af8bca1692a98daefea2acd5c5602da7fc9f77376dddbfb3be381b1ca86ddbc7dc660fce445cbef0b6798c3220693018cf287d213d8c7162229364 SHA512 953a158fc3e4ab1582a57ddadaf064b910b50d3ed7c36d463ceb7dd7d005ed4798a52ac059c084ad4a4ec7d055c21f3eac7d6f00953aecd8f558058ccdd8ef07 EBUILD libva-utils-9999.ebuild 1903 BLAKE2B 977bd6b9097f5fc340e8d59ff5fbfcb7ec0e9f81ac9b9b4bdd4b8a3af3647c895e496dd0c671dcbebe48275469e0fde2288333f4e1f87808642293ca1fa46580 SHA512 c85d4d3322e2851e23a528c031f363a5e06c3982b5bcded6b08471ea9f07e8f91608b50b53d7b0564fb16f6c9b57b379dc524ab27344195d96a68cac14514462 MISC metadata.xml 596 BLAKE2B 856d27918d6cd6c983271e4f762f7b1278bd90231d33181b5381dbc425523d637c65902526ed1b48a0df6aadf41d77bd249e886dbc485edf93f5394fa458cd13 SHA512 46e6d1ef1cc966aadb696293fb1b5f86d1f3fe5d0245ca01a2d9be6d1b35f29830cee41d4e04f0c8d557dd20eb41ae927dc60a854ce24862a2b2f7fc8faee766 diff --git a/media-video/libva-utils/libva-utils-2.22.0.ebuild b/media-video/libva-utils/libva-utils-2.22.0.ebuild index 60f57e6e4c4a..4de57531c234 100644 --- a/media-video/libva-utils/libva-utils-2.22.0.ebuild +++ b/media-video/libva-utils/libva-utils-2.22.0.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} = *9999 ]] ; then EGIT_REPO_URI="https://github.com/intel/libva-utils" else SRC_URI="https://github.com/intel/libva-utils/archive/${PV}.tar.gz -> ${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux" + KEYWORDS="amd64 arm64 ~loong ppc64 ~riscv x86 ~amd64-linux ~x86-linux" fi LICENSE="MIT" diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest index fb9b5cae9aa5..e1ac746f2936 100644 --- a/media-video/lsdvd/Manifest +++ b/media-video/lsdvd/Manifest @@ -1,4 +1,4 @@ AUX lsdvd-0.17-autotools.patch 466 BLAKE2B 3ec7a605c54b3808df96bec660e824b29ba8e5dc582c155bab27aa7e28d68041f314e57e495688358a6173ec5f8e0f1047716dfec8ec43c90e0c162e498923c0 SHA512 477a514d25379b11b8c44fcef62481f667c1a839f74e3e731ed3e15291e3e80db7848c1d8606d46bfd18b8b2cc4d931cb4194f5703c524d2251eba5a093299f2 DIST lsdvd-0.17.tar.gz 99250 BLAKE2B 2b3203527aa4aabd43d26de5f983733f5570905a81043f49e18531a29198499ebb2b9c1ed9caf4ff061639ca02f047c13f95948c09bad7b105d8c02bb3ec9c67 SHA512 d217ebe063c9d4c1584abe99cba5c5d09e1d600d26c58f90d542235f9a629433aa24f24fd8399c639e21391e7a5e8bdf54a9c85083aed63eae1090f4c23677e0 -EBUILD lsdvd-0.17.ebuild 599 BLAKE2B 9bed362df8dbf563e887d0d256aab72d8e3939dc40de01894ce126b3f55f578b22cf937d05094acaf9f1f5616b79431958eace7f4ec54f40e5a09c75e312a5a8 SHA512 f2392977285ab5cd27d55f20911e1ae13c8380ac5800381d19e1f13109f8002895dd0e957a5521ca6bbfad9c3a3f0e592e029430056b43918cfbff8946f7eb00 +EBUILD lsdvd-0.17.ebuild 593 BLAKE2B 90d8cc956adb409e511d4aae2de939beebe3bdb725a60d67b544191a1cbb6f3786e533bdeb5f65472ac54803d18a1e2e01e81690ecae23fae794f570baaf9371 SHA512 b708d1f5c9f6baeca3b48f6c7888d019901488564a4a889916a572f8d189a8670e64d55794893917a20151f140067bff3d383ac826d5276fb5660efce0f1f488 MISC metadata.xml 299 BLAKE2B 14baa9779438a685ba4c67b40becb5ecb849fc0605aa1cc60664f59af85776868f5bb4ad2c416b9f163344c07a5c2099ab3b5ef3e9b45200ab71b6ad1ddddac0 SHA512 e145df76dd8df4a6d68ee786b05055ed02632d76f36c818ecb376d50ec5397218fb004cf8d8da1ac0c23c5d8e14b5afaea4049f9723b466d3216504764d3cae7 diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild index 8e7ad78a3d30..1f6f3484592a 100644 --- a/media-video/lsdvd/lsdvd-0.17.ebuild +++ b/media-video/lsdvd/lsdvd-0.17.ebuild @@ -11,7 +11,7 @@ SRC_URI="https://downloads.sourceforge.net/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" +KEYWORDS="~alpha amd64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="media-libs/libdvdread:0=" DEPEND="${RDEPEND}" diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index 7d0206c1a41b..f8cfa27e8bbc 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -4,5 +4,5 @@ AUX mjpegtools-2.2.1-gcc15-template.patch 10735 BLAKE2B e9e171909a435c8e5926f4b0 AUX mjpegtools-2.2.1-lto.patch 731 BLAKE2B 9bee6eddad066794ec2404d4ca3df363fb66a458d4a296d0878bf4d21a3e242d6f660a5d9d7b2996e5742140d1a5e50b75144386821f78d254f9e5f2b8a81b86 SHA512 68cc4c1e70ac7753fdc7ba036b5407dcb9839fa05ef61c5d3567e9f1efb26a8ce71ee6f1c259fcc1277f90d0d2beb041119a627ff5e8e63bce49c3f542077c8b AUX mjpegtools-2.2.1-puts-c99-configure.patch 682 BLAKE2B 36d38e5ad56496647030150728cd86e043a2b3913d28d6aaa964bf51a3ae143e8ed200ae66424ef863ad2588222159d999a9caf7e2976b431880639b44fdc121 SHA512 de3e85d0d96d4ce12c423b4110f31d13082ac2c69ebc146516b03202521696aa4170b12cfc51c9a7959f028317957ed98edcdb33e5e0261133d4c2791843044e DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b SHA512 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830 -EBUILD mjpegtools-2.2.1-r2.ebuild 2893 BLAKE2B 1405896365b69df71533f5588d933ce118f624d28482469bda88c7194c4d6d17088587b393403488ebfc4d39fa5f38e5877d908c7f1ed7ff506ff5e935234cca SHA512 e56e9a8cceaeacfbc82e1c76f6ca80921bb82161da8e639f972054775e8394a81686611fad444ea9298d585d6772b0214b4c2fb2e42ebccef1047e8cb97f3849 +EBUILD mjpegtools-2.2.1-r2.ebuild 2887 BLAKE2B 110daff5432fdc62fd4985edf9643ee94681ca4eb8616787f7987e23b044d0bf9f333a8f0e89874f75982093c96c9c9bbd97e9193cf3be18d9266c0e6178489b SHA512 49da2ab074d50146f02ce116cde877e74d02d57634b633c39a2709beea008d2ffd5a9e888183144c6b5ec5e3acf251d56a9725970159b4b85e575a5ee0ab776e MISC metadata.xml 538 BLAKE2B 420dc5b1516f83aed28539d6c9cb3964135bd67d9a8c334eb5ad72bc95156fe3795ca8098cebc46e7a263e3a84cdb8bfe1a393b7f9a9f47eeaf24527748723a9 SHA512 c53c44b7a0bdea16c3c56d11edde87edea9849ffb37b2eba21701ad5791f1348d61d7216457efa0964c1503d89e2d86c4616d1fda240129f98ab2b68ec5e6926 diff --git a/media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild index b6700e97964f..150ce709ca1b 100644 --- a/media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild +++ b/media-video/mjpegtools/mjpegtools-2.2.1-r2.ebuild @@ -12,7 +12,7 @@ SRC_URI="https://downloads.sourceforge.net/project/mjpeg/mjpegtools/${PV}/${P}.t 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 ~loong ~mips ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~loong ~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/mkvtoolnix/Manifest b/media-video/mkvtoolnix/Manifest index 18f867b4b589..0fccc4251bd7 100644 --- a/media-video/mkvtoolnix/Manifest +++ b/media-video/mkvtoolnix/Manifest @@ -1,16 +1,14 @@ -AUX mkvtoolnix-80.0.0-fix-qtmultimedia.patch 808 BLAKE2B 560d85d4ef07677adb63053997a3198cf7348e8172f052a944fefd26c45c269247e3bd9a3831c9ba70fbabffe74ed7c53ac2637c5c0e1d32f1b5faca907aedfb SHA512 c7d3fce5c74d41db6d27a9c03866afce291dcc329257073cc8767e871847d1c80539b72c0c3392efb5010623d932ac0e4cfa3c86135d264faf9607cc2fa11999 -AUX mkvtoolnix-80.0.0-no-uic-qtwidgets.patch 1035 BLAKE2B ff38fb84285d2f496ebe56325dbb3c0059c41ec32bfbf31c2f45659ee17a2b4d29391d5f7b258b2c8c7d2ffcd25644c32ba4f4c0261e51a83bd518cb967c99a1 SHA512 d0b8ebbb246049ec8749dc1dc14575e41f091c758d323a4b7597475eb6422a0886eb9e4408084d4e386467760903e5fc444685d490216cae6642634318a6eef2 -AUX mkvtoolnix-80.0.0-optional-qtdbus.patch 2501 BLAKE2B 9372aee680a4b20adef6e0b9fe444548b40573ee50a9d9ac7593407d1b9e69670fe3c16ecd2dc3d752154a5414f714f201d00a5a1b4a96065265bd553219c1ba SHA512 75eb5344605ef9c461df7e8d92ce5422d241efe01aa49d148cbb337ac29f589ce83e4e258918dd62246c84fead8d971770ca577d7ead47246b5a74b023503fd1 AUX mkvtoolnix-83.0.0-fix-disable-gui.patch 4772 BLAKE2B 9f1244cd93e1292cc91903846af71dac9bf0a81f2eedebe8166cd3516208a815d7054bec4ad77fb51f4adfc71a6ae5d84eb2096f5dc2d2895adde93d900a5f93 SHA512 f8939d53940fe2cd4a3b4e80b2af111934a5cacb9f87e7d17be9c3a34ce4205ec02ac4a2003c1b55ba97d0c5da132cdd8e123105db02cdcf7dfc289fdbc97314 AUX mkvtoolnix-84.0.0-fix-libcxx-c++20.patch 1459 BLAKE2B 0836cb4b8d3df74254257b977272d3e6cdc4e9c0b92a95b17b880b722b942ed1a9eafe2b9bb2b822a2a593264d76f8a0941331db08e3377359b357fd5dd7be4f SHA512 8de434ee48cc4021fdbf2b8edf644f85bcfebf1c76a5ebfe11f74c86eb0564f7820db183ea7f2f3103e84a84428694cc946c142da54a5ee86950841feaa7c89e -DIST mkvtoolnix-81.0.tar.xz 11067288 BLAKE2B 64bf3cd1872e3b67c6932ed29527e1dff2f913d257464cdca2d54a62bd2154a820d86bce857f55345aba1bcd5701872dbddcb5a029845d0079159358cb154fb0 SHA512 d23f6d1819437ba77576852141256698997e49066158903e1cea4086b9c05302d6661780e911fc258c028a84f2ac95140f6ba15d2ffd11c23cb92e422febf7c7 -DIST mkvtoolnix-81.0.tar.xz.sig 833 BLAKE2B 37e63e92628d3dcb6e9c9129e09dbef1d1d4e80515a05a9a5684d5d542ef54b024e76f1fac50b242e32172ef24493123b6103ae79fa411eefea7704cd63070d5 SHA512 3975c0b217318fdd9eeed23694c0e25536c694fa6cef63560b48ed79db7827be41cbe9a2cd8d8c1d2555beb436a5191a5ad21f0e5e73f93f2ca1c09be13826cb +AUX mkvtoolnix-86.0-libfmt-11-fix.patch 726 BLAKE2B 0379ba93dfb9669123492335516a3618cb970ea1ed19234202be7a28aa6276b51f982c596319f921ec0476e7d25b8ff74d46247f21af00838eed2bde22f36ab3 SHA512 6085ce904bf2ecb4fd43e469778f634b8e609a4a0f2733477605ead9b275a12be0fc1204ec09b601b5efb4328d65790ec424c2a542e14c962172b43797fc821f DIST mkvtoolnix-83.0.tar.xz 11278152 BLAKE2B f57b398c747d90021f2a13e58df23655e898a0bb68ad7f050f7a3fe0018866570fb81780f2d68a8c9ed06b66882578b5a9144c3be1bb9b79bc5f79e13f06bde5 SHA512 e70236249f9f72c4ffeab8222c03cdf373a25643f1b106a1abb695184152be8bb22e3fb5dc67b48e6193d9ac37d0b9b2ea317a31214b92648ac75a82c99f9b5d DIST mkvtoolnix-83.0.tar.xz.sig 833 BLAKE2B 3eddaa4941d84937a7b771bea66be52979437abb54cd178eb6d24b30628db3ee0ad72f23bea7419a7bc13cfd4f84d6d004b46ad63bad0eeeef8fd05f37bcaf4f SHA512 6d3ac46a40139fff67da61c77a802df243764d8c26c55e3b951d407fd3147bcf985f8a62c21b18c12fabe0afdc535a3449a6bfff3f15a5779b2aed1f94fe0ab7 DIST mkvtoolnix-84.0.tar.xz 11325260 BLAKE2B 147878e796c3ce9b3dc03e026eaeb45c21946d0a80ff76d090a8a11a22e1e02fddfe158192df264c5a006ad9007a73d68ddd5c79f0ccd1d103e827e4d0123974 SHA512 3a73bb2497a227fd2e0a65d58e72bf479662828a7b4201b37b7bfdd7f88d294a6690aee024661d8b5615036f64a4ce1c2ba64d7b24ebd352f8f5ce3ffdac543a DIST mkvtoolnix-84.0.tar.xz.sig 833 BLAKE2B 903530d5968d9409a9b0fe1f236c254386a33ce1224b36d4e6f33d603851eec2ed27aac2923d59a3f2e729a48bd7724d8b697cbdff5213bec338417f1632ef29 SHA512 2338a226e0df776e1b3c78f93793900e62c391fd7fd4e56c317840f3d00fccc20d6ede3118ad47266b6772459d1959a221f2e475a4b96bd9c2d58caab3dae184 -EBUILD mkvtoolnix-81.0.ebuild 3617 BLAKE2B 68232e3bc6f600d7c33c8d9263193457d1eaa21c42c192c7c02749b0cf8db06b02fa7947b33319af7515af7822f4ddfa2d1adfe8a87c868a5e7c0b7d05d94de1 SHA512 f224a17d42ce74aae9ac6d8a9b7b1c8f38f34656707503d0c6f304fb67ca3ba3ce15d511f6fcab7a9a3038b7a156a6956c10a02e9d66b4fc1ba32fc30400028d +DIST mkvtoolnix-86.0.tar.xz 11369476 BLAKE2B a18ed1534f693f98924bc5c4bb1d3acedd154dacede17691a88b1d1a14c99d5ba4bc5483060d67624e682058e8af1a91ea0f77b095f35af340dea84a441dedc1 SHA512 ca1009439d662f32c75ee915f89ed1ccf1475f84782a5da977521e1ab1a558400d844d689ba37d3e5bcc2cb0ec70d3fac5db5594d0088668dd0ba3ac759819c6 +DIST mkvtoolnix-86.0.tar.xz.sig 833 BLAKE2B d53e8f8198f5ce5faec0b6c991ecf64a43f42395182aa7ead970f17e56b01c986392922b052cc2ac5e380983b937345838a96cde84e575d72bfcff2dd3084b09 SHA512 19901f9f61e108b8c4db0dab833e0998ab2bdc227130fe6d1aea6b9f495e66aa796bd4d3f70f14dadc906226884f03aaca90e710233e58fb604f66b28fb4abee EBUILD mkvtoolnix-83.0.ebuild 3138 BLAKE2B 71c5d5528b5a6b1f4fa70e85e9cfe0c2aacb292f0d088d93cd6b441fa0b300e5eef9d8d4e9be0ab32d2004c8a046fb2ea8a398a9b2b77ae75f6471be20d6f997 SHA512 0323f6e04b0d32e9ba2bc9c0fef1dce65ab23b2cd6e959a3b4572aedcf3c1f42e3d8e2411891f96d7bf2c9eade8090caba095422be82326434937e3ee3d828df EBUILD mkvtoolnix-84.0-r1.ebuild 3191 BLAKE2B cdbcd27d650f4e193a2fc76ff1e97f06be5b2ab49656332a235655465a87998546a160d18e35574c2814db700988951f6933cb8261752dc3b3f8c8b821e6024e SHA512 f5390992e4a381d5744f998fe624b633b2f141c7ee0d47aaced4d5903f1e33c958f8c33c0924106fa4975de03902071f53d816102a865028f9dddfea74947bfd +EBUILD mkvtoolnix-86.0.ebuild 3186 BLAKE2B c735b0f489a99e25af136a90ac5b01e2b53bb88a2e0e5d2d4b60a8174f28feb72d50dcf22f4041bc68a36a7375c8fa82c547a7c61fd1744d4c59e4320d47fb60 SHA512 3b5ce2d2ad875d831b21927a1b0b3055f12aed75d5b717d715cdfefa5e8e6c62c77e0a98a6486eeb4d7332f0b173b6b997a42a05777a1e92c61d627981d61edf EBUILD mkvtoolnix-9999.ebuild 3122 BLAKE2B 08bd971c6a8eac6d5c328e864692176097b8c10fe00da64d2985626b2fa5eab4dc239f7042ebe152a8c566e047b217924935e2ec0d31a8ac3f6fe60beacd0649 SHA512 3adf6b36985c95a0112274021bb80419ac51a652aa6a6004e46357488bf34e3367849bc35e7ead16e78012b36632d4cfc6aaa0daff7456451628cc72f04fa68c MISC metadata.xml 343 BLAKE2B b13d9c252a7ad2f27c772c43d3476eee87d9a173c8fcc04a3be28ca9cfb826e6f1de6eade1211b4ff5f4a379b20a0961667fc99eee91495589e0632ad94b4c0a SHA512 cb7fd77f65779de841da03890fd1d0031cea8a95153f116f01f1be7d8ef5b87bb760933fc74f64a1d49ce94bc897cde94fdd4f6b45c016c3c20b842097692dc0 diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch deleted file mode 100644 index d31731a266f8..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-fix-qtmultimedia.patch +++ /dev/null @@ -1,29 +0,0 @@ -From 246f824a6a0d2bc93ec4ad2ebfde7c92b42c879a Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Tue, 21 Nov 2023 01:10:23 +0200 -Subject: [PATCH] Fix detection of QtDBus and QtMultimedia - -* Sometimes you may have qtdbus and qtmultimedia present at the same - time. - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/ac/qt6.m4 -+++ b/ac/qt6.m4 -@@ -95,10 +95,12 @@ EOT - - if test $result2 != 0; then - continue -- elif test $qt_module = dbus; then -+ fi -+ if test $qt_module = dbus; then - qmake_qt_ui="$qmake_qt_ui dbus" - AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) -- elif test $qt_module = multimedia; then -+ fi -+ if test $qt_module = multimedia; then - qmake_qt_ui="$qmake_qt_ui multimedia" - fi - done --- -2.43.0 - diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch deleted file mode 100644 index 203721aedcff..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 196e704d9bd44a5bb7655d8a85b6f270b2165b3c Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Mon, 20 Nov 2023 23:41:06 +0200 -Subject: [PATCH] Only check for uic in qt5 if gui is enabled - -We should only check for UIC (provided by qtwidgets) if we're building the GUI. - -Qt (just qtcore) itself is *always* needed to build mkvtoolnix (it's used -for e.g. MIME type detection since 59.0.0), but the rest of Qt -(like qtwidgets) is only needed for the GUI build. - -The build system incorrectly unconditionally checks for UIC. We fix it here -to only check for it when doing a GUI build. - -https://bugs.gentoo.org/844097 - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/ac/qt5.m4 -+++ b/ac/qt5.m4 -@@ -63,7 +63,7 @@ check_qt5() { - AC_MSG_RESULT(no: could not find the rcc executable) - return - -- elif test x"$UIC" = x; then -+ elif test x"$UIC" = x && test x"$enable_gui" = xyes; then - AC_MSG_CHECKING(for Qt 5) - AC_MSG_RESULT(no: could not find the uic executable) - return --- -2.43.0 - diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch b/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch deleted file mode 100644 index deb8d59fa6c4..000000000000 --- a/media-video/mkvtoolnix/files/mkvtoolnix-80.0.0-optional-qtdbus.patch +++ /dev/null @@ -1,70 +0,0 @@ -From 998cd9baa8edbbc0a02509728c7ff21ddaaaad51 Mon Sep 17 00:00:00 2001 -From: Alfred Wingate <parona@protonmail.com> -Date: Mon, 20 Nov 2023 23:18:56 +0200 -Subject: [PATCH] Add an option for qtdbus support - -Signed-off-by: Alfred Wingate <parona@protonmail.com> ---- a/ac/qt5.m4 -+++ b/ac/qt5.m4 -@@ -103,11 +103,13 @@ check_qt5() { - return - fi - -- if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then -- PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no]) -- if test x"$dbus_found" = xyes; then -- with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus" -- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) -+ if test x"$enable_dbus" = xyes; then -+ if test x"$MINGW" != x1 && ! echo "$host" | grep -q -i apple ; then -+ PKG_CHECK_EXISTS([Qt5DBus],[dbus_found=yes],[dbus_found=no]) -+ if test x"$dbus_found" = xyes; then -+ with_qt_pkg_config_modules="$with_qt_pkg_config_modules,Qt5DBus" -+ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) -+ fi - fi - fi - -@@ -254,6 +256,11 @@ AC_ARG_WITH([qt_pkg_config_modules], - AC_ARG_WITH([qt_pkg_config], - AS_HELP_STRING([--without-qt-pkg-config],[do not use pkg-config for detecting Qt 5; instead rely on QT_CFLAGS/QT_LIBS being set correctly already]), - [ with_qt_pkg_config=${withval} ], [ with_qt_pkg_config=yes ]) -+AC_ARG_ENABLE([dbus], -+ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]), -+ [],[enable_dbus=yes]) -+ -+ - - have_qt5=no - ---- a/ac/qt6.m4 -+++ b/ac/qt6.m4 -@@ -96,9 +96,12 @@ EOT - if test $result2 != 0; then - continue - fi -- if test $qt_module = dbus; then -- qmake_qt_ui="$qmake_qt_ui dbus" -- AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) -+ if test x"$enable_dbus" = xyes; then -+ PKG_CHECK_EXISTS([Qt6DBus],[dbus_found=yes],[dbus_found=no]) -+ if test x"$dbus_found" = xyes; then -+ qmake_qt_ui="$qmake_qt_ui dbus" -+ AC_DEFINE(HAVE_QTDBUS, 1, [Define if QtDBus is present]) -+ fi - fi - if test $qt_module = multimedia; then - qmake_qt_ui="$qmake_qt_ui multimedia" -@@ -272,6 +275,9 @@ AC_ARG_ENABLE([gui], - AC_ARG_ENABLE([qt6], - AS_HELP_STRING([--enable-qt6],[compile with Qt 6 (yes)]), - [],[enable_qt6=yes]) -+AC_ARG_ENABLE([dbus], -+ AC_HELP_STRING([--enable-dbus],[enable/disable qtdbus/dbus from being included in build (yes)]), -+ [],[enable_dbus=yes]) - - have_qt6=no - --- -2.43.0 - diff --git a/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch b/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch new file mode 100644 index 000000000000..3b4b1b9fca52 --- /dev/null +++ b/media-video/mkvtoolnix/files/mkvtoolnix-86.0-libfmt-11-fix.patch @@ -0,0 +1,25 @@ +https://gitlab.com/mbunkus/mkvtoolnix/-/merge_requests/2259 +https://gitlab.com/mbunkus/mkvtoolnix/-/commit/b57dde69dc80b151844e0762a2ae6bca3ba86d95 + +From b57dde69dc80b151844e0762a2ae6bca3ba86d95 Mon Sep 17 00:00:00 2001 +From: Kefu Chai <tchaikov@gmail.com> +Date: Mon, 15 Jul 2024 11:10:09 +0800 +Subject: [PATCH] fix build with fmt v11 + +fmt::join() was moved into fmt/ranges.h since fmt 11, so let's +include this header for using it. + +Signed-off-by: Kefu Chai <tchaikov@gmail.com> +--- a/src/common/common.h ++++ b/src/common/common.h +@@ -35,6 +35,7 @@ + + #include <fmt/format.h> + #include <fmt/ostream.h> ++#include <fmt/ranges.h> + + #include <boost/algorithm/string.hpp> + #include <boost/multiprecision/cpp_int.hpp> +-- +GitLab + diff --git a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild b/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild index 077c325ecc46..b44d36acb42f 100644 --- a/media-video/mkvtoolnix/mkvtoolnix-81.0.ebuild +++ b/media-video/mkvtoolnix/mkvtoolnix-86.0.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit autotools flag-o-matic multiprocessing qmake-utils xdg +inherit autotools flag-o-matic multiprocessing prefix qmake-utils xdg if [[ ${PV} == *9999 ]] ; then inherit git-r3 @@ -17,7 +17,7 @@ else https://mkvtoolnix.download/sources/${P}.tar.xz verify-sig? ( https://mkvtoolnix.download/sources/${P}.tar.xz.sig ) " - KEYWORDS="amd64 ppc ppc64 x86" + KEYWORDS="~amd64 ~ppc ~ppc64 ~x86" VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/mkvtoolnix.asc" fi @@ -27,43 +27,30 @@ HOMEPAGE="https://mkvtoolnix.download/ https://gitlab.com/mbunkus/mkvtoolnix" LICENSE="GPL-2" SLOT="0" -IUSE="dbus debug dvd gui nls qt6 pch test" +IUSE="debug dvd gui nls pch test" RESTRICT="!test? ( test )" # check NEWS.md for build system changes entries for boost/libebml/libmatroska # version requirement updates and other packaging info RDEPEND=" - app-text/cmark:0= dev-libs/boost:= dev-libs/gmp:= - >=dev-libs/libebml-1.4.4:= + >=dev-libs/libebml-1.4.5:= >=dev-libs/libfmt-8.0.1:= >=dev-libs/pugixml-1.11 + >=dev-qt/qtbase-6.2:6[dbus] media-libs/flac:= >=media-libs/libmatroska-1.7.1:= media-libs/libogg media-libs/libvorbis sys-libs/zlib dvd? ( media-libs/libdvdread:= ) - !qt6? ( - dev-qt/qtcore:5 - dbus? ( dev-qt/qtdbus:5 ) - gui? ( - dev-qt/qtsvg:5 - dev-qt/qtgui:5 - dev-qt/qtnetwork:5 - dev-qt/qtwidgets:5 - dev-qt/qtconcurrent:5 - dev-qt/qtmultimedia:5 - ) - ) - qt6? ( - dev-qt/qtbase:6[dbus?] - gui? ( - dev-qt/qtbase:6[concurrent,gui,network,widgets] - dev-qt/qtmultimedia:6 - dev-qt/qtsvg:6 - ) + gui? ( + app-text/cmark:0= + >=dev-qt/qtbase-6.2:6[concurrent,gui,network,widgets] + >=dev-qt/qtmultimedia-6.2:6 + >=dev-qt/qtsvg-6.2:6 + media-libs/libglvnd ) " DEPEND="${RDEPEND} @@ -87,9 +74,7 @@ if [[ ${PV} != *9999 ]] ; then fi PATCHES=( - "${FILESDIR}"/mkvtoolnix-80.0.0-no-uic-qtwidgets.patch - "${FILESDIR}"/mkvtoolnix-80.0.0-fix-qtmultimedia.patch - "${FILESDIR}"/mkvtoolnix-80.0.0-optional-qtdbus.patch + "${FILESDIR}"/mkvtoolnix-86.0-libfmt-11-fix.patch ) src_prepare() { @@ -102,6 +87,9 @@ src_prepare() { # bug #692018 sed -i -e 's/pandoc/diSaBlEd/' ac/pandoc.m4 || die + # bug #928463 + hprefixify "${S}/ac/ax_docbook.m4" + eautoreconf # remove bundled libs @@ -115,7 +103,6 @@ src_configure() { local myeconfargs=( $(use_enable debug) $(usex pch "" --disable-precompiled-headers) - $(use_enable dbus) $(use_enable gui) $(use_with dvd dvdread) $(use_with nls gettext) @@ -124,24 +111,12 @@ src_configure() { --disable-optimization --with-boost="${ESYSROOT}"/usr --with-boost-libdir="${ESYSROOT}"/usr/$(get_libdir) - ) - # Qt (of some version) is always needed, even for non-GUI builds, - # to do e.g. MIME detection. See e.g. bug #844097. - # But most of the Qt deps are conditional on a GUI build. - if use qt6; then - myeconfargs+=( - --enable-qt6 - --disable-qt5 - --with-qmake6="$(qt6_get_bindir)"/qmake - ) - else - myeconfargs+=( - --disable-qt6 - --enable-qt5 - --with-qmake="$(qt5_get_bindir)"/qmake - ) - fi + # Qt (of some version) is always needed, even for non-GUI builds, + # to do e.g. MIME detection. See e.g. bug #844097. + # But most of the Qt deps are conditional on a GUI build. + --with-qmake6="$(qt6_get_bindir)"/qmake + ) # Work around bug #904710. use nls || export ac_cv_path_PO4A= diff --git a/media-video/motion/Manifest b/media-video/motion/Manifest index e858f6e4f7d0..3cebbbef5b2c 100644 --- a/media-video/motion/Manifest +++ b/media-video/motion/Manifest @@ -4,6 +4,6 @@ AUX motion.confd-r5 884 BLAKE2B 63c497e942ae499271504d308f826f23d718ac968f7735e3 AUX motion.initd-r5 1392 BLAKE2B 87ac71a1e75ace73ac28c52ff0b1d6bbce364e6d43ef8604f3b90c08646fcf4a66abb4d7b16170eb63e7f7f65e5155382c9bf12ff074feffd2c6f3f16479518c SHA512 0060c062e7ce7f3b9c6ae70d0d6830a1676d9a173072bb3464b42fc2bd595d6237524a1ea916f60268533087647e81eef3b39a1b086cf8e8970837d96e48146c AUX motion.service-r4 497 BLAKE2B 8941424317635d214e74d5d558a443212129c38fed9921b101bd3689d743ed6bd68e30748075ae8c5d26aa10732fc6ce1f08707c9ed559eb89a27322e57e0995 SHA512 44e0fa13e4d93af517a06bac5191d16d528648c6b3eb9d56f80e447db7ef46b311acf6fd1d2159a24fa22200be41bdc62eeef8670ddba918bdd28f6d710f90c0 DIST motion-release-4.5.1.tar.gz 856665 BLAKE2B 59ae638113c7f08ced4b18d7c4f19e3b3f1850ba0cd4c224b300be5ac65ae3b45aa391f26f506a91bb4c38a47b552c71db846d2b3217ccf0b2f5799873ab7ddb SHA512 3b8b60ad4f41c37cc215aa575b0295ee99b15f2d32cbf3393c0f7cdd8d87616cca1c00e11cb7bf74e4afa285caa094f08df3ba62ab21dcb28a48336e3ff5803e -EBUILD motion-4.5.1-r3.ebuild 2348 BLAKE2B d55e46855de12b6c63cf90540d129aa93f387cf91ff890f00a06215b583b748f0b1528d3b9a6f323424ef343fcec515566b61f26081b2684eab6b80a8feebc30 SHA512 665dcb6486be8eaf3e82c9afd93c47f6fc29361a273159873908fabfe1934d6c017a220251be20ac3a8de4a6ac591c240684646a1ef3bf6d2b72d04364e0d546 -EBUILD motion-4.5.1-r4.ebuild 2281 BLAKE2B 45c63007c6a8e91866412f4bf8b67b7d224c7015ff903dbd0750324d2dbc06744faad2de30468ee1221bdb8ee5d5843b4544a6fdb8a339369c91755d1949c40c SHA512 efef2a9774338ab4951107f08abc523a3d1b7957ccdf68e672f0658c7f3d7179f469fb51c67891f4c847b726d06f94fb57656d66e5e96814240a5746a31b05f4 +EBUILD motion-4.5.1-r3.ebuild 2342 BLAKE2B fc35de7f4f3236dc84afb32727671bbb6baa7d697b7373ce8bfcec8aa82c6adf401d75194ad3b3b931ae0c46f0e811aa56a0f12d28aeb352fe55aec773b840d7 SHA512 0669ddd7b26388f24ea120614dac71c23c3d191ef36cb08598b1418746e9e59aac69b89ac1e66dd98e14f1033a941752459678e53f5268bd23283aa51d999d47 +EBUILD motion-4.5.1-r4.ebuild 2275 BLAKE2B 94b3ff22e3f6080fcc1dca0b104fda2268d967f2b55a376b61c7cd264880910b8ce11b7c5704d7280dc93f9384295c1f51b8506ff38229b3b22ad7c672d4d8de SHA512 2e7aeaf92759636de9c1eb9dd701130a386805cf888725737fd40b23e9e6a1b2a2478fad917720f8bfb1d92c58242b09c4a1fd41044f179b290a7c55cb8c78f4 MISC metadata.xml 766 BLAKE2B 1385dc89a2d67fc06b0c430b7cb6a606ce22af15c633edc78382e48bc14e423a2a4ff1553531e0e373151e48d2fed1ab78f9da67680fda3eea6b3d717b077d22 SHA512 8c944d3b1bb54b25597bae085b3fdc3da3ff3677eb97fee314558597917355a2fa4db4216720dc51aa171bb032eb426ae8b1d3c9bc5efed3662af75d8d49cc54 diff --git a/media-video/motion/motion-4.5.1-r3.ebuild b/media-video/motion/motion-4.5.1-r3.ebuild index b145c2763090..4147689f41f8 100644 --- a/media-video/motion/motion-4.5.1-r3.ebuild +++ b/media-video/motion/motion-4.5.1-r3.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-release-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc x86" +KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc x86" IUSE="ffmpeg mariadb mmal mysql postgres sqlite v4l webp" RDEPEND=" diff --git a/media-video/motion/motion-4.5.1-r4.ebuild b/media-video/motion/motion-4.5.1-r4.ebuild index 691023faf1fd..6c898913fac2 100644 --- a/media-video/motion/motion-4.5.1-r4.ebuild +++ b/media-video/motion/motion-4.5.1-r4.ebuild @@ -12,7 +12,7 @@ S="${WORKDIR}/${PN}-release-${PV}" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86" IUSE="ffmpeg mariadb mysql postgres sqlite v4l webp" RDEPEND=" diff --git a/media-video/mplayer/Manifest b/media-video/mplayer/Manifest index f3a7c5f220f1..2e29f4aa1267 100644 --- a/media-video/mplayer/Manifest +++ b/media-video/mplayer/Manifest @@ -8,8 +8,8 @@ DIST font-arial-iso-8859-2.tar.bz2 222208 BLAKE2B 94b1a04672bf9b4b20a0e6981591e7 DIST mplayer-1.5_p20230215.tar.xz 15454028 BLAKE2B 08012f9b955921d832ab268a6e52e22e018b669787ff5e1c1ac734bd85083138551ad1065d5e4f5f9c977b804f8135ee89d2fd0590fb7228d4916b458cc58efa SHA512 f93d222817ff59ac7708956d6e8d5e9ee2084b4e724f66ea9fe4ffd477b864c2d0546d8df97511d499495ee446239645216a1e027d70eed434a3c64331f5ac73 DIST mplayer-1.5_p20230618.tar.xz 15101476 BLAKE2B 74f1d2d579c83330d8bf1e1ce2a89592f62142f361ff0e4107710c80de4351a5807e344869cb55ff5b5856efaedb6cfe242483f8e7f97521b805f84ca23e3818 SHA512 874e76b3edfccb7475349d954ed49860f92a5e99f0374084f5da53af35326365bb064c460fb6527d2fb6d8ae20d9e059ba197f45d4de42bc7a78992b5191a7cb DIST mplayer-1.5_p20231206.tar.xz 15212032 BLAKE2B c4658a0070296a9e24bb8388787a2ef322fefad4f4ea095bbf3f95b20f2e32b0423814ae311e43c9a6ef20afe0970540abd5d6d0ae0ebd59df74a8beb7abe3df SHA512 480502c735fb8d24ea1761a2b3f7daf1872df268f44791c7141f5b444b583beb0e4ecebe94e04129d27aae27656baddfb2da50406a431f1df39c589baac69432 -EBUILD mplayer-1.5_p20230215.ebuild 17501 BLAKE2B 84cdc744deb52c78e3bed5b8d41a9a64233505b9d851cc0bc402840bd2e9bbabe2af4fd63a68c476c696cf7793fb580bb28391b891bb3985f5ceefe5271a899a SHA512 3fb5a1c6325a0878c8ac9f017502c33f820932be898becfc36625a1115462a358e59a947f80913f4cbb404935bec751fc52ab5d831950567a1dc9d1aa446a847 -EBUILD mplayer-1.5_p20230618.ebuild 17893 BLAKE2B 96f7f68b54ea6940a8a7858c18adbdeb72c35b7078445075dcbe2f956bf6e2e9d23b2a4eed14b34ff5ad395397cbb368517b430db6e5b13d7852aef0973e7d3c SHA512 3e68896891cff03089954a413aedff501c48672306776ad09da74d6b9793a21f1b63d63c26b94709075d42dfd32d2746d95d828c5efd5ebc66be743f584fe384 -EBUILD mplayer-1.5_p20231206.ebuild 17914 BLAKE2B 2d42fbccb6ecc1050821d5c62e2b2135f5d92e6739d806920f10de410cccfe05525f3b8cd02001ebb3fbd0c9b089699c54f8856eae1a3eeafef552f63d77b4be SHA512 0204650a953831776d53919b8d397c5ba2bb30fa08d7039a802e784178f70e623f2cb6f0807f17bfbf04687ad31d70169200ebe1c966a242c739acdf354c258c -EBUILD mplayer-9999.ebuild 17853 BLAKE2B 4407c637b5ae7eb5c9c07661ac617dcf0d48877e1b2447ff50dfc109e5cc14a8993ef10e015ad98db8c76a19dd51735b16da379ca2707b18e03b3286019c2197 SHA512 c33825186eddbd6d1cab2f490663318ec815f880c86466efba09ea80f7dc367a9fbbb7852d5ef109d3b2651d50a67ebfd937728e8fb6471258b50c1fe1ee6480 +EBUILD mplayer-1.5_p20230215.ebuild 17495 BLAKE2B 00fbaddadf64602f68a02c1fadf950081697f749003454165154792c78e0da4a4132e1c766c5fefece67ea98b947324a2e0f1ebc13a733b36368b416fe68850e SHA512 ea127eb56b1a6f5df61e9ed7fabea50ea56b53f9f3c3986acd8aa9fee638fc11495d80d62e8e990489f4488f87aa72d2e1977693dd48304fec50076d506091b2 +EBUILD mplayer-1.5_p20230618.ebuild 17887 BLAKE2B 09ffce401d06826d180e5694469fc2014e97abfe7417f60b00c2469e16c59c3e2d2fb506d5b5573724bd6e391497e0dfb237166e6ef6eef1333a35f341c41bc7 SHA512 7a82ebee32e708ea5133a79f7b3e1d4f1102bbad8c874d3a3bc7def70361fd8703140455f4a35af3752a143b0ec4249208aaa76ff5e655c4639b3eb2bc4aa39a +EBUILD mplayer-1.5_p20231206.ebuild 17908 BLAKE2B 15016d72084f6dfacee9bb4e21f3d62421b4f8c625b323071f1dc288231850c6c0eb7e216b6e14221edae2041abcae19d7d6a6df6a595d3e561172df561c9235 SHA512 bab83f04006922dfd467e1ecd904d8e206b1468c2d49f449e8b11fc381606f4d11ffd496c620b87b72ff0bf1dc2da9f12d84674d461460503421740a5373bee9 +EBUILD mplayer-9999.ebuild 17847 BLAKE2B 9f9ee521826c84609cb6c7642cf031da978c7b0ed5f52ed4d71dda64b68824a7710d8caa94e062f0aedc68b8076a39ff0e90e3e8edb6fca7088400699417d7b2 SHA512 ab3adb7ce75b94544cbea35f4e4e18792d9103847138529700ef33540dcb3ff68cc23fe1239af23346c6dfd3f1b2b10dcf02911410627787d091e3b9b372c1c7 MISC metadata.xml 2475 BLAKE2B 5a083ce5b8ed729245ec9eaf544be95f6cbdb9fcb5b80d3a21195557c3aede46d09bd93a0d1acd3830fc796f90dd5f15a17a3d3c69ba2a1a54a0676264dd02de SHA512 f04082ffd63adf9102dd82eb5b4c628fbf912701c7dae69f0b00bbad4e0957355e43369912e9422acc087200de982920c212efb60ba9c26675f74fd5f37fd739 diff --git a/media-video/mplayer/mplayer-1.5_p20230215.ebuild b/media-video/mplayer/mplayer-1.5_p20230215.ebuild index ae49ee100092..73222bdf8321 100644 --- a/media-video/mplayer/mplayer-1.5_p20230215.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20230215.ebuild @@ -166,7 +166,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )" LICENSE="GPL-2" SLOT="0" if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi # faac codecs are nonfree diff --git a/media-video/mplayer/mplayer-1.5_p20230618.ebuild b/media-video/mplayer/mplayer-1.5_p20230618.ebuild index 60e8cf3cc9e3..7d5a5877ad06 100644 --- a/media-video/mplayer/mplayer-1.5_p20230618.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20230618.ebuild @@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )" LICENSE="GPL-2" SLOT="0" if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86" + KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ppc ppc64 ~riscv ~sparc x86" fi # faac codecs are nonfree diff --git a/media-video/mplayer/mplayer-1.5_p20231206.ebuild b/media-video/mplayer/mplayer-1.5_p20231206.ebuild index 54ab8bf0f878..2fcc4c0f3ffe 100644 --- a/media-video/mplayer/mplayer-1.5_p20231206.ebuild +++ b/media-video/mplayer/mplayer-1.5_p20231206.ebuild @@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )" LICENSE="GPL-2" SLOT="0" if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" fi # faac codecs are nonfree diff --git a/media-video/mplayer/mplayer-9999.ebuild b/media-video/mplayer/mplayer-9999.ebuild index b7e9b5420e81..2257a9dbf343 100644 --- a/media-video/mplayer/mplayer-9999.ebuild +++ b/media-video/mplayer/mplayer-9999.ebuild @@ -169,7 +169,7 @@ RDEPEND+="selinux? ( sec-policy/selinux-mplayer )" LICENSE="GPL-2" SLOT="0" if [[ ${PV} != *9999* ]]; then - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86" fi # faac codecs are nonfree diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index a147e5c9830e..20168b1cb938 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -1,15 +1,8 @@ +AUX json11-1.0.0-include-cstdint.patch 258 BLAKE2B 2b7cb5abcbaaaf7c44f1b483716cd68e7a68a5d92f0107847aeb514b93c2b34da1311bd9465ba2077ef568cb7d1a7c150fc89e9adb981a9b59fd7821cefb159d SHA512 c7df20caa578d12a707b74fde88f856dbbf5e75176d7b9aca13f7fe9b501f4ca844fee5a4f2250b3c9de4afd1cd9ed1c26717a06ea4b1d239415cc154152305f DIST cef_binary_5060_linux_x86_64_v3.tar.xz 91352460 BLAKE2B 443f4b1bc638d3fe462fd8b8dd167e96f65aebb2b8de3616beac298449e2786c746f9a1fa4a0dbe2e3ef2d593139938e97538890d3ca3b74018b3afb9c7fc661 SHA512 1fbdf1d4ed117f3b8af20476c57502145d652b451ba8e0a544081403d292cc7a78642e9071b8f0283a19ef7ad507ef6e0d9df32b00afc51605ab74f650a7d755 -DIST obs-browser-2a2879b5a69f4a99cd7459d8595af46cdb23115c.tar.gz 112519 BLAKE2B 94b0e46d83865ff5b85ffa07c082a561ad14205512502976e555555449441a0f701d14445b97b2084d2e10bc9289dd51e28fcf7057cb4584e6ef025bfde93062 SHA512 5ad219dacf50a4187ff79ee8d5d3e2bcc978b6dd91396669e76c56af2af26424c74151b15d9185a87c06aeb694a0a2f5d80e66a6c18c60ce843009c6f97e9b3a -DIST obs-browser-996b5a7bc43d912f1f4992e0032d4f263ac8b060.tar.gz 112416 BLAKE2B c82b5b55184130caaca0aad066ce1253c28206522e8d130cb3b940ee283c8a2dffc409a5d4774cad17535f958f52f4fe632a6b4462a18c10a4b5bbe02b60b4e9 SHA512 f6f7dbeb1d28b6c47663f36cb119cbc90a18c46fc6e81ca6db87e901ae4cee1fafd4a4a8c3f8cae94619d2f8f92baf1c52ca5c7df182f3df7521397638b0660d -DIST obs-browser-c81851a1d7696c2d7ba319122eec387c1568ad44.tar.gz 112521 BLAKE2B 184d398941e8055c89f9a80664ce0b3a900fc0df75c5f45c30e3c80e7645c23052ab4ff6816169136c7d9ae4da7754ab0a64bc075a7ee9036effa64860c88f21 SHA512 78e09171d173ff756ce60f6ac1da201cc87ac317b3f5839632813a177b7eb126a376e8d194eb2b6d64a7cf0d1292640d6c216cfd4e82f71f54b44e8a85e86c49 -DIST obs-studio-30.1.2.tar.gz 16023853 BLAKE2B 8886b7c07240e5f83a37f046c0a68aad6432cfc7056959caa25c33dd9a830de44f27c821809116000f82939e1684222c1f8343bc83b362f0f3f3338923bbf196 SHA512 8d6102f3431c1c6c530f22b09612cb955c1877e5aba07aa0ba1d7b014471ebf9f0c1f8e898eb9373c64417455e75d8b9cf2ae4d9010b6a09330bac9f4e5aa01e -DIST obs-studio-30.2.0.tar.gz 16122672 BLAKE2B 7c91c1a3691035fb3503ac25a22bad416de506488cb9bf2f4567b6048f40f4bd93ca17a92e92c535c9ead6e70b7610200b335d203978b47feee7e642310d86d2 SHA512 546374e0efbe9f23ecc2580d9d118e930afd576471b8931baa00cd4fbafe6bcba5f3a4b15769338860472aad616ccd2bd952bdef416acd85e637bbefd8c9d581 -DIST obs-studio-30.2.1.tar.gz 16150144 BLAKE2B 4e50f90af43ba785619bb90a793bbfe63e5d914d046c4da109883a3f21f98f9a55efd6600374046623e87f47733167236a2390b0ba90d4e9c7c310e24a4d5792 SHA512 d8bbe71305d3aac3d64db1d3c9bee0a849bffcad4ba1019c9028d69511a4c2ed341b878a3fd5818abda707fcecb2bc90c3f35a453d84317c782d24c299a15a13 +DIST obs-browser-c710222ec9d7ef9aa5d7099e9019d636e2c89f00.tar.gz 112527 BLAKE2B abfdd7cff3ec4479cc78d1f85a404ac48c2ebee1ba679a48e4e7abeb685ee08faa00059bda1cee2d5abf16b69ad0aa843898f612b3ee9d46f0950bd546aa6e44 SHA512 1ec2f48ce986c0d44cddf4332c8b58b8eb1fcb6a662504dd7ec580f9eb45b2a570542424d4c31ed6f96060746f21082661d43bf50b94469b4ef0c1f0b9190f7c +DIST obs-studio-30.2.3.tar.gz 16150339 BLAKE2B b3ed65060881a731bd2e48d8b490cde4a0cf2886bfbdfb2f09536b4aae15c8230c6f6fc20eed3943b88c194b46509dca702d7e955b5b148b5f3577db410f0889 SHA512 1fea762b8fb4d5401516d9e547fe20db389633fb1abbdb52e4b9559ab6aaf3b9f4c25e055896b4063c6a693bfeb78e6463486b4c66e3994a6d1ceb0b7f65865f DIST obs-websocket-0548c7798a323fe5296c150e13b898a5ee62fc1e.tar.gz 250611 BLAKE2B fefeab4a637528138152d6e1bd374d6e3f08e4a4e20698665adf4dd925e7831df5bdb1068e402def71b6e12e239db823dac2944e6549c00e914abca175d16fc0 SHA512 f24f520c4a08ad2b80d97c5dfba14421fcd48661d3b0fb694af5d11e063c711e7bf49a4baa95d9de8aff07b6fbbd4b4681ce10a4074506d98cf25c793cc2844d -DIST obs-websocket-d2d4bfb3e78cf2b02c8e2f5dda1d805eda8d8f32.tar.gz 246888 BLAKE2B 6e06c85ee47cb088a50b9d5eae9a8d68441989c1f76fdcd7806d59597062af5eb36e1722600b1a8d544e5f11533985b9bac243f7ca1002eed616e2f5c11a9a3f SHA512 31d5e1817aab341e55cbc5c759f28509f442695afb90d08a235c07359a65d2c2d3dfae2bf9c8a5086db310bb127dc59945ebe23fb219fda7408ee82d05b43938 -DIST obs-websocket-f8bc7c4f593c7957ecdb45a24faaff3e95f24e8b.tar.gz 250582 BLAKE2B 13a93a00b8f7d3cc775641243ffb14b98490b2190386663a05621376dc9f70838005768039c236083e8767e1951378341a242df2fefdd74b7172090a4526a0d0 SHA512 38e02f346042d6c71bab6f0dc3c706953b996d0c8a92a3c0922b04955ea0152857005f924c5a0fccfaa64a6fef5b0dd597bce658c152be38081d1dc02ed2be19 -EBUILD obs-studio-30.1.2.ebuild 6640 BLAKE2B 241a80f92daea4928520509f91381bccc022afe21aa41ad71f011bc44f90460363912801f02a6073b7453d8d75d224e619c854756fdf22567a6a2388ccb7e8a6 SHA512 d529ac6361cbb04317d204fae7d8aad901bb0a90c656acee0d5bf61c3e880b15090edbf5679c51b53482cdfa9e77488a8e62703627df4eef102f8bdb7e5dcf73 -EBUILD obs-studio-30.2.0-r1.ebuild 6670 BLAKE2B 6b8704a9ef7239cc81c2cadf30a583d5e64b0bdf62c71a0012ce23df34473111c36932eb644bebda1a72166cea0efdbe74abe2a337a202dc6aa2cd5cf531e294 SHA512 d9196c6840df14e0193d8b2fa444b89d0533f8f53395905c2a1e7856a21e2047043216bb427318e34155009f4d5da6862c85b88e6ce5ad02f92885173179c41e -EBUILD obs-studio-30.2.1.ebuild 6670 BLAKE2B 559a7e73d73288d74ee5fa2924e72dfcbcd9f031419c679918f6b942a839a57d905749bcea05f379054f79fcf40604f08562b3388a982454a59f362fa5b2786c SHA512 9f75229467b2edfe4b141ad6d184c8ec3d279ee3e1623716fe64374ae81be689e1158aad4a3de3cb872029cc5240ed315fabbd9adace18b9d28bfce59e03e56d -EBUILD obs-studio-9999.ebuild 6670 BLAKE2B 559a7e73d73288d74ee5fa2924e72dfcbcd9f031419c679918f6b942a839a57d905749bcea05f379054f79fcf40604f08562b3388a982454a59f362fa5b2786c SHA512 9f75229467b2edfe4b141ad6d184c8ec3d279ee3e1623716fe64374ae81be689e1158aad4a3de3cb872029cc5240ed315fabbd9adace18b9d28bfce59e03e56d -MISC metadata.xml 1470 BLAKE2B ce34216dcee69e90450a9cce810db3a494db1cafe6a8cd1029b0a749a7d69e0503fc5c5f6f298bebc2422e57f623ef63e17ac3814fd495e14c2b6e02bba1a9bd SHA512 0479dd3a4de659f8ce00b663129ca20ca31b837cd29bfca43bf7cca02d6762dabf0778c96c1b47d9814e3f6045c4793cc8f47f74d2a8940c8b2a1969ed69e895 +EBUILD obs-studio-30.2.3.ebuild 6866 BLAKE2B 837ac56245cfc7a1f627a930b1bbbf4278357600b1ddd7f810948f4110fd45c060f173cafd156d022b5a9a2990a7660074a14118f3dce052fec6fee5802b7801 SHA512 dd621ec4cf061d89f47a78e911d6bdc6527b6f932cda248f4a36239eb2297314eeb2c63e00856a602508fd61ffe7fb1b552b8a3bc98e45e583b5aaa6baa1a5d8 +EBUILD obs-studio-9999.ebuild 6689 BLAKE2B 26d9aff248f3405bbbe9504ac05985aa7bacba9a25ffe216e2db48189056d5006bc357649389962793df0e80bd46d5db8c34505cec3092f4ac1410818a4b189b SHA512 c4ac86d887704f59b2f6865c57dda6c94c00867957709ac595b89a464f8456e7060f609795403c3e236fd174b7beaa9a72d7ad58b685171ce8159f0ffd8e21a8 +MISC metadata.xml 1533 BLAKE2B 7bc778d152d6854330f821d0712da81b54397a35118baf4ba61b3ce4eb7aff5a292d4e4c74c01992761c3cae15b367dcf85450080e920d35ffeb2ee06c74483b SHA512 3dbc5096e3203ec8350e75db78519a061270d52d441e159ab297147a729bda21016a26e15b5c0447dc4a835da59ee822da99265e4f8c3bea3a1e173b134c739c diff --git a/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch new file mode 100644 index 000000000000..29648cf15825 --- /dev/null +++ b/media-video/obs-studio/files/json11-1.0.0-include-cstdint.patch @@ -0,0 +1,12 @@ +diff --git a/json11.cpp b/json11.cpp +index 9647846..8266a14 100644 +--- a/json11.cpp ++++ b/json11.cpp +@@ -22,6 +22,7 @@ + #include "json11.hpp" + #include <cassert> + #include <cmath> ++#include <cstdint> + #include <cstdlib> + #include <cstdio> + #include <limits> diff --git a/media-video/obs-studio/metadata.xml b/media-video/obs-studio/metadata.xml index 2e6e1d188e06..be051ff610c3 100644 --- a/media-video/obs-studio/metadata.xml +++ b/media-video/obs-studio/metadata.xml @@ -19,8 +19,9 @@ <flag name="pipewire">Build with PipeWire support.</flag> <flag name="python">Build with scripting support for Python 3.</flag> <flag name="qsv">Build with Intel Quick Sync Video support.</flag> + <flag name="sndio">Build with sndio support.</flag> <flag name="speex">Build with Speex noise suppression filter support.</flag> - <flag name="ssl">Build with TLS/SSL support for RTMPS connections.</flag> + <flag name="test-input">Build and install input sources used for testing.</flag> <flag name="vlc">Build with VLC media source support.</flag> <flag name="websocket">Build with WebSocket API support.</flag> </use> diff --git a/media-video/obs-studio/obs-studio-30.1.2.ebuild b/media-video/obs-studio/obs-studio-30.1.2.ebuild deleted file mode 100644 index 6ddcf823b797..000000000000 --- a/media-video/obs-studio/obs-studio-30.1.2.ebuild +++ /dev/null @@ -1,270 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) -LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{9..12} ) - -inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg - -CEF_DIR="cef_binary_5060_linux_x86_64" -CEF_REVISION="_v3" -OBS_BROWSER_COMMIT="996b5a7bc43d912f1f4992e0032d4f263ac8b060" -OBS_WEBSOCKET_COMMIT="d2d4bfb3e78cf2b02c8e2f5dda1d805eda8d8f32" - -DESCRIPTION="Software for Recording and Streaming Live Video Content" -HOMEPAGE="https://obsproject.com" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git" - EGIT_SUBMODULES=( - plugins/obs-browser - plugins/obs-websocket - ) -else - SRC_URI=" - https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz - https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz - " - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -fi - -SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}${CEF_REVISION}.tar.xz )" - -LICENSE="Boost-1.0 GPL-2+ MIT Unlicense" -SLOT="0" -IUSE=" - +alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio - python qsv speex +ssl test truetype v4l vlc wayland websocket -" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - browser? ( || ( alsa pulseaudio ) ) - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -BDEPEND=" - lua? ( dev-lang/swig ) - python? ( dev-lang/swig ) -" -# media-video/ffmpeg[opus] required due to bug 909566 -DEPEND=" - dev-libs/glib:2 - dev-libs/jansson:= - dev-qt/qtbase:6[network,widgets,xml(+)] - dev-qt/qtsvg:6 - media-libs/libglvnd[X] - media-libs/libva - media-libs/rnnoise - media-libs/x264:= - media-video/ffmpeg:=[nvenc?,opus,x264] - net-misc/curl - sys-apps/dbus - sys-apps/pciutils - sys-apps/util-linux - sys-libs/zlib:= - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libXcomposite - x11-libs/libXfixes - x11-libs/libxkbcommon - alsa? ( media-libs/alsa-lib ) - browser? ( - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) - dev-cpp/nlohmann_json - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - dev-libs/wayland - media-libs/alsa-lib - media-libs/fontconfig - media-libs/mesa[gbm(+)] - net-print/cups - x11-libs/cairo - x11-libs/libdrm - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXi - x11-libs/libxkbcommon - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libxshmfence - x11-libs/libXtst - x11-libs/pango - ) - fdk? ( media-libs/fdk-aac:= ) - jack? ( virtual/jack ) - lua? ( ${LUA_DEPS} ) - mpegts? ( - net-libs/librist - net-libs/srt - ) - pipewire? ( media-video/pipewire:= ) - pulseaudio? ( media-libs/libpulse ) - python? ( ${PYTHON_DEPS} ) - qsv? ( media-libs/libvpl ) - speex? ( media-libs/speexdsp ) - ssl? ( net-libs/mbedtls:= ) - test? ( dev-util/cmocka ) - truetype? ( - media-libs/fontconfig - media-libs/freetype - ) - v4l? ( - media-libs/libv4l - virtual/udev - ) - vlc? ( media-video/vlc:= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - websocket? ( - dev-cpp/asio - dev-cpp/nlohmann_json - dev-cpp/websocketpp - dev-libs/qr-code-generator - ) -" -RDEPEND="${DEPEND}" - -QA_PREBUILT=" - usr/lib*/obs-plugins/chrome-sandbox - usr/lib*/obs-plugins/libcef.so - usr/lib*/obs-plugins/libEGL.so - usr/lib*/obs-plugins/libGLESv2.so - usr/lib*/obs-plugins/libvk_swiftshader.so - usr/lib*/obs-plugins/libvulkan.so.1 - usr/lib*/obs-plugins/swiftshader/libEGL.so - usr/lib*/obs-plugins/swiftshader/libGLESv2.so -" - -pkg_setup() { - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - default - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - else - rm -d ${P}/plugins/obs-browser || die - mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die - - rm -d ${P}/plugins/obs-websocket || die - mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die - fi -} - -src_prepare() { - default - - sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die - - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/867250 - # https://github.com/obsproject/obs-studio/issues/8988 - use wayland && filter-lto - - cmake_src_prepare -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR}) - -DCALM_DEPRECATION=ON - -DCCACHE_SUPPORT=OFF - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AJA=OFF - -DENABLE_BROWSER=$(usex browser) - -DENABLE_DECKLINK=$(usex decklink) - -DENABLE_FREETYPE=$(usex truetype) - -DENABLE_JACK=$(usex jack) - -DENABLE_LIBFDK=$(usex fdk) - -DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts) - -DENABLE_PIPEWIRE=$(usex pipewire) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_QSV11=$(usex qsv) - -DENABLE_RNNOISE=ON - -DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861 - -DENABLE_SPEEXDSP=$(usex speex) - -DENABLE_UNIT_TESTS=$(usex test) - -DENABLE_V4L2=$(usex v4l) - -DENABLE_VLC=$(usex vlc) - -DENABLE_VST=ON - -DENABLE_WAYLAND=$(usex wayland) - -DENABLE_WEBRTC=OFF # Requires libdatachannel. - -DENABLE_WEBSOCKET=$(usex websocket) - -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DUNIX_STRUCTURE=1 - ) - - if [[ ${PV} != 9999 ]]; then - mycmakeargs+=( - -DOBS_VERSION_OVERRIDE=${PV} - ) - fi - - if use lua || use python; then - mycmakeargs+=( - -DENABLE_SCRIPTING_LUA=$(usex lua) - -DENABLE_SCRIPTING_PYTHON=$(usex python) - -DENABLE_SCRIPTING=ON - ) - else - mycmakeargs+=( -DENABLE_SCRIPTING=OFF ) - fi - - if use browser && use ssl; then - mycmakeargs+=( -DENABLE_WHATSNEW=ON ) - else - mycmakeargs+=( -DENABLE_WHATSNEW=OFF ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # external plugins may need some things not installed by default, install them here - insinto /usr/include/obs/UI/obs-frontend-api - doins UI/obs-frontend-api/obs-frontend-api.h -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use alsa && ! use pulseaudio; then - elog - elog "For the audio capture features to be available," - elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to" - elog "be enabled." - elog - fi - - if use v4l && has_version media-video/v4l2loopback; then - elog - elog "Depending on system configuration, the v4l2loopback kernel module" - elog "may need to be loaded manually, and needs to be re-built after" - elog "kernel changes." - elog - fi - - optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi] - optfeature "virtual camera support" media-video/v4l2loopback -} diff --git a/media-video/obs-studio/obs-studio-30.2.0-r1.ebuild b/media-video/obs-studio/obs-studio-30.2.0-r1.ebuild deleted file mode 100644 index c2bb6f445487..000000000000 --- a/media-video/obs-studio/obs-studio-30.2.0-r1.ebuild +++ /dev/null @@ -1,271 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) -LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{9..12} ) - -inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg - -CEF_DIR="cef_binary_5060_linux_x86_64" -CEF_REVISION="_v3" -OBS_BROWSER_COMMIT="c81851a1d7696c2d7ba319122eec387c1568ad44" -OBS_WEBSOCKET_COMMIT="f8bc7c4f593c7957ecdb45a24faaff3e95f24e8b" - -DESCRIPTION="Software for Recording and Streaming Live Video Content" -HOMEPAGE="https://obsproject.com" - -if [[ ${PV} == 9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://github.com/obsproject/obs-studio.git" - EGIT_SUBMODULES=( - plugins/obs-browser - plugins/obs-websocket - ) -else - SRC_URI=" - https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz - https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz - " - KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" -fi - -SRC_URI+=" browser? ( https://cdn-fastly.obsproject.com/downloads/${CEF_DIR}${CEF_REVISION}.tar.xz )" - -LICENSE="Boost-1.0 GPL-2+ MIT Unlicense" -SLOT="0" -IUSE=" - +alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio - python qsv speex +ssl test truetype v4l vlc wayland websocket -" -RESTRICT="!test? ( test )" -REQUIRED_USE=" - browser? ( || ( alsa pulseaudio ) ) - lua? ( ${LUA_REQUIRED_USE} ) - python? ( ${PYTHON_REQUIRED_USE} ) -" - -BDEPEND=" - lua? ( dev-lang/swig ) - python? ( dev-lang/swig ) -" -# media-video/ffmpeg[opus] required due to bug 909566 -DEPEND=" - dev-cpp/nlohmann_json - dev-libs/glib:2 - dev-libs/jansson:= - dev-libs/uthash - dev-qt/qtbase:6[network,widgets,xml(+)] - dev-qt/qtsvg:6 - media-libs/libglvnd[X] - media-libs/libva - media-libs/rnnoise - media-libs/x264:= - media-video/ffmpeg:=[nvenc?,opus,x264] - net-misc/curl - sys-apps/dbus - sys-apps/pciutils - sys-apps/util-linux - sys-libs/zlib:= - x11-libs/libX11 - x11-libs/libxcb:= - x11-libs/libXcomposite - x11-libs/libXfixes - x11-libs/libxkbcommon - alsa? ( media-libs/alsa-lib ) - browser? ( - || ( - >=app-accessibility/at-spi2-core-2.46.0:2 - ( app-accessibility/at-spi2-atk dev-libs/atk ) - ) - dev-libs/expat - dev-libs/glib - dev-libs/nspr - dev-libs/nss - dev-libs/wayland - media-libs/alsa-lib - media-libs/fontconfig - media-libs/mesa[gbm(+)] - net-print/cups - x11-libs/cairo - x11-libs/libdrm - x11-libs/libXcursor - x11-libs/libXdamage - x11-libs/libXext - x11-libs/libXi - x11-libs/libxkbcommon - x11-libs/libXrandr - x11-libs/libXrender - x11-libs/libXScrnSaver - x11-libs/libxshmfence - x11-libs/libXtst - x11-libs/pango - ) - fdk? ( media-libs/fdk-aac:= ) - jack? ( virtual/jack ) - lua? ( ${LUA_DEPS} ) - mpegts? ( - net-libs/librist - net-libs/srt - ) - pipewire? ( media-video/pipewire:= ) - pulseaudio? ( media-libs/libpulse ) - python? ( ${PYTHON_DEPS} ) - qsv? ( media-libs/libvpl ) - speex? ( media-libs/speexdsp ) - ssl? ( net-libs/mbedtls:= ) - test? ( dev-util/cmocka ) - truetype? ( - media-libs/fontconfig - media-libs/freetype - ) - v4l? ( - media-libs/libv4l - virtual/udev - ) - vlc? ( media-video/vlc:= ) - wayland? ( - dev-libs/wayland - x11-libs/libxkbcommon - ) - websocket? ( - dev-cpp/asio - dev-cpp/websocketpp - dev-libs/qr-code-generator - ) -" -RDEPEND="${DEPEND}" - -QA_PREBUILT=" - usr/lib*/obs-plugins/chrome-sandbox - usr/lib*/obs-plugins/libcef.so - usr/lib*/obs-plugins/libEGL.so - usr/lib*/obs-plugins/libGLESv2.so - usr/lib*/obs-plugins/libvk_swiftshader.so - usr/lib*/obs-plugins/libvulkan.so.1 - usr/lib*/obs-plugins/swiftshader/libEGL.so - usr/lib*/obs-plugins/swiftshader/libGLESv2.so -" - -pkg_setup() { - use lua && lua-single_pkg_setup - use python && python-single-r1_pkg_setup -} - -src_unpack() { - default - - if [[ ${PV} == 9999 ]]; then - git-r3_src_unpack - else - rm -d ${P}/plugins/obs-browser || die - mv obs-browser-${OBS_BROWSER_COMMIT} ${P}/plugins/obs-browser || die - - rm -d ${P}/plugins/obs-websocket || die - mv obs-websocket-${OBS_WEBSOCKET_COMMIT} ${P}/plugins/obs-websocket || die - fi -} - -src_prepare() { - default - - sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die - - # -Werror=lto-type-mismatch - # https://bugs.gentoo.org/867250 - # https://github.com/obsproject/obs-studio/issues/8988 - use wayland && filter-lto - - cmake_src_prepare -} - -src_configure() { - local libdir=$(get_libdir) - local mycmakeargs=( - $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR}) - -DCALM_DEPRECATION=ON - -DCCACHE_SUPPORT=OFF - -DENABLE_ALSA=$(usex alsa) - -DENABLE_AJA=OFF - -DENABLE_BROWSER=$(usex browser) - -DENABLE_DECKLINK=$(usex decklink) - -DENABLE_FREETYPE=$(usex truetype) - -DENABLE_JACK=$(usex jack) - -DENABLE_LIBFDK=$(usex fdk) - -DENABLE_NATIVE_NVENC=$(usex nvenc) - -DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts) - -DENABLE_PIPEWIRE=$(usex pipewire) - -DENABLE_PULSEAUDIO=$(usex pulseaudio) - -DENABLE_QSV11=$(usex qsv) - -DENABLE_RNNOISE=ON - -DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861 - -DENABLE_SPEEXDSP=$(usex speex) - -DENABLE_UNIT_TESTS=$(usex test) - -DENABLE_V4L2=$(usex v4l) - -DENABLE_VLC=$(usex vlc) - -DENABLE_VST=ON - -DENABLE_WAYLAND=$(usex wayland) - -DENABLE_WEBRTC=OFF # Requires libdatachannel. - -DENABLE_WEBSOCKET=$(usex websocket) - -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DUNIX_STRUCTURE=1 - ) - - if [[ ${PV} != 9999 ]]; then - mycmakeargs+=( - -DOBS_VERSION_OVERRIDE=${PV} - ) - fi - - if use lua || use python; then - mycmakeargs+=( - -DENABLE_SCRIPTING_LUA=$(usex lua) - -DENABLE_SCRIPTING_PYTHON=$(usex python) - -DENABLE_SCRIPTING=ON - ) - else - mycmakeargs+=( -DENABLE_SCRIPTING=OFF ) - fi - - if use browser && use ssl; then - mycmakeargs+=( -DENABLE_WHATSNEW=ON ) - else - mycmakeargs+=( -DENABLE_WHATSNEW=OFF ) - fi - - cmake_src_configure -} - -src_install() { - cmake_src_install - - # external plugins may need some things not installed by default, install them here - insinto /usr/include/obs/UI/obs-frontend-api - doins UI/obs-frontend-api/obs-frontend-api.h -} - -pkg_postinst() { - xdg_pkg_postinst - - if ! use alsa && ! use pulseaudio; then - elog - elog "For the audio capture features to be available," - elog "at least one of the 'alsa' or 'pulseaudio' USE-flags needs to" - elog "be enabled." - elog - fi - - if use v4l && has_version media-video/v4l2loopback; then - elog - elog "Depending on system configuration, the v4l2loopback kernel module" - elog "may need to be loaded manually, and needs to be re-built after" - elog "kernel changes." - elog - fi - - optfeature "VA-API hardware encoding" media-video/ffmpeg[vaapi] - optfeature "virtual camera support" media-video/v4l2loopback -} diff --git a/media-video/obs-studio/obs-studio-30.2.1.ebuild b/media-video/obs-studio/obs-studio-30.2.3.ebuild index d5800bb8e299..043f43465d42 100644 --- a/media-video/obs-studio/obs-studio-30.2.1.ebuild +++ b/media-video/obs-studio/obs-studio-30.2.3.ebuild @@ -11,7 +11,7 @@ inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg CEF_DIR="cef_binary_5060_linux_x86_64" CEF_REVISION="_v3" -OBS_BROWSER_COMMIT="2a2879b5a69f4a99cd7459d8595af46cdb23115c" +OBS_BROWSER_COMMIT="c710222ec9d7ef9aa5d7099e9019d636e2c89f00" OBS_WEBSOCKET_COMMIT="0548c7798a323fe5296c150e13b898a5ee62fc1e" DESCRIPTION="Software for Recording and Streaming Live Video Content" @@ -111,6 +111,7 @@ DEPEND=" net-libs/librist net-libs/srt ) + nvenc? ( >=media-libs/nv-codec-headers-12 ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) python? ( ${PYTHON_DEPS} ) @@ -137,7 +138,9 @@ DEPEND=" dev-libs/qr-code-generator ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + qsv? ( media-libs/intel-mediasdk ) +" QA_PREBUILT=" usr/lib*/obs-plugins/chrome-sandbox @@ -180,6 +183,10 @@ src_prepare() { use wayland && filter-lto cmake_src_prepare + + pushd deps/json11 &> /dev/null || die + eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch" + popd &> /dev/null || die } src_configure() { @@ -195,7 +202,7 @@ src_configure() { -DENABLE_FREETYPE=$(usex truetype) -DENABLE_JACK=$(usex jack) -DENABLE_LIBFDK=$(usex fdk) - -DENABLE_NATIVE_NVENC=$(usex nvenc) + -DENABLE_NATIVE_NVENC=OFF -DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts) -DENABLE_PIPEWIRE=$(usex pipewire) -DENABLE_PULSEAUDIO=$(usex pulseaudio) diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index d5800bb8e299..78f140d81c76 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -5,13 +5,13 @@ EAPI=8 CMAKE_REMOVE_MODULES_LIST=( FindFreetype ) LUA_COMPAT=( luajit ) -PYTHON_COMPAT=( python3_{9..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit cmake flag-o-matic lua-single optfeature python-single-r1 xdg CEF_DIR="cef_binary_5060_linux_x86_64" CEF_REVISION="_v3" -OBS_BROWSER_COMMIT="2a2879b5a69f4a99cd7459d8595af46cdb23115c" +OBS_BROWSER_COMMIT="be9f1b646406d2250b402581b043f1558042d7f0" OBS_WEBSOCKET_COMMIT="0548c7798a323fe5296c150e13b898a5ee62fc1e" DESCRIPTION="Software for Recording and Streaming Live Video Content" @@ -26,9 +26,12 @@ if [[ ${PV} == 9999 ]]; then ) else SRC_URI=" - https://github.com/obsproject/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz - https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz - https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz + https://github.com/obsproject/${PN}/archive/${PV}.tar.gz + -> ${P}.tar.gz + https://github.com/obsproject/obs-browser/archive/${OBS_BROWSER_COMMIT}.tar.gz + -> obs-browser-${OBS_BROWSER_COMMIT}.tar.gz + https://github.com/obsproject/obs-websocket/archive/${OBS_WEBSOCKET_COMMIT}.tar.gz + -> obs-websocket-${OBS_WEBSOCKET_COMMIT}.tar.gz " KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" fi @@ -39,9 +42,8 @@ LICENSE="Boost-1.0 GPL-2+ MIT Unlicense" SLOT="0" IUSE=" +alsa browser decklink fdk jack lua mpegts nvenc pipewire pulseaudio - python qsv speex +ssl test truetype v4l vlc wayland websocket + python qsv sndio speex test-input truetype v4l vlc wayland websocket " -RESTRICT="!test? ( test )" REQUIRED_USE=" browser? ( || ( alsa pulseaudio ) ) lua? ( ${LUA_REQUIRED_USE} ) @@ -66,6 +68,7 @@ DEPEND=" media-libs/x264:= media-video/ffmpeg:=[nvenc?,opus,x264] net-misc/curl + net-libs/mbedtls:= sys-apps/dbus sys-apps/pciutils sys-apps/util-linux @@ -111,13 +114,13 @@ DEPEND=" net-libs/librist net-libs/srt ) + nvenc? ( >=media-libs/nv-codec-headers-12 ) pipewire? ( media-video/pipewire:= ) pulseaudio? ( media-libs/libpulse ) python? ( ${PYTHON_DEPS} ) qsv? ( media-libs/libvpl ) + sndio? ( media-sound/sndio ) speex? ( media-libs/speexdsp ) - ssl? ( net-libs/mbedtls:= ) - test? ( dev-util/cmocka ) truetype? ( media-libs/fontconfig media-libs/freetype @@ -137,7 +140,9 @@ DEPEND=" dev-libs/qr-code-generator ) " -RDEPEND="${DEPEND}" +RDEPEND="${DEPEND} + qsv? ( media-libs/intel-mediasdk ) +" QA_PREBUILT=" usr/lib*/obs-plugins/chrome-sandbox @@ -172,46 +177,46 @@ src_unpack() { src_prepare() { default - sed -i '/-Werror$/d' "${WORKDIR}"/${P}/cmake/Modules/CompilerConfig.cmake || die - # -Werror=lto-type-mismatch # https://bugs.gentoo.org/867250 # https://github.com/obsproject/obs-studio/issues/8988 use wayland && filter-lto cmake_src_prepare + + pushd deps/json11 &> /dev/null || die + eapply "${FILESDIR}/json11-1.0.0-include-cstdint.patch" + popd &> /dev/null || die } src_configure() { local libdir=$(get_libdir) local mycmakeargs=( $(usev browser -DCEF_ROOT_DIR=../${CEF_DIR}) - -DCALM_DEPRECATION=ON - -DCCACHE_SUPPORT=OFF -DENABLE_ALSA=$(usex alsa) -DENABLE_AJA=OFF -DENABLE_BROWSER=$(usex browser) + -DENABLE_CCACHE=OFF -DENABLE_DECKLINK=$(usex decklink) + -DENABLE_FFMPEG_NVENC=$(usex nvenc) -DENABLE_FREETYPE=$(usex truetype) -DENABLE_JACK=$(usex jack) -DENABLE_LIBFDK=$(usex fdk) - -DENABLE_NATIVE_NVENC=$(usex nvenc) -DENABLE_NEW_MPEGTS_OUTPUT=$(usex mpegts) + -DENABLE_NVENC=$(usex nvenc) -DENABLE_PIPEWIRE=$(usex pipewire) -DENABLE_PULSEAUDIO=$(usex pulseaudio) -DENABLE_QSV11=$(usex qsv) -DENABLE_RNNOISE=ON - -DENABLE_RTMPS=$(usex ssl ON OFF) # Needed for bug 880861 + -DENABLE_SNDIO=$(usex sndio) -DENABLE_SPEEXDSP=$(usex speex) - -DENABLE_UNIT_TESTS=$(usex test) + -DENABLE_TEST_INPUT=$(usex test-input) -DENABLE_V4L2=$(usex v4l) -DENABLE_VLC=$(usex vlc) -DENABLE_VST=ON -DENABLE_WAYLAND=$(usex wayland) -DENABLE_WEBRTC=OFF # Requires libdatachannel. -DENABLE_WEBSOCKET=$(usex websocket) - -DOBS_MULTIARCH_SUFFIX=${libdir#lib} - -DUNIX_STRUCTURE=1 ) if [[ ${PV} != 9999 ]]; then @@ -230,7 +235,7 @@ src_configure() { mycmakeargs+=( -DENABLE_SCRIPTING=OFF ) fi - if use browser && use ssl; then + if use browser; then mycmakeargs+=( -DENABLE_WHATSNEW=ON ) else mycmakeargs+=( -DENABLE_WHATSNEW=OFF ) diff --git a/media-video/parole/Manifest b/media-video/parole/Manifest index ca96e8bb7687..29bfe7d8ce1e 100644 --- a/media-video/parole/Manifest +++ b/media-video/parole/Manifest @@ -1,3 +1,3 @@ DIST parole-4.18.1.tar.bz2 934059 BLAKE2B db5b6345bcf8eae47668bfd504106b8f44bb272a7d9e88fb53824a4141c88a45f4fdcb6df5a5513ebba82ffda9438be91ffe060d1cc19f0ab56887dc3ff606e1 SHA512 ec2b8036f2be594dc13c37aca76b7250ec1792c7166501e9a2775efb731e87cf6894196243e68026437e2bbd4a9edf1aa9cfa076886e333e2ecf4523f8f1d647 -EBUILD parole-4.18.1.ebuild 1549 BLAKE2B 55c6af21b3546f502b80e0a3292ca86dba6bcdde209a21c9b5087dd44c2aecb5c8308937f2444d144630550b482364dd2eda5fa8c412375061d99afbdc67c7bf SHA512 b78d5eb9b08bbb9b685118f647a90fd091fee454c589736cf9ef662e99cd955c4424dd4980de1d05958a6c651c13ff221227b55f460c20671aecf69c0307aabe +EBUILD parole-4.18.1.ebuild 1543 BLAKE2B f568237ced2baf59669ea6e40cd1649e5c5f775ec4525ea81bc5c72f74c30da575dba655cbcb31df9a2b310c73ed543b56bbb36c114f0cce793d8ed8e19c7850 SHA512 bc2a5eaf66134192e23f726827489cdf854680ebac2d8f6477d2bcc617d7f322197cccd4a3f750b94261ce2e2b211e6d5a22f892c4662ac0d42b05820845e51d MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3 diff --git a/media-video/parole/parole-4.18.1.ebuild b/media-video/parole/parole-4.18.1.ebuild index 22957f3ae0b8..8e2685ebdb8e 100644 --- a/media-video/parole/parole-4.18.1.ebuild +++ b/media-video/parole/parole-4.18.1.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~mips ~ppc ppc64 ~riscv x86" +KEYWORDS="amd64 arm arm64 ~loong ~mips ~ppc ppc64 ~riscv x86" IUSE="libnotify taglib wayland X" REQUIRED_USE="|| ( wayland X )" diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 682e3f530a47..26c99e5e7db7 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -20,6 +20,7 @@ DIST pipewire-1.2.0-docs.tar.xz 58528 BLAKE2B b7abdfecd46239050ab80695c8f3d1a4e6 DIST pipewire-1.2.0.tar.bz2 1810104 BLAKE2B a20caae515d800f80f607aeba585609ce9f47d0a38c48cc2eb3534f64049f774c119e36d27a585b5f7537e4eef6b2a56881e7db1e2ca2eedd52248ee9f331209 SHA512 3b9ceb02d3ea9fcadd2e009750d0c5b2435c8648c79f2fa9dc8dc83c772759985b140a02381a6c7be819b23d2a5a7671e456e81cf9b5be3437e994ef610bda59 DIST pipewire-1.2.1.tar.bz2 1812153 BLAKE2B a95d3ba69ef6ee8d001c9081fec4392ef0c219c154b0f78851dd15e5a60f6daccc33fdf80a9ea653bd32d14109c5e1a5885e0c5ce392747be8e08c37a239a2e2 SHA512 e5bf5b712e2d96c96dd907780cd4b1a3d153f01261977bd75a11823bcc2be17b6c858d2967821862660d97426c8ed5f8ebd7bfde27dafe9f30c5b459b17e587f DIST pipewire-1.2.2.tar.bz2 1812524 BLAKE2B 4085ace98c38e718dd259f5ef864d8674e0c663bd486f5e8dfb2e79d63b471eb8686ab79841aa0e5689ef9d08ce0be66cb67cce2e9038cd5a81e823a816e8209 SHA512 8baf98bdb05f95acaf2f9a5189ad6da843181464cc21f31cc39604bfb2beb2a34327621348122e07436e39c5d0ad223a941674737848ac2e4e56e0d366d1b5f5 +DIST pipewire-1.2.3.tar.bz2 1813639 BLAKE2B 42bd8a08125e79a67a4adec30541ae7fef3c1e8279d8f84365636f8691a237fc7d6b392ed2576b681a9b9418804978e5a8493d7062567ed89035286fb49977f5 SHA512 8a06ef3a9079b334b0d3248431fe6a09f330ad8078dc378ac465e253d3601c3e4552e2e07f7cf492ff6fbc218e686b30941ea153ccaaf826b5f0ff231f6b214e EBUILD pipewire-1.0.5-r1.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6 EBUILD pipewire-1.0.5.ebuild 19988 BLAKE2B 49df8fcf2e136537401ebab8673c0815a275c2deb29a2779306a77536d2db0688c81e69bbf768061a2ee3e94888da5e77e12055594bf84b14951fd28f12e248c SHA512 5d6506afa393f6286ba33a88cdf17f739a265e2f09baf1b7f9ff5fb239a7b4d87b32ce553d366bfaf6ba36f4384982cf73a521488118d2e5f33d87b4cc9467e3 EBUILD pipewire-1.0.6.ebuild 19283 BLAKE2B c873436b2f3cad35aa2d6797085823cc215d621b275634c25c3b79e00a56121a97824f3092df74b13809a9ea7639b669710fb9ae7476441209c9f7aff1496827 SHA512 f290058849e339a64bb897e831618b9f886b9c6b7754a0f3b4301fc94be929c0531ffd6c98754228c30bc308371e508021fa907252028d6a5a57d14314d4b5b6 @@ -27,5 +28,6 @@ EBUILD pipewire-1.0.7-r1.ebuild 19565 BLAKE2B c0250fdcf5157412d74ef4c020d64b571f EBUILD pipewire-1.2.0-r2.ebuild 19711 BLAKE2B 65857f3b19d08a242973dc65fc333556b8ec0d8e91f56e712706ff8a217f3aa5cecdaa7dd43002e8391b61feb96e818c852d68a8cf4d9930906cd7fbf3d228f1 SHA512 bc94f1000e8ad0b7ba91199d240fa8ac15e55f50bab175be6390d040238f8682df5235a5871aa528c5cd36c429a8bc1a7a838660614265696862389ac9cea6c9 EBUILD pipewire-1.2.1.ebuild 19729 BLAKE2B 2f722ffaef79800104aa53263fae1cf2b3db9f9c73c52a704e4b0bdb36402f152d16dbab339f7da6db6e208511750025d7229eafb49d8436fc0e2d38b25c7874 SHA512 e0a7e27440fecdc82b334ff39455fc7ed370ff67da9b50b71fef0fe0fe381091fc317f551b343180160bc978b4366eb20f5cfe925d96bbe8ea8ce5561a7f03c0 EBUILD pipewire-1.2.2.ebuild 19602 BLAKE2B 0594a1082c02d88befd9d3cdf4eaea883bb905e3a16223e1646be00d6281c1446d4c56b07db6c5873c73a38a80f4219106ac0f5d77a3490ad8f4c88d293ace14 SHA512 f14db8d84c6081b6ea4d59d6b67a83f82cf795794d73c8b4917a67ca037b22a3c041bf2f58020f7d7b342fbbbaaa44cea1e17b9e43847ba388e27a8bcdabf9e5 +EBUILD pipewire-1.2.3.ebuild 19602 BLAKE2B 0594a1082c02d88befd9d3cdf4eaea883bb905e3a16223e1646be00d6281c1446d4c56b07db6c5873c73a38a80f4219106ac0f5d77a3490ad8f4c88d293ace14 SHA512 f14db8d84c6081b6ea4d59d6b67a83f82cf795794d73c8b4917a67ca037b22a3c041bf2f58020f7d7b342fbbbaaa44cea1e17b9e43847ba388e27a8bcdabf9e5 EBUILD pipewire-9999.ebuild 19591 BLAKE2B 4c2d6315cad7fb2746817dbc15fe29f3a2007e8abc83a338952ee0f82a1113dbfd8d0426595fd6d5c3c1ea7e4a1d7b87e135b2202e563b95a06ad4403cf684e9 SHA512 f8341246a2c4403375f8493966d42801d1a4846d2a3a6e9464421a50bddf95dca5c3b7832c042e63ef68773550e009235e55d98f3a90178419ee15c73ddad936 MISC metadata.xml 2156 BLAKE2B 974459115e0f3cf4e4c3ac15159740b42e01a093da37d8a27f80e122c9ab2a3fe9194443eaf08f9b66d613db90a14465abbe1b76816bce90e11a46c8409c7513 SHA512 cfe0fdb86c993f167507e22635878d6d7d5dcd48f4c23323231263551ceff986fc454700428ecb7d2ee2abe82093c35d8e7bd491020fd6dd3f3889c09e9020bb diff --git a/media-video/pipewire/pipewire-1.2.3.ebuild b/media-video/pipewire/pipewire-1.2.3.ebuild new file mode 100644 index 000000000000..408bee308b53 --- /dev/null +++ b/media-video/pipewire/pipewire-1.2.3.ebuild @@ -0,0 +1,515 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# 1. Please regularly check (even at the point of bumping) Fedora's packaging +# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide. +# +# 2. Upstream also sometimes amend release notes for the previous release to mention +# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros +# +# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things +# continue to move quickly. It's not uncommon for fixes to be made shortly +# after releases. + +# TODO: Maybe get upstream to produce `meson dist` tarballs: +# - https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3663 +# - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1788 +# +# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-pipewire-docs +# Set to 1 if prebuilt, 0 if not +# (the construct below is to allow overriding from env for script) +: ${PIPEWIRE_DOCS_PREBUILT:=1} + +PIPEWIRE_DOCS_PREBUILT_DEV=sam +PIPEWIRE_DOCS_VERSION="$(ver_cut 1-2).0" +# Default to generating docs (inc. man pages) if no prebuilt; overridden later +PIPEWIRE_DOCS_USEFLAG="+man" +PYTHON_COMPAT=( python3_{10..12} ) +inherit meson-multilib optfeature prefix python-any-r1 systemd tmpfiles udev + +if [[ ${PV} == 9999 ]]; then + PIPEWIRE_DOCS_PREBUILT=0 + EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" + inherit git-r3 +else + if [[ ${PV} == *_p* ]] ; then + MY_COMMIT="" + SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2" + S="${WORKDIR}"/${PN}-${MY_COMMIT} + else + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2" + fi + + if [[ ${PIPEWIRE_DOCS_PREBUILT} == 1 ]] ; then + SRC_URI+=" !man? ( https://dev.gentoo.org/~${PIPEWIRE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${PIPEWIRE_DOCS_VERSION}-docs.tar.xz )" + PIPEWIRE_DOCS_USEFLAG="man" + fi + + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~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="${PIPEWIRE_DOCS_USEFLAG} bluetooth dbus doc echo-cancel extra ffmpeg flatpak gstreamer gsettings ieee1394 jack-client jack-sdk liblc3 lv2" +IUSE+=" modemmanager pipewire-alsa readline roc selinux sound-server ssl system-service 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)! + +# - TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled +# - TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work +# which provides adequate guarantee that alsa-lib will be able to provide audio services. +# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL. +# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally. +# - ffmpeg is only used for pw-cat. We don't build the spa plugin which receives barely any activity. +REQUIRED_USE=" + ffmpeg? ( extra ) + bluetooth? ( dbus ) + jack-sdk? ( !jack-client ) + modemmanager? ( bluetooth ) + system-service? ( systemd ) + !sound-server? ( !pipewire-alsa ) + jack-client? ( dbus ) +" + +RESTRICT="!test? ( test )" + +BDEPEND=" + >=dev-build/meson-0.59 + virtual/pkgconfig + dbus? ( dev-util/gdbus-codegen ) + doc? ( + ${PYTHON_DEPS} + >=app-text/doxygen-1.9.8 + media-gfx/graphviz + ) + man? ( + ${PYTHON_DEPS} + >=app-text/doxygen-1.9.8 + ) +" +# * While udev could technically be optional, it's needed for a number of options, +# and not really worth it, bug #877769. +# +# * Supports both legacy webrtc-audio-processing:0 and new webrtc-audio-processing:1. +# We depend on :1 as it prefers that, it's not legacy, and to avoid automagic. +# +# * Older Doxygen (<1.9.8) may work but inferior output is created: +# - https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1778 +# - https://github.com/doxygen/doxygen/issues/9254 +RDEPEND=" + acct-group/audio + acct-group/pipewire + media-libs/alsa-lib[${MULTILIB_USEDEP}] + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + virtual/libudev[${MULTILIB_USEDEP}] + bluetooth? ( + dev-libs/glib + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + media-libs/opus + media-libs/sbc + >=net-wireless/bluez-4.101:= + virtual/libusb:1 + ) + dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] ) + echo-cancel? ( >=media-libs/webrtc-audio-processing-1.2:1 ) + extra? ( >=media-libs/libsndfile-1.0.20 ) + ffmpeg? ( media-video/ffmpeg:= ) + flatpak? ( dev-libs/glib ) + gstreamer? ( + >=dev-libs/glib-2.32.0:2 + >=media-libs/gstreamer-1.10.0:1.0 + media-libs/gst-plugins-base:1.0 + ) + gsettings? ( >=dev-libs/glib-2.26.0:2 ) + ieee1394? ( media-libs/libffado[${MULTILIB_USEDEP}] ) + jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) + jack-sdk? ( + !media-sound/jack-audio-connection-kit + !media-sound/jack2 + ) + liblc3? ( media-sound/liblc3 ) + lv2? ( media-libs/lilv ) + modemmanager? ( >=net-misc/modemmanager-1.10.0 ) + pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] ) + sound-server? ( !media-sound/pulseaudio-daemon ) + roc? ( >=media-libs/roc-toolkit-0.3.0:= ) + readline? ( sys-libs/readline:= ) + selinux? ( sys-libs/libselinux ) + ssl? ( dev-libs/openssl:= ) + systemd? ( sys-apps/systemd ) + system-service? ( acct-user/pipewire ) + v4l? ( media-libs/libv4l ) + X? ( + media-libs/libcanberra + x11-libs/libX11 + x11-libs/libXfixes + ) + zeroconf? ( net-dns/avahi ) +" + +DEPEND="${RDEPEND}" + +PDEPEND=">=media-video/wireplumber-0.5.2" + +# 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-libs/libsdl2 +# >=media-libs/vulkan-loader-1.1.69 +# +# Ditto for DEPEND +# >=dev-util/vulkan-headers-1.1.69 + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch +) + +pkg_setup() { + if use doc || use man ; then + python-any-r1_pkg_setup + fi +} + +src_prepare() { + default + + # Used for upstream backports + [[ -d "${FILESDIR}"/${PV} ]] && eapply "${FILESDIR}"/${PV} +} + +multilib_src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + + $(meson_feature dbus) + $(meson_native_use_feature zeroconf avahi) + $(meson_native_use_feature doc docs) + $(meson_native_use_feature man) + $(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone + $(meson_feature test tests) + -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests + $(meson_feature ieee1394 libffado) + $(meson_native_use_feature gstreamer) + $(meson_native_use_feature gstreamer gstreamer-device-provider) + $(meson_native_use_feature gsettings) + $(meson_native_use_feature systemd) + + $(meson_native_use_feature system-service systemd-system-service) + -Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)" + -Dsystemd-user-unit-dir="$(systemd_get_userunitdir)" + + $(meson_native_use_feature systemd systemd-user-service) + $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph + $(meson_feature selinux) + -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) + -Dcompress-offload=disabled # TODO: tinycompress unpackaged + -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) + # https://gitlab.freedesktop.org/pipewire/pipewire/-/merge_requests/1379 + $(meson_native_use_feature modemmanager bluez5-backend-native-mm) + $(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 opus) + $(meson_native_use_feature bluetooth bluez5-codec-opus) + $(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 + $(meson_native_use_feature ffmpeg pw-cat-ffmpeg) + $(meson_native_use_feature flatpak) + -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 + -Dbluez5-codec-lc3plus=disabled # unpackaged + $(meson_native_use_feature liblc3 bluez5-codec-lc3) + $(meson_native_use_feature lv2) + $(meson_native_use_feature v4l v4l2) + -Dlibcamera=disabled # libcamera is not in Portage tree + $(meson_native_use_feature roc) + $(meson_native_use_feature readline) + $(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) + -Dlibmysofa=disabled # libmysofa is unpackaged + $(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 + + # We still have <5.16 kernels packaged in Gentoo and 6.1 (LTS) only + # just became stable, with 5.15 being the previous LTS. Many people + # are still on it. + -Dpam-defaults-install=true + + # Just for bell sounds in X11 right now. + $(meson_native_use_feature X x11) + $(meson_native_use_feature X x11-xfixes) + $(meson_native_use_feature X libcanberra) + + # TODO + -Dsnap=disabled + ) + + # This installs the schema file for pulseaudio-daemon, iff we are replacing + # the official sound-server + if use !sound-server; then + emesonargs+=( '-Dgsettings-pulse-schema=disabled' ) + else + emesonargs+=( + $(meson_native_use_feature gsettings gsettings-pulse-schema) + ) + fi + + meson_src_configure +} + +multilib_src_test() { + meson_src_test --timeout-multiplier 10 +} + +multilib_src_install() { + # Our custom DOCS do not exist in multilib source directory + DOCS= meson_src_install +} + +multilib_src_install_all() { + einstalldocs + + if ! use man && [[ ${PIPEWIRE_DOCS_PREBUILT} == 1 ]] ; then + doman "${WORKDIR}"/${PN}-${PIPEWIRE_DOCS_VERSION}-docs/man/*/*.[0-8] + fi + + if use pipewire-alsa; then + dodir /etc/alsa/conf.d + + # Install pipewire conf loader hook + insinto /usr/share/alsa/alsa.conf.d + doins "${FILESDIR}"/99-pipewire-default-hook.conf + eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf + + # These will break if someone has /etc that is a symbolic link to a subfolder! See #724222 + # And the current dosym8 -r implementation is likely affected by the same issue, too. + dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf + dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf + fi + + # Enable required wireplumber alsa and bluez monitors + if use sound-server; then + # Install sound-server enabler for wireplumber 0.5.0+ conf syntax + insinto /etc/wireplumber/wireplumber.conf.d + doins "${FILESDIR}"/gentoo-sound-server-enable-audio-bluetooth.conf + fi + + if use system-service; then + newtmpfiles - pipewire.conf <<-EOF || die + d /run/pipewire 0755 pipewire pipewire - - + EOF + fi + + if ! use systemd; then + insinto /etc/xdg/autostart + newins "${FILESDIR}"/pipewire.desktop-r2 pipewire.desktop + + exeinto /usr/bin + newexe "${FILESDIR}"/gentoo-pipewire-launcher.in-r3 gentoo-pipewire-launcher + + doman "${FILESDIR}"/gentoo-pipewire-launcher.1 + + # Disable pipewire-pulse if sound-server is disabled. + if ! use sound-server ; then + sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die + fi + + eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher + fi +} + +pkg_postrm() { + udev_reload +} + +pkg_preinst() { + HAD_SOUND_SERVER=0 + HAD_SYSTEM_SERVICE=0 + + if has_version "media-video/pipewire[sound-server(-)]" ; then + HAD_SOUND_SERVER=1 + fi + + if has_version "media-video/pipewire[system-service(-)]" ; then + HAD_SYSTEM_SERVICE=1 + fi +} + +pkg_postinst() { + udev_reload + + use system-service && tmpfiles_process pipewire.conf + + local ver + for ver in ${REPLACING_VERSIONS} ; do + if has_version kde-plasma/kwin[screencast] || has_version x11-wm/mutter[screencast] ; then + # https://bugs.gentoo.org/908490 + # https://gitlab.freedesktop.org/pipewire/pipewire/-/issues/3243 + ewarn "Please restart KWin/Mutter after upgrading PipeWire." + ewarn "Screencasting may not work until you do." + fi + + if ver_test ${ver} -le 0.3.66-r1 ; then + elog ">=pipewire-0.3.66 uses the 'pipewire' group to manage permissions" + elog "and limits needed to function smoothly:" + elog + elog "1. Please make sure your user is in the 'pipewire' group for" + elog "the best experience with realtime scheduling (PAM limits behavior)!" + elog "You can add your account with:" + elog " usermod -aG pipewire <youruser>" + elog + elog "2. For the best experience with fast user switching, it is recommended" + elog "that you remove your user from the 'audio' group unless you rely on the" + elog "audio group for device access control or ACLs.:" + elog " usermod -rG audio <youruser>" + elog + + if ! use jack-sdk ; then + elog + 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 + ewarn + 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 + fi + + if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then + elog + elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" + elog "are recommended to edit pulseaudio client configuration files:" + elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf" + elog "if it exists, and disable autospawning of the original daemon by setting:" + elog + elog " autospawn = no" + elog + elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" + elog + elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" + elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant" + elog "command:" + elog + elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &" + elog + fi + + 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 + fi + fi + done + + if [[ ${HAD_SOUND_SERVER} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then + # TODO: We could drop most of this if we set up systemd presets? + # They're worth looking into because right now, the out-of-the-box experience + # is automatic on OpenRC, while it needs manual intervention on systemd. + if use sound-server && use systemd ; then + elog + 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." + elog + fi + + if ! use sound-server ; then + ewarn + ewarn "USE=sound-server is disabled! If you want PipeWire to provide" + ewarn "your sound, please enable it. See the wiki at" + ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio" + ewarn "for more details." + ewarn + fi + fi + + if use system-service && [[ ${HAD_SYSTEM_SERVICE} -eq 0 || -z ${REPLACING_VERSIONS} ]] ; then + ewarn + ewarn "You have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable PipeWire to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of the" + ewarn "box, and you are on your own with configuration." + ewarn + fi + + 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 use sound-server && ! use pipewire-alsa; then + optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]" + fi +} diff --git a/media-video/raspberrypi-omxplayer/Manifest b/media-video/raspberrypi-omxplayer/Manifest deleted file mode 100644 index 1b64e9b2ef41..000000000000 --- a/media-video/raspberrypi-omxplayer/Manifest +++ /dev/null @@ -1,6 +0,0 @@ -AUX Makefile-0_p20160528.patch 1558 BLAKE2B 46ac6fc78241cef74e05b560c7a75d8367f8e191066f40a801b760688c99cd39b36d36ad56c73979bdef988a01906576169232bcf08d8ff0584510018ef28468 SHA512 0774d69992a1a19c4caf7edd17dfb41f5670ad1f8c4a86834064ce1a9fe88db01814b4c6eb8e8c118b94280e5af908bc8806831252617613dbdc745acd99ccc4 -AUX cross-0_p20160528.patch 520 BLAKE2B d7c69d51a04cf7c458ed97e3911ea6732dd7e51c1cec42787de9c5f77bde1e6312c83fc5317c838e2e8d684f22cd2ac7fbc56c36551421b7468868eb811e9688 SHA512 7ac3f7b3cda31ff6277da792d49e18b792646108faa28154bbad719f0181187e22d9ac7065a685edfcbc28076fc8a37d95b9381cc68e39a469a15c85622dec58 -AUX fonts-path.patch 881 BLAKE2B 3d95639c3aa0bc2d724b44477edc3f9699d627822df12504cf0a3e7beed7fc80a1d1b8a30d2dc4012a2ba0c9869dea5f8801610685b472a4a50b9a0d91748440 SHA512 995e9b5850a240e07814697054178fc19e94483d51b11a3786b8eff6c609619be2d7caa97c63ebdc1d194acb1d24a85b8acd34bbb4d5c0c7cc92a14da7b368dd -DIST raspberrypi-omxplayer-0_p20160528.tar.gz 1207624 BLAKE2B 5b8f8973302718cd06f0b7527eb1cc59bddd4c98a58917c540853e54a5c6d6978b00eb790ac5d18cd2e1b90730543e51c3c6edc221b4df1d9482d5e89af5846b SHA512 c7b00908f52159745dda94f35b9150122ca1e4e97ad1578a89f6db917b1579a8ed94c4ef1592a7c2590240e0fd1e7e0617e3ee8dec7f532368205ee63ce42572 -EBUILD raspberrypi-omxplayer-0_p20160528-r3.ebuild 1208 BLAKE2B 2ad72bf9cd96b3e894543d3fd13b5316dd7e842949e3fa462c21f4f9c2803fe18374585e89ae8542d513a03678411c5c67001b4eef8969154d6ec38291452729 SHA512 59fa8b4f6075c86e3b1fe62f101183e15285a6a28592702b2d5b884d08b75f3d062452119dd826accb54509a7ec00cb6c7d1220e4e3650fd8617d0939b3b27ab -MISC metadata.xml 335 BLAKE2B f439fa31b97a36c8be72b15959a8fe68afa02e4c14d5efb6bb1a0f9f85edfa2dbe3ec4a6fd7cefed81290eca9404d24c25eea0d6fa7d0d2869d4fd93222194c4 SHA512 d3eea8023c1ea51f78b0f8fa93921bfed2fb8aa7c3b769399e5c517e2160c469621b6f8098d78216839e6e357c8e3c1847ac48ea5a2c54635c9e7d1bfd8aa293 diff --git a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch deleted file mode 100644 index d71e6b376080..000000000000 --- a/media-video/raspberrypi-omxplayer/files/Makefile-0_p20160528.patch +++ /dev/null @@ -1,26 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -2,9 +2,11 @@ - - CFLAGS+=-std=c++0x -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS -DTARGET_POSIX -DTARGET_LINUX -fPIC -DPIC -D_REENTRANT -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64 -DHAVE_CMAKE_CONFIG -D__VIDEOCORE4__ -U_FORTIFY_SOURCE -Wall -DHAVE_OMXLIB -DUSE_EXTERNAL_FFMPEG -DHAVE_LIBAVCODEC_AVCODEC_H -DHAVE_LIBAVUTIL_OPT_H -DHAVE_LIBAVUTIL_MEM_H -DHAVE_LIBAVUTIL_AVUTIL_H -DHAVE_LIBAVFORMAT_AVFORMAT_H -DHAVE_LIBAVFILTER_AVFILTER_H -DHAVE_LIBSWRESAMPLE_SWRESAMPLE_H -DOMX -DOMX_SKIP64BIT -ftree-vectorize -DUSE_EXTERNAL_OMX -DTARGET_RASPBERRY_PI -DUSE_EXTERNAL_LIBBCM_HOST - --LDFLAGS+=-L./ -Lffmpeg_compiled/usr/local/lib/ -lc -lWFC -lGLESv2 -lEGL -lbcm_host -lopenmaxil -lfreetype -lz -+PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre -+ -+LIBS+=-lrt -lpthread $(shell ${PKG_CONFIG} --libs $(PKGS)) -L/opt/vc/lib - --INCLUDES+=-I./ -Ilinux -Iffmpeg_compiled/usr/local/include/ -I /usr/include/dbus-1.0 -I /usr/lib/arm-linux-gnueabihf/dbus-1.0/include -+INCLUDES+=$(shell ${PKG_CONFIG} --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux - - DIST ?= omxplayer-dist - -@@ -51,8 +47,7 @@ - bash gen_version.sh > version.h - - omxplayer.bin: version $(OBJS) -- $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) -lvchiq_arm -lvchostif -lvcos -ldbus-1 -lrt -lpthread -lavutil -lavcodec -lavformat -lswscale -lswresample -lpcre -- $(STRIP) omxplayer.bin -+ $(CXX) $(LDFLAGS) -o omxplayer.bin $(OBJS) $(LIBS) - - help.h: README.md Makefile - awk '/SYNOPSIS/{p=1;print;next} p&&/KEY BINDINGS/{p=0};p' $< \ diff --git a/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch b/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch deleted file mode 100644 index bd35d6283d21..000000000000 --- a/media-video/raspberrypi-omxplayer/files/cross-0_p20160528.patch +++ /dev/null @@ -1,15 +0,0 @@ ---- a/Makefile -+++ b/Makefile -@@ -4,9 +4,11 @@ - - PKGS=freetype2 dbus-1 libavcodec libavutil libavformat libswresample libswscale libpcre - --LIBS+=-lrt -lpthread $(shell pkg-config --libs $(PKGS)) -L/opt/vc/lib -+PKG_CONFIG ?= pkg-config - --INCLUDES+=$(shell pkg-config --cflags $(PKGS)) -I/opt/vc/include -I. -Ilinux -+LIBS+=-lrt -lpthread $(shell $(PKG_CONFIG) --libs $(PKGS)) -L${SYSROOT}/opt/vc/lib -+ -+INCLUDES+=$(shell $(PKG_CONFIG) --cflags $(PKGS)) -I${SYSROOT}/opt/vc/include -I. -Ilinux - - DIST ?= omxplayer-dist diff --git a/media-video/raspberrypi-omxplayer/files/fonts-path.patch b/media-video/raspberrypi-omxplayer/files/fonts-path.patch deleted file mode 100644 index 6683145f6833..000000000000 --- a/media-video/raspberrypi-omxplayer/files/fonts-path.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/omxplayer.cpp b/omxplayer.cpp -index 0626e2e..8450bf2 100644 ---- a/omxplayer.cpp -+++ b/omxplayer.cpp -@@ -83,8 +83,8 @@ bool m_osd = true; - bool m_no_keys = false; - std::string m_external_subtitles_path; - bool m_has_external_subtitles = false; --std::string m_font_path = "/usr/share/fonts/truetype/freefont/FreeSans.ttf"; --std::string m_italic_font_path = "/usr/share/fonts/truetype/freefont/FreeSansOblique.ttf"; -+std::string m_font_path = "/usr/share/fonts/freefont/FreeSans.ttf"; -+std::string m_italic_font_path = "/usr/share/fonts/freefont/FreeSansOblique.ttf"; - std::string m_dbus_name = "org.mpris.MediaPlayer2.omxplayer"; - bool m_asked_for_font = false; - bool m_asked_for_italic_font = false; diff --git a/media-video/raspberrypi-omxplayer/metadata.xml b/media-video/raspberrypi-omxplayer/metadata.xml deleted file mode 100644 index a3222eacca00..000000000000 --- a/media-video/raspberrypi-omxplayer/metadata.xml +++ /dev/null @@ -1,11 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="person"> - <email>fordfrog@gentoo.org</email> - <name>Miroslav Šulc</name> - </maintainer> - <upstream> - <remote-id type="github">popcornmix/omxplayer</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild b/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild deleted file mode 100644 index 67b8ee489721..000000000000 --- a/media-video/raspberrypi-omxplayer/raspberrypi-omxplayer-0_p20160528-r3.ebuild +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic toolchain-funcs - -GIT_COMMIT="791d7df" -DESCRIPTION="Command line media player for the Raspberry Pi" -HOMEPAGE="https://github.com/popcornmix/omxplayer" -SRC_URI="https://github.com/popcornmix/omxplayer/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="~arm" -IUSE="X" - -RDEPEND="dev-libs/libpcre - media-fonts/freefont - || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin ) - sys-apps/dbus - sys-apps/fbset - media-video/ffmpeg - dev-libs/boost - media-libs/freetype:2 - X? ( - x11-apps/xrefresh - x11-apps/xset - )" -DEPEND="${RDEPEND} - virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/Makefile-0_p20160528.patch - "${FILESDIR}"/fonts-path.patch - "${FILESDIR}"/cross-0_p20160528.patch -) - -DOCS=( README.md ) - -S="${WORKDIR}/popcornmix-omxplayer-${GIT_COMMIT}" - -src_prepare() { - default - cat > Makefile.include << EOF -LIBS=-lvchostif -lvchiq_arm -lvcos -lbcm_host -lEGL -lGLESv2 -lopenmaxil -lrt -lpthread -EOF - - tc-export CXX PKG_CONFIG -} - -src_compile() { - emake omxplayer.bin -} - -src_install() { - dobin omxplayer omxplayer.bin - einstalldocs -} diff --git a/media-video/shotcut/Manifest b/media-video/shotcut/Manifest index a7235112ce64..cb098fed5dec 100644 --- a/media-video/shotcut/Manifest +++ b/media-video/shotcut/Manifest @@ -1,6 +1,6 @@ -DIST shotcut-23.09.29.tar.gz 11908874 BLAKE2B e107d5f0284afd54b31eff72220d4224621da7b46fff6345d729ea0464b8967bc3329a12121aeedcdec6bcce7f4c6394065463269708a4bd4d29cc4389bc1706 SHA512 a829c2eda51db4fe20fa207e3e98ce0fb1e777af8ac495aa1ad20407bb91a41fed569298611288e04a528f1120fc89292d0333d3e445dce1ab86a799dea78e16 DIST shotcut-24.02.19.tar.gz 12077171 BLAKE2B ac7ab500f8817007ec981a94a2b7a414a4d981c630bd289fdf70eb2f1d493391dc74e372d82273aa4d81a2a9b685b1275e30ab47f6d6c5ce44812c286f43ed54 SHA512 60fc8874622db7ebb3e345ac8ba23a0d7c5e60c929c5955189b71540bbd5946e4dc0db0ad119a4ba3659f2d6e4dd64652be3dabc82b3c01feefb5619685ec454 -EBUILD shotcut-23.09.29.ebuild 1207 BLAKE2B afb8639799bd29f00cfd325eb884d63359e5d8243464273a5debd68929bcab62bb81048a90b1e34154dcdf8c7ff4530ee69995b8f7e88ecf11af31c9b56d910f SHA512 e2cb5620f3cb6e8a471019fd46be770477e9a2112abcc5171253e5256268e665d3ab4c2430294abc889cf75a94e43cf3a40da3f7065892538c6f86ad76c10e95 +DIST shotcut-24.06.26.tar.gz 12276595 BLAKE2B 0f062f3cb3991291b962fd351cac266bf20fd7d58acb70245655b93cbdbc7147a24e17d4ecf4eaa1bd5e3bbf29a29b73f289d529c539f6540616e3a03bf82ac5 SHA512 282c3f73cedae9b1fcb85d08a18fcd164481307baaca0227f536846ee0fc1c2f09382d0ba40fb0993210c78e7192338fa3577fe9c963e8bfc5a9d5bacc912a8b EBUILD shotcut-24.02.19.ebuild 1226 BLAKE2B 45e59c078e4e5d5a7d03230abb0217a593d7836219928d4f2e14bb62c7f3f3257eaee16aa3204bf10d3a51ba5b955d68c3cc59ad3887f78970029473e3c9b01f SHA512 2442f8f01b4b7bfd23b084f5e866d51d4c896edd14df5a9fd7a121687a444d84f2d86839e10486ee40c885d5368c605c3f1f7ec392b311f21c3fa4cc8a83fded -EBUILD shotcut-9999.ebuild 1207 BLAKE2B afb8639799bd29f00cfd325eb884d63359e5d8243464273a5debd68929bcab62bb81048a90b1e34154dcdf8c7ff4530ee69995b8f7e88ecf11af31c9b56d910f SHA512 e2cb5620f3cb6e8a471019fd46be770477e9a2112abcc5171253e5256268e665d3ab4c2430294abc889cf75a94e43cf3a40da3f7065892538c6f86ad76c10e95 +EBUILD shotcut-24.06.26.ebuild 1227 BLAKE2B 529d7aed3e8e423953848ba0877932bc3ab232c159a55803d39bdc8d578cf2a7467e038dd72290da0af5c7378df04567cef99827cb0559e02823bfe0b8c210fa SHA512 0d4a3f48b9f70754c8ff744003f7b4340eadbbf79ff69dc301dc787e16f90f38a8ccc33509619a3fd7d7ac569c42bccfa8d8a9d42c0422fd8c155e0e215c716f +EBUILD shotcut-9999.ebuild 1227 BLAKE2B 529d7aed3e8e423953848ba0877932bc3ab232c159a55803d39bdc8d578cf2a7467e038dd72290da0af5c7378df04567cef99827cb0559e02823bfe0b8c210fa SHA512 0d4a3f48b9f70754c8ff744003f7b4340eadbbf79ff69dc301dc787e16f90f38a8ccc33509619a3fd7d7ac569c42bccfa8d8a9d42c0422fd8c155e0e215c716f MISC metadata.xml 481 BLAKE2B 183f296894a3deb21038399eec0a637f2080d029fb8ea539a5a165206868704e472ed554bec67325fb54a4d8aeea54c01857635e32abdd229c91f3ba7855d095 SHA512 95af90837128290393f798b1561ebcbad057da1b5dafb583f9f9ba56878ff1d48245438ea3605601fad608e749235619d2195290c04c5c31eb8bbe627b58f4a7 diff --git a/media-video/shotcut/shotcut-23.09.29.ebuild b/media-video/shotcut/shotcut-24.06.26.ebuild index 88276adaf800..b72aafd2d6c0 100644 --- a/media-video/shotcut/shotcut-23.09.29.ebuild +++ b/media-video/shotcut/shotcut-24.06.26.ebuild @@ -15,11 +15,12 @@ else EGIT_REPO_URI="https://github.com/mltframework/shotcut/" fi -IUSE="debug" - LICENSE="GPL-3+" + SLOT="0" +IUSE="debug" + BDEPEND=" dev-qt/qttools:6[linguist] " @@ -27,6 +28,7 @@ DEPEND=" dev-qt/qtbase:6[concurrent,gui,network,opengl,sql,widgets,xml] dev-qt/qtdeclarative:6[widgets] dev-qt/qtmultimedia:6 + dev-qt/qtcharts:6 >=media-libs/mlt-7.18.0[ffmpeg,frei0r,jack,opengl,sdl,xml] media-video/ffmpeg " diff --git a/media-video/shotcut/shotcut-9999.ebuild b/media-video/shotcut/shotcut-9999.ebuild index 88276adaf800..b72aafd2d6c0 100644 --- a/media-video/shotcut/shotcut-9999.ebuild +++ b/media-video/shotcut/shotcut-9999.ebuild @@ -15,11 +15,12 @@ else EGIT_REPO_URI="https://github.com/mltframework/shotcut/" fi -IUSE="debug" - LICENSE="GPL-3+" + SLOT="0" +IUSE="debug" + BDEPEND=" dev-qt/qttools:6[linguist] " @@ -27,6 +28,7 @@ DEPEND=" dev-qt/qtbase:6[concurrent,gui,network,opengl,sql,widgets,xml] dev-qt/qtdeclarative:6[widgets] dev-qt/qtmultimedia:6 + dev-qt/qtcharts:6 >=media-libs/mlt-7.18.0[ffmpeg,frei0r,jack,opengl,sdl,xml] media-video/ffmpeg " diff --git a/media-video/subliminal/Manifest b/media-video/subliminal/Manifest index 489aa64a203d..18851711301e 100644 --- a/media-video/subliminal/Manifest +++ b/media-video/subliminal/Manifest @@ -4,6 +4,6 @@ DIST matroska_test_w1_1.zip 184550509 BLAKE2B f111725aa08267661942072c2d4ac019d3 DIST subliminal-2.1.0.tar.gz 5480458 BLAKE2B 249bdd027d99dfb0b81d939af2dc08f62b52dca2c8618f1006ca76eee41c2443b450076eddc1aa533997beca8cdf9016b884d7eceeebbf4e48ced91dae1a2361 SHA512 9b26ae594895470830547eed604aa5b28b75f590e5be12c2d5a478c5daf798d405f209639bd54dce0565b0e27d1b0daa5bef87dfa8590af61f2ab1e287c41060 DIST subliminal-2.2.1.gh.tar.gz 3165965 BLAKE2B 9b69547540773d1434117a0e81bebcb3da49f97c145285a2bb2349ff8d6a4cb35f42f8fa8c306d2afedaf0ccff275908526a0f6d6c7ba7846aea6acd2b154b92 SHA512 4e59ccfe42419bb33df395aad6c2255ad03cfe7311fc754ea591be7c9e33ef5cc3e980a1da2839afe79e3b22024b3e7b458b03b4e6270ea8bcadc0337d7e37bf EBUILD subliminal-2.1.0-r2.ebuild 2745 BLAKE2B 288c4b2344576e480cff2eb3119e2ff6dfd371aee22d94d1bba9f26a65341a8b314aa68f3247095bae583fd2a1af1d2fbed6f7d0219b005a0826f7f195f91eea SHA512 67151fb4aad8038deb2b8636a00cb504c0f9262cb7caa9373b59a055757455b002c135430db32db1207a2152166288583391ecedb2f013c46ec62a003d868538 -EBUILD subliminal-2.2.1.ebuild 2262 BLAKE2B 5e6e7ed0cfb4b477e3592d56d31e7d11614f790152943bb9810f0ceb32c08a9fa92a7a7ccf2e1738706e365dbb3bacddf4c4cdd82ff0f77c699d78ff848ae232 SHA512 240c05ea23740bcd749fe11baba3f279a219a74034c2fddb0a77e173f73ff60d5a917f502426a4187a6c41d98493e4140ad2eb32bc24ee285a06dea0b435cf3b +EBUILD subliminal-2.2.1.ebuild 2261 BLAKE2B da9bce5aa784b9fb9f97400c3cb2c78cd448005f2327643b9e28000357e20c0e5ee628064fc45a054fe047845dea33a3027676a46c0b607757f5a1dc3ef8ed9f SHA512 02bdf3455b508a13f9838331a332795be5852c9b6397f42364387edfdb673692a1ee87cf0d75d06125f1e99309ac6d95e8bfa44b73c95ad235b7be9ed6fe718d EBUILD subliminal-9999.ebuild 2250 BLAKE2B 272763ffa8d84987d4eeb716d0149d1b9339140c7f6576067ab66a3c603ad88742fbd6d1aeb8a7438337352410fb96fe18caec53d31eabddd57c8a1a5bc5ebcc SHA512 67001ae785e7c27adfee96baa867c09efd7042f10304a7270b163216964777c04715b9687e4931c538573e1da6630ea8c59fa5d5cb30cb37a2fa01407057a266 MISC metadata.xml 447 BLAKE2B 42fac15336ea05ed85313259c5571f8e4101a39157973a2c43bc1a77bdb1e6610e9373646d485f8e5a5df1420b8fb3c780393e3191d4069a4e2ec5296733adc1 SHA512 fa0256091da7f65f41cfdd1b4ebd7e485c15c8a72cd916d553003e0d8beca479b0d0d877ad90c6c986b5c24070a89994d359f4672d2dfac513d06e9a8683d826 diff --git a/media-video/subliminal/subliminal-2.2.1.ebuild b/media-video/subliminal/subliminal-2.2.1.ebuild index 2ced5f8b3782..d432d8ef9ca3 100644 --- a/media-video/subliminal/subliminal-2.2.1.ebuild +++ b/media-video/subliminal/subliminal-2.2.1.ebuild @@ -18,7 +18,7 @@ if [[ ${PV} == 9999 ]] ; then EGIT_BRANCH="develop" else SRC_URI="https://github.com/Diaoul/${PN}/archive/${PV}.tar.gz -> ${P}.gh.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 ~x86" fi SRC_URI+=" test? ( https://downloads.sourceforge.net/matroska/test_files/matroska_test_w1_1.zip )" diff --git a/media-video/totem/Manifest b/media-video/totem/Manifest index b5ccc34dcf02..8d62d539b9ae 100644 --- a/media-video/totem/Manifest +++ b/media-video/totem/Manifest @@ -1,4 +1,4 @@ AUX 43.0-gst-inspect-sandbox.patch 1470 BLAKE2B e92278c4951deb89d13dc96ddc33606ba0f1d21c0e16f4d49cc637fdd15fc5905509eb040e9857ccc4e56d1f5c9f9afb0f7e7e994371928f67cf26c1ff1fddca SHA512 d248b919ac90b27f51eb2a74127013acbf59e669d83b1d4d9b177ee75881fa98714a36e94232a4caf2ca101efff8df4dde12ad9deae49a2f2072d62c3aef7781 DIST totem-43.0.tar.xz 2486304 BLAKE2B 3b43ad2cbf40472bff3b7369001b9b7784ef52244812d9aae493fffa99982a8f24770d0f5063f0b1f1fd320d6b2cec5e702ded9ccfaece51f7bdf9d862b96230 SHA512 b35d32ebadf4b9900ab234f07f8a7128edbc15593e1447c22f3c7a653fcbd4a2df9d45484e2decce5dd5ab67849fca1003a1ded338a0af0930b6560ee4f764ae -EBUILD totem-43.0-r1.ebuild 3011 BLAKE2B d428ec694914433b7c54149c77cfb471fb3b828d65bd305284505c383d2271283e8238c7c8121f69caf773908e852c8f016852c1d7cf8174b7c9bdcc8fc58163 SHA512 8c69b319bcfbd0e5ca982d38b2f8ca69936687092757ce15ae15172e4239278e2d3279a2f5cce3d1b505d6c63a3779aba472decc36015b376dcceee1daccff56 +EBUILD totem-43.0-r1.ebuild 3005 BLAKE2B 6948e017da3add7c4961fb02163e050c94042228d6285f61f946d3f12412106beb46b9a0ca62c8a25179424fdef616c6ae8ca7269d653b70bf4489e1a1c84fea SHA512 e2652990bbdcd6768f6677147c9af780fca97841d470d195f1e99718c9e14ef0def101ef59b9abc8948551efee82db21724faaefc6af7456eec45f343e626751 MISC metadata.xml 1144 BLAKE2B 93350ee033585bcb68019b5daed10bdb6fd3f436b234fe7a077695a230868b7733cad41dec152aaa44a2b61b6aea0c057c59896ebe84b8e9bbafbba4b0aecc27 SHA512 5ec35c0372f72d88b19502b561031387b3fa1421e5cd5c642350410918b3b538b4e55fb0cf6f1ee69442ddf3865680c747e70f5196c45c7c91ea708d68a2ad15 diff --git a/media-video/totem/totem-43.0-r1.ebuild b/media-video/totem/totem-43.0-r1.ebuild index 99c261c6b5ea..500638a0f4ac 100644 --- a/media-video/totem/totem-43.0-r1.ebuild +++ b/media-video/totem/totem-43.0-r1.ebuild @@ -19,7 +19,7 @@ REQUIRED_USE=" " RESTRICT="!test? ( test )" -KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv x86" +KEYWORDS="amd64 ~arm arm64 ~loong ~ppc ~ppc64 ~riscv x86" COMMON_DEPEND=" >=dev-libs/glib-2.72.0:2 diff --git a/media-video/vcdimager/Manifest b/media-video/vcdimager/Manifest index 63756bffe24a..dacd0e6757fd 100644 --- a/media-video/vcdimager/Manifest +++ b/media-video/vcdimager/Manifest @@ -1,4 +1,4 @@ AUX vcdimager-2.0.1-pkg-config.patch 347 BLAKE2B 082ac47630ce7289967a3dfb17c601ba90c01d15e87bedb61a78a44573a38ac0c0d8790bf2acca540c2dbe91f6a099b57032644dbb32d202c05709dddc17ffbe SHA512 e43827527b656e8813c41266e30a9f9e86a3a7dd67ff01de08088d78a775481914d7a6f1d472b80d53e93f09573e0b922006652626415fd5d7f6a9c3ca534468 DIST vcdimager-2.0.1.tar.gz 1115207 BLAKE2B edf70212e81a89924e64115cae9eab77619f7e639e5529b85cc6a80c6ef4f4028c8a207bec86c41283b9768f6a0f56ef56adfad18c7bba20c315b1e5554a83a9 SHA512 55a9d235149a35fe26576703c623a2c9a3f7deedd2e42e01271fdf1e1fdf14c51ee040ee3b5d15fe1b5860fbd4cbeb437362b1a1f40187c8d4d691b6b89a2230 -EBUILD vcdimager-2.0.1.ebuild 1485 BLAKE2B 4629eac1a302f7bf6fa15887132d8f991f6ed521f82cae3de5f4565d5e6d426a6386fa3b60b940415d9351510f2b2f88dbf99df09b55b6a954509311fd55867b SHA512 1b813458f28a9d40267687e0598274db553a50d66ca560d0a358aaa49fbde507f14f69e7831400bc2265fcf91e134b8d8fadda7bc227adc5731fcd3b88293bb1 +EBUILD vcdimager-2.0.1.ebuild 1479 BLAKE2B 24b3307cce35211c68705a641c13fe82f20a1aaf8cff51612e29fff529548201bed6707060e3e8fe139ab6f456a64a7481901b3d80fe8b31ddc12411dc4f50f7 SHA512 f98428518ffbbce59cff5ceb38630a11f344d15e5feb387a2bc052cd89fee45d33fdf738896c55cb7dfeacebb90cdefc7f537517e4d2cf8fb3ea6cb66a58aace MISC metadata.xml 308 BLAKE2B be4600e2320c950b7fafee411800508a7bd2c5356663a6f8e7e6c0cb85eff65f73c822d405bcd105eb74918a20e5dca7f531c9a2dfa617c2f43cbac5117d8bb1 SHA512 22f120fa391fa30c71797a0803d90bf0bae6d784b9ff19ee1cf5df2e9779bf8ef4c75160384916f6bc84f3dd8cc796c6eab70d284d7901334e9304a2cad8ef27 diff --git a/media-video/vcdimager/vcdimager-2.0.1.ebuild b/media-video/vcdimager/vcdimager-2.0.1.ebuild index ef677b24f99a..e426f812b722 100644 --- a/media-video/vcdimager/vcdimager-2.0.1.ebuild +++ b/media-video/vcdimager/vcdimager-2.0.1.ebuild @@ -11,7 +11,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.gz" LICENSE="GPL-2+" SLOT="0" -KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86" IUSE="static-libs +xml" RDEPEND=" diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest index 31080fd1de2d..aec743b1daa1 100644 --- a/media-video/wireplumber/Manifest +++ b/media-video/wireplumber/Manifest @@ -1,12 +1,17 @@ AUX wireplumber-0.4.15-config-disable-sound-server-parts.patch 783 BLAKE2B ed172805cd263fa0320563eb2440147e83567cad24bbec253a9d6cddedffd969056e2041110b96fd0b1e210cd7a45c25385174031496f6931f0a6c27257d23b2 SHA512 b1838315d3629560a93f4d1c7065419b592a7cffe69e898147e37b9e56ae0f0e5cb45f1ba0b5217af01f711fb0c20f547dc61797276892a593f644c48992ae47 AUX wireplumber-0.4.81-config-disable-sound-server-parts.patch 906 BLAKE2B 9373bb9cd9234d0fd68ccfba41011083aadd2dfcfd19d7cdda235f075b5cbe02562f8719153ea4e0412614401b3c7f6b60083b3578e9d9450b0a0dfc4b6222a4 SHA512 9fb2c5b5baeebde8dac9c6b6cc192cf85a4b70db3ef7a50233a7c064dc407c763d906063958a5dd06746e1730e2110803eb328105802ea5c4d6bb6d685376a93 +AUX wireplumber-0.5.6-bluetooth-only-autoswitch.patch 3011 BLAKE2B 95f015a1c9e2b93bece9377a6ba072fe581053a17dc8586bed1cfb5a5d4eaaaef1713ab5e289f903ac6b47c8bbf958bba2dfc675a866b6bdb2ccc2ce9690e5be SHA512 39b0efe430f6ca7922b01e3d161e8a19ae0773687efe37207f389b96e06973e3bae1149c7ade7ded67a452a64158095d013d2fc78c1d22c612d0313d34a9cebb +AUX wireplumber-0.5.6-config-disable-sound-server-parts.patch 559 BLAKE2B 8d71fadbfb8b45eeede3c3b322e11205f4b31af098f0798cc9bef2ee92eb74ce5f811233981351097b4da02c70ce42bcd0033fd951a89f8bc8218468d09b235c SHA512 1e6deb4ce2452f22fca6722c22cfa6a61794f8612c9b2baf6ac1a9b4cf6bdae84e3685e1d8957db3121d304fd5842de47a0f319b755dc349f354f55e118d4750 DIST wireplumber-0.4.17.tar.bz2 330355 BLAKE2B fec1cf75bec687bff1cb48416cf22503a79609cf11220ab9353d3b8038cae1db63da8aa269aca034c0c0afd474e2ba89b236bb7e778da111516e3b15d5449f02 SHA512 5efb71091f262458bc912f4670249fac3ef858021785fbee9be749564a3fa452b1c4ff75634132f7d44fd06d7fc5ea2debb022b1f4a8d5c9c3afa992fab7ecf8 DIST wireplumber-0.5.2.tar.bz2 408788 BLAKE2B 51a9c0268212b353b54099d2d57fd93dec5b42d4ec3151f93b4ebd4df3f4478a19858ec8302af58558a9387afa647a00a0872d471f0f2ea5e681978afbdcf553 SHA512 4cd2949739b8af86f73e072fe8c1d8606fa9be77b6e109aa0825d516f11953c4811ae1162da07ae245f7039f4243d01c43b8e9c083d4e0be1066b180484abbfb DIST wireplumber-0.5.3.tar.bz2 411081 BLAKE2B 627cb0adaddd512e2b5f2e706b622972232f76000d690837da5f03a3628669b99c4768de6590ec378684311915626de7ac3316bda1f5d1152c9df448ec41e389 SHA512 1c62f7f919242b2a9586ff6a532f214b564bcf10c838eae4a64078edf6fd461fc65f364c8af79150e33b86594331446516a1a4c926bb245a4b2ba2d9f63f7243 DIST wireplumber-0.5.5.tar.bz2 411519 BLAKE2B 016641b6b21b6176b0f3f70c0c96ccd32ea4d3609bf337a3c9af6e8219cb160a92e30027e3187adb023d0c35ad822ce9be374d098eab76508f218a7ae2528754 SHA512 50ddc6f275bba89ddac0e55dd2a572a13ca19953bce6bdbca14eadd44f3669c7ad4b39ae857770543567a05ea3e437ccee36a2538fad1f4caa777036ace04f77 +DIST wireplumber-0.5.6.tar.bz2 415566 BLAKE2B 7f5323ddea415bac31bbb5f05b711e52bd631d9e6c4b22b6055055761a19c0a4c16a36a90ecd0f90c3fbfaddad8be57e823ad0b97327569e94074bee21d5e31c SHA512 58b18c1c1f1040e9954de75488a82ff7504fb908f7e5d57dd219f3479612551c94a1384d399a99b983f66859560aaf71c8ab9414318e48abb6f8cd3b88fcecc8 EBUILD wireplumber-0.4.17-r1.ebuild 3785 BLAKE2B c6108e4a024cb00a63bcc82a215fc80b6fe106903339e892416a017bc6d607d7bfb268a305b30e82988f2dcda793ecfd8fcc4e15d2691b8a6ba248e93e72916a SHA512 4bcda3c48ba1a23f61f6678e26eb420aeb057c193cc61ba5d65cbf560e5d292fe4dbd7dddc8fa7bf1d6f190a6297d4969961b8358707707d6a067e58feb94f89 EBUILD wireplumber-0.5.2.ebuild 3801 BLAKE2B 67265b726b3267c13a3bc1ac5f393c69a8c65c3dba98e7c647ac1099ce28d449540604c3b0ff9b053843b5adaaba0325558692fcfb15ba995aa12f61b9b66fe5 SHA512 97382f121b1e594b26a8b4fe35b01ac855b70e2c9747d18de7a6d56fc99fbe52bec34ccc315faf0dff297934f2cad7edd4b24a4a2570115c7292b1e63daba128 EBUILD wireplumber-0.5.3.ebuild 3957 BLAKE2B 1ec67fc3d874a7ce13c0e49e13bcddd5d3abcc19d4d419883b5a53d71fbb3b8c7e7c272cee55e5e348540464e4feaba7e99267c813fedf9d6e4a69a5f16b0b99 SHA512 c37f1a8cb7570a766396647bd15368b9b20ba16f81881facc9e6d6ea02abbcf895d9b8cac8d2f46b4944ed7d156d4bfd5cfdcef8e62fd9395834234765ce6e53 EBUILD wireplumber-0.5.5.ebuild 3963 BLAKE2B 8c6b2725180db9f33430d75af2872ffffffb8f5af821dc2545c3b97bf7830f82cc78832c3e348ad1cfa9ed52a06b0cefdfa1ecdeb27a49ecf0103f4ff7786b08 SHA512 45c82e2a2a47c2da3559768fdaf177e4127ef79f3c26e5e00e4f216124eb8e08615a6c4b525877fc9941ec25fb0652ecd6e68e617f7ef7c5308ea0fca94eac43 -EBUILD wireplumber-9999.ebuild 3963 BLAKE2B 8c6b2725180db9f33430d75af2872ffffffb8f5af821dc2545c3b97bf7830f82cc78832c3e348ad1cfa9ed52a06b0cefdfa1ecdeb27a49ecf0103f4ff7786b08 SHA512 45c82e2a2a47c2da3559768fdaf177e4127ef79f3c26e5e00e4f216124eb8e08615a6c4b525877fc9941ec25fb0652ecd6e68e617f7ef7c5308ea0fca94eac43 +EBUILD wireplumber-0.5.6-r1.ebuild 4015 BLAKE2B eb60aa697f917c4fa8216042177d42f8018c66d8c480eb4a1e7e2daf72feb4e9b5563da48000050bb895b64befeb5ae149f6d56f04bc2dd5ae34dddaeafcd887 SHA512 de095a4a987d0e0984ef5b5dfd82687f65300dbf4372a54ba68a732f28cad8ca9cffd5919aa9711c59057070b405b9fe7facfafdeb1197b4a257ad2de59a7d47 +EBUILD wireplumber-0.5.6.ebuild 3962 BLAKE2B 18dab254c1892c125e4bba512d54b3b060f127793c6618be2d462f626d1123b7c01c3e67a14625344b5ab5cfb567045179cc42467ccbbd85dc614b5f904303a3 SHA512 39047bf258ae5d4c7621993eecceebba1f7fb18719638e762cb78336ba15cbc284b884fae6d86d427eb5ffe824066dd045ec11168f04dcbd923441df7b97e7e8 +EBUILD wireplumber-9999.ebuild 3962 BLAKE2B 18dab254c1892c125e4bba512d54b3b060f127793c6618be2d462f626d1123b7c01c3e67a14625344b5ab5cfb567045179cc42467ccbbd85dc614b5f904303a3 SHA512 39047bf258ae5d4c7621993eecceebba1f7fb18719638e762cb78336ba15cbc284b884fae6d86d427eb5ffe824066dd045ec11168f04dcbd923441df7b97e7e8 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55 diff --git a/media-video/wireplumber/files/wireplumber-0.5.6-bluetooth-only-autoswitch.patch b/media-video/wireplumber/files/wireplumber-0.5.6-bluetooth-only-autoswitch.patch new file mode 100644 index 000000000000..779a4d4f21bf --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.5.6-bluetooth-only-autoswitch.patch @@ -0,0 +1,64 @@ +https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/715 +https://gitlab.freedesktop.org/pipewire/wireplumber/-/merge_requests/669 +https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/b68a6794cd5c3702a2144be60c41a9ca982c416b + +From b68a6794cd5c3702a2144be60c41a9ca982c416b Mon Sep 17 00:00:00 2001 +From: Pauli Virtanen <pav@iki.fi> +Date: Sun, 8 Sep 2024 20:22:41 +0300 +Subject: [PATCH] autoswitch-bluetooth-profile: switch only Bluetooth devices + +Handle only devices associated with Bluetooth loopback nodes. + +Make sure the node.link-group iteration cannot get stuck if there is a +loop in the link graph. +--- a/src/scripts/device/autoswitch-bluetooth-profile.lua ++++ b/src/scripts/device/autoswitch-bluetooth-profile.lua +@@ -301,13 +301,14 @@ end + + -- We consider a Stream of interest if it is linked to a bluetooth loopback + -- source filter +-local function checkStreamStatus (stream, node_om) ++local function checkStreamStatus (stream, node_om, visited_link_groups) + -- check if the stream is linked to a bluetooth loopback source + local stream_id = tonumber(stream["bound-id"]) + local peer_id = lutils.getNodePeerId (stream_id) + if peer_id ~= nil then + local bt_node = node_om:lookup { +- Constraint { "bound-id", "=", peer_id, type = "gobject" } ++ Constraint { "bound-id", "=", peer_id, type = "gobject" }, ++ Constraint { "bluez5.loopback", "=", "true", type = "pw" } + } + if bt_node ~= nil then + local dev_id = bt_node.properties["device.id"] +@@ -325,18 +326,27 @@ local function checkStreamStatus (stream, node_om) + else + -- Check if it is linked to a filter main node, and recursively advance if so + local filter_main_node = node_om:lookup { +- Constraint { "bound-id", "=", peer_id, type = "gobject" } ++ Constraint { "bound-id", "=", peer_id, type = "gobject" }, ++ Constraint { "node.link-group", "+", type = "pw" } + } + if filter_main_node ~= nil then + -- Now check all stream nodes for this filter + local filter_link_group = filter_main_node.properties ["node.link-group"] ++ if visited_link_groups == nil then ++ visited_link_groups = {} ++ end ++ if visited_link_groups [filter_link_group] then ++ return nil ++ else ++ visited_link_groups [filter_link_group] = true ++ end + for filter_stream_node in node_om:iterate { + Constraint { "media.class", "matches", "Stream/Input/Audio", type = "pw-global" }, + Constraint { "stream.monitor", "!", "true", type = "pw" }, + Constraint { "bluez5.loopback", "!", "true", type = "pw" }, + Constraint { "node.link-group", "=", filter_link_group, type = "pw" } + } do +- local dev_id = checkStreamStatus (filter_stream_node, node_om) ++ local dev_id = checkStreamStatus (filter_stream_node, node_om, visited_link_groups) + if dev_id ~= nil then + return dev_id + end +-- +GitLab diff --git a/media-video/wireplumber/files/wireplumber-0.5.6-config-disable-sound-server-parts.patch b/media-video/wireplumber/files/wireplumber-0.5.6-config-disable-sound-server-parts.patch new file mode 100644 index 000000000000..4e691e5790b3 --- /dev/null +++ b/media-video/wireplumber/files/wireplumber-0.5.6-config-disable-sound-server-parts.patch @@ -0,0 +1,18 @@ +From ed5ce9c176db2e26ac9915b4d86c3a076a8093ae Mon Sep 17 00:00:00 2001 +From: "Igor V. Kovalenko" <igor.v.kovalenko@gmail.com> +Date: Fri, 2 Feb 2024 22:00:03 +0300 +Subject: [PATCH] config: Disable alsa and bluez monitors by default + +--- a/src/config/wireplumber.conf ++++ b/src/config/wireplumber.conf +@@ -72,8 +72,8 @@ wireplumber.profiles = { + + policy.standard = required + +- hardware.audio = required +- hardware.bluetooth = required ++ #hardware.audio = required ++ #hardware.bluetooth = required + hardware.video-capture = required + } + diff --git a/media-video/wireplumber/wireplumber-0.5.6-r1.ebuild b/media-video/wireplumber/wireplumber-0.5.6-r1.ebuild new file mode 100644 index 000000000000..a5d10f865805 --- /dev/null +++ b/media-video/wireplumber/wireplumber-0.5.6-r1.ebuild @@ -0,0 +1,132 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# 1. Please regularly check (even at the point of bumping) Fedora's packaging +# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide +# +# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things +# continue to move quickly. It's not uncommon for fixes to be made shortly +# after releases. + +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson systemd + +DESCRIPTION="Replacement for pipewire-media-session" +HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/0.5" +IUSE="elogind system-service systemd test" + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + ?? ( elogind systemd ) + system-service? ( systemd ) +" + +RESTRICT="!test? ( test )" + +# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building +BDEPEND=" + dev-libs/glib + dev-util/gdbus-codegen + dev-util/glib-utils + sys-devel/gettext + test? ( sys-apps/dbus ) +" +DEPEND=" + ${LUA_DEPS} + >=dev-libs/glib-2.68 + >=media-video/pipewire-1.0.5-r1:= + virtual/libintl + elogind? ( sys-auth/elogind ) + systemd? ( sys-apps/systemd ) +" +RDEPEND=" + ${DEPEND} + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) +" + +DOCS=( {NEWS,README}.rst ) + +PATCHES=( + # Defer enabling sound server parts to media-video/pipewire + # TODO: Soon, we should be able to migrate to just a dropin at + # /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735. + "${FILESDIR}"/${PN}-0.5.6-config-disable-sound-server-parts.patch + + "${FILESDIR}"/${P}-bluetooth-only-autoswitch.patch +) + +src_configure() { + local emesonargs=( + -Ddaemon=true + -Dtools=true + -Dmodules=true + # Ebuild not wired up yet (Sphinx, Doxygen?) + -Ddoc=disabled + # Only used for Sphinx doc generation + -Dintrospection=disabled + -Dsystem-lua=true + -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) + $(meson_feature elogind) + $(meson_feature systemd) + $(meson_use system-service systemd-system-service) + $(meson_use systemd systemd-user-service) + -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) + -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) + $(meson_use test tests) + $(meson_use test dbus-tests) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + mv "${ED}"/usr/share/doc/wireplumber/* "${ED}"/usr/share/doc/${PF} || die + rmdir "${ED}"/usr/share/doc/wireplumber || die +} + +pkg_postinst() { + if systemd_is_booted ; then + ewarn "pipewire-media-session.service is no longer installed. You must switch" + ewarn "to wireplumber.service user unit before your next logout/reboot:" + ewarn "systemctl --user disable pipewire-media-session.service" + ewarn "systemctl --user --force enable wireplumber.service" + else + ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" + ewarn "is started (a replacement for directly calling pipewire binary)." + ewarn + ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" + ewarn "or, if it does exist, that any reference to" + ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." + fi + + if use system-service; then + ewarn + ewarn "WARNING: you have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable WirePlumber to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of" + ewarn "box, and you are on your own with configuration." + ewarn + fi +} diff --git a/media-video/wireplumber/wireplumber-0.5.6.ebuild b/media-video/wireplumber/wireplumber-0.5.6.ebuild new file mode 100644 index 000000000000..05daac42ad03 --- /dev/null +++ b/media-video/wireplumber/wireplumber-0.5.6.ebuild @@ -0,0 +1,130 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# 1. Please regularly check (even at the point of bumping) Fedora's packaging +# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide +# +# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things +# continue to move quickly. It's not uncommon for fixes to be made shortly +# after releases. + +LUA_COMPAT=( lua5-{3,4} ) + +inherit lua-single meson systemd + +DESCRIPTION="Replacement for pipewire-media-session" +HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber" + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git" + EGIT_BRANCH="master" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.bz2" + KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +fi + +LICENSE="MIT" +SLOT="0/0.5" +IUSE="elogind system-service systemd test" + +REQUIRED_USE=" + ${LUA_REQUIRED_USE} + ?? ( elogind systemd ) + system-service? ( systemd ) +" + +RESTRICT="!test? ( test )" + +# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building +BDEPEND=" + dev-libs/glib + dev-util/gdbus-codegen + dev-util/glib-utils + sys-devel/gettext + test? ( sys-apps/dbus ) +" +DEPEND=" + ${LUA_DEPS} + >=dev-libs/glib-2.68 + >=media-video/pipewire-1.0.5-r1:= + virtual/libintl + elogind? ( sys-auth/elogind ) + systemd? ( sys-apps/systemd ) +" +RDEPEND=" + ${DEPEND} + system-service? ( + acct-user/pipewire + acct-group/pipewire + ) +" + +DOCS=( {NEWS,README}.rst ) + +PATCHES=( + # Defer enabling sound server parts to media-video/pipewire + # TODO: Soon, we should be able to migrate to just a dropin at + # /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735. + "${FILESDIR}"/${PN}-0.5.6-config-disable-sound-server-parts.patch +) + +src_configure() { + local emesonargs=( + -Ddaemon=true + -Dtools=true + -Dmodules=true + # Ebuild not wired up yet (Sphinx, Doxygen?) + -Ddoc=disabled + # Only used for Sphinx doc generation + -Dintrospection=disabled + -Dsystem-lua=true + -Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version)) + $(meson_feature elogind) + $(meson_feature systemd) + $(meson_use system-service systemd-system-service) + $(meson_use systemd systemd-user-service) + -Dsystemd-system-unit-dir=$(systemd_get_systemunitdir) + -Dsystemd-user-unit-dir=$(systemd_get_userunitdir) + $(meson_use test tests) + $(meson_use test dbus-tests) + ) + + meson_src_configure +} + +src_install() { + meson_src_install + + mv "${ED}"/usr/share/doc/wireplumber/* "${ED}"/usr/share/doc/${PF} || die + rmdir "${ED}"/usr/share/doc/wireplumber || die +} + +pkg_postinst() { + if systemd_is_booted ; then + ewarn "pipewire-media-session.service is no longer installed. You must switch" + ewarn "to wireplumber.service user unit before your next logout/reboot:" + ewarn "systemctl --user disable pipewire-media-session.service" + ewarn "systemctl --user --force enable wireplumber.service" + else + ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher" + ewarn "is started (a replacement for directly calling pipewire binary)." + ewarn + ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist" + ewarn "or, if it does exist, that any reference to" + ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)." + fi + + if use system-service; then + ewarn + ewarn "WARNING: you have enabled the system-service USE flag, which installs" + ewarn "the system-wide systemd units that enable WirePlumber to run as a system" + ewarn "service. This is more than likely NOT what you want. You are strongly" + ewarn "advised not to enable this mode and instead stick with systemd user" + ewarn "units. The default configuration files will likely not work out of" + ewarn "box, and you are on your own with configuration." + ewarn + fi +} diff --git a/media-video/wireplumber/wireplumber-9999.ebuild b/media-video/wireplumber/wireplumber-9999.ebuild index a3a02062c4c1..05daac42ad03 100644 --- a/media-video/wireplumber/wireplumber-9999.ebuild +++ b/media-video/wireplumber/wireplumber-9999.ebuild @@ -68,7 +68,7 @@ PATCHES=( # Defer enabling sound server parts to media-video/pipewire # TODO: Soon, we should be able to migrate to just a dropin at # /usr/share. See https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/652#note_2399735. - "${FILESDIR}"/${PN}-0.4.81-config-disable-sound-server-parts.patch + "${FILESDIR}"/${PN}-0.5.6-config-disable-sound-server-parts.patch ) src_configure() { diff --git a/media-video/x264-encoder/Manifest b/media-video/x264-encoder/Manifest index 44ff2075f03f..487720e021b4 100644 --- a/media-video/x264-encoder/Manifest +++ b/media-video/x264-encoder/Manifest @@ -1,6 +1,8 @@ DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9 DIST x264-0.0.20231114.tar.bz2 833229 BLAKE2B e8e60767d16ea11e55f9dd56f1c74535a06b07a498b91d4372872925915563b67fb917c5856e2e40e1f58acbab3142509d036cae8d56820bef0e16ee7bc35196 SHA512 7705c2827c6b280afc7403bce206f82ee94c1ba76c582d3e6ae017b9c4f08c4475ac70373f8a0bcda73046221456efc3f338c57aaf03c11f4d8e63f69bb94db5 +DIST x264-0.0.20240513.tar.bz2 841594 BLAKE2B fe88195c52d90e635a0aedef7d18886160147ba41cd1a692ae9a661b76608ac11e05aa5bc4628030f833d6a822cee187f3fbc4c015e094eb1b30c96783147124 SHA512 6d0d9e079d6c7650abb5c00ad60cf3cfe72a220b3ee7cd030d4daeefdd9feeb4d056cf2e01b2f8d2fb0a66ccc15cdde860237f8ac5eac42ede6e5444a81346f8 EBUILD x264-encoder-0.0.20220222.ebuild 2146 BLAKE2B 5aa96436f28c6943e59f2fb8d1b061bb66ebaac901268b73c3651259346d1f1aa429c2f4f4a29bc6b1de7accc093f0e80166a4a7f1d98f0b95cd8065fed94238 SHA512 3a1c20eb9f93ad24c48d7bc5dc7e01195adef29ae90bff6b648f0f8a919a76b2210ea33e4b626aaeefe002e18a7cda684719e2657e6a29014425315b7b649ef7 EBUILD x264-encoder-0.0.20231114.ebuild 2207 BLAKE2B d40d41cd4ea540b2bfe5224345488e0c02bd2fe17081f38b947185d9e06dabe1ffbd3606e3f4b95363f6846a1d2dbbcb0bea28ae7bd500d839e176163edddb8f SHA512 1576b40aa709c903f63f337214ad977fea2fae0d4f6b3890e04149ef73dee1bd0c0e5de6dfdc926ee3088219e8cfca67dd13ef446d37e8b90c624246bd147cd4 -EBUILD x264-encoder-9999.ebuild 2209 BLAKE2B 59667c3997a0e43ab3ff4453ba434a7a6cefd9587f4aabac28e08cb31828bb7038e5a65e2ecbb063f392d9c5ff4c6654c27a89a2f944a335daaf84adb0a7a251 SHA512 2eb37cb0932dc828c23c87b9e9dc14f0066a24fa14f6b239941b6a0a8bd47fe02cd373efa77e6d07006703d967470f3011f4fef683baa31f47c9df051354e041 +EBUILD x264-encoder-0.0.20240513.ebuild 2209 BLAKE2B 20b35fde815abff94a7d0a9d1bab9de138a9caecd2f70ad8303c21e979fd4ef5021688fe9f4a0bbba6b39946d0fc2346944d37c320435c7198fab7cb83291cbb SHA512 7fc1e1bf72e48a7b6a6c8a98f329f728605ae353d7f2fe9314be28331d179ec71b2350b833d7b56e4e9b8d5b2539f5b6118b3855012f13208fb855340c5a7a14 +EBUILD x264-encoder-9999.ebuild 2209 BLAKE2B 20b35fde815abff94a7d0a9d1bab9de138a9caecd2f70ad8303c21e979fd4ef5021688fe9f4a0bbba6b39946d0fc2346944d37c320435c7198fab7cb83291cbb SHA512 7fc1e1bf72e48a7b6a6c8a98f329f728605ae353d7f2fe9314be28331d179ec71b2350b833d7b56e4e9b8d5b2539f5b6118b3855012f13208fb855340c5a7a14 MISC metadata.xml 531 BLAKE2B fbf3d1b3460773bd6cb8deaa7df7d1da8bd9597d8c1c1da2ea19fc8ced206f3424b4f10af6d019941a2a1e2974c53f21db1dc47a2062c6dae401e514051c58a8 SHA512 1a36bbd77bb5e526a42fe35382fef906d741fd51b0569c2255191222c4cf006e12767228ae0fdda9bf32f72cdb24cc1f250b6bd7e57aadb50a3bc09624a2e0c0 diff --git a/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild new file mode 100644 index 000000000000..488b1f76ddb7 --- /dev/null +++ b/media-video/x264-encoder/x264-encoder-0.0.20240513.ebuild @@ -0,0 +1,77 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +# Bump with media-libs/x264 + +inherit flag-o-matic toolchain-funcs + +DESCRIPTION="A free commandline encoder for X264/AVC streams" +HOMEPAGE="https://www.videolan.org/developers/x264.html" + +if [[ ${PV} == 9999 ]]; then + inherit git-r3 + EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git" +else + X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1" + SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2" + KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" + S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}" +fi + +LICENSE="GPL-2" +SLOT="0" +IUSE="avs custom-cflags ffmpeg ffmpegsource +interlaced mp4 +threads" +REQUIRED_USE="ffmpegsource? ( ffmpeg )" + +RDEPEND=" + ~media-libs/x264-${PV}[interlaced=,threads=] + ffmpeg? ( media-video/ffmpeg:= ) + ffmpegsource? ( media-libs/ffmpegsource ) + mp4? ( >=media-video/gpac-0.5.2:= ) +" +ASM_DEP=">=dev-lang/nasm-2.13" +DEPEND=" + ${RDEPEND} + amd64? ( ${ASM_DEP} ) + x86? ( ${ASM_DEP} ) +" +BDEPEND="virtual/pkgconfig" + +src_configure() { + tc-export CC + + if [[ ${ABI} == x86 || ${ABI} == amd64 ]]; then + export AS="nasm" + else + export AS="${CC}" + fi + + # let upstream pick the optimization level by default + use custom-cflags || filter-flags -O? + + ./configure \ + --prefix="${EPREFIX}"/usr \ + --libdir="${EPREFIX}"/usr/$(get_libdir) \ + --system-libx264 \ + --host="${CHOST}" \ + --disable-lsmash \ + $(usex avs "" "--disable-avs") \ + $(usex ffmpeg "" "--disable-lavf --disable-swscale") \ + $(usex ffmpegsource "" "--disable-ffms") \ + $(usex interlaced "" "--disable-interlaced") \ + $(usex mp4 "" "--disable-gpac") \ + $(usex threads "" "--disable-thread") || die + + # this is a nasty workaround for bug #376925 for x264 that also applies + # here, needed because as upstream doesn't like us fiddling with their CFLAGS + if use custom-cflags; then + local cflags + cflags="$(grep "^CFLAGS=" config.mak | sed 's/CFLAGS=//')" + cflags="${cflags//$(get-flag O)/}" + cflags="${cflags//-O? /$(get-flag O) }" + cflags="${cflags//-g /}" + sed -i "s:^CFLAGS=.*:CFLAGS=${cflags//:/\\:}:" config.mak + fi +} diff --git a/media-video/x264-encoder/x264-encoder-9999.ebuild b/media-video/x264-encoder/x264-encoder-9999.ebuild index f688e3cb2d4e..488b1f76ddb7 100644 --- a/media-video/x264-encoder/x264-encoder-9999.ebuild +++ b/media-video/x264-encoder/x264-encoder-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -14,7 +14,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 EGIT_REPO_URI="https://code.videolan.org/videolan/x264.git" else - X264_COMMIT="c196240409e4d7c01b47448d93b1f9683aaa7cf7" + X264_COMMIT="4613ac3c15fd75cebc4b9f65b7fb95e70a3acce1" SRC_URI="https://code.videolan.org/videolan/x264/-/archive/${X264_COMMIT}/x264-${X264_COMMIT}.tar.bz2 -> ${P/-encoder}.tar.bz2" KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86" S="${WORKDIR}/${PN/-encoder}-${X264_COMMIT}" diff --git a/media-video/xvid4conf/Manifest b/media-video/xvid4conf/Manifest index afe487c2afd6..b8d135a4edfd 100644 --- a/media-video/xvid4conf/Manifest +++ b/media-video/xvid4conf/Manifest @@ -1,3 +1,3 @@ DIST xvid4conf-1.12.tar.gz 133494 BLAKE2B cafe728bd85d2f34ba382d672d38b60378e632358ea7a03b9e3599c8a415517c6a84678a04383fbb2480e3ef35890a134c8fb6aa98eeeea8aac2fe9566282fc9 SHA512 277b081563b3e9ec2e3c78cf0ea7c504acf0585c0184ee359d0174be38c4c32b931360ce543193df3b323083d21a58d2ff94380647773c71eebed6928c857f57 -EBUILD xvid4conf-1.12.ebuild 429 BLAKE2B 70d5fa25d37f06ed47c9a552935beb46151593d6008ac39c7099ef604ce3039ff2b5831045165bdcf60687b689f9f5a0ec75478975ca72505e12487857b66fff SHA512 6a4fcb03f0458cf8894f5ce0f086bf6d3d7344cb4de99ca622376a5cd7ce46a086b2f3a5a480bc04f82561a28f6dde27272adbeca2d7f0e459e01e8e3c71eee2 +EBUILD xvid4conf-1.12.ebuild 423 BLAKE2B 963933a20993cd58bac1bf86244f244d9881231e1592db105b1d73d7edd6fa4931a72c6ed7c2f0f521ef707a386135607c6dfd361d538d0b881d48510960cc2b SHA512 0ed39d4587f780dbe74a19e93dadb3089bef10da6374d686f5c9dd36c58a9438846e0b7c91b804093d6e4179db54a57a2e2ac22b49e8b9aba1fb0a6fdb78c4d3 MISC metadata.xml 222 BLAKE2B 96fcf0d83a18e2c1f4611d550e7e2123a06fe8b3b2890cb5757284d8fc7d3bebdf1aeb4f82affbc7c51268749cac9fdcbf43888e3bec0e68e1b6548a3f6eca76 SHA512 c3657a6bf2503e6585ee53453bf0ba26b5eed2e894342087358b5f4306a960db915de61036b6c8dc57cdb7a7f3326d57ff3badf7b3ecefaa99291289a73997de diff --git a/media-video/xvid4conf/xvid4conf-1.12.ebuild b/media-video/xvid4conf/xvid4conf-1.12.ebuild index 1abd32b45fc1..9132080a0b58 100644 --- a/media-video/xvid4conf/xvid4conf-1.12.ebuild +++ b/media-video/xvid4conf/xvid4conf-1.12.ebuild @@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~hppa ~ia64 ppc ppc64 sparc x86" +KEYWORDS="~alpha amd64 ~hppa ppc ppc64 sparc x86" RDEPEND=">=x11-libs/gtk+-2.2.4:2" DEPEND="${RDEPEND}" diff --git a/media-video/yle-dl/Manifest b/media-video/yle-dl/Manifest index cfc37e65b4f8..e8ca1f2bd7fd 100644 --- a/media-video/yle-dl/Manifest +++ b/media-video/yle-dl/Manifest @@ -1,5 +1,3 @@ -DIST yle-dl-20240706.tar.gz 78964 BLAKE2B 5ed0a9ba391853566c3abbbd88d6fcce33c7f7e88183e89f3c272f6cae6c519ff272f648934e8fa58e0a7d59f87677189e14f1532cbadbbd6f73312810b4994e SHA512 c54a99bfa1ff71296e4ae40cb62408338942144e60f8df25fa8e7a9d53ff8d3c61e0b3c85e8404c716a18f54986e242b72dd4424c65ffe24f2ea4b128f7cf27a DIST yle-dl-20240806.tar.gz 79725 BLAKE2B c09d8ee7ca7f9db30433fb1cfa2ecf7ea2d791a56661341d059c917a498b9a60d7db277a4a186523eb841f0543d07d8caeb8c1adcf4804051e3196cbba4e2e4a SHA512 21b3cbddbdf058b75a5bb1afca0a2ca3573b99a18a85185458227d82f291028c4796e27f53a7a72b07cdd96ef1606ddac6dd467ebe8d1004ad4e9f4e0e62f17e -EBUILD yle-dl-20240706.ebuild 1645 BLAKE2B dfaf08491d68989ca75e38acb9affe10072e6a63ef1ff220223a9bf3cbf8c72bb0b21bb30cf7f93927d1cb81774f09c7501267f7f0f229eb331bb32268c575d3 SHA512 be707b7dc0923fe99fbe35de6f1fdec25697691b0e9ac280cc4eb0ec38283f57ad57e423209ef641ddb22df6e3d1d8b453d4acfbdce16bbed068c6ce03bf2fcc -EBUILD yle-dl-20240806.ebuild 1647 BLAKE2B fa3ce1ae091f519c758cbbbfd310417ebcbe1605b028f0a336ef6e2594efa686226e6268ed5ad31f17569953c1664fa474e932c6fe55743ce734de1935309f21 SHA512 a414c107619dbe1d7a779027441a841ae9c5689d3b0ed367a8c4b0ecf190ec3fe72caee8cabbd3fc0eef4427a53e482312c3608be106b9503bc743cc42ab978b +EBUILD yle-dl-20240806.ebuild 1645 BLAKE2B 2e8453168ce7ed9399880b4cd514c4ab58cde113eadc9d0999af157922c6d0f821f0d7e1fd9f4bac071411c76f158b783543546d16174a793298a75497b79a82 SHA512 57c7ff304c52eaf16b06d4b2e61a2fb426303798b623a3392a2c2e727f80b0fa9fb717073187d906efd50e4dfe80be953349c9d29e21a64e35a186fb00b4031d MISC metadata.xml 363 BLAKE2B b27761ed00c4849b5e9a0c51fdf699ab7e1589acc017be236339e8e5044fbe05ad62ad8c7104f6e9e43de0779ad6f9f3fe4144fc57376d87d0304f7c7c3fe7cf SHA512 1b061009279fcf8271bec4958ddb93d93e1455686e42d623a64ef51a65e4f852d23873c59d5e547bbf66d6c596f542fd29f78de5c7b33f484918b01beb76dc92 diff --git a/media-video/yle-dl/yle-dl-20240706.ebuild b/media-video/yle-dl/yle-dl-20240706.ebuild deleted file mode 100644 index d879b645e845..000000000000 --- a/media-video/yle-dl/yle-dl-20240706.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) -DISTUTILS_USE_PEP517=flit - -inherit distutils-r1 optfeature - -DESCRIPTION="Download media files from Yle Areena" -HOMEPAGE="https://aajanki.github.io/yle-dl/ https://github.com/aajanki/yle-dl" -SRC_URI="https://github.com/aajanki/yle-dl/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz" - -LICENSE="GPL-3+" -SLOT="0" -KEYWORDS="amd64 x86" - -IUSE="test" -REQUIRED_USE="${PYTHON_REQUIRED_USE}" - -# Requires an active internet connection during tests, -PROPERTIES="test_network" -RESTRICT="test" - -RDEPEND="media-video/ffmpeg - net-misc/wget - >=dev-python/attrs-18.1.0[${PYTHON_USEDEP}] - >=dev-python/ConfigArgParse-0.13.0[${PYTHON_USEDEP}] - dev-python/lxml[${PYTHON_USEDEP}] - dev-python/progress[${PYTHON_USEDEP}] - dev-python/requests[${PYTHON_USEDEP}]" -BDEPEND="test? ( - ${RDEPEND} - media-video/ffmpeg[gnutls] - dev-python/pip[${PYTHON_USEDEP}] - dev-python/pytest[${PYTHON_USEDEP}] - dev-python/wheel[${PYTHON_USEDEP}] - )" - -distutils_enable_tests pytest - -DOCS=( COPYING ChangeLog README.fi.md README.sv.md README.md yledl.conf.sample ) - -src_install() { - docompress -x "/usr/share/doc/${PF}/yledl.conf.sample" - distutils-r1_src_install -} - -pkg_postinst() { - elog "Sample configuration file has been installed to " - elog " /usr/share/doc/yle-dl-${PVR}/yledl.conf.sample" - elog - optfeature "automatically detect filesystems that require restricted character sets" dev-python/psutil - optfeature "store metadata as extended file attributes" dev-python/pyxattr - optfeature "youtube-dl download engine" net-misc/yt-dlp -} diff --git a/media-video/yle-dl/yle-dl-20240806.ebuild b/media-video/yle-dl/yle-dl-20240806.ebuild index d718c96adb4a..63252b50ca2d 100644 --- a/media-video/yle-dl/yle-dl-20240806.ebuild +++ b/media-video/yle-dl/yle-dl-20240806.ebuild @@ -14,7 +14,7 @@ SRC_URI="https://github.com/aajanki/yle-dl/archive/refs/tags/${PV}.tar.gz -> ${P LICENSE="GPL-3+" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="amd64 x86" IUSE="test" REQUIRED_USE="${PYTHON_REQUIRED_USE}" |