diff options
Diffstat (limited to 'media-sound')
21 files changed, 44 insertions, 465 deletions
diff --git a/media-sound/audex/Manifest b/media-sound/audex/Manifest index 7dd89498b07c..860c3b2c0635 100644 --- a/media-sound/audex/Manifest +++ b/media-sound/audex/Manifest @@ -1,2 +1,2 @@ DIST audex-24.08.3.tar.xz 711860 BLAKE2B c93255a6be4e76f565d32e2c9b638983b619aa3962a2ac9ca60cf7ee48fa9856a12283c97409c8e11f96084e8ff891dc7d958bfd5e7326dcbd74c0300c393686 SHA512 0779e8c82f6c92a51ef772171bbc51c309280f1b85d7e2c003efa841eb656d8bc3ad50e1ff0fa51b4f6117655aff10252b9aa8df6b90fddc6b556f2bc10946a6 -DIST audex-24.12.0.tar.xz 714176 BLAKE2B 9555ac5cbd1c6521da9e88e8d1a69ba68f5a16103368f14563a22ee8cd133bbaa645ef04ba9a996be91c28dde5686f4a1ab3bb09ff10c4ac7136c0281d1e9c15 SHA512 fea459f0711bf3bccb115f92e9e39dc6cd7b9bce47dda770a5871e6bb11ff5794f7decb1fac5eb984b1ab12209dd8df83b93d52bcd7725744cb559ea27c305e2 +DIST audex-24.12.1.tar.xz 716860 BLAKE2B b9cc6ab01e8371c072e130475f8f156f0dcb454f41e5b4b8e3daef0e28ef68486a28a7fa0fd08e5c576ba7f02ffce171e836db45e96962e239da4d7c62caf1b1 SHA512 106b082909d4b581e6cc1b0ac4e1cc8d20265c73e96de20ceaab7085e78b91909b55b4758381ed1959e608609b84a7e2f8e5e176dd0bc866e8a79467da187163 diff --git a/media-sound/audex/audex-24.12.0.ebuild b/media-sound/audex/audex-24.12.1.ebuild index 797eb8b4c7f5..8b2308535cfd 100644 --- a/media-sound/audex/audex-24.12.0.ebuild +++ b/media-sound/audex/audex-24.12.1.ebuild @@ -1,11 +1,11 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="true" PVCUT=$(ver_cut 1-3) -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org diff --git a/media-sound/elisa/Manifest b/media-sound/elisa/Manifest index f2004705fbc0..20c044e9d48b 100644 --- a/media-sound/elisa/Manifest +++ b/media-sound/elisa/Manifest @@ -1,2 +1,2 @@ DIST elisa-24.08.3.tar.xz 1909116 BLAKE2B 1f1fd6f767bc7da4a0ba9ef5d6472138cc8a4107211fb061a7d6fba0304ba79fa6ac4bee0ee631b26c4743e9a44ac5ea7e96767762c346f27b7fee649ba1eb30 SHA512 a81950f2f2248e8590ad32c056b56532c0ba847e885abf0aed8109746d3db69a96293f66c91e7670f9b5bfd45a61d91c97d3ef78a95ea217f33ad8f8b18b43cc -DIST elisa-24.12.0.tar.xz 1924748 BLAKE2B 8f7b632f7424fa2c6f6e50e6b31ac7ad5187de74c98d9361278ed8f3b08934b6590cb7c562c2e0dbc9c67e74f9e155bab88a7cb14a9a8e3aa8f0cf21809fbed8 SHA512 0b5ca83dbf67d358d3e0b8a26305fe192edb553ba1c144153260d0d5b86fa088367d941a391e5ff3a4139a2208e08daad9c2fe04ade7e59e261e7739a83b4fb8 +DIST elisa-24.12.1.tar.xz 1924868 BLAKE2B 1877ee588a86430cc21b3869bece5fd5cdd91cadd3d94a7c044a2c9440ceb7eb5bf44f151390a78288632dc7ff4468c83633f4e02bdd3ae95dad5c4b1d0716f2 SHA512 cd9514e1736cf20a3b9ebb895ab9c3a706e406d16e22803fd251ef94651697ea9cd5c991c7a11567339da05f5042d76a81b96256e997b78b1d5aa18efcad7b48 diff --git a/media-sound/elisa/elisa-24.12.0.ebuild b/media-sound/elisa/elisa-24.12.1.ebuild index e729f16e7d6e..e949e11298c7 100644 --- a/media-sound/elisa/elisa-24.12.0.ebuild +++ b/media-sound/elisa/elisa-24.12.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 ECM_TEST="forceoptional" -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org diff --git a/media-sound/flake/files/flake-0.11-make-instability.patch b/media-sound/flake/files/flake-0.11-make-instability.patch index ac2bd95859fb..66cb47a4e53d 100644 --- a/media-sound/flake/files/flake-0.11-make-instability.patch +++ b/media-sound/flake/files/flake-0.11-make-instability.patch @@ -31,3 +31,27 @@ diff -ru a/flake/Makefile b/flake/Makefile flake_g$(EXESUF): flake.o wav.o $(DEP_LIBS) $(CC) $(FLAKE_LIBDIRS) $(LDFLAGS) -o $@ flake.o wav.o $(FLAKE_LIBS) $(EXTRALIBS) cp -p flake_g$(EXESUF) flake$(EXESUF) +Clean up implicit declaration in configure and prepare for C23 +diff -ru a/configure b/configure +@@ -666,6 +667,7 @@ + # test for strnlen in string.h + check_exec <<EOF && have_strnlen=yes || have_strnlen=no + #define _ISOC9X_SOURCE 1 ++#define _GNU_SOURCE 1 ++#include <strings.h> + #include <string.h> + int main( void ) { return (strnlen("help", 6) == 4)?0:1; } + EOF +diff -ru a/common.h b/common.h +--- a/common.h 2025-01-09 16:06:00.978525674 +0400 ++++ b//common.h 2025-01-09 16:07:06.592168373 +0400 +@@ -87,7 +87,8 @@ + return i; + } + #elif !defined(__USE_GNU) +-extern size_t strnlen(const char *s, size_t maxlen); ++#include <strings.h> ++//extern size_t strnlen(const char *s, size_t maxlen); + #endif + + #endif /* COMMON_H */ diff --git a/media-sound/flake/flake-0.11.ebuild b/media-sound/flake/flake-0.11-r1.ebuild index 995a85be4f49..25a2b34a6e6f 100644 --- a/media-sound/flake/flake-0.11.ebuild +++ b/media-sound/flake/flake-0.11-r1.ebuild @@ -16,7 +16,11 @@ KEYWORDS="amd64 x86" PATCHES=("${FILESDIR}"/${P}-make-instability.patch) src_configure() { - # NIH configure script + # NIH configure script that uses hardcoded cc for discovery + # https://bugs.gentoo.org/947767 + sed -i -e "s:cc=\"gcc\":cc=\"$(tc-getCC)\":" configure \ + || die failed to patch CC + ./configure \ --ar="$(tc-getAR)" \ --cc="$(tc-getCC)" \ diff --git a/media-sound/kasts/Manifest b/media-sound/kasts/Manifest index 238db682e195..912462a1a575 100644 --- a/media-sound/kasts/Manifest +++ b/media-sound/kasts/Manifest @@ -1,2 +1,2 @@ DIST kasts-24.08.3.tar.xz 619032 BLAKE2B a5c6a0fe14ba94fa0f80fe53eca2c51b30d366142f83eeafc5521de923cd06c601fe5fafb929ac671d1f8081f830eb23e70f93e5a421f78b5f112bb96030e7c9 SHA512 b53e8f97508d2cbe846fa263b75192b36f1c3fa23165f3d21bd13c682ac55522e006e00bfb9dc34e8b8d8c216b4607fe5a4094019dd274097f34a0b2ac09f7a8 -DIST kasts-24.12.0.tar.xz 625720 BLAKE2B df01c112e16a70bafb3841a182ca26f496b571e7ce20c394cb635f886327e0fe51c7a35b88fc23d40e79466a65936de39195f87776ffee30ff004b5c80b4b62d SHA512 b28d503174d9d07e690de3c2d8e5db3f47d9098bd7b9e50365034004375b845f96c38a89cbd9977913d1f5c22362ac0b1f141b81a1e9574bad4f40b22a2c14ff +DIST kasts-24.12.1.tar.xz 626016 BLAKE2B a7e9b80187d81fcecb7b06b478948b07cb9f2630769b4dd4ce03bd0c20c6086737d6c6319e6033bb7c439c817bd49819ad3da3adaf883798d481c00977937445 SHA512 b2366b6a08644eaf198f1a991354a8f46add113233408ad5953dab320d496862db77ea8088d86f555b036f7cd022c4a5f9557f119393cc296bbc8c4f4359771e diff --git a/media-sound/kasts/kasts-24.12.0.ebuild b/media-sound/kasts/kasts-24.12.1.ebuild index 6618440efed5..12a1db6a4627 100644 --- a/media-sound/kasts/kasts-24.12.0.ebuild +++ b/media-sound/kasts/kasts-24.12.1.ebuild @@ -1,9 +1,9 @@ -# Copyright 2023-2024 Gentoo Authors +# Copyright 2023-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org diff --git a/media-sound/krecorder/Manifest b/media-sound/krecorder/Manifest index 986d3497cb7f..8c7211e0f867 100644 --- a/media-sound/krecorder/Manifest +++ b/media-sound/krecorder/Manifest @@ -1,2 +1,2 @@ DIST krecorder-24.08.3.tar.xz 168280 BLAKE2B 8f17304e9528657be24934ed23d1d7115607454f819f0201b1bc0bc2e840dbce7d8e26981ce0c57977aae6f16665a6e4981d2033640f607b6b49a0aa66cbcac9 SHA512 4697ae0708206a02ef63e023590a5200add598be57306b8c3b0d8d29d5eef7d9cf3ca2bce425de323059b44ee583934312ec05fb9864d6288591822718326dc2 -DIST krecorder-24.12.0.tar.xz 168860 BLAKE2B e99b9910209c99af719d75a7668d192fd9285e317af823ca207c9a3f50b727ebfe4a0658ba71c0e8261eecb5af4aa54f38470927777b79938c1ddd1ce48393ea SHA512 12fed2d6853f5372c127b9e3284125d178353129cadfb7113b60cc2d17de20b5187a5fad83c5890e548e68ae136edb27e581b5bda4c9eefbec7e3e854f436a49 +DIST krecorder-24.12.1.tar.xz 168876 BLAKE2B 15a441a9f06f79d76d2c742598999a60a83d29d83570f0576f0a07917526fbd397ff8d266b2f7eef55f5c49a250338b5de479c4e83bce2747a813f504d6024f9 SHA512 925a397d3c821e4f6c53010beeaedc2d263122b213f70bc4405e190f7b75bf65bfe5b9ce242e6b425420f9188a0e19c751ab244b4ae9a48384767bb5e34f4c46 diff --git a/media-sound/krecorder/krecorder-24.12.0.ebuild b/media-sound/krecorder/krecorder-24.12.1.ebuild index 01e69af0a849..f66ea364c59a 100644 --- a/media-sound/krecorder/krecorder-24.12.0.ebuild +++ b/media-sound/krecorder/krecorder-24.12.1.ebuild @@ -1,10 +1,10 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 KDE_ORG_CATEGORY="utilities" -KFMIN=6.5.0 +KFMIN=6.7.0 QTMIN=6.7.2 inherit ecm gear.kde.org diff --git a/media-sound/openmpt123/Manifest b/media-sound/openmpt123/Manifest index 2941fe4abe48..9cc3eda38aec 100644 --- a/media-sound/openmpt123/Manifest +++ b/media-sound/openmpt123/Manifest @@ -1 +1 @@ -DIST libopenmpt-0.7.10+release.autotools.tar.gz 1671289 BLAKE2B 62bd4a1bcd9685fdb92c270687b71609a23986941e301ad17cc37ca5f6b5b76fa1a8f425b2e68603bb29bfa34c3c1caea98faea1d95004f87943b2bed6b7c9a0 SHA512 e5f02b045bc1449791ec43a32216c4c4231edff88b3bda07283c9768118bce3a1f50c2535dbe38a21eb12016294e3b5823ef2f32f2f1e21d40fafe188bad783d +DIST libopenmpt-0.7.13+release.autotools.tar.gz 1681351 BLAKE2B d75df89e85531e85974bd532773e8ed16440211448790779191a61a629dde33ef7280bcc1c82e6ac6aeb313f7f568bc7a2abe707772801f52c271977b88eff8e SHA512 04e63c635dd6c63c2ce79db4eff971f10e4d14a12c7f143fc317a4b5f5188cd8cbf84fc5121057c2beff3a3e6b9b48767c02b9eb5c569accab3e6ff7322a9690 diff --git a/media-sound/openmpt123/openmpt123-0.7.10.ebuild b/media-sound/openmpt123/openmpt123-0.7.13.ebuild index d3819b92551d..d8a1233270c6 100644 --- a/media-sound/openmpt123/openmpt123-0.7.10.ebuild +++ b/media-sound/openmpt123/openmpt123-0.7.13.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 diff --git a/media-sound/soundkonverter/Manifest b/media-sound/soundkonverter/Manifest deleted file mode 100644 index 174b63c1565f..000000000000 --- a/media-sound/soundkonverter/Manifest +++ /dev/null @@ -1 +0,0 @@ -DIST soundkonverter-3.0.1.tar.gz 821278 BLAKE2B 3b54a0e8d728d15a1c0ae716e0d321fe37a866f755fee25dd284e46a04a514ace5e8b27fb612b928a3a6ddf32504d08ff0165ceb5c8d48ba1763fcd34994e586 SHA512 db0f9ff7b8d229012d08bb8030c7f11c428632867d0eeb7de8717d47f651a7641240aa0df9c947653fe6a2ad7d4930421f69fff8d038d47f28ca563dfa720911 diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch deleted file mode 100644 index b7009d33125d..000000000000 --- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-deps.patch +++ /dev/null @@ -1,30 +0,0 @@ -From 0eda1978640dda400ca02172abeeacbb725f7b7c Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 19 Jul 2020 11:43:30 +0200 -Subject: [PATCH] Consolidate find_package calls inside CMakeLists.txt - -- Drop unused Qt5Network -- Search for Qt5Xml once instead of in most plugins -- KF5WidgetsAddons and KF5KIO were already being searched for - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 521d0da..7e578f0 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -30,7 +30,7 @@ include(CMakePackageConfigHelpers) - include(ECMInstallIcons) - include(FeatureSummary) - --find_package(Qt5 REQUIRED COMPONENTS Network Core Widgets) -+find_package(Qt5 REQUIRED COMPONENTS Core Widgets Xml) - find_package(KF5 REQUIRED COMPONENTS I18n XmlGui KIO Solid Config ConfigWidgets WidgetsAddons KDELibs4Support) - find_package(KF5Cddb) - find_package(Phonon4Qt5 REQUIRED) --- -2.27.0 - diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch deleted file mode 100644 index cc5a584b5e0c..000000000000 --- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-fix-add-dirs.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 16fb09fcbd5712b7b75004229dbb74f85f213b53 Mon Sep 17 00:00:00 2001 -From: Daniel Faust <hessijames@gmail.com> -Date: Mon, 6 Aug 2018 18:35:15 +0200 -Subject: [PATCH] Fix adding directories to the Replay Gain tool - -Fixes #70 ---- - replaygainscanner/replaygainfilelist.cpp | 2 +- - 1 files changed, 1 insertion(+), 1 deletion(-) - -diff --git a/replaygainscanner/replaygainfilelist.cpp b/replaygainscanner/replaygainfilelist.cpp -index edd64d0..3df5d58 100644 ---- a/replaygainscanner/replaygainfilelist.cpp -+++ b/replaygainscanner/replaygainfilelist.cpp -@@ -355,7 +355,7 @@ int ReplayGainFileList::listDir( const QString& directory, const QStringList& fi - if( filter.contains(codecName) ) - { - QList<QUrl> urls; -- urls.append(directory + "/" + fileName); -+ urls.append("file://" + directory + "/" + fileName); - addFiles( urls, codecName ); - } - diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch deleted file mode 100644 index 8439e7a83df9..000000000000 --- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-kf-5.72-findtaglib.patch +++ /dev/null @@ -1,300 +0,0 @@ -From 3760bccb3aa1e15bd5ec67bc977717c55a95bc6e Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 19 Jul 2020 12:06:28 +0200 -Subject: [PATCH 1/2] FindTaglib.cmake: Update local copy with ECM 5.72.0 - version and adapt cmake - -ECM 5.72.0 ships an incompatible FindTaglib.cmake module. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 6 +- - cmake/modules/FindTaglib.cmake | 209 +++++++++++------------------ - 2 files changed, 85 insertions(+), 130 deletions(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 521d0da..c9d9bee 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -40,7 +40,7 @@ find_package(Phonon4Qt5 REQUIRED) - find_package(Cdparanoia REQUIRED) - - set(TAGLIB_MIN_VERSION "1.10") --find_package(Taglib REQUIRED) -+find_package(Taglib ${TAGLIB_MIN_VERSION} REQUIRED) - - - # plugins -@@ -48,7 +48,7 @@ add_subdirectory(plugins) - - - # include directories --include_directories(${TAGLIB_INCLUDES} ${CDPARANOIA_INCLUDE_DIR}) -+include_directories(${CDPARANOIA_INCLUDE_DIR}) - - - # translation -@@ -120,7 +120,7 @@ set(soundkonverter_SRCS - ) - - add_executable(soundkonverter ${soundkonverter_SRCS}) --target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 ${TAGLIB_LIBRARIES} ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) -+target_link_libraries(soundkonverter KF5::WidgetsAddons KF5::KIOFileWidgets KF5::KIOCore KF5::Solid KF5::Cddb Phonon::phonon4qt5 Taglib::Taglib ${CDPARANOIA_LIBRARIES} KF5::KDELibs4Support soundkonvertercore) - - install(TARGETS soundkonverter DESTINATION ${BIN_INSTALL_DIR}) - -diff --git a/cmake/modules/FindTaglib.cmake b/cmake/modules/FindTaglib.cmake -index 5a985f9..40c5ca2 100644 ---- a/cmake/modules/FindTaglib.cmake -+++ b/cmake/modules/FindTaglib.cmake -@@ -1,135 +1,90 @@ --# - Try to find the Taglib library --# Once done this will define -+#.rst: -+# FindTaglib -+# ---------- - # --# TAGLIB_FOUND - system has the taglib library --# TAGLIB_CFLAGS - the taglib cflags --# TAGLIB_LIBRARIES - The libraries needed to use taglib -- --# Copyright (c) 2006, Laurent Montel, <montel@kde.org> -+# Try to find the Taglib library. - # --# Redistribution and use is allowed according to the terms of the BSD license. --# For details see the accompanying COPYING-CMAKE-SCRIPTS file. -- --if(NOT TAGLIB_MIN_VERSION) -- set(TAGLIB_MIN_VERSION "1.6") --endif(NOT TAGLIB_MIN_VERSION) -- --if(NOT WIN32) -- find_program(TAGLIBCONFIG_EXECUTABLE NAMES taglib-config PATHS -- ${BIN_INSTALL_DIR} -- ) --endif(NOT WIN32) -- --#reset vars --set(TAGLIB_LIBRARIES) --set(TAGLIB_CFLAGS) -- --# if taglib-config has been found --if(TAGLIBCONFIG_EXECUTABLE) -- -- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --version RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_VERSION) -- -- if(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") -- message(STATUS "TagLib version too old: version searched :${TAGLIB_MIN_VERSION}, found ${TAGLIB_VERSION}") -- set(TAGLIB_FOUND FALSE) -- else(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") -- -- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --libs RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_LIBRARIES) -- -- exec_program(${TAGLIBCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE TAGLIB_CFLAGS) -+# This will define the following variables: -+# -+# ``Taglib_FOUND`` -+# True if the system has the taglib library of at least the minimum -+# version specified by the version parameter to find_package() -+# ``Taglib_INCLUDE_DIRS`` -+# The taglib include dirs for use with target_include_directories -+# ``Taglib_LIBRARIES`` -+# The taglib libraries for use with target_link_libraries() -+# ``Taglib_VERSION`` -+# The version of taglib that was found -+# -+# If ``Taglib_FOUND is TRUE, it will also define the following imported -+# target: -+# -+# ``Taglib::Taglib`` -+# The Taglib library -+# -+# Since 5.72.0 -+# -+# SPDX-FileCopyrightText: 2006 Laurent Montel <montel@kde.org> -+# SPDX-FileCopyrightText: 2019 Heiko Becker <heirecka@exherbo.org> -+# SPDX-FileCopyrightText: 2020 Elvis Angelaccio <elvis.angelaccio@kde.org> -+# SPDX-License-Identifier: BSD-3-Clause - -- if(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) -- set(TAGLIB_FOUND TRUE) -- endif(TAGLIB_LIBRARIES AND TAGLIB_CFLAGS) -- string(REGEX REPLACE " *-I" ";" TAGLIB_INCLUDES "${TAGLIB_CFLAGS}") -- endif(TAGLIB_VERSION VERSION_LESS "${TAGLIB_MIN_VERSION}") -- mark_as_advanced(TAGLIB_CFLAGS TAGLIB_LIBRARIES TAGLIB_INCLUDES) -+find_package(PkgConfig QUIET) - --else(TAGLIBCONFIG_EXECUTABLE) -+pkg_search_module(PC_TAGLIB QUIET taglib) - -- find_path(TAGLIB_INCLUDES -- NAMES -- tag.h -+find_path(Taglib_INCLUDE_DIRS -+ NAMES tag.h - PATH_SUFFIXES taglib -- PATHS -- ${KDE4_INCLUDE_DIR} -- ${INCLUDE_INSTALL_DIR} -- ) -- -- IF(NOT WIN32) -- # on non-win32 we don't need to take care about WIN32_DEBUG_POSTFIX -- -- FIND_LIBRARY(TAGLIB_LIBRARIES tag PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) -- -- ELSE(NOT WIN32) -- -- # 1. get all possible libnames -- SET(args PATHS ${KDE4_LIB_DIR} ${LIB_INSTALL_DIR}) -- SET(newargs "") -- SET(libnames_release "") -- SET(libnames_debug "") -- -- LIST(LENGTH args listCount) -- -- # just one name -- LIST(APPEND libnames_release "tag") -- LIST(APPEND libnames_debug "tagd") -- -- SET(newargs ${args}) -- -- # search the release lib -- FIND_LIBRARY(TAGLIB_LIBRARIES_RELEASE -- NAMES ${libnames_release} -- ${newargs} -- ) -- -- # search the debug lib -- FIND_LIBRARY(TAGLIB_LIBRARIES_DEBUG -- NAMES ${libnames_debug} -- ${newargs} -- ) -- -- IF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) -- -- # both libs found -- SET(TAGLIB_LIBRARIES optimized ${TAGLIB_LIBRARIES_RELEASE} -- debug ${TAGLIB_LIBRARIES_DEBUG}) -- -- ELSE(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) -- -- IF(TAGLIB_LIBRARIES_RELEASE) -- -- # only release found -- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_RELEASE}) -- -- ELSE(TAGLIB_LIBRARIES_RELEASE) -- -- # only debug (or nothing) found -- SET(TAGLIB_LIBRARIES ${TAGLIB_LIBRARIES_DEBUG}) -- -- ENDIF(TAGLIB_LIBRARIES_RELEASE) -- -- ENDIF(TAGLIB_LIBRARIES_RELEASE AND TAGLIB_LIBRARIES_DEBUG) -- -- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_RELEASE) -- MARK_AS_ADVANCED(TAGLIB_LIBRARIES_DEBUG) -- -- ENDIF(NOT WIN32) -- -- INCLUDE(FindPackageMessage) -- INCLUDE(FindPackageHandleStandardArgs) -- FIND_PACKAGE_HANDLE_STANDARD_ARGS(Taglib DEFAULT_MSG TAGLIB_INCLUDES TAGLIB_LIBRARIES) -- --endif(TAGLIBCONFIG_EXECUTABLE) -- -+ HINTS ${PC_TAGLIB_INCLUDEDIR} -+) -+ -+find_library(Taglib_LIBRARIES -+ NAMES tag -+ HINTS ${PC_TAGLIB_LIBDIR} -+) -+ -+set(Taglib_VERSION ${PC_TAGLIB_VERSION}) -+ -+if (Taglib_INCLUDE_DIRS AND NOT Taglib_VERSION) -+ if(EXISTS "${Taglib_INCLUDE_DIRS}/taglib.h") -+ file(READ "${Taglib_INCLUDE_DIRS}/taglib.h" TAGLIB_H) -+ -+ string(REGEX MATCH "#define TAGLIB_MAJOR_VERSION[ ]+[0-9]+" TAGLIB_MAJOR_VERSION_MATCH ${TAGLIB_H}) -+ string(REGEX MATCH "#define TAGLIB_MINOR_VERSION[ ]+[0-9]+" TAGLIB_MINOR_VERSION_MATCH ${TAGLIB_H}) -+ string(REGEX MATCH "#define TAGLIB_PATCH_VERSION[ ]+[0-9]+" TAGLIB_PATCH_VERSION_MATCH ${TAGLIB_H}) -+ -+ string(REGEX REPLACE ".*_MAJOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MAJOR_VERSION "${TAGLIB_MAJOR_VERSION_MATCH}") -+ string(REGEX REPLACE ".*_MINOR_VERSION[ ]+(.*)" "\\1" TAGLIB_MINOR_VERSION "${TAGLIB_MINOR_VERSION_MATCH}") -+ string(REGEX REPLACE ".*_PATCH_VERSION[ ]+(.*)" "\\1" TAGLIB_PATCH_VERSION "${TAGLIB_PATCH_VERSION_MATCH}") -+ -+ set(Taglib_VERSION "${TAGLIB_MAJOR_VERSION}.${TAGLIB_MINOR_VERSION}.${TAGLIB_PATCH_VERSION}") -+ endif() -+endif() -+ -+include(FindPackageHandleStandardArgs) -+find_package_handle_standard_args(Taglib -+ FOUND_VAR -+ Taglib_FOUND -+ REQUIRED_VARS -+ Taglib_LIBRARIES -+ Taglib_INCLUDE_DIRS -+ VERSION_VAR -+ Taglib_VERSION -+) -+ -+if (Taglib_FOUND AND NOT TARGET Taglib::Taglib) -+ add_library(Taglib::Taglib UNKNOWN IMPORTED) -+ set_target_properties(Taglib::Taglib PROPERTIES -+ IMPORTED_LOCATION "${Taglib_LIBRARIES}" -+ INTERFACE_INCLUDE_DIRECTORIES "${Taglib_INCLUDE_DIRS}" -+ ) -+endif() - --if(TAGLIB_FOUND) -- if(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) -- message(STATUS "Taglib found: ${TAGLIB_LIBRARIES}") -- endif(NOT Taglib_FIND_QUIETLY AND TAGLIBCONFIG_EXECUTABLE) --else(TAGLIB_FOUND) -- if(Taglib_FIND_REQUIRED) -- message(FATAL_ERROR "Could not find Taglib") -- endif(Taglib_FIND_REQUIRED) --endif(TAGLIB_FOUND) -+mark_as_advanced(Taglib_LIBRARIES Taglib_INCLUDE_DIRS) - -+include(FeatureSummary) -+set_package_properties(Taglib PROPERTIES -+ URL "https://taglib.org/" -+ DESCRIPTION "A library for reading and editing the meta-data of audio formats" -+) --- -2.27.0 - - -From ff943d9cb19aa46b555826a053642ac2e84d392d Mon Sep 17 00:00:00 2001 -From: Andreas Sturmlechner <asturm@gentoo.org> -Date: Sun, 19 Jul 2020 13:02:33 +0200 -Subject: [PATCH 2/2] Use local cmake modules first - -Although FindTaglib.cmake was fixed in previous commit, local cmake modules -should not be overriden by system versions anyway. - -Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org> ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index c9d9bee..7a92898 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -19,7 +19,7 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-deprecated-declarations") - - # kde libs - find_package(ECM REQUIRED NO_MODULE) --set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules) -+set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules ${ECM_MODULE_PATH}) - - add_definitions(-DSOUNDKONVERTER_KF5_BUILD) - --- -2.27.0 - diff --git a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch b/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch deleted file mode 100644 index cae51b5790bc..000000000000 --- a/media-sound/soundkonverter/files/soundkonverter-3.0.1-metainfodir.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 8589c87095466f0785902dea6367192bcd813eb3 Mon Sep 17 00:00:00 2001 -From: eclipseo <30413512+eclipseo@users.noreply.github.com> -Date: Fri, 7 Sep 2018 18:15:43 +0200 -Subject: [PATCH] Install appdata in /usr/share/metainfo - -appdata file should now be installed in /usr/share/metainfo. /usr/share/appdata is deprecated. ---- - CMakeLists.txt | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/CMakeLists.txt b/CMakeLists.txt -index a0e36de..521d0da 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -135,7 +135,7 @@ install(FILES soundkonverter_replaygainplugin.desktop DESTINATION ${SERVICETYPES - install(FILES soundkonverter_ripperplugin.desktop DESTINATION ${SERVICETYPES_INSTALL_DIR}) - install(FILES soundkonverter-rip-audiocd.desktop DESTINATION ${DATA_INSTALL_DIR}/solid/actions) - --install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/appdata) -+install(FILES soundkonverter.appdata.xml DESTINATION ${SHARE_INSTALL_PREFIX}/metainfo) - - add_subdirectory(icons) - add_subdirectory(images) diff --git a/media-sound/soundkonverter/metadata.xml b/media-sound/soundkonverter/metadata.xml deleted file mode 100644 index 8b7b2706f6a4..000000000000 --- a/media-sound/soundkonverter/metadata.xml +++ /dev/null @@ -1,15 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> -<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer type="project"> - <email>sound@gentoo.org</email> - <name>Gentoo Sound project</name> - </maintainer> - <maintainer type="project"> - <email>kde@gentoo.org</email> - <name>Gentoo KDE Project</name> - </maintainer> - <upstream> - <remote-id type="github">dfaust/soundkonverter</remote-id> - </upstream> -</pkgmetadata> diff --git a/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild b/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild deleted file mode 100644 index 391721a35df6..000000000000 --- a/media-sound/soundkonverter/soundkonverter-3.0.1-r3.ebuild +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit ecm - -DESCRIPTION="Frontend to various audio converters" -HOMEPAGE="https://www.linux-apps.com/p/1126634/ https://github.com/dfaust/soundkonverter" -SRC_URI="https://github.com/dfaust/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${P}/src" - -LICENSE="GPL-2" -SLOT="5" -KEYWORDS="~amd64 ~x86" - -RDEPEND=" - dev-qt/qtgui:5 - dev-qt/qtwidgets:5 - dev-qt/qtxml:5 - kde-apps/libkcddb:5 - kde-frameworks/kcompletion:5 - kde-frameworks/kconfig:5 - kde-frameworks/kconfigwidgets:5 - kde-frameworks/kcoreaddons:5 - kde-frameworks/kdelibs4support:5 - kde-frameworks/ki18n:5 - kde-frameworks/kio:5 - kde-frameworks/knotifications:5 - kde-frameworks/kservice:5 - kde-frameworks/ktextwidgets:5 - kde-frameworks/kwidgetsaddons:5 - kde-frameworks/kxmlgui:5 - kde-frameworks/solid:5 - >=media-libs/phonon-4.11.0[qt5(+)] - >=media-libs/taglib-1.10 - media-sound/cdparanoia -" -DEPEND="${RDEPEND}" -BDEPEND="sys-devel/gettext" - -# git master, now archived: -PATCHES=( - "${FILESDIR}/${P}-deps.patch" - "${FILESDIR}/${P}-kf-5.72-findtaglib.patch" - "${FILESDIR}/${P}-fix-add-dirs.patch" - "${FILESDIR}/${P}-metainfodir.patch" -) - -pkg_postinst() { - ecm_pkg_postinst - - elog "soundKonverter optionally supports many different audio formats." - elog "You will need to install the appropriate encoding packages for the" - elog "formats you require. For a full listing, consult the README file" - elog "in /usr/share/doc/${PF}" -} diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest index 20dd2fa73715..441c5f7708ac 100644 --- a/media-sound/strawberry/Manifest +++ b/media-sound/strawberry/Manifest @@ -1,2 +1,2 @@ DIST strawberry-1.2.2.tar.xz 11460012 BLAKE2B bf0edcec29b85cd33b8f2ee883979e6056f776b039e265f63e9b1f7c04cd5193531477f4a52d1eb6f520e380078eee13d3b8d9823f78806527712c09b7a445aa SHA512 f61029de969c47c10c4353d2613a111e0103d1fa0f2e968e3b3c0ce8679f4eaeb302ff24e4bbe28af4513b88b73ca8d02e8e0418fc1150a3144316d5441e996c -DIST strawberry-1.2.3.tar.xz 11460484 BLAKE2B 7fc1313a496a4f19ca2853b3cc21ba0ceab8dfa2a4916271fd073e7171e4705f232c244598df550574c57bd73cf1446e384d0d563cf9281be32f2d01ef996d65 SHA512 3efe5c8245376731a0558493f6153d312badad21553502d9a876c0d00c74c157aa3b7549815d9925457cedf87f1c94dca25588ae4ece1cf442b9a29f056dc447 +DIST strawberry-1.2.4.tar.xz 11456732 BLAKE2B 4aa378ed759c6d7c0c230ab1f48ecfac6601f7c653edf961e9336c6cf2d95e7033bbc811457a02e536c4cc41718db173032b8d27199fec702f87cec96b448a94 SHA512 b5b7745bfdbbfe517afa4ff60fb768429a045853bd3ba2b84699e2e71f0fd31bcea677ea7c5ede70e2803cefe8153f5196af6670cd2cda6c4e286d9d40a69c3b diff --git a/media-sound/strawberry/strawberry-1.2.3-r2.ebuild b/media-sound/strawberry/strawberry-1.2.4.ebuild index c2b53b601542..c2b53b601542 100644 --- a/media-sound/strawberry/strawberry-1.2.3-r2.ebuild +++ b/media-sound/strawberry/strawberry-1.2.4.ebuild |