gentoo (valentine's day) resync : 14.02.2021

3 files changed, 264 insertions, 0 deletions

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 06cd0a7c6f1a..cc46e27951fc 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,5 +1,8 @@
 AUX sonic-visualiser-4.0.1-notest.patch 1917 BLAKE2B 9130b7a31a8d53d7e5471e129aa8fa0881d17649359d0884136e8f4498cf2e404d58eed4752680a9662ef5495dae51b8e8e98f050620ff8dd7507484639b550f SHA512 598ea01c897afeb60cbf19c606ec6eabc0f73c311daf06339334b67fe68a0858c9b6640be4d2f19cf3b95b60d41b8a7f58bb068dbcbc1858074d3085e0a6553d
+AUX sonic-visualiser-4.3-meson.build.patch 4428 BLAKE2B 30f2fb4f69f633de44e7f50f901a14a997cc785cbd23b33668e7587ff1cdc270eea94f7caa6fb54605009ebcadcb8d0b69d26980aa592a89696fcf4ede919b89 SHA512 1bf40499f8a15572ec1aad67685508aaac5fb7f41fd8ba4c5e129bed04b1fc0052f87618036b9ef3fd3c6205c7a8a27dfcf5349d6b9c99eb3de7a6348a775238
 AUX sonic-visualiser.xml 496 BLAKE2B 464d8840a763d695983ab47568294771e5bf80600c17e28676d32c0adf1c479a7f46a28572ec055f1c9bb8331b91497afaf4d241ebff6d2cf81e0eaed725559e SHA512 16a3f2d6adb715bcbc49ddf549f163e06fd1919a2e475d54dbc80d7b4cb8a757bf3124f75e158e53df132bcd9c60ad68da61b2ac0164af62ec1e3bb00415b264
 DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
+DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d
 EBUILD sonic-visualiser-4.2.ebuild 2857 BLAKE2B 480517d4a7be070af7e4b70727b66cb7fb6bccfd46fa532b9e1896685f092417b7ef4082019c414181ce551b8dcf7deff66af89acb1e2b27e17e5f2cf4967d4a SHA512 95e5d27ac10caac3752b45a01a75f07131cc0ad70d477b475c57382c1dd4493e7f7db433bf49ce84a30222c5a779f7a0c1f5099c72186561796193f42434750b
+EBUILD sonic-visualiser-4.3.ebuild 1601 BLAKE2B 2607a86ce68466b0f3a21b02ed591a252d4129d1d0a2925e9da82df21451e7d1b2acf41fd46f8966d9f62a384321c644f8afc350dac25e4d064c5af892155e4d SHA512 c2c741cf1cfb304665a4a91a96c387934eefe62e6fdbc769ad7562c04ba3372cab2be8510ba262d12bb6d79400b42e1bdfa5eac53cd7688bd33caab9720df5a0
 MISC metadata.xml 353 BLAKE2B a43c47637d7677bb228f7f1be5c106785dc7fb429a831858e1dbcb222fc016676c855e888b31070a363c658d7904b80e09a0fd13c424f9d12ee4bbf9211ac023 SHA512 812f7ef25b8bde0654650ac3f3ddd1e18bfc828db0b5709fdf4c57017438ea118b7d7d14c9dd7006cb7fa63aeb72a25d155ec60beb0eca36bfbd292ecf5faa3f
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
new file mode 100644
index 000000000000..d92c07d587f7
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.3-meson.build.patch
@@ -0,0 +1,182 @@
+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'
+   serd_dep = dependency('serd-0', version: '>= 0.5')
+   capnp_dep = dependency('capnp', version: '>= 0.6')
+   lrdf_dep = dependency('lrdf', version: '>= 0.2')
+-  oggz_dep = dependency('oggz', version: '>= 1.0.0')
+-  fishsound_dep = dependency('fishsound', version: '>= 1.0.0')
+-  mad_dep = dependency('mad', version: '>= 0.15.0')
+-  id3tag_dep = dependency('id3tag', version: '>= 0.15.0')
+-  opus_dep = dependency('opusfile')
+-  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 = [
+     bzip2_dep,
+@@ -113,23 +103,8 @@ if system == 'linux'
+     serd_dep,
+     capnp_dep,
+     lrdf_dep,
+-    oggz_dep,
+-    fishsound_dep,
+-    mad_dep,
+-    id3tag_dep,
+-    opus_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'
+     '-DHAVE_SERD',
+     '-DHAVE_CAPNP',
+     '-DHAVE_LRDF',
+-    '-DHAVE_OGGZ',
+-    '-DHAVE_FISHSOUND',
+-    '-DHAVE_MAD',
+-    '-DHAVE_ID3TAG',
+-    '-DHAVE_OPUS',
+-    '-DHAVE_LIBLO',
+-    '-DHAVE_JACK', '-DDYNAMIC_JACK',
+-    '-DHAVE_LIBPULSE',
+     '-D__LINUX_ALSASEQ__',
+     '-D__LINUX_ALSA__' # for RtMidi
+   ]
+ 
+-  if portaudio_dep.found()
++  enable_id3tag = get_option('id3tag')
++  if enable_id3tag
++    id3tag_dep = dependency('id3tag', version: '>= 0.15.0')
++    feature_dependencies += [
++      id3tag_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_ID3TAG',
++    ]
++  endif
++
++  enable_jack = get_option('jack')
++  if enable_jack
++    jack_dep = dependency('jack', version: '>= 0.100')
++    feature_dependencies += [
++      jack_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_JACK',
++      '-DDYNAMIC_JACK',
++    ]
++  endif
++
++  enable_mad = get_option('mad')
++  if enable_mad
++    mad_dep = dependency('mad', version: '>= 0.15.0')
++    feature_dependencies += [
++      mad_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_MAD',
++    ]
++
++    svcore_moc_args = [
++      '-DHAVE_MAD'
++    ]
++  endif
++
++  enable_ogg = get_option('ogg')
++  if enable_ogg
++    oggz_dep = dependency('oggz', version: '>= 1.0.0')
++    fishsound_dep = dependency('fishsound', version: '>= 1.0.0')
++    feature_dependencies += [
++      oggz_dep,
++      fishsound_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_OGGZ',
++      '-DHAVE_FISHSOUND',
++    ]
++  endif
++
++  enable_opus = get_option('opus')
++  if enable_opus
++    opus_dep = dependency('opusfile')
++    feature_dependencies += [
++      opus_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_OPUS',
++    ]
++  endif
++
++  enable_osc = get_option('osc')
++  if enable_osc
++    lo_dep = dependency('liblo')
++    feature_dependencies += [
++      lo_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_LIBLO',
++    ]
++  endif
++
++  enable_portaudio = get_option('portaudio')
++  if enable_portaudio
++    portaudio_dep = dependency('portaudio-2.0', version: '>= 19', required: false)
++    feature_dependencies += [
++      portaudio_dep,
++    ]
+     feature_defines += [
+       '-DHAVE_PORTAUDIO',
+     ]
+   endif
+ 
+-  svcore_moc_args = [
+-    '-DHAVE_MAD'
++  enable_pulseaudio = get_option('pulseaudio')
++  if enable_pulseaudio
++    libpulse_dep = dependency('libpulse', version: '>= 0.9')
++    feature_dependencies += [
++      libpulse_dep,
++    ]
++    feature_defines += [
++      '-DHAVE_LIBPULSE',
++    ]
++  endif
++
++  server_dependencies = [
++    capnp_dep,
++    sord_dep,
++    dl_dep,
+   ]
+   
+ 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 @@
++option('id3tag', type: 'boolean', value: false)
++option('jack', type: 'boolean', value: false)
++option('mad', type: 'boolean', value: false)
++option('ogg', type: 'boolean', value: false)
++option('opus', type: 'boolean', value: false)
++option('osc', type: 'boolean', value: false)
++option('portaudio', type: 'boolean', value: false)
++option('pulseaudio', type: 'boolean', value: false)
diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
new file mode 100644
index 000000000000..79ea3cb16090
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit meson desktop xdg
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="https://www.sonicvisualiser.org/"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2755/${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
+	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/opusfile )
+	osc? ( media-libs/liblo )
+	portaudio? ( media-libs/portaudio )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+
+# tests fail without mp3 support
+RESTRICT="!test? ( test )"
+REQUIRED_USE="
+	|| ( jack pulseaudio portaudio )
+	test? ( id3tag mad )
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}-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
+}