public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "Andreas Sturmlechner" <asturm@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/
Date: Tue, 01 Apr 2025 21:15:33 +0000 (UTC)	[thread overview]
Message-ID: <1743541835.66926346e4fc8ae98105c9a3da0dc5af3c71dbd7.asturm@gentoo> (raw)

commit:     66926346e4fc8ae98105c9a3da0dc5af3c71dbd7
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Tue Apr  1 20:22:14 2025 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Tue Apr  1 21:10:35 2025 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66926346

media-video/subtitlecomposer: add 0.8.1_p20250308 KF6-based snapshot

Force QT_QPA_PLATFORM=xcb to fix video glitches in Wayland sessions.

Closes: https://bugs.gentoo.org/948852
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 media-video/subtitlecomposer/Manifest              |  1 +
 ...mposer-0.8.1_p20250308-force-xcb-platform.patch | 26 ++++++++++
 media-video/subtitlecomposer/metadata.xml          | 11 ++--
 .../subtitlecomposer-0.8.1_p20250308.ebuild        | 59 ++++++++++++++++++++++
 4 files changed, 92 insertions(+), 5 deletions(-)

diff --git a/media-video/subtitlecomposer/Manifest b/media-video/subtitlecomposer/Manifest
index f54766dbbeeb..b0c790ca98ed 100644
--- a/media-video/subtitlecomposer/Manifest
+++ b/media-video/subtitlecomposer/Manifest
@@ -1,2 +1,3 @@
 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
+DIST subtitlecomposer-0.8.1_p20250308-10aad738.tar.gz 1413805 BLAKE2B 223849494ae92b7ffa961a345f83beb6caf2bbb051a1a90379f30b20f0bb3cc0c47a7d0d26fee1f474c374d67e6c30168eca3934c62dcb1ac0ab27a0d73071f1 SHA512 c8cef8abcf85a026643c808b501448384dca5f66b164aae27127733134fff9e84a84063979ddff1e4342a9ed9c1c1345946c11a112ed05b36da485044801a075

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
@@ -1,15 +1,16 @@
 <?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>
 	<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_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
+}


             reply	other threads:[~2025-04-01 21:15 UTC|newest]

Thread overview: 11+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-04-01 21:15 Andreas Sturmlechner [this message]
  -- strict thread matches above, loose matches on Subject: below --
2024-06-30 21:42 [gentoo-commits] repo/gentoo:master commit in: media-video/subtitlecomposer/, media-video/subtitlecomposer/files/ Andreas Sturmlechner
2023-09-02 21:08 Andreas Sturmlechner
2023-07-25 12:35 Andreas Sturmlechner
2023-03-29 13:53 Andreas Sturmlechner
2022-05-18 12:50 Andreas Sturmlechner
2022-05-09 21:56 Andreas Sturmlechner
2020-12-25 19:54 Andreas Sturmlechner
2020-09-29 15:02 Andreas Sturmlechner
2019-07-24 21:22 Andreas Sturmlechner
2018-11-01  9:45 Maciej Mrozowski

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1743541835.66926346e4fc8ae98105c9a3da0dc5af3c71dbd7.asturm@gentoo \
    --to=asturm@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox