diff options
Diffstat (limited to 'media-video')
18 files changed, 196 insertions, 150 deletions
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz Binary files differindex f61c936a220f..21588e621cc0 100644 --- a/media-video/Manifest.gz +++ b/media-video/Manifest.gz diff --git a/media-video/ffmpeg-compat/Manifest b/media-video/ffmpeg-compat/Manifest index 3dc7c231904c..cb8f7c867c89 100644 --- a/media-video/ffmpeg-compat/Manifest +++ b/media-video/ffmpeg-compat/Manifest @@ -6,6 +6,6 @@ DIST ffmpeg-6.1.2.tar.xz 10466152 BLAKE2B ff1f2b2bb60ccc4c37b6ffda2a0e6a0be80c45 DIST ffmpeg-6.1.2.tar.xz.asc 520 BLAKE2B f26a2d6f5423f93090f2a448172e49f3858aeb5a00f326207d374bbb70fa8942c7ee1a7c55338b2db664b647c983cd5ab4fd8d71efe5c37af4c90385ca17d0ab SHA512 a26dba1f4870b964080b45f8468f5ce3591eb6aa69be426bf4afbe5a60c3cbd0fe5056dc86ca7bb817c04ae30d39160cb7773772a9a2123ae7f095b18a6d7050 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 -EBUILD ffmpeg-compat-4.4.5.ebuild 14657 BLAKE2B e5563e14a0624d009c952eac45289651b9b03880461a2e1465ec3fd7824f51e3bf6d02cac65c72c6a7c8892c1bf1244cd3738aac3c3b30b861b478ba9062591e SHA512 acecaffd8b416ba6f6564e4c404bda4a96cbb8fb8374d6b418b6aaa289a30464d554fb1476900f8b8897e347d6459ef50a52b7c559b652ea4e151dbafe839d92 -EBUILD ffmpeg-compat-6.1.2.ebuild 16786 BLAKE2B 424d4dc872bc517299ca54e46fd30f537799640895e1ce7a59bce1c518a7c6788cb1b253c9861f923cbe31ed479736539898e7c9c653e8ecd2c92cd22e761419 SHA512 1404a0ec32ae11a0e92ff54e8129a432f426b7e91360e6f77a9e4f75673356ea17cef2eec2ad0037ae9d13e8387c7ec97cc5e288a9a653dcb122ec229fae245e +EBUILD ffmpeg-compat-4.4.5.ebuild 15002 BLAKE2B 903682168147ac3cf4f0b72d38f305169864e75ec794d8c9a2990486c91779ea44d623623c50591a09ff10c31ee9235f59074167849219cf46e18f4a1969e350 SHA512 bf159fb253a301335010fb74776610a3df160d3c94cb519f173370c7d010464f706c82490a956238a081911d4295ae5435b749b9ad375062a1135edc10e55448 +EBUILD ffmpeg-compat-6.1.2.ebuild 17131 BLAKE2B 4b655a95c8d9131cdc0e4158ba288ae73df98d8c008192588f8cae25a2893d95134271e509793973d382516275525567f0e67a5eb016fa91da82c263a9d63202 SHA512 761207fa46faaa4ca3d869158aaa80b38a27837986dd13a69041fafe7aa9995123938b39a6ceb5c0b69f5cbb9a20a71f4a3a04b8f6fbfb17a9338ec59c6697b1 MISC metadata.xml 7605 BLAKE2B af1dae9179eb75099f73330e42f95be290f59e99e4062f265e0cf339d9d2e9fd3ef5265600e8e497b2edd58d2501ded48fb92fe6e3c92f1c5015fe79a999c187 SHA512 6093fd6f4c22221cc3ee7bde293f0ea9bffbcaecac8c3735f515cc37a1c48b69b6ee38acd34c892c1c72e14bc4f823714e446224f1bc4806e7bad52190fd63e2 diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild index c7bee8fbe8a4..a61c33e1d509 100644 --- a/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild +++ b/media-video/ffmpeg-compat/ffmpeg-compat-4.4.5.ebuild @@ -20,7 +20,7 @@ else verify-sig? ( https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz.asc ) https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi @@ -290,6 +290,15 @@ PATCHES=( "${WORKDIR}"/patches ) +pkg_pretend() { + # TODO: drop this after a few months + if has_version "${CATEGORY}/${PN}[mp3]" && use !lame; then #952971 + ewarn "${PN}'s 'mp3' USE was renamed to 'lame', please enable it" + ewarn "if wish to keep the ability to encode using media-sound/lame." + ewarn "This is *not* needed if only want mp3 playback." + fi +} + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] || return diff --git a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild index 8c6fe47c26b1..4a3a3a7e15b3 100644 --- a/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild +++ b/media-video/ffmpeg-compat/ffmpeg-compat-6.1.2.ebuild @@ -27,7 +27,7 @@ else "} https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi @@ -340,6 +340,15 @@ PATCHES=( "${WORKDIR}"/patches ) +pkg_pretend() { + # TODO: drop this after a few months + if has_version "${CATEGORY}/${PN}[mp3]" && use !lame; then #952971 + ewarn "${PN}'s 'mp3' USE was renamed to 'lame', please enable it" + ewarn "if wish to keep the ability to encode using media-sound/lame." + ewarn "This is *not* needed if only want mp3 playback." + fi +} + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] || return diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest index c3d48ea7555f..db9b196207a9 100644 --- a/media-video/ffmpeg/Manifest +++ b/media-video/ffmpeg/Manifest @@ -13,8 +13,8 @@ DIST ffmpeg-rpi-6.1-r3.patch 800738 BLAKE2B b7e449ee5eec8b50a3b3bba233c5269f3b68 DIST ffmpeg-rpi-6.1-r3.patch.asc 833 BLAKE2B 31fd5823c06d5884f7b0980de9072c35bbf4e1d6c0ed20b089439325d50956127238ca29469b003dba623b888a5aae3c4d8ad177862534e77b8e51f29cbed96c SHA512 3d8943b7151e20f73e9c14b121c501847bd7e01f2cf57ff135fc8c223653ec9d433bfe4012fa564f70c0471980b66d7ec3d9b5b1b14865187187719ba110cb5f DIST ffmpeg-rpi-7.1.1.patch 847869 BLAKE2B efc3fef1810034b40eee1f637499171529fc6027c4fc0ef66da587c704a7742b454903aa060b21305e1d9a714eb31d96cd93f93d7cadb5815a0de22ac040b9e1 SHA512 a3f9013aec9b17e0fc1689d946e57e251a88eac3f9e7856d46fe9614fea29211feaf106d32a31f97c0e8c83c1685ca454c31f9bcb5dafb669a0933d683e581c8 DIST ffmpeg-rpi-7.1.1.patch.asc 833 BLAKE2B a30e8d0216325ac86a3b7f8ac132a61a1d3eb97eff5e758cdad5af89e74ecfb577bda6438b263651d772b265a38f8ac6bf5056598f6f707411236245f939045a SHA512 a75547b38ab1445b94fea2d38f60c93092a70ecd45ec6ec0830084280d684c631a49ccbf46327ac4052ade3e7934b257f8d2c3aa107950ec9da0e66873f3e5be -EBUILD ffmpeg-4.4.5-r2.ebuild 14657 BLAKE2B e5563e14a0624d009c952eac45289651b9b03880461a2e1465ec3fd7824f51e3bf6d02cac65c72c6a7c8892c1bf1244cd3738aac3c3b30b861b478ba9062591e SHA512 acecaffd8b416ba6f6564e4c404bda4a96cbb8fb8374d6b418b6aaa289a30464d554fb1476900f8b8897e347d6459ef50a52b7c559b652ea4e151dbafe839d92 -EBUILD ffmpeg-6.1.2-r1.ebuild 16786 BLAKE2B 424d4dc872bc517299ca54e46fd30f537799640895e1ce7a59bce1c518a7c6788cb1b253c9861f923cbe31ed479736539898e7c9c653e8ecd2c92cd22e761419 SHA512 1404a0ec32ae11a0e92ff54e8129a432f426b7e91360e6f77a9e4f75673356ea17cef2eec2ad0037ae9d13e8387c7ec97cc5e288a9a653dcb122ec229fae245e -EBUILD ffmpeg-7.1.1.ebuild 17230 BLAKE2B 158bffe6b9c71941b6e0aabde7ff2b3e8054cb1516c3a98840627f9d4ea668e01650cffc48d75429c8bfaf86c0602eb8349ac193010705db70ff6cee73c8be2a SHA512 234115773b41e016b015053bd8625962f8c834c0ad688b2d24fd76a89fc0c124e4e55295f06bff356dc351d6f940a63218447b81e99ec2100b7b46a217f51cdc -EBUILD ffmpeg-9999.ebuild 17192 BLAKE2B 887c6d5bb422a4985d5678dbc48524c649c181bb115dc9acf1f1fea62d77fc82a135d0ae6b92840d0f145ee19cbf30cbccd9fe77bda02883ebe4751c5913f022 SHA512 8dc3e26057939314a7e5c4ea0345f7f71bb204413888a04caf6de56135070cd8c271d5285b88992f1983688213800ad52bba9e6c8dc92130c95c251109a48639 +EBUILD ffmpeg-4.4.5-r2.ebuild 15002 BLAKE2B 903682168147ac3cf4f0b72d38f305169864e75ec794d8c9a2990486c91779ea44d623623c50591a09ff10c31ee9235f59074167849219cf46e18f4a1969e350 SHA512 bf159fb253a301335010fb74776610a3df160d3c94cb519f173370c7d010464f706c82490a956238a081911d4295ae5435b749b9ad375062a1135edc10e55448 +EBUILD ffmpeg-6.1.2-r1.ebuild 17131 BLAKE2B 4b655a95c8d9131cdc0e4158ba288ae73df98d8c008192588f8cae25a2893d95134271e509793973d382516275525567f0e67a5eb016fa91da82c263a9d63202 SHA512 761207fa46faaa4ca3d869158aaa80b38a27837986dd13a69041fafe7aa9995123938b39a6ceb5c0b69f5cbb9a20a71f4a3a04b8f6fbfb17a9338ec59c6697b1 +EBUILD ffmpeg-7.1.1.ebuild 17575 BLAKE2B 97548c9f846ec2b694c90a5e7f2fc366d58b900d03568e54effc26b45847f241055034b8ddab70e9cf37496b48718bdae9f4b6fcb49dfa5361847a33060ca35d SHA512 b82516c603d56cbe58543cb5f8d45ed8758ee7ffd2e905818b44ff6a8e72d8628924efb9fd020e9c981db0762710430a3ebec9f43d53663e173e25523988852b +EBUILD ffmpeg-9999.ebuild 17537 BLAKE2B 3368a80182e6adb43c2baaed3a818dc308709e2f79cb2701e1a24bf75e39dda38c6d7eac4e18de30e78fea43a3e73ff59e9f3993a032a0fba8e923a42ca374d2 SHA512 bec97a8a64cb3b8ce91eba01313509c1ff51377b6dcab04a3491ed20974f7505e12f087bce02be571fba7831e07a1c715307fc6d0c70680cbec74b013ab6e161 MISC metadata.xml 8057 BLAKE2B 1acd5f3b8df2c2ef798e3f3cde26e093ed94c09be4edeaa81cba5d99c5d2295090912006f9570eff94b9025f09aeb02c49462e0e4087b58adc8dde4bd7936e62 SHA512 985d262f99959827daed0317719fe16ad7df9db9eec0bd385a6b6d5f6ea3027fd68bc8346c5f3be74ba382d9f53ae0ff2ad4ca371c4d38dcc1f885436e0b88ca diff --git a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild index c7bee8fbe8a4..a61c33e1d509 100644 --- a/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild +++ b/media-video/ffmpeg/ffmpeg-4.4.5-r2.ebuild @@ -20,7 +20,7 @@ else verify-sig? ( https://ffmpeg.org/releases/ffmpeg-${PV}.tar.xz.asc ) https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi @@ -290,6 +290,15 @@ PATCHES=( "${WORKDIR}"/patches ) +pkg_pretend() { + # TODO: drop this after a few months + if has_version "${CATEGORY}/${PN}[mp3]" && use !lame; then #952971 + ewarn "${PN}'s 'mp3' USE was renamed to 'lame', please enable it" + ewarn "if wish to keep the ability to encode using media-sound/lame." + ewarn "This is *not* needed if only want mp3 playback." + fi +} + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] || return diff --git a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild index 8c6fe47c26b1..4a3a3a7e15b3 100644 --- a/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild +++ b/media-video/ffmpeg/ffmpeg-6.1.2-r1.ebuild @@ -27,7 +27,7 @@ else "} https://dev.gentoo.org/~ionen/distfiles/ffmpeg-$(ver_cut 1-2)-patchset-1.tar.xz " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi @@ -340,6 +340,15 @@ PATCHES=( "${WORKDIR}"/patches ) +pkg_pretend() { + # TODO: drop this after a few months + if has_version "${CATEGORY}/${PN}[mp3]" && use !lame; then #952971 + ewarn "${PN}'s 'mp3' USE was renamed to 'lame', please enable it" + ewarn "if wish to keep the ability to encode using media-sound/lame." + ewarn "This is *not* needed if only want mp3 playback." + fi +} + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] || return diff --git a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild index 42cb8bfe77d0..48ce87160460 100644 --- a/media-video/ffmpeg/ffmpeg-7.1.1.ebuild +++ b/media-video/ffmpeg/ffmpeg-7.1.1.ebuild @@ -26,7 +26,7 @@ else ) "} " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi @@ -351,6 +351,15 @@ PATCHES=( "${FILESDIR}"/${PN}-7.1.1-svt-av1-3.patch ) +pkg_pretend() { + # TODO: drop this after a few months + if has_version "${CATEGORY}/${PN}[mp3]" && use !lame; then #952971 + ewarn "${PN}'s 'mp3' USE was renamed to 'lame', please enable it" + ewarn "if wish to keep the ability to encode using media-sound/lame." + ewarn "This is *not* needed if only want mp3 playback." + fi +} + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] || return diff --git a/media-video/ffmpeg/ffmpeg-9999.ebuild b/media-video/ffmpeg/ffmpeg-9999.ebuild index 1069affabc06..7ddbfafb70fc 100644 --- a/media-video/ffmpeg/ffmpeg-9999.ebuild +++ b/media-video/ffmpeg/ffmpeg-9999.ebuild @@ -26,7 +26,7 @@ else ) "} " - S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} + S=${WORKDIR}/ffmpeg-${PV} # avoid ${P} for ffmpeg-compat KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~x64-macos" fi @@ -345,6 +345,15 @@ PATCHES=( "${FILESDIR}"/${PN}-6.1-opencl-parallel-gmake-fix.patch ) +pkg_pretend() { + # TODO: drop this after a few months + if has_version "${CATEGORY}/${PN}[mp3]" && use !lame; then #952971 + ewarn "${PN}'s 'mp3' USE was renamed to 'lame', please enable it" + ewarn "if wish to keep the ability to encode using media-sound/lame." + ewarn "This is *not* needed if only want mp3 playback." + fi +} + pkg_setup() { [[ ${MERGE_TYPE} != binary ]] || return diff --git a/media-video/kaffeine/Manifest b/media-video/kaffeine/Manifest index 414de506cedb..9152e0f1817c 100644 --- a/media-video/kaffeine/Manifest +++ b/media-video/kaffeine/Manifest @@ -1,3 +1,4 @@ +AUX kaffeine-2.1.0_pre20241125-force-xcb-platform.patch 728 BLAKE2B e1d6e0176197e5ead3e33c24a130a669fd7c67e2ef958e83de9fdbe0d46b6b831d7e46c2f8c8f7d447cff809fe4765ebe07f27fc8d6a3827002f43478bb7942e SHA512 9a6ec00a911c1a71c2e823d3ca1f4a60d3784e4f9b18e12ca3a86a38c2dc73198d623da45084866edb0d95779bb0386872999c8a6878237d827c38111e30ec21 DIST kaffeine-2.1.0_pre20241125-45fd3627.tar.gz 6573858 BLAKE2B 6ccc18725ad16e5b3f7c37233fcf3a040a4dcf3b9a88ed867ea9d0dbd44225e9b0cbc5f2491943b73cd3e6d6dc557aa5a69ffa8db0fe42d32da504375c88184d SHA512 d4c109a727d69fce7ddfede90f03d82bf2003ec4cac6f7f685745c1e880cdb92e69f93693315d03d5a2088cdba70f67141b2581f935a11937816cfc8d3369b05 -EBUILD kaffeine-2.1.0_pre20241125.ebuild 1290 BLAKE2B 2b9c318509c557b723cad2bfd2e98648091217805aa558be42104d47023745c5a8550b5b7ccc72d8ebeb499b3dca5fd5df7a0562f79702df851384744a4e3f04 SHA512 91e23946f2389e2fd41796ff98bd9b2b7de687cbf54737443f66e1e49a0558cc9560b84169e7d3b0ad20bc51cb472269d21b0cabe531e9a3fc4ad979a14871e7 +EBUILD kaffeine-2.1.0_pre20241125-r1.ebuild 1425 BLAKE2B b3b69adf42270dc8e3a54ab303e0b2c2a53ef661c6584f0e95e853e9a58c06dbb371a8a71ddae41f64a714ad86442779eae6e0dc623174f0f951bf4261dfc51f SHA512 be1792fcc32c4c80beb7d93fcc4255732768fb93924e6223bed36340edccfab4fc946696bb131cff244ef400f6b04ca466d7f6a17442e86a6895302178fc525a MISC metadata.xml 531 BLAKE2B 7a1855baa27cfd698688e7451187d4ca265593866485751ae9d44b39dcfa95e5961ba4e8d991ec8b1b41e1ce74d82150847e97ab6ab07dbbefbc5b618f3bc457 SHA512 0ee50508e7549058c31a5a58d760256b57e039a067d7ba10833d199b6e8b70c2968ea52adddcd69ddb0460b3c12ae13c27b14fa5f0d3ccc3584ea783975a3033 diff --git a/media-video/kaffeine/files/kaffeine-2.1.0_pre20241125-force-xcb-platform.patch b/media-video/kaffeine/files/kaffeine-2.1.0_pre20241125-force-xcb-platform.patch new file mode 100644 index 000000000000..135cc1f75df0 --- /dev/null +++ b/media-video/kaffeine/files/kaffeine-2.1.0_pre20241125-force-xcb-platform.patch @@ -0,0 +1,30 @@ +From 79ded89ab9e477ce93e71d6184104ff273553ae9 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Ball=C3=B3=20Gy=C3=B6rgy?= <ballogyor@gmail.com> +Date: Tue, 25 Feb 2025 13:39:06 +0100 +Subject: [PATCH] Force X11 + +VLC does not support video playback on Wayland. + +BUG: 397594 +--- + src/main.cpp | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/src/main.cpp b/src/main.cpp +index a7e0efa6..185a6b72 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -211,6 +211,10 @@ int main(int argc, char *argv[]) + { + qInstallMessageHandler(verboseMessageHandler); + ++#if LIBVLC_VERSION_MAJOR <= 3 ++ qputenv("QT_QPA_PLATFORM", "xcb"); ++#endif ++ + KLocalizedString::setApplicationDomain("kaffeine"); + + KaffeineApplication app(argc, argv); +-- +GitLab + diff --git a/media-video/kaffeine/kaffeine-2.1.0_pre20241125.ebuild b/media-video/kaffeine/kaffeine-2.1.0_pre20241125-r1.ebuild index b5e4972d08f1..e6978ca00cb1 100644 --- a/media-video/kaffeine/kaffeine-2.1.0_pre20241125.ebuild +++ b/media-video/kaffeine/kaffeine-2.1.0_pre20241125-r1.ebuild @@ -42,6 +42,9 @@ BDEPEND=" DOCS=( Changelog NOTES README.md ) +# Upstream MR: https://invent.kde.org/multimedia/kaffeine/-/merge_requests/14 +PATCHES=( "${FILESDIR}/${P}-force-xcb-platform.patch" ) + src_configure() { # tools working on $HOME directory for a local git checkout local mycmakeargs=( diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest index b1db60fd15dd..9fb61fec7c7a 100644 --- a/media-video/subtitlecomposer/Manifest +++ b/media-video/subtitlecomposer/Manifest @@ -1,5 +1,4 @@ -DIST subtitlecomposer-0.7.1-patchset-1.tar.xz 6868 BLAKE2B 59ae09e6807b0c9eeb094556ec381157701a6d3ae66317c175816f2a779ef3db1874146c5ec0d211a07353bf592c1ff7ad8dcf91a1370916d37290204e7e5909 SHA512 bd7849ee7e4bb449b7f758bf86a45110f0e647d6a35ec31bbab82b7e8f02ac3b81aed958723848a08830a32f1e252dc2231d9a8a736b738b6c105c1a715aea1b -DIST subtitlecomposer-0.8.1.tar.xz 763276 BLAKE2B eb5eca2505e5b2c859768f2816fae603be8066d3530802c434b78c7754a379bb4d293f5138416ebbcc4b4e0d95cb71f0e11bc5efc72efcc77c4486b096b5e6fc SHA512 28e83ba2429f17d11252b1eb56d5d9ae018f746a4b211292707847ea54659b80b2829e1d482f9740da6951c614dbfc8fff4b4019cee0f5001687282075205d53 -EBUILD subtitlecomposer-0.8.1-r1.ebuild 1621 BLAKE2B cd07b5d48131c3482fa777072fcc9cb3edb5ba30b95b25478ac4478a538cb306374bbf1e1e70c5417312039315c7a5df1bd5642418b41d17f40eb08f30ebd223 SHA512 8a35f6ba5abcdf91aae858a07766ea840b822352fb8aff40d9f5bc47924bb2f6e05e110fa278b734b279568195624033c18b2476b6b426c7f8187a5334cd5058 -EBUILD subtitlecomposer-0.8.1.ebuild 1515 BLAKE2B 4811aa3c4b153a0a736a438b3d918921736209eafcf77f48d77b5191d2af8ef51093360c0bca235c594cc97a7075eb12024a85ca2fccc258a7662db9955058d5 SHA512 3ee3015523cd96698fd4c32656b7d192f8ca581a522313a7500da94d1e5b8aa30a8772093c24c0036aa3138b5e5f9fbbb8ff82f87ff8d156107ab8be764f14ba -MISC metadata.xml 438 BLAKE2B b11cde969ef9af83c7e70ac17615703c8f0b4296113a8ff552a669c3b7bf7b5291106dd1c4ece993fd8195f5af3bcd1b05697b583bd85f4a155fa10351cbbadd SHA512 d32994646bdbfb90e5fde722a905ebf5fa59903de7c36fd8228ce257057ac8523d7219656d1f1a1bdcc3f0eec1ad9f34535d4090078c9e3a6890d58b8e1e3b71 +AUX subtitlecomposer-0.8.1_p20250308-force-xcb-platform.patch 671 BLAKE2B 9d716847b2d9d0f6dd3be8f101b76428e55c136bd2c119d7a2bb6a261337c1e7e57a6904d390e959fda3c7f70a41ee52c116702455f9f97330e9679a72de4dc8 SHA512 1401f702e6113d95babd5fbd22929d8226d6885a645ec06d4c6e46b7a99fd281c782ac686a128549d304ce16a20d48dcb4d7f7c4945ab1540668ba516bce1b25 +DIST subtitlecomposer-0.8.1_p20250308-10aad738.tar.gz 1413805 BLAKE2B 223849494ae92b7ffa961a345f83beb6caf2bbb051a1a90379f30b20f0bb3cc0c47a7d0d26fee1f474c374d67e6c30168eca3934c62dcb1ac0ab27a0d73071f1 SHA512 c8cef8abcf85a026643c808b501448384dca5f66b164aae27127733134fff9e84a84063979ddff1e4342a9ed9c1c1345946c11a112ed05b36da485044801a075 +EBUILD subtitlecomposer-0.8.1_p20250308.ebuild 1448 BLAKE2B f01ad237bc933d3cfe6f94d650f3e90a976bbe5484d7137ae3026f4de085ccb1581e75998bc4394d8e2194ef68a9e98869401ca467bbbe5060d1fecdc237a2bb SHA512 dcf22af5793abcb8ba37304a309ea8027ca02825e03796ddfbcecefa5f20b15e218e11cccab38bacf9d3e235d115eb5d5b7dfd3ba2011c2da10140a01ad0a1b8 +MISC metadata.xml 547 BLAKE2B 6abe4c59a9bcd838502d5eb8efc46433b92d1da080c3c02fee57b93c5c061b2252ad34898893fb9c421f28131ea0f301c19a85d7198170acd8e9bbec3a8e538d SHA512 14b265d18c39771133ba22d600091db07bff3c2f703f9a2183b703961f3c9c5e9340a70655733a8cace7bdab719e45996d6c3e30d91bcfd175c0b6cdebd067b1 diff --git a/media-video/subtitlecomposer/files/subtitlecomposer-0.8.1_p20250308-force-xcb-platform.patch b/media-video/subtitlecomposer/files/subtitlecomposer-0.8.1_p20250308-force-xcb-platform.patch new file mode 100644 index 000000000000..dbd0afae05c0 --- /dev/null +++ b/media-video/subtitlecomposer/files/subtitlecomposer-0.8.1_p20250308-force-xcb-platform.patch @@ -0,0 +1,26 @@ +From 9bad579b525e1bb2e704217a9f6aa7ccc4d6b950 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner <asturm@gentoo.org> +Date: Tue, 1 Apr 2025 22:28:27 +0200 +Subject: [PATCH] Force xcb platform against video glitches in Wayland sessions + +Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> +--- + src/main.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/main.cpp b/src/main.cpp +index 63bff921..9599329a 100644 +--- a/src/main.cpp ++++ b/src/main.cpp +@@ -146,6 +146,8 @@ main(int argc, char **argv) + avcodec_register_all(); + #endif + ++ qputenv("QT_QPA_PLATFORM", "xcb"); ++ + SubtitleComposer::Application app(argc, argv); + + KAboutData aboutData( +-- +2.49.0 + diff --git a/media-video/subtitlecomposer/metadata.xml b/media-video/subtitlecomposer/metadata.xml index d14e6df997e3..2462a9cd4fba 100644 --- a/media-video/subtitlecomposer/metadata.xml +++ b/media-video/subtitlecomposer/metadata.xml @@ -2,14 +2,15 @@ <!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> - <maintainer type="project"> <email>kde@gentoo.org</email> <name>Gentoo KDE Project</name> </maintainer> + <maintainer type="project"> + <email>media-video@gentoo.org</email> + <name>Gentoo Video project</name> + </maintainer> <upstream> - <bugs-to>https://bugs.kde.org/</bugs-to> + <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=subtitlecomposer</bugs-to> + <remote-id type="kde-invent">multimedia/subtitlecomposer</remote-id> </upstream> </pkgmetadata> diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.8.1-r1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.8.1-r1.ebuild deleted file mode 100644 index 5f07e28dfc2a..000000000000 --- a/media-video/subtitlecomposer/subtitlecomposer-0.8.1-r1.ebuild +++ /dev/null @@ -1,65 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm ffmpeg-compat kde.org - -DESCRIPTION="Text-based subtitles editor" -HOMEPAGE="https://subtitlecomposer.kde.org/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - PATCHSET="${PN}-0.7.1-patchset-1" - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="unicode" - -DEPEND=" - dev-libs/openssl:= - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - media-libs/openal - media-video/ffmpeg-compat:6= - unicode? ( dev-libs/icu:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -# TODO: upstream -PATCHES=( "${WORKDIR}/${PATCHSET}/${PN}-0.7.1-tests-optional.patch" ) - -src_configure() { - # TODO: fix with >=ffmpeg-7 then drop compat (bug #948852) - ffmpeg_compat_setup 6 - - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 610434 - $(cmake_use_find_package unicode ICU) - ) - - ecm_src_configure -} diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.8.1.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.8.1.ebuild deleted file mode 100644 index 9f632bb807de..000000000000 --- a/media-video/subtitlecomposer/subtitlecomposer-0.8.1.ebuild +++ /dev/null @@ -1,62 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -ECM_TEST="forceoptional" -KFMIN=5.106.0 -QTMIN=5.15.9 -inherit ecm kde.org - -DESCRIPTION="Text-based subtitles editor" -HOMEPAGE="https://subtitlecomposer.kde.org/" - -if [[ ${KDE_BUILD_TYPE} = release ]]; then - PATCHSET="${PN}-0.7.1-patchset-1" - SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz - https://dev.gentoo.org/~asturm/distfiles/${PATCHSET}.tar.xz" - KEYWORDS="amd64 ~x86" -fi - -LICENSE="GPL-2" -SLOT="5" -IUSE="unicode" - -DEPEND=" - dev-libs/openssl:= - >=dev-qt/qtdeclarative-${QTMIN}:5 - >=dev-qt/qtgui-${QTMIN}:5 - >=dev-qt/qtnetwork-${QTMIN}:5 - >=dev-qt/qtwidgets-${QTMIN}:5 - >=kde-frameworks/kcodecs-${KFMIN}:5 - >=kde-frameworks/kcompletion-${KFMIN}:5 - >=kde-frameworks/kconfig-${KFMIN}:5 - >=kde-frameworks/kconfigwidgets-${KFMIN}:5 - >=kde-frameworks/kcoreaddons-${KFMIN}:5 - >=kde-frameworks/ki18n-${KFMIN}:5 - >=kde-frameworks/kio-${KFMIN}:5 - >=kde-frameworks/ktextwidgets-${KFMIN}:5 - >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 - >=kde-frameworks/kxmlgui-${KFMIN}:5 - >=kde-frameworks/sonnet-${KFMIN}:5 - media-libs/openal - media-video/ffmpeg:0= - unicode? ( dev-libs/icu:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - sys-devel/gettext - virtual/pkgconfig -" - -# TODO: upstream -PATCHES=( "${WORKDIR}/${PATCHSET}/${PN}-0.7.1-tests-optional.patch" ) - -src_configure() { - local mycmakeargs=( - -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 610434 - $(cmake_use_find_package unicode ICU) - ) - - ecm_src_configure -} diff --git a/media-video/subtitlecomposer/subtitlecomposer-0.8.1_p20250308.ebuild b/media-video/subtitlecomposer/subtitlecomposer-0.8.1_p20250308.ebuild new file mode 100644 index 000000000000..f96565900b8a --- /dev/null +++ b/media-video/subtitlecomposer/subtitlecomposer-0.8.1_p20250308.ebuild @@ -0,0 +1,59 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +ECM_TEST="forceoptional" +KFMIN=6.9.0 +QTMIN=6.8.1 +KDE_ORG_COMMIT=10aad738194d675ac4cfcde62097938e6921d25e +inherit ecm kde.org xdg + +DESCRIPTION="Text-based subtitles editor" +HOMEPAGE="https://subtitlecomposer.kde.org/" + +LICENSE="GPL-2+" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="unicode" + +DEPEND=" + dev-libs/openssl:= + >=dev-qt/qt5compat-${QTMIN}:6 + >=dev-qt/qtbase-${QTMIN}:6[gui,network,opengl,widgets] + >=dev-qt/qtdeclarative-${QTMIN}:6 + >=kde-frameworks/kcodecs-${KFMIN}:6 + >=kde-frameworks/kcompletion-${KFMIN}:6 + >=kde-frameworks/kconfig-${KFMIN}:6 + >=kde-frameworks/kconfigwidgets-${KFMIN}:6 + >=kde-frameworks/kcoreaddons-${KFMIN}:6 + >=kde-frameworks/ki18n-${KFMIN}:6 + >=kde-frameworks/kio-${KFMIN}:6 + >=kde-frameworks/ktextwidgets-${KFMIN}:6 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:6 + >=kde-frameworks/kxmlgui-${KFMIN}:6 + >=kde-frameworks/sonnet-${KFMIN}:6 + media-libs/openal + >=media-video/ffmpeg-5.1.5:0= + unicode? ( dev-libs/icu:= ) +" +RDEPEND="${DEPEND} + !${CATEGORY}/${PN}:5 +" +BDEPEND=" + sys-devel/gettext + virtual/pkgconfig +" + +# TODO: downstream workaround, push upstream? +PATCHES=( "${FILESDIR}/${P}-force-xcb-platform.patch" ) + +src_configure() { + local mycmakeargs=( + -DQT_MAJOR_VERSION=6 + -DCMAKE_DISABLE_FIND_PACKAGE_PocketSphinx=ON # bugs 616706, 610434 + $(cmake_use_find_package unicode ICU) + ) + + ecm_src_configure +} |