commit: 70ba453f6af2b866d2b11166381d144840a695bb
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 22 18:26:18 2025 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 23 07:41:51 2025 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=70ba453f
media-sound/kid3: Add upstream fix for IUSE="flac,-vorbis"
Upstream commit 7503e693d1ff9a90832b757cd5cd854aefe3cfa3
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>
.../kid3-3.9.6-oggflacmetadata-buildfix.patch | 66 ++++++++++++++++++++--
.../{kid3-3.9.6-r2.ebuild => kid3-3.9.6-r3.ebuild} | 0
2 files changed, 62 insertions(+), 4 deletions(-)
diff --git a/media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch
b/media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch
index ab1ef15f3cf5..ec4a64486afb 100644
--- a/media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch
+++ b/media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch
@@ -1,8 +1,8 @@
From 711b6a839523ced7453be89d3a4333b408b90b30 Mon Sep 17 00:00:00 2001
From: Andreas Sturmlechner <[email protected]>
Date: Mon, 17 Mar 2025 22:54:16 +0100
-Subject: [PATCH] CMake: Restore WITH_FLAC lever and oggflacmetadata option w/o
- WITH_VORBIS
+Subject: [PATCH 1/2] CMake: Restore WITH_FLAC lever and oggflacmetadata option
+ w/o WITH_VORBIS
Make explicit and properly conditionalise both WITH_FLAC and WITH_VORBIS.
@@ -15,7 +15,7 @@ Signed-off-by: Andreas Sturmlechner <[email protected]>
1 file changed, 20 insertions(+), 12 deletions(-)
diff --git a/src/plugins/oggflacmetadata/CMakeLists.txt
b/src/plugins/oggflacmetadata/CMakeLists.txt
-index c3365ea52..91d9c690c 100644
+index c3365ea5..91d9c690 100644
--- a/src/plugins/oggflacmetadata/CMakeLists.txt
+++ b/src/plugins/oggflacmetadata/CMakeLists.txt
@@ -1,24 +1,25 @@
@@ -72,5 +72,63 @@ index c3365ea52..91d9c690c 100644
target_compile_definitions(${plugin_TARGET} PRIVATE HAVE_CONFIG_H)
--
-GitLab
+2.49.0
+
+
+From 7503e693d1ff9a90832b757cd5cd854aefe3cfa3 Mon Sep 17 00:00:00 2001
+From: Urs Fleisch <[email protected]>
+Date: Sat, 22 Mar 2025 06:11:53 +0100
+Subject: [PATCH 2/2] Support configuration WITH_VORBIS=OFF, WITH_FLAC=ON
+
+---
+ src/plugins/oggflacmetadata/CMakeLists.txt | 4 ++--
+ src/plugins/oggflacmetadata/oggfile.cpp | 3 +++
+ 2 files changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/src/plugins/oggflacmetadata/CMakeLists.txt
b/src/plugins/oggflacmetadata/CMakeLists.txt
+index 91d9c690..fcffe83f 100644
+--- a/src/plugins/oggflacmetadata/CMakeLists.txt
++++ b/src/plugins/oggflacmetadata/CMakeLists.txt
+@@ -14,9 +14,9 @@ if(WITH_VORBIS OR WITH_FLAC)
+
+ string(TOLOWER ${plugin_NAME} plugin_TARGET)
+
+- add_library(${plugin_TARGET} oggflacmetadataplugin.cpp)
++ add_library(${plugin_TARGET} oggflacmetadataplugin.cpp oggfile.cpp)
+ if(HAVE_VORBIS)
+- target_sources(${plugin_TARGET} PRIVATE oggfile.cpp vcedit.c)
++ target_sources(${plugin_TARGET} PRIVATE vcedit.c)
+ endif()
+ if(HAVE_FLAC)
+ target_sources(${plugin_TARGET} PRIVATE flacfile.cpp)
+diff --git a/src/plugins/oggflacmetadata/oggfile.cpp
b/src/plugins/oggflacmetadata/oggfile.cpp
+index 3b7ba695..a0c9b772 100644
+--- a/src/plugins/oggflacmetadata/oggfile.cpp
++++ b/src/plugins/oggflacmetadata/oggfile.cpp
+@@ -39,6 +39,7 @@
+ #include "tagconfig.h"
+ #include "taggedfilesystemmodel.h"
+
++#ifdef HAVE_VORBIS
+ namespace {
+
+ /*
+@@ -136,6 +137,7 @@ long oggtell(void* stream)
+ }
+
+ }
++#endif // HAVE_VORBIS
+
+ /**
+ * Constructor.
+@@ -345,6 +347,7 @@ void OggFile::clearTags(bool force)
+ notifyModelDataChanged(priorIsTagInformationRead);
+ }
+ #else // HAVE_VORBIS
++int OggFile::taggedFileFeatures() const { return 0; }
+ void OggFile::readTags(bool) {}
+ bool OggFile::writeTags(bool, bool*, bool) { return false; }
+ void OggFile::clearTags(bool) {}
+--
+2.49.0
diff --git a/media-sound/kid3/kid3-3.9.6-r2.ebuild
b/media-sound/kid3/kid3-3.9.6-r3.ebuild
similarity index 100%
rename from media-sound/kid3/kid3-3.9.6-r2.ebuild
rename to media-sound/kid3/kid3-3.9.6-r3.ebuild
