From 72e4c0bc86eea366d063d15b3d5611e8f82ffd05 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Mon, 24 Mar 2025 00:31:53 +0000 Subject: gentoo auto-resync : 24:03:2025 - 00:31:53 --- media-sound/Manifest.gz | Bin 57250 -> 57246 bytes media-sound/kid3/Manifest | 4 +- .../kid3-3.9.6-oggflacmetadata-buildfix.patch | 66 +++++++++++++- media-sound/kid3/kid3-3.9.6-r2.ebuild | 97 --------------------- media-sound/kid3/kid3-3.9.6-r3.ebuild | 97 +++++++++++++++++++++ 5 files changed, 161 insertions(+), 103 deletions(-) delete mode 100644 media-sound/kid3/kid3-3.9.6-r2.ebuild create mode 100644 media-sound/kid3/kid3-3.9.6-r3.ebuild (limited to 'media-sound') diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz index 4499bd789459..8acbe9180034 100644 Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest index dc998c1041a6..6adb7052450a 100644 --- a/media-sound/kid3/Manifest +++ b/media-sound/kid3/Manifest @@ -1,6 +1,6 @@ AUX kid3-3.9.6-no-ndebug.patch 1684 BLAKE2B 91f52e2ffb86d026ab206978b2d885c0b090e4ad94203af582e09d05b0d166c6c7e8817e85ded4e2a36f53d0408b33906ee84f90ff42bb918e4883f4e62fff47 SHA512 651116c2f1bc5a15611cf421286b073b3d5ae3980c3c28271801f95f6abb74d23aa6a11f43ec34a905fd61fab9cee2e6a3c9dd2cd2b9a913ef1e8011aa1cd011 -AUX kid3-3.9.6-oggflacmetadata-buildfix.patch 2409 BLAKE2B 9434f0fcfb105add37d92a88f875519bd8fcc575e7e4e228b8e310050b4dfdefc4e107aff8a785f67ed98dfb4e09c0645b13893f778f21017bd03016c5c6731e SHA512 8a6171fec5728f1bfac9091e445c20966c78f7cf7ea7d5ac7ec4d648934079b622e53481770f31b4907a465cab11be73f88743016b11e4859cf39e78af0d6d40 +AUX kid3-3.9.6-oggflacmetadata-buildfix.patch 4265 BLAKE2B 0eacafec38615643d0a93ff73ba610c1f81270191e35c8aa450c80976b2da125e95ae4fbe7f3ce12a9307195fbf7e2c7eefc80423529f584814ce8d4d88ff8ca SHA512 31a3ef840d64a47f26394e560906d8bf45cbb13e64792f37f91b7ed5720979090c0641b9fcb21b3735a1f43f78b9d0e1c8d981762cce293cb56d31f32742b01b DIST kid3-3.9.6.tar.xz 1872012 BLAKE2B 3945ca19f08baf84373ba34bcb9917f58d20f9208479a3a2d1319bdf50aae5cc56b906f5ac2caee5eb3d5c5f042a0ecdeff3e3ac0ecb499e6e3a32db436f2b1d SHA512 1667b3f5d458f9cc54e5b9af839c849e990a333eab3cfaa8d310b4d46b925ca5b57ea0ac9365a023fecc1ac2429f761dd2bfc0b3a3df48f5d4dd351c8741455f -EBUILD kid3-3.9.6-r2.ebuild 2192 BLAKE2B 8db186607b29f9b28cc15cca67e26b8d40d1802eca30ca2b032698d5ca385f6aee29c0ed2cd049d5eda65b85dbd1d6660b3565351b01204779678f968e900f50 SHA512 77bc4db056941294a978676c1177733c5652b390e668ce310a8f7bd52a30c7c4f54ddeec34a96fe0a298cf08582e94bccbcaf839ad30a76a28dc5ab6e3b09343 +EBUILD kid3-3.9.6-r3.ebuild 2192 BLAKE2B 8db186607b29f9b28cc15cca67e26b8d40d1802eca30ca2b032698d5ca385f6aee29c0ed2cd049d5eda65b85dbd1d6660b3565351b01204779678f968e900f50 SHA512 77bc4db056941294a978676c1177733c5652b390e668ce310a8f7bd52a30c7c4f54ddeec34a96fe0a298cf08582e94bccbcaf839ad30a76a28dc5ab6e3b09343 EBUILD kid3-3.9.6.ebuild 1996 BLAKE2B fac6b3d6d8f5f71e7c1503e315202c7c3cece06e139b260547cfae20267d2a19382773d8918d60141232d08fb2e6cf37c99dff29e45971662f50c70280415191 SHA512 78b38e1e27231e237adf6b13d0ae37855b606953b847ce5f2b32bdc40d83dce7956e9df22b094258c18d77eb81e58d508842b12f6f77e06276505ef97e22ca80 MISC metadata.xml 735 BLAKE2B 1715c990ed5b2240f888bd2a6587ac4ebdeb88722a89567fb7f78c3f9b4002e27c2db4dbabb81617d203449bfbe809aebb188ddc2dad922c23858b2b5437324c SHA512 9e1261175451eee81451fb9012577d144c838be90d1e637a34c8866e9045e35425309fa35fd6fa4b8bc15ae09bb071cdef5b6d95e79d20122790c8c57c9e0b44 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 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 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 +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-r2.ebuild deleted file mode 100644 index 638ffde75f28..000000000000 --- a/media-sound/kid3/kid3-3.9.6-r2.ebuild +++ /dev/null @@ -1,97 +0,0 @@ -# Copyright 1999-2025 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..13} ) -inherit cmake kde.org python-any-r1 xdg - -DESCRIPTION="Simple tag editor based on Qt" -HOMEPAGE="https://kid3.kde.org/" - -if [[ ${KDE_BUILD_TYPE} != live ]]; then - SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" - KEYWORDS="~amd64 ~x86" -fi - -LICENSE="GPL-2+" -SLOT="0" -IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis" - -REQUIRED_USE="test? ( flac mp3 mp4 taglib vorbis )" # bug 926747 -RESTRICT="!test? ( test )" - -DEPEND=" - dev-qt/qtbase:6[gui,network,widgets,xml] - dev-qt/qtdeclarative:6 - dev-qt/qtmultimedia:6 - sys-libs/readline:= - acoustid? ( - media-libs/chromaprint:= - media-video/ffmpeg:= - ) - flac? ( media-libs/flac:=[cxx] ) - kde? ( - kde-frameworks/kconfig:6 - kde-frameworks/kconfigwidgets:6 - kde-frameworks/kcoreaddons:6 - kde-frameworks/kio:6 - kde-frameworks/kwidgetsaddons:6 - kde-frameworks/kxmlgui:6 - ) - mp3? ( media-libs/id3lib ) - mp4? ( media-libs/libmp4v2 ) - mpris? ( dev-qt/qtbase:6[dbus] ) - taglib? ( >=media-libs/taglib-1.9.1:= ) - vorbis? ( - media-libs/libogg - media-libs/libvorbis - ) -" -RDEPEND="${DEPEND} - !media-sound/kid3:5 -" -BDEPEND="${PYTHON_DEPS} - dev-qt/qttools:6[linguist] - kde? ( kde-frameworks/extra-cmake-modules:0 ) -" - -PATCHES=( - "${FILESDIR}/${P}-no-ndebug.patch" # bug 949369 - # https://invent.kde.org/multimedia/kid3/-/merge_requests/34 - "${FILESDIR}/${P}-oggflacmetadata-buildfix.patch" # bug 917038 -) - -pkg_setup() { - use test && python-any-r1_pkg_setup -} - -src_prepare() { - # overengineered upstream build system - cmake_src_prepare - # applies broken python hacks, bug #614950 - cmake_comment_add_subdirectory doc -} - -src_configure() { - local mycmakeargs=( - -DBUILD_WITH_QT6=ON - -DWITH_QAUDIODECODER=ON # bug 855281 - -DWITH_CHROMAPRINT=$(usex acoustid) - -DWITH_DBUS=$(usex mpris) - -DWITH_FLAC=$(usex flac) - -DWITH_ID3LIB=$(usex mp3) - -DWITH_MP4V2=$(usex mp4) - -DWITH_TAGLIB=$(usex taglib) - -DBUILD_TESTING=$(usex test) - -DWITH_VORBIS=$(usex vorbis) - ) - - if use kde ; then - mycmakeargs+=( "-DWITH_APPS=KDE;CLI" ) - else - mycmakeargs+=( "-DWITH_APPS=Qt;CLI" ) - fi - - cmake_src_configure -} diff --git a/media-sound/kid3/kid3-3.9.6-r3.ebuild b/media-sound/kid3/kid3-3.9.6-r3.ebuild new file mode 100644 index 000000000000..638ffde75f28 --- /dev/null +++ b/media-sound/kid3/kid3-3.9.6-r3.ebuild @@ -0,0 +1,97 @@ +# Copyright 1999-2025 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..13} ) +inherit cmake kde.org python-any-r1 xdg + +DESCRIPTION="Simple tag editor based on Qt" +HOMEPAGE="https://kid3.kde.org/" + +if [[ ${KDE_BUILD_TYPE} != live ]]; then + SRC_URI="mirror://kde/stable/${PN}/${PV}/${P}.tar.xz" + KEYWORDS="~amd64 ~x86" +fi + +LICENSE="GPL-2+" +SLOT="0" +IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis" + +REQUIRED_USE="test? ( flac mp3 mp4 taglib vorbis )" # bug 926747 +RESTRICT="!test? ( test )" + +DEPEND=" + dev-qt/qtbase:6[gui,network,widgets,xml] + dev-qt/qtdeclarative:6 + dev-qt/qtmultimedia:6 + sys-libs/readline:= + acoustid? ( + media-libs/chromaprint:= + media-video/ffmpeg:= + ) + flac? ( media-libs/flac:=[cxx] ) + kde? ( + kde-frameworks/kconfig:6 + kde-frameworks/kconfigwidgets:6 + kde-frameworks/kcoreaddons:6 + kde-frameworks/kio:6 + kde-frameworks/kwidgetsaddons:6 + kde-frameworks/kxmlgui:6 + ) + mp3? ( media-libs/id3lib ) + mp4? ( media-libs/libmp4v2 ) + mpris? ( dev-qt/qtbase:6[dbus] ) + taglib? ( >=media-libs/taglib-1.9.1:= ) + vorbis? ( + media-libs/libogg + media-libs/libvorbis + ) +" +RDEPEND="${DEPEND} + !media-sound/kid3:5 +" +BDEPEND="${PYTHON_DEPS} + dev-qt/qttools:6[linguist] + kde? ( kde-frameworks/extra-cmake-modules:0 ) +" + +PATCHES=( + "${FILESDIR}/${P}-no-ndebug.patch" # bug 949369 + # https://invent.kde.org/multimedia/kid3/-/merge_requests/34 + "${FILESDIR}/${P}-oggflacmetadata-buildfix.patch" # bug 917038 +) + +pkg_setup() { + use test && python-any-r1_pkg_setup +} + +src_prepare() { + # overengineered upstream build system + cmake_src_prepare + # applies broken python hacks, bug #614950 + cmake_comment_add_subdirectory doc +} + +src_configure() { + local mycmakeargs=( + -DBUILD_WITH_QT6=ON + -DWITH_QAUDIODECODER=ON # bug 855281 + -DWITH_CHROMAPRINT=$(usex acoustid) + -DWITH_DBUS=$(usex mpris) + -DWITH_FLAC=$(usex flac) + -DWITH_ID3LIB=$(usex mp3) + -DWITH_MP4V2=$(usex mp4) + -DWITH_TAGLIB=$(usex taglib) + -DBUILD_TESTING=$(usex test) + -DWITH_VORBIS=$(usex vorbis) + ) + + if use kde ; then + mycmakeargs+=( "-DWITH_APPS=KDE;CLI" ) + else + mycmakeargs+=( "-DWITH_APPS=Qt;CLI" ) + fi + + cmake_src_configure +} -- cgit v1.2.3