diff options
| author | Andreas Sturmlechner <asturm@gentoo.org> | 2023-07-06 13:56:10 +0200 |
|---|---|---|
| committer | Andreas Sturmlechner <asturm@gentoo.org> | 2023-07-06 13:57:40 +0200 |
| commit | a108fdfe12ad87b18b63991d86009ac01b41bf2d (patch) | |
| tree | b4160e648f0a46dcdebbab7ae13b9a70c6ab8e2b /kde-apps/k3b | |
| parent | f7a9cf2ebe9d18b8868ee074c574da4540d936a3 (diff) | |
| download | kde-a108fdfe12ad87b18b63991d86009ac01b41bf2d.tar.gz kde-a108fdfe12ad87b18b63991d86009ac01b41bf2d.tar.bz2 kde-a108fdfe12ad87b18b63991d86009ac01b41bf2d.zip | |
kde-apps/k3b: Re-enable external encoder plugin
Hard-disable transcode in code by reverting upstream commit
f7d385a40cc062fa4db46c165f82f437dea82c58.
Bug: https://bugs.gentoo.org/891585
Bug: https://bugs.gentoo.org/906526
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
Diffstat (limited to 'kde-apps/k3b')
| -rw-r--r-- | kde-apps/k3b/files/k3b-23.04.2-disable-transcode.patch | 38 | ||||
| -rw-r--r-- | kde-apps/k3b/k3b-23.04.49.9999.ebuild | 4 | ||||
| -rw-r--r-- | kde-apps/k3b/k3b-9999.ebuild | 4 |
3 files changed, 44 insertions, 2 deletions
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 00000000000..209c13cd454 --- /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 <asturm@gentoo.org> +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 <asturm@gentoo.org> +--- + 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.49.9999.ebuild b/kde-apps/k3b/k3b-23.04.49.9999.ebuild index f51f2af3a3d..15d27d3eba6 100644 --- a/kde-apps/k3b/k3b-23.04.49.9999.ebuild +++ b/kde-apps/k3b/k3b-23.04.49.9999.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 diff --git a/kde-apps/k3b/k3b-9999.ebuild b/kde-apps/k3b/k3b-9999.ebuild index f51f2af3a3d..15d27d3eba6 100644 --- a/kde-apps/k3b/k3b-9999.ebuild +++ b/kde-apps/k3b/k3b-9999.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 |