From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4A06F15800D for ; Thu, 6 Jul 2023 12:13:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C70FE088C; Thu, 6 Jul 2023 12:13:13 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E969E0880 for ; Thu, 6 Jul 2023 12:13:13 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 658A33410B8 for ; Thu, 6 Jul 2023 12:13:12 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id AB095AD2 for ; Thu, 6 Jul 2023 12:13:09 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1688645571.c65bd23152d13d499b085a6854efac9ad3eb4cc2.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/k3b/, kde-apps/k3b/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch kde-apps/k3b/k3b-23.04.2-r1.ebuild kde-apps/k3b/k3b-23.04.2.ebuild X-VCS-Directories: kde-apps/k3b/ kde-apps/k3b/files/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c65bd23152d13d499b085a6854efac9ad3eb4cc2 X-VCS-Branch: master Date: Thu, 6 Jul 2023 12:13:09 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 18790309-63d9-4f95-b4f6-7fa70d14db19 X-Archives-Hash: 9a9db6427af97b52325b24959cda3829 commit: c65bd23152d13d499b085a6854efac9ad3eb4cc2 Author: Andreas Sturmlechner gentoo org> AuthorDate: Thu Jul 6 11:56:10 2023 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Thu Jul 6 12:12:51 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c65bd231 kde-apps/k3b: Re-enable external encoder plugin Hard-disable transcode in code by reverting upstream commit f7d385a40cc062fa4db46c165f82f437dea82c58. Bug: https://bugs.gentoo.org/891585 Closes: https://bugs.gentoo.org/906526 Signed-off-by: Andreas Sturmlechner gentoo.org> .../k3b/files/k3b-23.04.2-disable-transcode.patch | 38 ++++++++++++++++++++++ .../{k3b-23.04.2.ebuild => k3b-23.04.2-r1.ebuild} | 4 ++- 2 files changed, 41 insertions(+), 1 deletion(-) diff --git a/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch b/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch new file mode 100644 index 000000000000..209c13cd4546 --- /dev/null +++ b/kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch @@ -0,0 +1,38 @@ +From cc1e0b76f080ed95c1f6e6d66ad806427f373909 Mon Sep 17 00:00:00 2001 +From: Andreas Sturmlechner +Date: Thu, 6 Jul 2023 13:52:04 +0200 +Subject: [PATCH] Revert "Keep transcode until a replacement is implemented." + +Make sure users are not presented with a completely broken option. + +This reverts commit f7d385a40cc062fa4db46c165f82f437dea82c58. + +Signed-off-by: Andreas Sturmlechner +--- + libk3b/core/k3bdefaultexternalprograms.cpp | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/libk3b/core/k3bdefaultexternalprograms.cpp b/libk3b/core/k3bdefaultexternalprograms.cpp +index e659fc1f8..2ebf88367 100644 +--- a/libk3b/core/k3bdefaultexternalprograms.cpp ++++ b/libk3b/core/k3bdefaultexternalprograms.cpp +@@ -37,6 +37,8 @@ void K3b::addDefaultPrograms( K3b::ExternalBinManager* m ) + // https://bugs.kde.org/show_bug.cgi?id=381131 + void K3b::addTranscodePrograms(K3b::ExternalBinManager* m) + { ++ Q_UNUSED(m); ++ /* Deprecated transcode + static const char* const transcodeTools[] = {"transcode", + 0, // K3b 1.0 only uses the transcode binary + "tcprobe", +@@ -48,6 +50,7 @@ void K3b::addTranscodePrograms(K3b::ExternalBinManager* m) + + for (int i = 0; transcodeTools[i]; ++i) + m->addProgram(new K3b::TranscodeProgram(transcodeTools[i])); ++ */ + } + + +-- +2.41.0 + diff --git a/kde-apps/k3b/k3b-23.04.2.ebuild b/kde-apps/k3b/k3b-23.04.2-r1.ebuild similarity index 96% rename from kde-apps/k3b/k3b-23.04.2.ebuild rename to kde-apps/k3b/k3b-23.04.2-r1.ebuild index d072c2b7d0bb..12bcb8cce68c 100644 --- a/kde-apps/k3b/k3b-23.04.2.ebuild +++ b/kde-apps/k3b/k3b-23.04.2-r1.ebuild @@ -72,10 +72,12 @@ RDEPEND="${DEPEND} DOCS+=( ChangeLog {FAQ,PERMISSIONS,README}.txt ) +PATCHES=( "${FILESDIR}/${PN}-23.04.2-disable-transcode.patch" ) # bugs 891585, 906526 + src_configure() { local mycmakeargs=( -DK3B_BUILD_API_DOCS=OFF - -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=OFF + -DK3B_BUILD_EXTERNAL_ENCODER_PLUGIN=ON -DK3B_BUILD_WAVE_DECODER_PLUGIN=ON -DK3B_ENABLE_HAL_SUPPORT=OFF -DK3B_ENABLE_MUSICBRAINZ=OFF