diff options
Diffstat (limited to 'media-video')
26 files changed, 613 insertions, 32 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex 241f04ea7468..00c3be2f4873 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/atomicparsley-wez/Manifest b/media-video/atomicparsley-wez/Manifest index 2369beec5a95..8f1fe5db8439 100644 --- a/media-video/atomicparsley-wez/Manifest +++ b/media-video/atomicparsley-wez/Manifest @@ -1,3 +1,3 @@ DIST atomicparsley-wez-0.9.6.tar.bz2 178956 BLAKE2B e7c9bc2f3b923194fef173b72b98e4654745e0811457a1e8cb29150ab265447c2bfa71b645869661f6fd92bb30a58f25ae3aa29b20255aa09ee63f3ab738b8c5 SHA512 1f094fd4d43f652319abd2eee70529d9a57e7843b4b725815b9939ad90cf56e3f061ffd9104507a7d74cabbdd9b7cb24ca12d30c88a89832629da3091bbcf1b6 -EBUILD atomicparsley-wez-0.9.6.ebuild 706 BLAKE2B 15164f7304863f7cd4e28d098aa79f900f3ee7dca0d298d85bd786fa10df2786e7e0dad0717beafda61b071e5037efcd75366f3ec1ae5cc7085545603b5dd3a8 SHA512 02e001d95d8ecbf656b28d2b5e0a998251a643adf7d28c6ba8e923007ccd806c71687354fa738bac83f726f84450f3de31427d93f5b95fd197e2e123f1cd5a18 +EBUILD atomicparsley-wez-0.9.6.ebuild 710 BLAKE2B 3ea5d79eedea3cc15f2bbafb23d2830d3a4e2dc8965c1cd88f9406c24bbe2d2193633e2e141bdb68b056650c712fe61b170f6c7b4e333f30f17496fd2d2ed2ef SHA512 3852772adc8f8c30b909498548ba9fe9414ef88d6600b4b1fb5995311e25498fca10d66e0cbe60b50756819bbb92446733041805e76e5c8a99167fadeb6f44aa MISC metadata.xml 366 BLAKE2B 3d4b050b8bbd4b17192df4b60b165faae307084a2dc081658c6dc22d5471cd19019c62453d13187035f62af73049bbaaad0cd17723080a3f69aac44bb24f0b31 SHA512 f684ca0c9a4172c43056c594829df51983662c6327e468bad4b20470d12d60f22cc73c35df06a97523908e6e6189366b74b521cc2c6493e85f5591c86a130690 diff --git a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild index 87fbafb2ae38..7f1cfc0f1f1d 100644 --- a/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild +++ b/media-video/atomicparsley-wez/atomicparsley-wez-0.9.6.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -13,7 +13,7 @@ SRC_URI="https://bitbucket.org/wez/${MY_PN}/get/${PV}.tar.bz2 -> ${P}.tar.bz2" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~riscv ~x86" IUSE="" RDEPEND="sys-libs/zlib diff --git a/media-video/atomicparsley/Manifest b/media-video/atomicparsley/Manifest index 2c481d17a181..bf6630623b1d 100644 --- a/media-video/atomicparsley/Manifest +++ b/media-video/atomicparsley/Manifest @@ -1,5 +1,5 @@ AUX atomicparsley-0.9.0-environment.patch 6195 BLAKE2B 86b8f11524c5f1011ea66fefc84ceb2559ce51824ef17c951640ba63c1fe59b3cc0b0f738754d0ad23ffa4cb395bf4bcae140d39f17a79a5b6b85d07a107271a SHA512 99e871d3ec76a4d6ff0c254241a9eca591786712ddce906d4f6df26a57142e28e489c4d289b4d24977cbbe2352d5e537532f82a561d57476cc63e07d2c7e2eb3 AUX atomicparsley-0.9.0-glibc-2.10.patch 1988 BLAKE2B 5f1304e85beed2697787511641a4043d989e532b3aaf0b61c9e50576a2276bae0d60757a35884bcb7dad8b322e9248d33d963d6223c8d51732366c38958ff5b3 SHA512 a139ec08b6918d1a879c97a294f6ec7cafe7c98eb81db977987ca274334347c7954a3f71d9facad72642654e79b3de742ea7ea2c5ec008b79ac89cfb6c936874 DIST AtomicParsley-source-0.9.0.zip 172616 BLAKE2B 6e2fa904cde622524ec51e3d084d89dd86c04db9942a27fae67b0d12db0542705d28e723c26db94d234f26c7249c6b8d4fd01a2bce891d2310a3a912667e1d84 SHA512 a4733893bb0d8bf824ee46d7da7f8c2ab9338ae56ea89810db1ac40282554e7e095b3e88631786b248a66aba878f166b9ac403769c66ef3ad45ac8ff7d411982 -EBUILD atomicparsley-0.9.0.ebuild 830 BLAKE2B ad1da9c3c599ca89de5f1fc4ebd4ea20fb658579e5bc94035ad55d670ee05df2c59e70135c26636077f5648dc4daadee08d6b02b254fcc54c8b305ed4b20635b SHA512 7c58729243aa0b4fc03810e76d6dbbd466c8f7302e4f931311fc8add9ba73893fe632ed37fdcc64e3b648c0c9d5d9a3000549da07b6f4ebee37768c5d216251d +EBUILD atomicparsley-0.9.0.ebuild 837 BLAKE2B 728dc681ca62e254a0fbd525d5ce0642226c85a9e478a554cd2ff7e78139e76ce5ab2e567198ea6e87b689eed84baaefb202fa4cb0f67de0da1ed2ac2139e2d6 SHA512 7459d82fd113b6c86f8eff3eac07815338719e24200e1dd4d8d12cf7f29d6259508710b3cd8a2967227eedac2dbf3767dd9852fec497195b4d4c62eb56daa3e0 MISC metadata.xml 307 BLAKE2B 3640f77bf82eb56de11af0ff0bbd29c7e4ea63b24c5aa1a53010b1fca6a85941c659fe069679b6d7fd11bce1b4a120a4e93e0b128f4c5bdd5e8574a5e8e67c99 SHA512 35d4d49d8c98be6ce817c5bff2a744fbbe3f996996946ad6f4aa0a0025ab3063bc028f397ac704cd01b449b8f652927a243b3c4418cdcc8c8ca7ee2d463fafe2 diff --git a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild index 3002e5401e2b..c60e09385f43 100644 --- a/media-video/atomicparsley/atomicparsley-0.9.0.ebuild +++ b/media-video/atomicparsley/atomicparsley-0.9.0.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2019 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -13,7 +13,7 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.zip" LICENSE="GPL-2" SLOT="0" -KEYWORDS="amd64 ppc ppc64 sparc x86" +KEYWORDS="amd64 ppc ppc64 ~riscv sparc x86" BDEPEND="app-arch/unzip" diff --git a/media-video/handbrake/Manifest b/media-video/handbrake/Manifest index dc39302994aa..8f728eca3ca1 100644 --- a/media-video/handbrake/Manifest +++ b/media-video/handbrake/Manifest @@ -3,6 +3,6 @@ AUX handbrake-1.3.3-x265-link.patch 277 BLAKE2B 6e5f7d5f59601ebf3c36116f595040d6 AUX handbrake-9999-remove-dvdnav-dup.patch 809 BLAKE2B 16cde838dcf59753e5438df0d2c2b81f45667058bd0687a7368c528f61bd2a2fedc4462894daad58c3acb5c51bdd53df3b30e28adba93a0fb2838416e4226217 SHA512 e2005155adf29e8253f4313d209b2ccc642fb1d7f63256d3bdf675ddd0e6b0e15bc6bffd98e19aa7dab3907e161e29c5268dc5656590ce9254b12a91ac3ff6b0 AUX handbrake-9999-remove-faac-dependency.patch 3697 BLAKE2B b0f7d0a1c4d464d3287ab233b756f5036d6ffa7e9e59a2f98a8ffb2ae59e46d25e56edb3e5bf9c04a16330f3dc50f4c2426f252b35834b7c9c9e6b4904244368 SHA512 9d070e50a9b7d4b8ac25b7d56bd341aca6dc979ba506c84f4b95109909f70020723915cd120bed24e84a8fc242ee3c3a5775f43a78b7995e53cd499444c9f6dc DIST handbrake-1.3.3.tar.bz2 16804119 BLAKE2B c081029e77911dc722764b0bef04e156694f8da0caaa6aedaae13d5c1045dccfc8292a466a8df323b471ca2a9de821b94740e9826fc9e7a2877b1d59653a728a SHA512 a4cca4e45d39eb3d43441abe832e2b8398694917981fa994075e475b68297cae28039e3c75d06442194262a881b9e416e5ebd73d10f86214b95f54c35fd3088c -EBUILD handbrake-1.3.3-r1.ebuild 4173 BLAKE2B 00f0f0214e52a1ec0cbb5a0aaeaf438d1a728f56b0c942fc3ba808b89793e16cc5c1db0a773b54821201b2b594aa1397bf6a8784793d8c6eb8e529303075cb04 SHA512 8dffe9fc3e05b210f3251cea43e720bc67d9edd9c0771886c3e83abf3d3a7f18a903c6923c3ef33d30a35f00f9f536e991e98575168acf45351eb1866c4ad499 -EBUILD handbrake-9999.ebuild 4175 BLAKE2B 7e9a8a9be4f0a3e1d33daeeecd62b40b2a4aadee12f3fe10b4a25af638a557912bb70490e641d37361a849583b0a2accac5ff453ed03e74b2e1a9d05e929814e SHA512 aab693480348d51909c134ded062bb4b7b4bfdcad985cce409c1b6916dc5898272755d53bd36f8abd8f803ad692229f8f0ba18b2208eaa2088e6f871fde3b603 +EBUILD handbrake-1.3.3-r2.ebuild 4175 BLAKE2B 3e70f8e7c14d51b807fecff2d165c49136114379744ab8050c29dfbbdd7ea3cca04bb144e0ede35821d065ae9f5a87777944c6a18e3777560ed3b63a48414a1d SHA512 f740e0f0d564a93810e1c870e8941ab162c5cb41b5b9848bc06563db067d341e677221536c6c3617db6a31dff0c5ad1fed76b148cef2565c4714dccac938212d +EBUILD handbrake-9999.ebuild 4177 BLAKE2B 25cb3cfc7d3ceb109bec0000e28c686774135de354e247c05c065c04da16902f7e7f9865aa857358b6c34dabbc0973081d4c89528c5d4a477182f7ea3692a675 SHA512 7f3d69592b79bfa420f60d692cc6c2e6ed17220fb782a93686ae0d84e3c95f953e3faddf85af2d4f7d204d4ced7d0f9a6c92127a59ddf09ef912a03d720bb82c MISC metadata.xml 966 BLAKE2B f6c02a468a505d238d9800831bf0bb74557d3c4975eb7708952bd30708edff587a32c6b50f53c2190327e9ad172de2c9aa85d38a2fadfc4c41676c10186fbb80 SHA512 1849d7132897355e89b0e8fcadaf6b1a5041d5df4a5433f964ac2a6a97ce1adde340e5304e6fc3e0f5b9fd345b827ea709323bcbfc30f9a3448fbd9dca0f10d2 diff --git a/media-video/handbrake/handbrake-1.3.3-r1.ebuild b/media-video/handbrake/handbrake-1.3.3-r2.ebuild index 2473cf819b8c..a0fb60145610 100644 --- a/media-video/handbrake/handbrake-1.3.3-r1.ebuild +++ b/media-video/handbrake/handbrake-1.3.3-r2.ebuild @@ -28,7 +28,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )" RDEPEND=" app-arch/xz-utils media-libs/speex - dev-libs/jansson + dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec media-libs/libass:= diff --git a/media-video/handbrake/handbrake-9999.ebuild b/media-video/handbrake/handbrake-9999.ebuild index d6c33bf60882..f90d1b9f1528 100644 --- a/media-video/handbrake/handbrake-9999.ebuild +++ b/media-video/handbrake/handbrake-9999.ebuild @@ -28,7 +28,7 @@ REQUIRED_USE="^^ ( fdk libav-aac )" RDEPEND=" app-arch/xz-utils media-libs/speex - dev-libs/jansson + dev-libs/jansson:= dev-libs/libxml2 media-libs/a52dec media-libs/libass:= diff --git a/media-video/lsdvd/Manifest b/media-video/lsdvd/Manifest index a24ec8334c25..7635c4b47714 100644 --- a/media-video/lsdvd/Manifest +++ b/media-video/lsdvd/Manifest @@ -1,4 +1,4 @@ -AUX lsdvd-0.17-autotools.patch 538 BLAKE2B cd5967fe1ae36d355db2a2b8f35a9a28d69f852729b8fc62425c7e71676f253ba3e6d47a4c9cd181bd45258b550e6c457b1d9baff125ae3d5f66a7c206330d44 SHA512 7fc4b172d8ca75019165758b2bad030e6a5ffc28cf542e1f0d9025078029578cb96b6ba5f1a6bd877f315baef74aa302dae78352636b03592e5a1343da5680b0 +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 612 BLAKE2B 817ea630f91a2546cf8e53e014062c4df7dbc087885002704699fda654cae8ce832afa190c4660ac99b8da1718baa27d611a3261bf6281ab4f7610e6f40641e4 SHA512 7a154ac1eeaf585fac025d5d3ae8a529c2768084e7c56b2e799deb0b7433f0c895dcd5f1fae012aaf9e17c2f5ee6027966f6b5afec6072f25b3c8002a0b30c23 +EBUILD lsdvd-0.17.ebuild 586 BLAKE2B e1112386508736a3c35d055bd25ff739810e2d34e064f4f15d1f91a8940be3d412d7d4fc7d78da1688b7d31dfcbc0ea6209e782b0ac89d3fdb7271e5b7ea9ffa SHA512 17ffc29a6e7a13da7f26946cccb37692e87dec0805194cdd4d295f0f356019fbaba6e01c043e0f4827233c7715be439a5d743bde711c7a6f0897e7d1de289ace MISC metadata.xml 299 BLAKE2B 14baa9779438a685ba4c67b40becb5ecb849fc0605aa1cc60664f59af85776868f5bb4ad2c416b9f163344c07a5c2099ab3b5ef3e9b45200ab71b6ad1ddddac0 SHA512 e145df76dd8df4a6d68ee786b05055ed02632d76f36c818ecb376d50ec5397218fb004cf8d8da1ac0c23c5d8e14b5afaea4049f9723b466d3216504764d3cae7 diff --git a/media-video/lsdvd/files/lsdvd-0.17-autotools.patch b/media-video/lsdvd/files/lsdvd-0.17-autotools.patch index c2f7e9456ed9..33a954f001c7 100644 --- a/media-video/lsdvd/files/lsdvd-0.17-autotools.patch +++ b/media-video/lsdvd/files/lsdvd-0.17-autotools.patch @@ -1,5 +1,5 @@ ---- configure.ac.orig 2014-10-04 00:36:04.484376722 -0600 -+++ configure.ac 2014-10-04 00:36:25.080207028 -0600 +--- a/configure.ac ++++ b/configure.ac @@ -1,9 +1,6 @@ AC_INIT([lsdvd], [0.17]) AM_INIT_AUTOMAKE([foreign]) @@ -9,4 +9,4 @@ -fi AC_SYS_LARGEFILE PKG_CHECK_MODULES([DVDREAD], [dvdread >= 4.1.3]) - AC_ARG_ENABLE([debug],
\ No newline at end of file + AC_ARG_ENABLE([debug], diff --git a/media-video/lsdvd/lsdvd-0.17.ebuild b/media-video/lsdvd/lsdvd-0.17.ebuild index fda1e95f98df..b4b39ff9fa7d 100644 --- a/media-video/lsdvd/lsdvd-0.17.ebuild +++ b/media-video/lsdvd/lsdvd-0.17.ebuild @@ -1,24 +1,28 @@ # Copyright 2003-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=5 -inherit autotools epatch +EAPI=8 + +inherit autotools DESCRIPTION="Utility for getting info out of DVDs" HOMEPAGE="https://sourceforge.net/projects/lsdvd/" -SRC_URI="mirror://sourceforge/lsdvd/${P}.tar.gz" +SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz" LICENSE="GPL-2" SLOT="0" -KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" -IUSE="" +KEYWORDS="~alpha amd64 ~ia64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos" RDEPEND="media-libs/libdvdread:0=" DEPEND="${RDEPEND}" -DOCS="AUTHORS README ChangeLog" + +PATCHES=( + "${FILESDIR}"/${PN}-0.17-autotools.patch +) + +DOCS=(AUTHORS README ChangeLog) src_prepare() { - rm "${S}/aclocal.m4" "${S}/Makefile.in" - epatch "${FILESDIR}"/${P}-autotools.patch + default eautoreconf } diff --git a/media-video/mjpegtools/Manifest b/media-video/mjpegtools/Manifest index fd6e124ec8e2..885ccaf9dfaf 100644 --- a/media-video/mjpegtools/Manifest +++ b/media-video/mjpegtools/Manifest @@ -1,3 +1,5 @@ DIST mjpegtools-2.2.0.tar.bz2 1542088 BLAKE2B 61736ea0782ef098110370ab75feac2d344709a849326acc366cc1dedfabe0aaec797292f09de9d0da8a2ce94506dc2c8749212b49f99ffa8775f347eae94b46 SHA512 d645c0004bf20cab67d2e09cde709f05e32ab755b773c93f75ab65bf6d4ab23d80addf3f8b98e1ce59cc05efc0776b11ca0c71568acb81fab6a0f15e60bce71f +DIST mjpegtools-2.2.1.tar.gz 2326425 BLAKE2B a6f2698dda6b7c92a1a786f39bfb1989587b2c35a1f94e435247f04a01f405808d464470fddf1eddaee73df75daaef460bd62e901b89b2b2e0b095332492b20b SHA512 4d7f4dcf56a0e6079025bf0221ee632d91c4cc635a8c7eb9ddf3f7b86ad7250415c6dc4fd4113081920bc9c8fdc2552b8a3aaf896bf5a778acfacb15c7ded830 EBUILD mjpegtools-2.2.0-r1.ebuild 2679 BLAKE2B 5f67591a0b27b85095b1522d1de4efe1373f1ba67a552cab271d5a933c7da6d5e42f3f53ab8daaf9a84c522ac71bc1cddf13869ffce7fe4b7a2f14adee1decea SHA512 58a9ae7d7a37ccfce311668a532b98aa0c28fc86b05cc41369f5f983e74413f3feaa360af57ff20ad62ed4f94f76f2cdaf7b6cf2dae95b0e28c3024df73ec609 +EBUILD mjpegtools-2.2.1.ebuild 2683 BLAKE2B 96dd3dad40d964f0a9951ea9ac88a22f818de2fb67c4fdf869196eb04327cccab6d00a0f9cb361d244fcaa5e207d71727886c763149348be214135c79b7f1380 SHA512 c318d9c10e1a9b2822e40be8d1f9631b982dcc720e93ad6c46a4ee33c444272287d94a9838f8659a22a6fdf3dfafdd78d6ae30f5447fe0b1df7c6a7c6e6d1b06 MISC metadata.xml 538 BLAKE2B 420dc5b1516f83aed28539d6c9cb3964135bd67d9a8c334eb5ad72bc95156fe3795ca8098cebc46e7a263e3a84cdb8bfe1a393b7f9a9f47eeaf24527748723a9 SHA512 c53c44b7a0bdea16c3c56d11edde87edea9849ffb37b2eba21701ad5791f1348d61d7216457efa0964c1503d89e2d86c4616d1fda240129f98ab2b68ec5e6926 diff --git a/media-video/mjpegtools/mjpegtools-2.2.1.ebuild b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild new file mode 100644 index 000000000000..54975b16164c --- /dev/null +++ b/media-video/mjpegtools/mjpegtools-2.2.1.ebuild @@ -0,0 +1,112 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools flag-o-matic multilib-minimal toolchain-funcs + +DESCRIPTION="Tools for MJPEG video" +HOMEPAGE="http://mjpeg.sourceforge.net/" +SRC_URI="mirror://sourceforge/mjpeg/${P}.tar.gz" + +LICENSE="GPL-2" +# Compare with version in SONAME on major bumps (e.g. 2.1 -> 2.2) +SLOT="1/2.2" +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86" +IUSE="cpu_flags_x86_mmx dv gtk png quicktime sdl sdlgfx static-libs" +REQUIRED_USE="sdlgfx? ( sdl )" + +BDEPEND=" + virtual/pkgconfig +" +RDEPEND=" + virtual/jpeg:0=[${MULTILIB_USEDEP}] + dv? ( >=media-libs/libdv-1.0.0-r3[${MULTILIB_USEDEP}] ) + gtk? ( x11-libs/gtk+:2 ) + png? ( media-libs/libpng:0= ) + quicktime? ( >=media-libs/libquicktime-1.2.4-r1[${MULTILIB_USEDEP}] ) + sdl? ( + >=media-libs/libsdl-1.2.15-r4[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + sdlgfx? ( media-libs/sdl-gfx ) + ) +" +DEPEND=" + ${RDEPEND} + >=sys-apps/sed-4 + virtual/awk + cpu_flags_x86_mmx? ( dev-lang/nasm ) +" + +src_prepare() { + default + + eautoreconf + sed -i -e '/ARCHFLAGS=/s:=.*:=:' configure +} + +multilib_src_configure() { + [[ $(gcc-major-version) -eq 3 ]] && append-flags -mno-sse2 + + local myconf=( + --enable-compile-warnings + $(use_enable cpu_flags_x86_mmx simd-accel) + $(use_enable static-libs static) + --enable-largefile + + $(use_with quicktime libquicktime) + $(use_with dv libdv) + $(use_with sdl libsdl) + --without-v4l + $(use_with sdl x) + + # used by tools only + $(multilib_native_use_with gtk) + $(multilib_native_use_with png libpng) + $(multilib_native_use_with sdlgfx) + ) + + ECONF_SOURCE=${S} \ + econf "${myconf[@]}" +} + +multilib_src_compile() { + if multilib_is_native_abi; then + default + else + # avoid building programs + emake bin_PROGRAMS= + fi +} + +multilib_src_test() { + # there are no tests at the moment, so it would just build + # all programs in non-native ABIs... + multilib_is_native_abi && default +} + +multilib_src_install() { + if multilib_is_native_abi; then + default + else + emake DESTDIR="${D}" install \ + bin_PROGRAMS= + fi +} + +multilib_src_install_all() { + einstalldocs + dodoc mjpeg_howto.txt PLANS HINTS docs/FAQ.txt + + find "${D}" -name '*.la' -delete || die +} + +pkg_postinst() { + if [[ -z "${REPLACING_VERSIONS}" ]]; then + elog "mjpegtools installs user contributed scripts which require additional" + elog "dependencies not pulled in by the installation." + elog "These have to be installed manually." + elog "Currently known extra dpendencies are: ffmpeg, mencoder from mplayer," + elog "parts of transcode, mpeg2dec from libmpeg2, sox, toolame, vcdimager, python." + fi +} diff --git a/media-video/obs-studio/Manifest b/media-video/obs-studio/Manifest index 85e9bfe77559..eacbf5fff0ce 100644 --- a/media-video/obs-studio/Manifest +++ b/media-video/obs-studio/Manifest @@ -4,7 +4,7 @@ DIST cef_binary_4280_linux64.tar.bz2 79740715 BLAKE2B c648a9a4205094450f9eae407e DIST obs-browser-f1a61c5a2579e5673765c31a47c2053d4b502d4b.tar.gz 79259 BLAKE2B 28cfa46928de0b5e626b384673f7b92b3a48cb631066dda06288c51df78f06b913707a1295a5142d4521505b0678a6c639bfbb5b8a066d585fa12849578a382e SHA512 3ecab39bfb36774ac501de087ca70ecde12f408cfd54cdf12539a92e89d0cf531767a066ff77139389158c46beee423cf1848081ed187890b86241aa96f7b179 DIST obs-studio-26.1.2.tar.gz 16624899 BLAKE2B 655a6c71d3a0ae6ae1fc2d166a148002bb17d6eaec06d5633a10fdbfe7f42e073526ede83cd36ad21c440debe870b41b43724caa00633733f1e196d918304adc SHA512 cd95fbf587f7edfe415cae75299d65c1d771bb118649fb839ae43d77145d87725c23df3360aa7b8c35ab8b62e5ec7983a8b02f8b102caa78f768eb58b4263417 DIST obs-studio-27.0.1.tar.gz 15787807 BLAKE2B c2ea571f06a81b2e87ce5d9fd010610ea6cc2753223e6373025f0389972d4638a5f3ff1802f9f0af2c631d71ebcf4603e064da804e8c89eb032b1ad5743d1bd4 SHA512 c15dda62c1f212f623914e61a90c6b1e035720fb84d64726c14f43d77ae7569777a23d04221db34347ce610e7c3407c29e726ae36412e98e34ea2ddb2072b7f3 -EBUILD obs-studio-26.1.2-r1.ebuild 4006 BLAKE2B f7bbf701f886efa63171ea25bcc8303c54fa60bea7ad72b7160d625193aa929ccfd4a4a5adb91628025b6a5240441ee52c79a01757b22a41cf933994978789f8 SHA512 0ce7a598bf46398e054981a71a7a6e904a0f45078d2014c8c43b85b164d9c812f4a60b75f57343ea89709c73cf60cdc83f751aedd34dbc71b9bff035197c0c1b -EBUILD obs-studio-27.0.1.ebuild 5399 BLAKE2B 0152786b6afc434d43fd4ddb4e1759457eb0dfcd82df0c0eca94419d28cc74ca24117f011c28b454b0ac7c56389042a1e09aaf65646b9a7bb67c95dd88b07a04 SHA512 00e97f618485ccad4af4aea7850e132116eb72c8f0456e5b4b8ddd8cf9510fa0fe50b1044c28ad4c3b7edca3592f46617438f91935fe2a5f28104e746c90adea -EBUILD obs-studio-9999.ebuild 5399 BLAKE2B 0152786b6afc434d43fd4ddb4e1759457eb0dfcd82df0c0eca94419d28cc74ca24117f011c28b454b0ac7c56389042a1e09aaf65646b9a7bb67c95dd88b07a04 SHA512 00e97f618485ccad4af4aea7850e132116eb72c8f0456e5b4b8ddd8cf9510fa0fe50b1044c28ad4c3b7edca3592f46617438f91935fe2a5f28104e746c90adea +EBUILD obs-studio-26.1.2-r2.ebuild 4008 BLAKE2B f4dff57e5e7edf5c6b5a7512cdaab44c764704ae4f9faa2023258d53c1f7f80246c8625b18b7148df37a457c84a9d3e70b9f0d2005a22de0911e5dd7010bfb8f SHA512 08a92ab707e07d73a89cb2227f9bec4790fdc2d62d7e7f8c5cc35a2375ba1269906b90a00f08b70b1737705fd4c7bd619a3ead879fef3d91fda1b605f604d26e +EBUILD obs-studio-27.0.1-r1.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34 +EBUILD obs-studio-9999.ebuild 5401 BLAKE2B 33a0bde9d9e7ca353f7b14ace507eefaca53dc9ba52ee079c02032789dc851060386d114a5d9f0d5936e6f8bce8d7c535e99ad10a5b2778bbdff0aa6ee41a2a9 SHA512 e95c75cb4c6f08794a12501941660b7a8a2f75bcb4e26315101c67d5e34bdd66b62213f707f176a146531cb314ed9931603df0c3c60f6c52076a8dc4e6e7de34 MISC metadata.xml 1581 BLAKE2B d05f9c5d2df5f8c866391d442b464d861d0fcf969dd2509e61b0c6de37fd297a9c89d4610642f87ad12e1fec5b13c401cd7121b2edbfc75e070ddea2c6e5ad86 SHA512 809d3758b41687a9e107cc3f14e7592cba52a74833c6f49581e7c20abb77bb88ff23ee8bb923ee0fee5c090408ceb4aa9799b51a477c2e6feb50ce38eb373a19 diff --git a/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild b/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild index 3e12ab881f7e..0ff7ff59c0e0 100644 --- a/media-video/obs-studio/obs-studio-26.1.2-r1.ebuild +++ b/media-video/obs-studio/obs-studio-26.1.2-r2.ebuild @@ -34,7 +34,7 @@ BDEPEND=" python? ( dev-lang/swig ) " DEPEND=" - >=dev-libs/jansson-2.5 + >=dev-libs/jansson-2.5:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 diff --git a/media-video/obs-studio/obs-studio-27.0.1.ebuild b/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild index 56839893506e..4c9f4cd3f3a8 100644 --- a/media-video/obs-studio/obs-studio-27.0.1.ebuild +++ b/media-video/obs-studio/obs-studio-27.0.1-r1.ebuild @@ -43,7 +43,7 @@ BDEPEND=" python? ( dev-lang/swig ) " DEPEND=" - dev-libs/jansson + dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] diff --git a/media-video/obs-studio/obs-studio-9999.ebuild b/media-video/obs-studio/obs-studio-9999.ebuild index 56839893506e..4c9f4cd3f3a8 100644 --- a/media-video/obs-studio/obs-studio-9999.ebuild +++ b/media-video/obs-studio/obs-studio-9999.ebuild @@ -43,7 +43,7 @@ BDEPEND=" python? ( dev-lang/swig ) " DEPEND=" - dev-libs/jansson + dev-libs/jansson:= dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5[wayland?] diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest index 3cc4fd8f8c28..3ea27ed4f2ad 100644 --- a/media-video/pipewire/Manifest +++ b/media-video/pipewire/Manifest @@ -9,6 +9,9 @@ AUX pipewire-0.3.36-fix-crash-uaf-media-session.patch 1295 BLAKE2B 7c32a70c48e2c AUX pipewire-0.3.36-fix-version.patch 716 BLAKE2B c447bd11291f809b7607f4094f2d5e3497996a3834e5d5d468dcc63f0e36c117a31158634c08b8acc724f0ce5b599594b05f79ef3e3128ac28843cc08df03fed SHA512 74c757edf20c911df9299b4322486a34746eec8c4aa212441082f954cebe7c7d9c836a757dd134d71b3c31a97abe1494c13dc470495846ffaf52f943ec397532 AUX pipewire-0.3.36-missing-limits-include.patch 452 BLAKE2B b498e4ec11ab3d5bc4cebdd0975802b68594678aa928dc85b5a7031276af9ec12edb1423714e3e96c7d658e574c679efa9c18afbee1b47b15f3ce582bc021fff SHA512 decd44a59152e4fdc64b79c2e330a09ca9b8f776e72ef7a0150dfe43d9c25f4e501d41c86a445a979137c412dc85e1ffa38fed91f976596500d2a28010d78407 AUX pipewire-0.3.36-non-systemd-integration.patch 911 BLAKE2B 6c6df1080821cefa1786da4db762a78011672226836525413d10fed3a18d43457277b6b868dfe0ee8e189143f76c971dd9c53809794864bcc642c804bf962ab8 SHA512 08b4998a3129f824c68310d2fc87245311e1d4b85a09a57f1d9bab76f990aa5d95686f22f3835a1072b7e6c0b6eb0246cc9c81884588f0146d26f9c215d9c565 +AUX pipewire-0.3.38-find-readline.patch 1546 BLAKE2B c8d6a8d53e8f71792c5055dabb0a66d8a2b93641e4ade45542fbcb3269ebabb3319c1225f63433cccf8000f4585607383a903045112e9bd204f95bed4e92546e SHA512 c09d604e09552c1dca29b9709c8571a9bc1393fa885e249d8e71403a5669ef732d0e14b9a7c9f315a55b03c2dd2022bfa9f71f4430ae7f93a8d01b686f6bf246 +AUX pipewire-0.3.38-fix-arm-build.patch 550 BLAKE2B c5c178160841494ffcbf5285939a8d2f5c4ac09ba9fd448b3c77446dc523a07d8ed090f08fec1029357c5cb67ea696f57aa3c22de1df5aa01d789c5c96cfdab5 SHA512 e35d35905da4f35b1db5c1e8a8dada24e83320dc38c4353f7c7dc4cc442c9a73aed02b4df99d66983683f36a004f85bdba9a287ff9e0e8ce71624e1703fced7b +AUX pipewire-0.3.38-libcamera-null-deref.patch 2031 BLAKE2B a1bc641385bd762da8e0e523d48438eb703230a6c05b5064f49584dea990c5aae449ddd9e8fe29dacb35b41dc70f50c4ab2086b3ce6e3a139ca5b5b14754da1a SHA512 5e19f04613de8a85cf70d75a5c1816ba61c789dc35905428b6f0787f63feb41ffe8cef09b1528e608affb6a27cddc7530dfe4f00a7ca3f45fba9740d4093abf0 AUX pipewire-launcher.sh 149 BLAKE2B 42a9fd174e8216f9941ec72bc50581d539453dd0430ac61712582039f1cfe17cafa050bd87fcb90b9c16ffd891fd9f9c5dfec99b2be8c66eaed0128af180508e SHA512 7f50287565fa44e2296a7b294e8fd3dd64938d2de15c6ff5674d85a6e7bbccbc334c0fb9e28321104aff5335894b3c5a21171f385465e37b422ef53988dbfe4b AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344 DIST pipewire-0.3.30.tar.gz 1540950 BLAKE2B 69b35743e3ad9a8caf68d9bb16cf395203efed6c3046b3f4ea33bbcdd6649f5d425d813042c12396a7cd5ff4e8ed91dbc395a96fe55935ad50f9c3f3918b0407 SHA512 ec525e0fb7e5c5313245fcc745b971fd7d4a1caa7ab9fe1fa38dc20d50f03e5969197e86b60659971676bec0f79aa7b7951c8209bfe9565a3fd1dcac1b8535b3 @@ -18,12 +21,14 @@ DIST pipewire-0.3.34.tar.gz 1682396 BLAKE2B 1a3524a833bde6facf637071f905bb0237f3 DIST pipewire-0.3.35.tar.gz 1704419 BLAKE2B 5c0debd19b29a9488be26125794f04e57e8b3cd3842654cb935decae18ffefc4137927d969448f60f1c1c2985d54db139fc3dcf07e36e81014021d63490096d8 SHA512 08a2e305fe4e9d3c3f4533c163b725dd32d26513e51a9f476bd18d6157ebf67e97e48b8df9595d45c81599f416e6b3f76e90df575dd460a8d26fe951db30e0f6 DIST pipewire-0.3.36.tar.gz 1708209 BLAKE2B 20fce0d7f88347fe594491d4fae7b6a8edee67ff7749f1a40b807a5d5094d792e61e3efd05dca2221f781c263e34ff0a50ad3c162231911d4b1d87704df6c775 SHA512 f0fc68ea005018b420a4f65a24dc9c85eb6263c24e66852a7ce2b03f966990d62487b388c7d73ff5adfc10c80c439b1200ae876e41d78f91db190036a1799a14 DIST pipewire-0.3.37.tar.gz 1716320 BLAKE2B ce98b28015de69a0c91953a4839d5f86a29cfa19e2058ba0a2476a75a03b782ae67239b418306e4ed7dab81fe7e77928a417b966ff3c72ac552006cea66e3218 SHA512 3f4cf1ac66117a56a7a264262e2e238a54060457da6a986bd9227f51cc7e8d1a8fd282aef8462c096819282c5baec22779d2025c2e1918bbfb3d6ff75829aea6 +DIST pipewire-0.3.38.tar.gz 1727371 BLAKE2B dac7f3e1992b9690195df1dbc04575d386d21d06d1727b004b851e300709b3707806b7b20d36c1e74225d91a2df5428c913376903b286592f87083857347e53e SHA512 c3c6c822bf4e5e77fed8d6ef09059d3e43195957692ab7baddc349af3d759d892a9af0e7802d389e2a9a15e5fece4c08ec963ac42df931233eec6057bad67eb6 EBUILD pipewire-0.3.30-r2.ebuild 9675 BLAKE2B df43c7f1ef0622d96741266e53dc343d9697903571c723c73f5267a8083539fde110ea8f6420f2c86e296d275ab45e4b9abacbd6f0310825a6121336cf11215b SHA512 47cdcbd48311cee24b45c05b3283c4bbe1231c44f6d55136966f887aa43ad69b789bf642e003b17aa6f1a3b59963e68047e4f8c396431cb05f6dd4d3161f8c14 EBUILD pipewire-0.3.32.ebuild 9601 BLAKE2B 4c01a9a3f04b8ec73583b0a6329fd728d025366cec1cc8bb5ad00d700643fcf1a2b0970f625e57cf847df533699a4e2ab7833429663842b37a9790d0071b55d5 SHA512 650385d711644a743144659a6f5642bd5ec73c93a5992354d87c4b6942967e7eccd251be481ccd79b44295aef52411608ac8c4d75c3ecd45087d23d42acfec4d EBUILD pipewire-0.3.33-r1.ebuild 9797 BLAKE2B ef2472ea8e6e06d286a72b00cc77fa04dbf6ffef5cf93cb1db75fca910114bf09442a72fe06709ab40f54f36206de47ff2b068381bb8d82c1e8077c79a7f683c SHA512 f2fcd471370696005008ec8614493cab105e08faf07f13effc76866c7f022f474a9e255c184069d5a371507713b1ca1e967ef0d254ea8e314dec3a105c13ec6e EBUILD pipewire-0.3.34.ebuild 9816 BLAKE2B 067c01652c0dbb7981606af3818735c37772ad4c2852761ccba4f94c1983246699b6445351458faed259024454052f69ca2ea03e5ad9b47581900ce32f458a0d SHA512 1b7ee3e5ebf11b27bf6c276d83dccc8c3b0fc013e9b75f82ffdedf70e712e9de1bd268b06e8c7cbeed4a71bd0ab5ec249055c817e17c655a011666e35bf62801 EBUILD pipewire-0.3.35.ebuild 9979 BLAKE2B 12d3135ef817c2266c911dd3182f9f876acee795038b77b7674d41521dd603fa7c8d874887cf841d4dcbb0376a4d0fcbd36f9e03245a9e359810338f69303b58 SHA512 5c3c314dca12e15736c4a16fd28799c3c982a5bca9bddc0ba0033727696aa685d4d52d2d7c5fe25e23e95c0930d11420845fc531b3388de7a33a9ee0a8d25587 -EBUILD pipewire-0.3.36.ebuild 10268 BLAKE2B a471b8d685b05244db999f568d7cb1d434f21273219357e0257f1234754e9752d9d8c1f3eade8a7e12e0a4edcc3de635e6f83abb7b03252dd82bee42a3436661 SHA512 e0531808150431e59560d40c9fc4fb34af096f7182439662e32913396d906356de13b6b487ca6c9aeb1ea9e04ae274d3c8495710a631776f341d7741cc441a64 +EBUILD pipewire-0.3.36.ebuild 10265 BLAKE2B 2f8126a2b17057613566895fea3d83fdb72fb305cd838144145aac61fb83dee6e6b49cba0a5745d2ae7451aedbcd9c72b67a716220a82858215bb549c9f3b7aa SHA512 378cdac981be1f8d55e5aafc7e869ef7ab49619784c4f91065aa94368fc5338b7cb4dc602c83ea0ae543aa29b39c616e96df37cc985f9d26dfeb3f1ea334d91e EBUILD pipewire-0.3.37.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61 -EBUILD pipewire-9999.ebuild 10105 BLAKE2B 3c2d5450d5ffdd1be84b55e9fa06305f6b94566761045f13b978aac9fcc721badf46c5cbac97c5ceffef69d68bb02e5ea3986fc448e2b15ac5a5c5e03ea99c8c SHA512 5dd64416f24b099bf465b630e9116e1c756b0372ae0035ee4b7a7ca6d9fe88b3c9d9ce507251dcc8ae91a4aa0ad9fb9fd95c84275146052c1b05149e0c0f2b61 +EBUILD pipewire-0.3.38.ebuild 10331 BLAKE2B b4d2175802683b15af627551c6f7911c1a79979d8544987b3be4bbdd910621b7847667050d5605798e2cf17d1bbb130083ec0a9f3421ed167d18ca9abd84cf20 SHA512 21caf157edf054945b92b0ac7a402bb7e51c8bb03e740bac33fb2f392cb5ee76d276f3d88f3e9cbcd9108f535b6017f657889ca0a37f0c992e053124ffc62698 +EBUILD pipewire-9999.ebuild 10126 BLAKE2B 26b722b3d6b6b603e9b73fc0272bd75b9e99fbb39c314e2cd8f864147cebe20b777d26d3ac922eef43addfdf94c1faf785279f0f6540b7b38fd6ef7f8c76e9cc SHA512 cd811868b41e04bf2c65884839910010d0641bea72f4afd3d2df9f23dd4a0a87d863f3481955dc1bde2db86893cbc08d4ddbe478f68e65a5aef2171ef4429dad MISC metadata.xml 1182 BLAKE2B 1f8a03e4957ec550bbdc24352ff138ae42b7aaffd876cef6578b4e7247f91fe1eb6d0c6b47bac01c3b477a7efbd1d89bdeb32c5a1411e7d749c45d5e5c3c70bd SHA512 d38b464b77040206ee7e45fb4f18f01c29db0f5bce087fc8caefa1728d3680c1bc299d7197e3ff7a46e0e08f219ac4b0893c1815d564517365c8996cac5e49bf diff --git a/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch new file mode 100644 index 000000000000..6b56304f5d17 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.38-find-readline.patch @@ -0,0 +1,36 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/ddfbd684e78e2b8b9ad40bedb4612ea0197d231a.patch + +From: Joshua Strobl <joshua@streambits.io> +Date: Thu, 30 Sep 2021 23:11:50 +0300 +Subject: [PATCH] Fix readline detection by allowing fallback to cc + find_library + +--- a/meson.build ++++ b/meson.build +@@ -326,6 +326,11 @@ dbus_dep = dependency('dbus-1') + sdl_dep = dependency('sdl2', required : get_option('sdl2')) + summary({'SDL 2': sdl_dep.found()}, bool_yn: true, section: 'Misc dependencies') + readline_dep = dependency('readline', required : false) ++ ++if not readline_dep.found() ++ readline_dep = cc.find_library('readline', required: false) ++endif ++ + summary({'readline (for pw-cli)': readline_dep.found()}, bool_yn: true, section: 'Misc dependencies') + ncurses_dep = dependency('ncursesw', required : false) + sndfile_dep = dependency('sndfile', version : '>= 1.0.20', required : get_option('sndfile')) +@@ -406,7 +411,12 @@ libinotify_dep = (build_machine.system() == 'freebsd' + : dependency('', required: false)) + + # On FreeBSD, libintl library is required for gettext +-libintl_dep = cc.find_library('intl', required: false) ++libintl_dep = dependency('intl', required: false) ++ ++if not libintl_dep.found() ++ libintl_dep = cc.find_library('intl', required: false) ++endif ++summary({'intl support': libintl_dep.found()}, bool_yn: true) + + need_alsa = get_option('pipewire-alsa').enabled() or get_option('session-managers').contains('media-session') + alsa_dep = dependency('alsa', version : '>=1.1.7', required: need_alsa) +GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch new file mode 100644 index 000000000000..222aa58cce13 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.38-fix-arm-build.patch @@ -0,0 +1,18 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f8817b439433798bd7217dc4ae72197887b0fc96.patch + +From: Wim Taymans <wtaymans@redhat.com> +Date: Thu, 30 Sep 2021 11:12:27 +0200 +Subject: [PATCH] cpu: fix compilation on ARM + +--- a/spa/plugins/support/cpu-arm.c ++++ b/spa/plugins/support/cpu-arm.c +@@ -80,7 +80,7 @@ arm_init(struct impl *impl) + int arch; + + if (!(cpuinfo = get_cpuinfo())) { +- spa_log_warn(impl->log, NAME " %p: Can't read cpuinfo", impl); ++ spa_log_warn(impl->log, "%p: Can't read cpuinfo", impl); + return 1; + } + +GitLab diff --git a/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch b/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch new file mode 100644 index 000000000000..beabd1a30291 --- /dev/null +++ b/media-video/pipewire/files/pipewire-0.3.38-libcamera-null-deref.patch @@ -0,0 +1,70 @@ +https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/d71a10b7fa9b5c560485b6bbde409c10d3fdd114.patch + +From: Wim Taymans <wtaymans@redhat.com> +Date: Thu, 30 Sep 2021 12:54:29 +0200 +Subject: [PATCH] libcamera: handle failure gracefully + +Don't try to access NULL pointers +--- a/spa/plugins/libcamera/libcamera-client.c ++++ b/spa/plugins/libcamera/libcamera-client.c +@@ -210,10 +210,10 @@ impl_init(const struct spa_handle_factory *factory, + SPA_DEVICE_CHANGE_MASK_PROPS; + this->info.flags = 0; + +- if(this->dev.camera == NULL) { ++ if(this->dev.camera == NULL) + this->dev.camera = (LibCamera*)newLibCamera(); ++ if(this->dev.camera != NULL) + libcamera_set_log(this->dev.camera, this->dev.log); +- } + + return 0; + } +--- a/spa/plugins/libcamera/libcamera-source.c ++++ b/spa/plugins/libcamera/libcamera-source.c +@@ -994,10 +994,10 @@ impl_init(const struct spa_handle_factory *factory, + port->dev.log = this->log; + port->dev.fd = -1; + +- if(port->dev.camera == NULL) { ++ if(port->dev.camera == NULL) + port->dev.camera = (LibCamera*)newLibCamera(); ++ if(port->dev.camera != NULL) + libcamera_set_log(port->dev.camera, port->dev.log); +- } + + if (info && (str = spa_dict_lookup(info, SPA_KEY_API_LIBCAMERA_PATH))) { + strncpy(this->props.device, str, 63); +--- a/spa/plugins/libcamera/libcamera_wrapper.cpp ++++ b/spa/plugins/libcamera/libcamera_wrapper.cpp +@@ -540,7 +540,8 @@ extern "C" { + } + + void LibCamera::close() { +- this->cam_->release(); ++ if (this->cam_) ++ this->cam_->release(); + } + + void LibCamera::connect() +@@ -775,6 +776,9 @@ extern "C" { + std::unique_ptr<CameraManager> cm = std::make_unique<CameraManager>(); + LibCamera* camera = new LibCamera(); + ++ pthread_mutexattr_init(&attr); ++ pthread_mutex_init(&camera->lock, &attr); ++ + ret = cm->start(); + if (ret) { + deleteLibCamera(camera); +@@ -794,9 +798,6 @@ extern "C" { + return nullptr; + } + +- pthread_mutexattr_init(&attr); +- pthread_mutex_init(&camera->lock, &attr); +- + camera->ring_buffer_init(); + + return camera; +GitLab diff --git a/media-video/pipewire/pipewire-0.3.36.ebuild b/media-video/pipewire/pipewire-0.3.36.ebuild index 43ac9052449d..ed38e2d391cb 100644 --- a/media-video/pipewire/pipewire-0.3.36.ebuild +++ b/media-video/pipewire/pipewire-0.3.36.ebuild @@ -12,7 +12,7 @@ if [[ ${PV} == 9999 ]]; then inherit git-r3 else SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" + KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 ~riscv x86" fi DESCRIPTION="Multimedia processing graphs" diff --git a/media-video/pipewire/pipewire-0.3.38.ebuild b/media-video/pipewire/pipewire-0.3.38.ebuild new file mode 100644 index 000000000000..9b2951c07937 --- /dev/null +++ b/media-video/pipewire/pipewire-0.3.38.ebuild @@ -0,0 +1,290 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +PYTHON_COMPAT=( python3_{8..10} ) + +inherit meson-multilib optfeature python-any-r1 systemd udev + +if [[ ${PV} == 9999 ]]; then + EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git" + inherit git-r3 +else + SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz" + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86" +fi + +DESCRIPTION="Multimedia processing graphs" +HOMEPAGE="https://pipewire.org/" + +LICENSE="MIT LGPL-2.1+ GPL-2" +SLOT="0/0.3" +IUSE="bluetooth doc echo-cancel extra gstreamer jack-client jack-sdk pipewire-alsa systemd test v4l" + +# Once replacing system JACK libraries is possible, it's likely that +# jack-client IUSE will need blocking to avoid users accidentally +# configuring their systems to send PW sink output to the emulated +# JACK's sink - doing so is likely to yield no audio, cause a CPU +# cycles consuming loop (and may even cause GUI crashes)! + +REQUIRED_USE="jack-sdk? ( !jack-client )" + +RESTRICT="!test? ( test )" + +BDEPEND=" + app-doc/xmltoman + >=dev-util/meson-0.59 + virtual/pkgconfig + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]') + doc? ( + app-doc/doxygen + media-gfx/graphviz + ) +" +RDEPEND=" + acct-group/audio + media-libs/alsa-lib + sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= + sys-libs/ncurses:=[unicode(+)] + virtual/libintl[${MULTILIB_USEDEP}] + virtual/libudev[${MULTILIB_USEDEP}] + bluetooth? ( + media-libs/fdk-aac + media-libs/libldac + media-libs/libfreeaptx + media-libs/sbc + >=net-wireless/bluez-4.101:= + ) + echo-cancel? ( media-libs/webrtc-audio-processing:0 ) + extra? ( + >=media-libs/libsndfile-1.0.20 + ) + gstreamer? ( + >=dev-libs/glib-2.32.0:2 + >=media-libs/gstreamer-1.10.0:1.0 + media-libs/gst-plugins-base:1.0 + ) + jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) + jack-sdk? ( + !media-sound/jack-audio-connection-kit + !media-sound/jack2 + ) + pipewire-alsa? ( + >=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}] + !media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] + ) + !pipewire-alsa? ( media-plugins/alsa-plugins[${MULTILIB_USEDEP},pulseaudio] ) + systemd? ( sys-apps/systemd ) + v4l? ( media-libs/libv4l ) +" + +DEPEND="${RDEPEND}" + +# Present RDEPEND that are currently always disabled due to the PW +# code using them being required to be disabled by Gentoo guidelines +# (i.e. developer binaries not meant for users) and unready code +# media-video/ffmpeg:= +# media-libs/libsdl2 +# >=media-libs/vulkan-loader-1.1.69 +# +# Ditto for DEPEND +# >=dev-util/vulkan-headers-1.1.69 + +DOCS=( {README,INSTALL}.md NEWS ) + +PATCHES=( + "${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch + # Upstream + "${FILESDIR}"/${P}-fix-arm-build.patch + "${FILESDIR}"/${P}-libcamera-null-deref.patch # (we don't have it in ::gentoo but let's be nice) + "${FILESDIR}"/${P}-find-readline.patch # just in case +) + +# limitsdfile related code taken from =sys-auth/realtime-base-0.1 +# with changes as necessary. +limitsdfile=40-${PN}.conf + +python_check_deps() { + has_version -b "dev-python/docutils[${PYTHON_USEDEP}]" +} + +src_prepare() { + default + + if ! use systemd; then + # This can be applied non-conditionally but would make for a + # significantly worse user experience on systemd then. + eapply "${FILESDIR}"/${PN}-0.3.36-non-systemd-integration.patch + fi + + einfo "Generating ${limitsdfile}" + cat > ${limitsdfile} <<- EOF || die + # Start of ${limitsdfile} from ${P} + + @audio - memlock 256 + + # End of ${limitsdfile} from ${P} + EOF +} + +multilib_src_configure() { + local emesonargs=( + -Ddocdir="${EPREFIX}"/usr/share/doc/${PF} + $(meson_native_use_feature doc docs) + $(meson_native_enabled examples) # Disabling this implicitly disables -Dmedia-session + # Replaced upstream by -Dsession-managers=..., needs more work, bug #812809 + # but default is same as before and right now, this is fatal with unreleased Meson. + #$(meson_native_enabled media-session) + $(meson_native_enabled man) + $(meson_feature test tests) + -Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests + $(meson_native_use_feature gstreamer) + $(meson_native_use_feature gstreamer gstreamer-device-provider) + $(meson_native_use_feature systemd) + -Dsystemd-system-service=disabled # Matches upstream + $(meson_native_use_feature systemd systemd-user-service) + $(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph + -Dspa-plugins=enabled + -Dalsa=enabled # Allows using kernel ALSA for sound I/O (-Dmedia-session depends on this) + -Daudiomixer=enabled # Matches upstream + -Daudioconvert=enabled # Matches upstream + $(meson_native_use_feature bluetooth bluez5) + $(meson_native_use_feature bluetooth bluez5-backend-hsp-native) + $(meson_native_use_feature bluetooth bluez5-backend-hfp-native) + $(meson_native_use_feature bluetooth bluez5-backend-ofono) + $(meson_native_use_feature bluetooth bluez5-backend-hsphfpd) + $(meson_native_use_feature bluetooth bluez5-codec-aac) + $(meson_native_use_feature bluetooth bluez5-codec-aptx) + $(meson_native_use_feature bluetooth bluez5-codec-ldac) + $(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889 + -Dcontrol=enabled # Matches upstream + -Daudiotestsrc=enabled # Matches upstream + -Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020 + -Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph + $(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client + $(meson_use jack-sdk jack-devel) + $(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '') + -Dsupport=enabled # Miscellaneous/common plugins, such as null sink + -Devl=disabled # Matches upstream + -Dtest=disabled # fakesink and fakesource plugins + $(meson_native_use_feature v4l v4l2) + -Dlibcamera=disabled # libcamera is not in Portage tree + -Dvideoconvert=enabled # Matches upstream + -Dvideotestsrc=enabled # Matches upstream + -Dvolume=enabled # Matches upstream + -Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream) + $(meson_native_use_feature extra pw-cat) + -Dudev=enabled + -Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d" + -Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install) + $(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat) + ) + + meson_src_configure +} + +multilib_src_install() { + # Our customs DOCS do not exist in multilib source directory + DOCS= meson_src_install +} + +multilib_src_install_all() { + einstalldocs + + insinto /etc/security/limits.d + doins ${limitsdfile} + + if use pipewire-alsa; then + dodir /etc/alsa/conf.d + # These will break if someone has /etc that is a symbol link to a subfolder! See #724222 + # And the current dosym8 -r implementation is likely affected by the same issue, too. + dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf + dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default.conf /etc/alsa/conf.d/99-pipewire-default.conf + fi + + if ! use systemd; then + insinto /etc/xdg/autostart + newins "${FILESDIR}"/pipewire.desktop pipewire.desktop + + exeinto /usr/libexec + newexe "${FILESDIR}"/pipewire-launcher.sh pipewire-launcher + fi +} + +pkg_postinst() { + elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users" + elog "using PipeWire. Do it either manually or add yourself" + elog "to the 'audio' group:" + elog + elog " usermod -aG audio <youruser>" + elog + + if ! use jack-sdk; then + elog "JACK emulation is incomplete and not all programs will work. PipeWire's" + elog "alternative libraries have been installed to a non-default location." + elog "To use them, put pw-jack <application> before every JACK application." + elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack" + elog "provider is still needed to compile the JACK applications themselves." + elog + fi + + if use systemd; then + elog "To use PipeWire for audio, 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 --now pipewire.socket pipewire-pulse.socket" + elog + elog "When switching from PulseAudio, do not forget to disable PulseAudio likewise:" + elog + elog " systemctl --user disable --now pulseaudio.service pulseaudio.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 pipewire-media-session" + elog "for relevant users:" + elog + elog " systemctl --user enable --now pipewire-media-session.service" + elog + else + elog "This ebuild auto-enables PulseAudio replacement. Because of that, users" + elog "are recommended to edit: ${EROOT}/etc/pulse/client.conf and disable" + elog "autospawning of the original daemon by setting:" + elog + elog " autospawn = no" + elog + elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!" + elog + elog "Alternatively, if replacing PulseAudio daemon is not desired, edit" + elog "${EROOT}/etc/pipewire/pipewire.conf by commenting out the relevant" + elog "command near the end of the file:" + elog + elog "#\"/usr/bin/pipewire\" = { args = \"-c pipewire-pulse.conf\" }" + elog + elog "NOTE:" + elog "Starting with PipeWire-0.3.30, this package is no longer installing its config" + elog "into ${EROOT}/etc/pipewire by default. In case you need to change" + elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire" + elog "and just override the sections you want to change." + fi + + elog "For latest tips and tricks, troubleshooting information and documentation" + elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire" + elog + + optfeature_header "The following can be installed for optional runtime features:" + optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit + + if has_version 'net-misc/ofono' ; then + ewarn "Native backend has become default. Please disable oFono via:" + if systemd_is_booted ; then + ewarn "systemctl disable --now ofono" + else + ewarn "rc-update delete ofono" + fi + ewarn + fi +} diff --git a/media-video/pipewire/pipewire-9999.ebuild b/media-video/pipewire/pipewire-9999.ebuild index 7725dfa300f5..b6c000cf8a53 100644 --- a/media-video/pipewire/pipewire-9999.ebuild +++ b/media-video/pipewire/pipewire-9999.ebuild @@ -47,6 +47,7 @@ RDEPEND=" acct-group/audio media-libs/alsa-lib sys-apps/dbus[${MULTILIB_USEDEP}] + sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[${MULTILIB_USEDEP}] virtual/libudev[${MULTILIB_USEDEP}] diff --git a/media-video/vidcutter/Manifest b/media-video/vidcutter/Manifest index 01a05d6c1158..bcb0f5d5d491 100644 --- a/media-video/vidcutter/Manifest +++ b/media-video/vidcutter/Manifest @@ -1,4 +1,6 @@ +DIST vidcutter-6.0.5.1.tar.gz 9909274 BLAKE2B 063c20f6ae0565b0f3a160b5ee298aae05b2ee1876cd4c73d9f37578a9e86a872353c3e2b7b1b6302db3d5a876139bfb19d50bf7cb4dd18e6e1d1a1ca3587fbd SHA512 f2ea2a86d9eaa3c6593e785daad6869c151baa1add529c9edaf2282f7acad762fbb29804790aece5e4fcd89e9e9bc77f61d1f0b68a1b1f3ecf58951ee8f200e9 DIST vidcutter-6.0.5.tar.gz 9911435 BLAKE2B 2d901768064b7c3b7444289db84e8f8d6e179d915b04f870a6b397f0d905c6b4ecab0768d045a8c1aa43b3bf7bccb2dcd60e9c043595f2aaf857ce657ec997f8 SHA512 b4a0e0cc3132038e9216f05117768695ba30840f04251c60561b7555cde9064efcf12440c801c834c2160d5b5acad011dc31055d9547269a5689361c875bca80 +EBUILD vidcutter-6.0.5.1.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5 EBUILD vidcutter-6.0.5.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5 EBUILD vidcutter-9999.ebuild 1017 BLAKE2B 190df679b975619b91bc2aeb9cc597efd0053326a014c2093a2ce37df4e4bf8fc28e497b40d5ad135322796dda5e185ed38e1074f46c26d623b64414f098bda3 SHA512 4330e92f3ff88eeb051594b4a0e3128d1c2d876e36c2f4838a70294246fda959af636506ee52b76eb5612e8828c1ca7e330746c5acb329ad83b585e4e8dbb8f5 MISC metadata.xml 461 BLAKE2B 0eeb6abbb7914b27cd567263de9001cfe17c9bd3b98a0887b21fd76b908a48c0abb3695039d21803709d47483078d15c5d412be7c408640ece0a433806272640 SHA512 55fd2db2f66d5cbc2410dfc57f235b90554cf3de4aaa88fc5069d499590ec45264499881f049c5469771f063638a65adad89686717c28abb89ef6ea632c88a30 diff --git a/media-video/vidcutter/vidcutter-6.0.5.1.ebuild b/media-video/vidcutter/vidcutter-6.0.5.1.ebuild new file mode 100644 index 000000000000..8ec68eb7ef9e --- /dev/null +++ b/media-video/vidcutter/vidcutter-6.0.5.1.ebuild @@ -0,0 +1,41 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +PYTHON_COMPAT=( python3_{7,8,9} ) + +inherit distutils-r1 xdg + +DESCRIPTION="FFmpeg-based simple video cutter & joiner with a modern PyQt5 GUI" +HOMEPAGE="http://vidcutter.ozmartians.com https://github.com/ozmartian/vidcutter" + +if [[ ${PV} == 9999 ]];then + inherit git-r3 + EGIT_REPO_URI="https://github.com/ozmartian/vidcutter" +else + SRC_URI="https://github.com/ozmartian/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-3" +SLOT="0" +IUSE="" + +DEPEND=" + >=media-video/mpv-0.25[libmpv] +" +RDEPEND="${DEPEND} + >=dev-python/PyQt5-5.7[dbus,multimedia,widgets,${PYTHON_USEDEP}] + dev-python/pyopengl[${PYTHON_USEDEP}] + media-video/ffmpeg[X,encode] + media-video/mediainfo" +BDEPEND=" + ${PYTHON_DEPS} + dev-python/setuptools[${PYTHON_USEDEP}]" +REQUIRED_USE="${PYTHON_REQUIRED_USE}" + +src_install() { + distutils-r1_src_install + mv "${ED}/usr/share/doc/${PN}" "${ED}/usr/share/doc/${P}" +} |