commit: fd09b083e51306e6fb9df0ae8f12b39b0dd8d5a6 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Thu Oct 31 22:46:30 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Thu Oct 31 22:47:19 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd09b083
media-sound/sonic-visualiser: bump to 5.0.1 + scrubbed patches Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/sonic-visualiser/Manifest | 1 + media-sound/sonic-visualiser/files/serd.patch | 6 -- .../files/sonic-visualiser-4.3-meson.build.patch | 5 -- ...ch => sonic-visualiser-5.0.1-meson.build.patch} | 81 ++++++++++----------- .../sonic-visualiser/sonic-visualiser-5.0.1.ebuild | 82 ++++++++++++++++++++++ 5 files changed, 121 insertions(+), 54 deletions(-) diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest index 29fb60832d07..5263e442d929 100644 --- a/media-sound/sonic-visualiser/Manifest +++ b/media-sound/sonic-visualiser/Manifest @@ -1 +1,2 @@ DIST sonic-visualiser-4.5.tar.gz 6652200 BLAKE2B a5e39a755e991663390370c06ce5d54b2ff9422081f8b9046097645f1f747972d270233a0d4fe05d4e6adde5239ca6d2d0210a8a67d9ef6ede60089471ce6452 SHA512 eca7f7b2a56a4c70f38c8fafdd20d5c0e773dc1a99a75189998dd1f50ae777df4999e1a4b3431f9202edfb8ce2686d05cf6448493c263c52ab5f068169a7385d +DIST sonic-visualiser-5.0.1.tar.gz 6583441 BLAKE2B 8c3b87aaae14d2ec3284c75b7a4c7a977bd54ede14a6c8c6d8a4f1bd679d051c6abc12045003940537d2ce86f20c33103fee6a90b56947b17f917e7deff7faad SHA512 eb58403b3d680bbe9b6b30a2ee1899db71f245d6b7b153caa04953268bff1bb52da069d63d2e062ebb14e01a4474214de6770e389b6d611990db7fab8fd6ecc6 diff --git a/media-sound/sonic-visualiser/files/serd.patch b/media-sound/sonic-visualiser/files/serd.patch index c7b6f179a686..d2b20b409da3 100644 --- a/media-sound/sonic-visualiser/files/serd.patch +++ b/media-sound/sonic-visualiser/files/serd.patch @@ -3,12 +3,6 @@ From: Chris Cannam <[email protected]> Date: Fri, 29 Jul 2022 13:31:37 +0100 Subject: [PATCH] Fix build failure ---- - meson.build | 1 + - 1 file changed, 1 insertion(+) - -diff --git a/meson.build b/meson.build -index 59a635f..35fc470 100644 --- a/meson.build +++ b/meson.build @@ -138,6 +138,7 @@ if system == 'linux' diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch index d92c07d587f7..1abea0fdadce 100644 --- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch +++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch @@ -1,5 +1,3 @@ -diff --git a/meson.build b/meson.build -index d1771e1..b18a5b6 100644 --- a/meson.build +++ b/meson.build @@ -90,17 +90,7 @@ if system == 'linux' @@ -166,9 +164,6 @@ index d1771e1..b18a5b6 100644 ] elif system == 'darwin' -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..e0da4fb --- /dev/null +++ b/meson_options.txt @@ -0,0 +1,8 @@ diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-5.0.1-meson.build.patch similarity index 83% copy from media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch copy to media-sound/sonic-visualiser/files/sonic-visualiser-5.0.1-meson.build.patch index d92c07d587f7..5646dc07075e 100644 --- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch +++ b/media-sound/sonic-visualiser/files/sonic-visualiser-5.0.1-meson.build.patch @@ -1,8 +1,6 @@ -diff --git a/meson.build b/meson.build -index d1771e1..b18a5b6 100644 --- a/meson.build +++ b/meson.build -@@ -90,17 +90,7 @@ if system == 'linux' +@@ -119,22 +119,8 @@ if system == 'linux' serd_dep = dependency('serd-0', version: '>= 0.5') capnp_dep = dependency('capnp', version: '>= 0.6') lrdf_dep = dependency('lrdf', version: '>= 0.2') @@ -11,16 +9,21 @@ index d1771e1..b18a5b6 100644 - mad_dep = dependency('mad', version: '>= 0.15.0') - id3tag_dep = dependency('id3tag', version: '>= 0.15.0') - opus_dep = dependency('opusfile') +- opusenc_dep = dependency('opusenc', required: false) +- if not opusenc_dep.found() +- opusenc_dep = dependency('libopusenc', required: false) +- endif - lo_dep = dependency('liblo') - jack_dep = dependency('jack', version: '>= 0.100') - libpulse_dep = dependency('libpulse', version: '>= 0.9') alsa_dep = dependency('alsa') -- + - portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false) - +- feature_dependencies = [ + vamphostsdk_dep, bzip2_dep, -@@ -113,23 +103,8 @@ if system == 'linux' +@@ -146,16 +132,6 @@ if system == 'linux' serd_dep, capnp_dep, lrdf_dep, @@ -29,22 +32,15 @@ index d1771e1..b18a5b6 100644 - mad_dep, - id3tag_dep, - opus_dep, +- opusenc_dep, - lo_dep, - portaudio_dep, - jack_dep, - libpulse_dep, alsa_dep, ] -- -- server_dependencies = [ -- capnp_dep, -- sord_dep, -- dl_dep, -- ] - - feature_defines = [ - '-DHAVE_BZ2', -@@ -142,26 +117,110 @@ if system == 'linux' + +@@ -178,34 +154,104 @@ if system == 'linux' '-DHAVE_SERD', '-DHAVE_CAPNP', '-DHAVE_LRDF', @@ -67,18 +63,21 @@ index d1771e1..b18a5b6 100644 + feature_dependencies += [ + id3tag_dep, + ] -+ feature_defines += [ + feature_defines += [ +- '-DHAVE_PORTAUDIO', + '-DHAVE_ID3TAG', -+ ] -+ endif -+ + ] + endif + +- if not opusenc_dep.found() + enable_jack = get_option('jack') + if enable_jack + jack_dep = dependency('jack', version: '>= 0.100') + feature_dependencies += [ + jack_dep, + ] -+ feature_defines += [ + feature_defines += [ +- '-DHAVE_OPUS_READ_ONLY' + '-DHAVE_JACK', + '-DDYNAMIC_JACK', + ] @@ -116,8 +115,9 @@ index d1771e1..b18a5b6 100644 + enable_opus = get_option('opus') + if enable_opus + opus_dep = dependency('opusfile') ++ opusenc_dep = dependency('libopusenc') + feature_dependencies += [ -+ opus_dep, ++ opus_dep, opusenc_dep, + ] + feature_defines += [ + '-DHAVE_OPUS', @@ -141,13 +141,8 @@ index d1771e1..b18a5b6 100644 + feature_dependencies += [ + portaudio_dep, + ] - feature_defines += [ - '-DHAVE_PORTAUDIO', - ] - endif - -- svcore_moc_args = [ -- '-DHAVE_MAD' ++ endif ++ + enable_pulseaudio = get_option('pulseaudio') + if enable_pulseaudio + libpulse_dep = dependency('libpulse', version: '>= 0.9') @@ -156,22 +151,22 @@ index d1771e1..b18a5b6 100644 + ] + feature_defines += [ + '-DHAVE_LIBPULSE', -+ ] -+ endif -+ -+ server_dependencies = [ -+ capnp_dep, -+ sord_dep, -+ dl_dep, - ] - + ] + endif + +- svcore_moc_args = [ +- '-DHAVE_MAD' +- ] +- elif system == 'darwin' -diff --git a/meson_options.txt b/meson_options.txt -new file mode 100644 -index 0000000..e0da4fb ---- /dev/null + + svdeps_dir = meson.current_source_dir() / 'sv-dependency-builds/osx' +--- a/meson_options.txt +++ b/meson_options.txt -@@ -0,0 +1,8 @@ +@@ -3,3 +3,11 @@ option('no_qt', + value: 'false', + description: 'Build only the small utilities that do not use Qt.') + +option('id3tag', type: 'boolean', value: false) +option('jack', type: 'boolean', value: false) +option('mad', type: 'boolean', value: false) diff --git a/media-sound/sonic-visualiser/sonic-visualiser-5.0.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-5.0.1.ebuild new file mode 100644 index 000000000000..3e8e85f984e8 --- /dev/null +++ b/media-sound/sonic-visualiser/sonic-visualiser-5.0.1.ebuild @@ -0,0 +1,82 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit meson xdg + +DESCRIPTION="Music audio files viewer and analiser" +HOMEPAGE="https://www.sonicvisualiser.org/ https://github.com/sonic-visualiser/sonic-visualiser"; +SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2866/${P}.tar.gz"; + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio test" + +BDEPEND=" + dev-qt/qttest:5 + virtual/pkgconfig +" +RDEPEND=" + app-arch/bzip2 + dev-libs/capnproto:= + dev-libs/serd + dev-libs/sord + dev-qt/qtcore:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5[ssl] + dev-qt/qtsvg:5 + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-libs/alsa-lib + media-libs/dssi + media-libs/ladspa-sdk + media-libs/liblrdf + media-libs/libsamplerate + media-libs/libsndfile + media-libs/rubberband + media-libs/speex + media-libs/vamp-plugin-sdk + sci-libs/fftw:3.0= + id3tag? ( media-libs/libid3tag:= ) + jack? ( virtual/jack ) + mad? ( media-libs/libmad ) + ogg? ( + media-libs/libfishsound + media-libs/liboggz + ) + opus? ( + media-libs/libopusenc + media-libs/opusfile + ) + osc? ( media-libs/liblo ) + portaudio? ( media-libs/portaudio ) + pulseaudio? ( media-libs/libpulse ) +" +DEPEND="${RDEPEND}" + +# tests fail without mp3 support +RESTRICT="!test? ( test )" +REQUIRED_USE=" + || ( jack pulseaudio portaudio ) + test? ( id3tag mad ) +" + +PATCHES=( + "${FILESDIR}/${PN}-5.0.1-meson.build.patch" +) + +src_configure() { + local emesonargs=( + $(meson_use id3tag) + $(meson_use jack) + $(meson_use mad) + $(meson_use ogg) + $(meson_use opus) + $(meson_use osc) + $(meson_use portaudio) + $(meson_use pulseaudio) + ) + meson_src_configure +}
