summaryrefslogtreecommitdiff
path: root/media-sound
diff options
context:
space:
mode:
Diffstat (limited to 'media-sound')
-rw-r--r--media-sound/Manifest.gzbin57257 -> 57256 bytes
-rw-r--r--media-sound/kid3/Manifest5
-rw-r--r--media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch76
-rw-r--r--media-sound/kid3/kid3-3.9.6-r2.ebuild (renamed from media-sound/kid3/kid3-3.9.6-r1.ebuild)13
-rw-r--r--media-sound/kid3/metadata.xml3
-rw-r--r--media-sound/pavucontrol/Manifest2
-rw-r--r--media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild2
7 files changed, 90 insertions, 11 deletions
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 3bb88802ee67..b24cbba9e305 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
Binary files differ
diff --git a/media-sound/kid3/Manifest b/media-sound/kid3/Manifest
index ecd216fef0df..dc998c1041a6 100644
--- a/media-sound/kid3/Manifest
+++ b/media-sound/kid3/Manifest
@@ -1,5 +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
DIST kid3-3.9.6.tar.xz 1872012 BLAKE2B 3945ca19f08baf84373ba34bcb9917f58d20f9208479a3a2d1319bdf50aae5cc56b906f5ac2caee5eb3d5c5f042a0ecdeff3e3ac0ecb499e6e3a32db436f2b1d SHA512 1667b3f5d458f9cc54e5b9af839c849e990a333eab3cfaa8d310b4d46b925ca5b57ea0ac9365a023fecc1ac2429f761dd2bfc0b3a3df48f5d4dd351c8741455f
-EBUILD kid3-3.9.6-r1.ebuild 2058 BLAKE2B 815f0a570088d13b432f363dde74f487af1afbcfbba3f45741251cb42fdef0849cd20135db53a2a20e071d3a945b1d0c863a93eb15b096e018e19e64db6ae8db SHA512 f281c8bd6b60d7c22e4a5d2b2c1452563483051c2100c8750f11c498fff284a9b8b96db44f8c177283877038d7696e7cc6261cdcb7a22d6b9d9c53b273924a27
+EBUILD kid3-3.9.6-r2.ebuild 2192 BLAKE2B 8db186607b29f9b28cc15cca67e26b8d40d1802eca30ca2b032698d5ca385f6aee29c0ed2cd049d5eda65b85dbd1d6660b3565351b01204779678f968e900f50 SHA512 77bc4db056941294a978676c1177733c5652b390e668ce310a8f7bd52a30c7c4f54ddeec34a96fe0a298cf08582e94bccbcaf839ad30a76a28dc5ab6e3b09343
EBUILD kid3-3.9.6.ebuild 1996 BLAKE2B fac6b3d6d8f5f71e7c1503e315202c7c3cece06e139b260547cfae20267d2a19382773d8918d60141232d08fb2e6cf37c99dff29e45971662f50c70280415191 SHA512 78b38e1e27231e237adf6b13d0ae37855b606953b847ce5f2b32bdc40d83dce7956e9df22b094258c18d77eb81e58d508842b12f6f77e06276505ef97e22ca80
-MISC metadata.xml 650 BLAKE2B a05aeb21a41043f2a4891e07db9fcdb32051fcb306dda9db0e892165e44728607430d3aeaf9f749e6a0b0a88b1935d1768853572661c1437c4b51a79a80acbf9 SHA512 02720f1bfffea6ee6a6f29d7bd2241b0bf425c491b5844f119d1ea9b6512b52d6c75a4eb9052d506905edb4790f5af0f7778d0ce05ddd3b17ba37e9b83cf3a5a
+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
new file mode 100644
index 000000000000..ab1ef15f3cf5
--- /dev/null
+++ b/media-sound/kid3/files/kid3-3.9.6-oggflacmetadata-buildfix.patch
@@ -0,0 +1,76 @@
+From 711b6a839523ced7453be89d3a4333b408b90b30 Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Mon, 17 Mar 2025 22:54:16 +0100
+Subject: [PATCH] CMake: Restore WITH_FLAC lever and oggflacmetadata option w/o
+ WITH_VORBIS
+
+Make explicit and properly conditionalise both WITH_FLAC and WITH_VORBIS.
+
+Follow-up to 365af1eb613f879d25d6aad8565e24259ad90e9f
+Fixes https://invent.kde.org/multimedia/kid3/-/issues/581
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ src/plugins/oggflacmetadata/CMakeLists.txt | 32 ++++++++++++++--------
+ 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
+--- a/src/plugins/oggflacmetadata/CMakeLists.txt
++++ b/src/plugins/oggflacmetadata/CMakeLists.txt
+@@ -1,24 +1,25 @@
+-if(WITH_VORBIS)
+- set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
++set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
+
++if(WITH_VORBIS)
+ find_package(Vorbis REQUIRED)
+- find_package(FLAC)
++endif()
++if(WITH_FLAC)
++ find_package(FLAC REQUIRED)
++endif()
+
++if(WITH_VORBIS OR WITH_FLAC)
+ configure_file(oggflacconfig.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/oggflacconfig.h)
+
+ set(plugin_NAME OggFlacMetadata)
+
+ string(TOLOWER ${plugin_NAME} plugin_TARGET)
+
+- add_library(${plugin_TARGET}
+- oggflacmetadataplugin.cpp
+- oggfile.cpp
+- vcedit.c
+- )
++ add_library(${plugin_TARGET} oggflacmetadataplugin.cpp)
++ if(HAVE_VORBIS)
++ target_sources(${plugin_TARGET} PRIVATE oggfile.cpp vcedit.c)
++ endif()
+ if(HAVE_FLAC)
+- target_sources(${plugin_TARGET} PRIVATE
+- flacfile.cpp
+- )
++ target_sources(${plugin_TARGET} PRIVATE flacfile.cpp)
+ endif()
+ qt_wrap_cpp(plugin_GEN_MOC_SRCS
+ oggflacmetadataplugin.h
+@@ -28,7 +29,14 @@ if(WITH_VORBIS)
+
+ target_include_directories(${plugin_TARGET} PRIVATE ${CMAKE_CURRENT_BINARY_DIR})
+
+- target_link_libraries(${plugin_TARGET} kid3-core VorbisFile::VorbisFile FLACPP::FLACPP Kid3Plugin)
++ target_link_libraries(${plugin_TARGET} kid3-core Kid3Plugin)
++
++ if(HAVE_VORBIS)
++ target_link_libraries(${plugin_TARGET} VorbisFile::VorbisFile)
++ endif()
++ if(HAVE_FLAC)
++ target_link_libraries(${plugin_TARGET} FLACPP::FLACPP)
++ endif()
+
+ target_compile_definitions(${plugin_TARGET} PRIVATE HAVE_CONFIG_H)
+
+--
+GitLab
+
diff --git a/media-sound/kid3/kid3-3.9.6-r1.ebuild b/media-sound/kid3/kid3-3.9.6-r2.ebuild
index f41b098ccee3..638ffde75f28 100644
--- a/media-sound/kid3/kid3-3.9.6-r1.ebuild
+++ b/media-sound/kid3/kid3-3.9.6-r2.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2+"
SLOT="0"
IUSE="acoustid flac kde mp3 mp4 +mpris +taglib test vorbis"
-REQUIRED_USE="flac? ( vorbis )"
+REQUIRED_USE="test? ( flac mp3 mp4 taglib vorbis )" # bug 926747
RESTRICT="!test? ( test )"
DEPEND="
@@ -30,10 +30,7 @@ DEPEND="
media-libs/chromaprint:=
media-video/ffmpeg:=
)
- flac? (
- media-libs/flac:=[cxx]
- media-libs/libvorbis
- )
+ flac? ( media-libs/flac:=[cxx] )
kde? (
kde-frameworks/kconfig:6
kde-frameworks/kconfigwidgets:6
@@ -59,7 +56,11 @@ BDEPEND="${PYTHON_DEPS}
kde? ( kde-frameworks/extra-cmake-modules:0 )
"
-PATCHES=( "${FILESDIR}/${P}-no-ndebug.patch" ) # bug 949369
+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
diff --git a/media-sound/kid3/metadata.xml b/media-sound/kid3/metadata.xml
index 802d3fde5502..a8f2a76a4c03 100644
--- a/media-sound/kid3/metadata.xml
+++ b/media-sound/kid3/metadata.xml
@@ -10,7 +10,8 @@
<name>Gentoo Sound project</name>
</maintainer>
<upstream>
- <bugs-to>https://bugs.kde.org/</bugs-to>
+ <bugs-to>https://bugs.kde.org/enter_bug.cgi?product=kid3</bugs-to>
+ <remote-id type="kde-invent">multimedia/kid3</remote-id>
</upstream>
<use>
<flag name="acoustid">Build acoustic fingerprinting plugin using <pkg>media-libs/chromaprint</pkg></flag>
diff --git a/media-sound/pavucontrol/Manifest b/media-sound/pavucontrol/Manifest
index 78374ca99c7a..f8ef129786b7 100644
--- a/media-sound/pavucontrol/Manifest
+++ b/media-sound/pavucontrol/Manifest
@@ -4,6 +4,6 @@ AUX pavucontrol-6.1-libcanberra-automagic.patch 1591 BLAKE2B 97e4f80b0fc17691d9c
DIST pavucontrol-5.0.tar.xz 194248 BLAKE2B 9e6b9b7d94be51a4ad8b5310e031c4fed0f5299e67c770c9a573c0647edf27345014fb6504892fad29b9b5e79ce43ed312217dbed8e2b31b805f291531062903 SHA512 5673d783c2c819a68b49025c051bedd39f4caba446a479797b06569e24a96acc0924ba680d2416baff8c3211cfc7c94760d503900207fbe7c89c5cb2adaebec1
DIST pavucontrol-6.1.tar.xz 169488 BLAKE2B 888fbe404482e5da5b59d10f913f174daa128029babbb9493df5df5d6d3c0b95e22d03a3ec2629fbcd4f33c6267f6e2173428d7eb9be8b7f4c7f012d3e777e92 SHA512 90a0d85916010f624928f6aa68524f776b0a529d84e75287739a07db48e4084767ca0caf75503e44e04d8add84b1d668ee9ed5b822b8f8f945cd902cdf78413a
EBUILD pavucontrol-5.0-r4.ebuild 1059 BLAKE2B 9a89dc64569d4af159421bb1a3f3938cca18d3fef422580928f957f098a0b7293692242672b296e73ca32f1f4b127ff9316dd68e927315d5b8d9dc15dcc33ccc SHA512 5b41954bce30f44c077af758a9dd361f4f7a27993707001528132127fc6499f49a9c8c1a712c4bee9ed94e31c6d0071e182afb0f27bb41cd088160bebf934f11
-EBUILD pavucontrol-6.1-r1.ebuild 1005 BLAKE2B fbb5e69e4d4a7a5795fe72284ae5f081b576161a33dd460a9b99228358838c5a5a8f23918ad5d5e207c45948533e75122293e37bb42f0d4ccca4c61594e74ba2 SHA512 54e7d75bcf4397be2585f09f4b5bd4bf371b649388b2e609a4d7b4b750953deef0973eaeb7d3f1672e670286de6e10e2791949ce4cfe6ae257a567ec6830c16f
+EBUILD pavucontrol-6.1-r1.ebuild 1004 BLAKE2B 693a6bff69f1fdf4327accc997853490335ef0853496a62eb5f79a5972311604ed92eba230c4b7a445391ee92c6099e657dd6eb83d976407be096b92bb9b30b1 SHA512 dab2de8534eeb0547c7f26ec9c86566ebaf4e1e46731e9fc91a81cfacc003d747c052bd6491986b36090a89ac3f7360c9df76c53dcabcf838fdafe5c0b3976f0
EBUILD pavucontrol-6.1.ebuild 824 BLAKE2B 28a3c697803d900612c1c23d314eb5ffa79c7c21e7b7d44a37e591ad6d13b70a625dcad946f621a575d3e1d7e45617aca47e85e120bbc5052afe23f1d5bed345 SHA512 3385a0e66299a46e904286f659da94af8fef7adad8d04baddeb3a032e2c9b1c4894687f7e9daf99a907533480bb4d13e8783a2138af5bc391ae347ccb33ba6d3
MISC metadata.xml 453 BLAKE2B 87654c3918a35652e229e756989ea1e28673139af38cafbd424d9d837bb4876c6429a744fbd24a4ac3dada76edfc62e2e89368147a93153b0c44b70e5fefaab8 SHA512 c75806ec49576d080381bd488c8b833601f777c1ef55ef19f4e2df6262bdb9f2e9a71e37082122de700017aeea4c20d4cb9a5ff7796b52946af24b51d2bbfcad
diff --git a/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild b/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild
index 2a2398e9247c..ed45b3277e41 100644
--- a/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild
+++ b/media-sound/pavucontrol/pavucontrol-6.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://freedesktop.org/software/pulseaudio/${PN}/${P}.tar.xz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
+KEYWORDS="amd64 arm ~arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
IUSE="sound"
generated by cgit v1.2.3 (git 2.25.1) at 2025-04-03 05:27:50 +0000