[gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2020-06-15 10:21 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2020-06-15 10:21 UTC (permalink / raw
  To: gentoo-commits

commit:     7ca1ee802fd1768f87d1f29c7d0ded48a91e0a4f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 15 10:21:04 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Jun 15 10:21:20 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7ca1ee80

media-sound/sonic-visualiser: fixed compilation with qt 5.15

Closes: https://bugs.gentoo.org/727304
Package-Manager: Portage-2.3.101, Repoman-2.3.22
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 .../files/sonic-visualiser-4.0.1-qt-5.15-fix.patch | 37 ++++++++++++++++++++++
 .../sonic-visualiser/sonic-visualiser-4.0.1.ebuild |  1 +
 2 files changed, 38 insertions(+)

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
new file mode 100644
index 00000000000..007df8ecbb6
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
@@ -0,0 +1,37 @@
+From 7ebbdfd514c70ab500c8079a11b8ed91d086fe5a Mon Sep 17 00:00:00 2001
+From: Christophe Giboudeaux <christophe@krop.fr>
+Date: Sat, 6 Jun 2020 11:09:16 +0200
+Subject: [PATCH] Fix build with Qt 5.15
+
+---
+ svgui/layer/WaveformLayer.cpp | 1 +
+ svgui/view/Overview.cpp       | 1 +
+ 2 files changed, 2 insertions(+)
+
+diff --git a/svgui/layer/WaveformLayer.cpp b/svgui/layer/WaveformLayer.cpp
+index 8499ba3..07b5b3c 100644
+--- a/svgui/layer/WaveformLayer.cpp
++++ b/svgui/layer/WaveformLayer.cpp
+@@ -27,6 +27,7 @@
+ #include "data/model/WaveformOversampler.h"
+ 
+ #include <QPainter>
++#include <QPainterPath>
+ #include <QPixmap>
+ #include <QTextStream>
+ 
+diff --git a/svgui/view/Overview.cpp b/svgui/view/Overview.cpp
+index 7e4248a..449ba63 100644
+--- a/svgui/view/Overview.cpp
++++ b/svgui/view/Overview.cpp
+@@ -20,6 +20,7 @@
+ 
+ #include <QPaintEvent>
+ #include <QPainter>
++#include <QPainterPath>
+ #include <iostream>
+ 
+ //#define DEBUG_OVERVIEW 1
+-- 
+2.26.2
+

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
index d69fb24dcd6..9e65f200e3f 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
@@ -59,6 +59,7 @@ REQUIRED_USE="|| ( jack pulseaudio portaudio )"
 PATCHES=(
 	"${FILESDIR}/${P}-notest.patch"
 	"${FILESDIR}/${P}-qt-deprecated.patch"
+	"${FILESDIR}/${P}-qt-5.15-fix.patch"
 )
 
 sv_disable_opt() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2024-10-31 22:47 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2024-10-31 22:47 UTC (permalink / raw
  To: gentoo-commits

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 <cannam@all-day-breakfast.com>
 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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2021-02-13 19:25 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2021-02-13 19:25 UTC (permalink / raw
  To: gentoo-commits

commit:     663f5d4793c32c07c78b8913b66ec0ad9b36571f
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 13 19:25:15 2021 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 13 19:25:30 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=663f5d47

media-sound/sonic-visualiser: bump to 4.3, switched to meson

Package-Manager: Portage-3.0.14, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/sonic-visualiser/Manifest              |   1 +
 .../files/sonic-visualiser-4.3-meson.build.patch   | 182 +++++++++++++++++++++
 .../sonic-visualiser/sonic-visualiser-4.3.ebuild   |  79 +++++++++
 3 files changed, 262 insertions(+)

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 989343543f5..75ca1fed0dd 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1 +1,2 @@
 DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3
+DIST sonic-visualiser-4.3.tar.gz 6467269 BLAKE2B 4c9bbfc751f94dfc0e8c93a8ba791b0a4bf949fe1f528a081da583ad720dcb25b3e6f84e31104f11ab5003b338b62a1ca1a9572bc9ec820d0a4269d25cbe0e04 SHA512 cbe0edee9f346545222e05156e4536710db932d6ec335687e91f2f4b24582e7f47703a3ecade87574ead8fa78dca821fd9ff2eb0d6e44c2b9c33c8d053fd738d

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 00000000000..d92c07d587f
--- /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 00000000000..79ea3cb1609
--- /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
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2020-11-09 12:02 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2020-11-09 12:02 UTC (permalink / raw
  To: gentoo-commits

commit:     d1b38a74aedf784f2299f4231732282ed794338c
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  9 12:01:55 2020 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov  9 12:01:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d1b38a74

media-sound/sonic-visualiser: removed obsolete 4.0.1 & 4.1

Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/sonic-visualiser/Manifest              |   2 -
 .../files/sonic-visualiser-4.0.1-qt-5.15-fix.patch |  37 ------
 .../sonic-visualiser-4.0.1-qt-deprecated.patch     |  22 ----
 .../sonic-visualiser/sonic-visualiser-4.0.1.ebuild | 126 --------------------
 .../sonic-visualiser/sonic-visualiser-4.1.ebuild   | 129 ---------------------
 5 files changed, 316 deletions(-)

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 780fa31327a..989343543f5 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,3 +1 @@
-DIST sonic-visualiser-4.0.1.tar.gz 6649178 BLAKE2B c231833f7cc6228d450600e5cbc6a6db85d0aa784ce67a225bedb1393ca82a99bca492912bbaf8bf87f5fcce48e57facc3f216b057233b53f596ccd71835d174 SHA512 6557d7c90618f7f2c18f8bb0058b8cd74a084f26376999074b9d5f23f04e1548b7e82ccbb73a301fa68c1d2f047810d312e568a85c9c7f3f25da9ec9b00c4220
-DIST sonic-visualiser-4.1.tar.gz 6535840 BLAKE2B b3afdb2026405148e2efb217e960a4e70fd8efbe3779c6cc3671b17a808f12e288efb89bbd5200da9ccfc8bdbd0c684d555f7394aab8e67d2963fd84f967da0c SHA512 57edfc52ddbc9198a6608460a8f4e4fc2a382588f2881b7ea99cc738d7944d66c942f24218a303fb20eaa698ee365f29006c985f2385afd7f5c27fec5a241adb
 DIST sonic-visualiser-4.2.tar.gz 6532519 BLAKE2B 8cc92b2cd932d3c9f014161635cd767aa6ffa671217fca7c63ec6b882ae46cc1ed790e108e9be59d536aab0cbead726057987c2920c501d451fd353b2bf83018 SHA512 186d723c74d3b2865588370d9ff3afaf9f5356957e670483ea52303477c6acd17bb99b44c05db0fe4c0dc9757ba17c5e25b7b2fda5a15e85d9e193322ce8f2c3

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
deleted file mode 100644
index 007df8ecbb6..00000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-5.15-fix.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7ebbdfd514c70ab500c8079a11b8ed91d086fe5a Mon Sep 17 00:00:00 2001
-From: Christophe Giboudeaux <christophe@krop.fr>
-Date: Sat, 6 Jun 2020 11:09:16 +0200
-Subject: [PATCH] Fix build with Qt 5.15
-
----
- svgui/layer/WaveformLayer.cpp | 1 +
- svgui/view/Overview.cpp       | 1 +
- 2 files changed, 2 insertions(+)
-
-diff --git a/svgui/layer/WaveformLayer.cpp b/svgui/layer/WaveformLayer.cpp
-index 8499ba3..07b5b3c 100644
---- a/svgui/layer/WaveformLayer.cpp
-+++ b/svgui/layer/WaveformLayer.cpp
-@@ -27,6 +27,7 @@
- #include "data/model/WaveformOversampler.h"
- 
- #include <QPainter>
-+#include <QPainterPath>
- #include <QPixmap>
- #include <QTextStream>
- 
-diff --git a/svgui/view/Overview.cpp b/svgui/view/Overview.cpp
-index 7e4248a..449ba63 100644
---- a/svgui/view/Overview.cpp
-+++ b/svgui/view/Overview.cpp
-@@ -20,6 +20,7 @@
- 
- #include <QPaintEvent>
- #include <QPainter>
-+#include <QPainterPath>
- #include <iostream>
- 
- //#define DEBUG_OVERVIEW 1
--- 
-2.26.2
-

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
deleted file mode 100644
index bf0bc76656b..00000000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff --git a/checker/src/plugincandidates.cpp b/checker/src/plugincandidates.cpp
-index 2990905..8297253 100644
---- a/checker/src/plugincandidates.cpp
-+++ b/checker/src/plugincandidates.cpp
-@@ -37,7 +37,7 @@
- 
- #include <QProcess>
- #include <QDir>
--#include <QTime>
-+#include <QElapsedTimer>
- 
- #if defined(_WIN32)
- #define PLUGIN_GLOB "*.dll"
-@@ -231,7 +231,7 @@ PluginCandidates::runHelper(vector<string> libraries, string descriptor)
-         process.write("\n", 1);
-     }
- 
--    QTime t;
-+    QElapsedTimer t;
-     t.start();
-     int timeout = 15000; // ms
- 

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
deleted file mode 100644
index 9e65f200e3f..00000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop qmake-utils xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2607/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio"
-
-BDEPEND="
-	dev-qt/qttest:5
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	>=dev-libs/capnproto-0.6:=
-	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-19 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-notest.patch"
-	"${FILESDIR}/${P}-qt-deprecated.patch"
-	"${FILESDIR}/${P}-qt-5.15-fix.patch"
-)
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	default
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use opus || sv_disable_opt opus
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	# capnproto 0.7 requires c++14 now
-	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
-		-i configure.ac \
-		-i */configure.ac \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-	sed -e 's/std=gnu++11/std=gnu++14/g' \
-		-i Makefile.* \
-		-i checker/Makefile.* \
-		|| die
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
-		einfo "Running ${i}"
-		HOME="${T}" ./${i} || die
-	done
-}
-
-src_install() {
-	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
-	dodoc README*
-
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu sonic-visualiser.desktop
-
-	# mime types
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-}

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild
deleted file mode 100644
index 3279c15e7c9..00000000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-4.1.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop qmake-utils xdg
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="https://www.sonicvisualiser.org/"
-SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2717/${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
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-RDEPEND="
-	app-arch/bzip2
-	>=dev-libs/capnproto-0.6:=
-	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-19 )
-	pulseaudio? ( media-sound/pulseaudio )
-"
-DEPEND="${RDEPEND}"
-
-# tests fail without mp3 support
-RESTRICT="!test? ( test )"
-REQUIRED_USE="
-	|| ( jack pulseaudio portaudio )
-	test? ( id3tag mad )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-4.0.1-notest.patch"
-)
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	default
-
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use opus || sv_disable_opt opus
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	# capnproto 0.7 requires c++14 now
-	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
-		-i configure.ac \
-		-i */configure.ac \
-		|| die
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-	sed -e 's/std=gnu++11/std=gnu++14/g' \
-		-i Makefile.* \
-		-i checker/Makefile.* \
-		|| die
-}
-
-src_test() {
-	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
-		einfo "Running ${i}"
-		HOME="${T}" ./${i} || die
-	done
-}
-
-src_install() {
-	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
-	dodoc README*
-
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu sonic-visualiser.desktop
-
-	# mime types
-	insinto /usr/share/mime/packages
-	doins "${FILESDIR}/${PN}.xml"
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2019-12-18 21:32 Miroslav Šulc
  0 siblings, 0 replies; 9+ messages in thread
From: Miroslav Šulc @ 2019-12-18 21:32 UTC (permalink / raw
  To: gentoo-commits

commit:     e544c3ca8fe5893037061d94f06c5d55227054ff
Author:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Dec 18 21:29:14 2019 +0000
Commit:     Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Dec 18 21:32:25 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e544c3ca

media-sound/sonic-visualiser: 4.0.1 bump

1) eapi7
2) switched from xdg-utils to xdg
3) organized imports
4) added opus use flag
5) updated patches
6) removed piper related code in ebuild as it is not
   applicable anymore
7) updated and fixed tests (bug #633626)
8) added hand-made mime xml file as upstream provides
   just desktop files

Bug: https://bugs.gentoo.org/633626
Closes: https://bugs.gentoo.org/683088
Package-Manager: Portage-2.3.82, Repoman-2.3.20
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>

 media-sound/sonic-visualiser/Manifest              |   1 +
 .../files/sonic-visualiser-4.0.1-notest.patch      |  52 +++++++++
 .../sonic-visualiser-4.0.1-qt-deprecated.patch     |  22 ++++
 .../sonic-visualiser/files/sonic-visualiser.xml    |  16 +++
 .../sonic-visualiser/sonic-visualiser-4.0.1.ebuild | 125 +++++++++++++++++++++
 5 files changed, 216 insertions(+)

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 5bbeea3cff4..123d580e294 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1 +1,2 @@
 DIST sonic-visualiser-3.1.1.tar.gz 5304359 BLAKE2B 79c9d1d55ea2ec939fdb7abe656ab81aae72862d139eda4e62037e0231c596cf725b4fd5741216e6413bc25e659798dee3b0e06f55063a9ad73f0d9204f76d84 SHA512 e83efffb62179e67a0e5fd7352f63f5a0210102a7fb38c5ad486479a3749f68a44fec2d1843d1c1ca826ba0004bf421811a270a0a50e3f89f71d956dc7a76ae7
+DIST sonic-visualiser-4.0.1.tar.gz 6649178 BLAKE2B c231833f7cc6228d450600e5cbc6a6db85d0aa784ce67a225bedb1393ca82a99bca492912bbaf8bf87f5fcce48e57facc3f216b057233b53f596ccd71835d174 SHA512 6557d7c90618f7f2c18f8bb0058b8cd74a084f26376999074b9d5f23f04e1548b7e82ccbb73a301fa68c1d2f047810d312e568a85c9c7f3f25da9ec9b00c4220

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
new file mode 100644
index 00000000000..ec70849915e
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-notest.patch
@@ -0,0 +1,52 @@
+diff --git a/test-svcore-base.pro b/test-svcore-base.pro
+index 275cb58..636129c 100644
+--- a/test-svcore-base.pro
++++ b/test-svcore-base.pro
+@@ -27,8 +27,3 @@ include(svcore/base/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-data-fileio.pro b/test-svcore-data-fileio.pro
+index 7b53ca1..a2aa3ce 100644
+--- a/test-svcore-data-fileio.pro
++++ b/test-svcore-data-fileio.pro
+@@ -27,8 +27,3 @@ include(svcore/data/fileio/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-data-model.pro b/test-svcore-data-model.pro
+index 3b45ac0..d08b14e 100644
+--- a/test-svcore-data-model.pro
++++ b/test-svcore-data-model.pro
+@@ -27,8 +27,3 @@ include(svcore/data/model/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+diff --git a/test-svcore-system.pro b/test-svcore-system.pro
+index 6ef7db7..685c1ba 100644
+--- a/test-svcore-system.pro
++++ b/test-svcore-system.pro
+@@ -27,8 +27,3 @@ include(svcore/system/test/files.pri)
+ 
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/system/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/system/test/%1", $$file) }
+-
+-!win32* {
+-    POST_TARGETDEPS += $$PWD/libbase.a
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
new file mode 100644
index 00000000000..bf0bc76656b
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-4.0.1-qt-deprecated.patch
@@ -0,0 +1,22 @@
+diff --git a/checker/src/plugincandidates.cpp b/checker/src/plugincandidates.cpp
+index 2990905..8297253 100644
+--- a/checker/src/plugincandidates.cpp
++++ b/checker/src/plugincandidates.cpp
+@@ -37,7 +37,7 @@
+ 
+ #include <QProcess>
+ #include <QDir>
+-#include <QTime>
++#include <QElapsedTimer>
+ 
+ #if defined(_WIN32)
+ #define PLUGIN_GLOB "*.dll"
+@@ -231,7 +231,7 @@ PluginCandidates::runHelper(vector<string> libraries, string descriptor)
+         process.write("\n", 1);
+     }
+ 
+-    QTime t;
++    QElapsedTimer t;
+     t.start();
+     int timeout = 15000; // ms
+ 

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser.xml b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
new file mode 100644
index 00000000000..6daac743002
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>
+<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
+
+  <mime-type type="application/x-sonicvisualiser">
+    <comment>Sonic Visualiser session file</comment>
+    <generic-icon name="sv-icon"/>
+    <glob pattern="*.sv"/>
+  </mime-type>
+
+  <mime-type type="application/x-sonicvisualiser-layer">
+    <comment>Sonic Visualiser layer file</comment>
+    <generic-icon name="sv-icon"/>
+    <glob pattern="*.svl"/>
+  </mime-type>
+
+</mime-info>

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
new file mode 100644
index 00000000000..cf406da5079
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-4.0.1.ebuild
@@ -0,0 +1,125 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop qmake-utils xdg
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="https://www.sonicvisualiser.org/"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2607/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="id3tag jack mad ogg opus osc +portaudio pulseaudio"
+
+BDEPEND="
+	dev-qt/qttest:5
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+"
+RDEPEND="
+	app-arch/bzip2
+	>=dev-libs/capnproto-0.6:=
+	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/opus )
+	osc? ( media-libs/liblo )
+	portaudio? ( >=media-libs/portaudio-19 )
+	pulseaudio? ( media-sound/pulseaudio )
+"
+DEPEND="${RDEPEND}"
+
+REQUIRED_USE="|| ( jack pulseaudio portaudio )"
+
+PATCHES=(
+	"${FILESDIR}/${P}-notest.patch"
+	"${FILESDIR}/${P}-qt-deprecated.patch"
+)
+
+sv_disable_opt() {
+	einfo "Disabling $1"
+	for i in . svapp svcore svgui ; do
+		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
+	done
+}
+
+src_prepare() {
+	default
+
+	use id3tag || sv_disable_opt id3tag
+	use jack || sv_disable_opt jack
+	use mad || sv_disable_opt mad
+	use ogg || sv_disable_opt fishsound
+	use ogg || sv_disable_opt oggz
+	use opus || sv_disable_opt opus
+	use osc || sv_disable_opt liblo
+	use portaudio || sv_disable_opt portaudio
+	use pulseaudio || sv_disable_opt libpulse
+
+	# capnproto 0.7 requires c++14 now
+	sed -e 's/AX_CXX_COMPILE_STDCXX_11/AX_CXX_COMPILE_STDCXX_14/g' \
+		-i configure.ac \
+		-i */configure.ac \
+		|| die
+
+	eautoreconf
+}
+
+src_configure() {
+	export QMAKE="$(qt5_get_bindir)"/qmake
+	econf
+	eqmake5 -r sonic-visualiser.pro
+	sed -e 's/std=gnu++11/std=gnu++14/g' \
+		-i Makefile.* \
+		-i checker/Makefile.* \
+		|| die
+}
+
+src_test() {
+	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model test-svcore-system ; do
+		einfo "Running ${i}"
+		HOME="${T}" ./${i} || die
+	done
+}
+
+src_install() {
+	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
+	dodoc README*
+
+	#install samples
+	insinto /usr/share/${PN}/samples
+	doins samples/*
+
+	# desktop entry
+	doicon icons/sv-icon.svg
+	domenu sonic-visualiser.desktop
+
+	# mime types
+	insinto /usr/share/mime/packages
+	doins "${FILESDIR}/${PN}.xml"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2018-10-11 12:42 Michael Palimaka
  0 siblings, 0 replies; 9+ messages in thread
From: Michael Palimaka @ 2018-10-11 12:42 UTC (permalink / raw
  To: gentoo-commits

commit:     0304bd779c2d41f0a71e39839bf8a009917ffe46
Author:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 11 12:36:39 2018 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Oct 11 12:42:38 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0304bd77

media-sound/sonic-visualiser: fix build with Qt 5.11

Closes: https://bugs.gentoo.org/664628
Signed-off-by: Michael Palimaka <kensington <AT> gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 .../files/sonic-visualiser-3.1.1-qt-5.11.patch               | 12 ++++++++++++
 media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild   |  7 +++++--
 2 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
new file mode 100644
index 00000000000..5d62677128b
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/sonic-visualiser-3.1.1-qt-5.11.patch
@@ -0,0 +1,12 @@
+Bug: https://bugs.gentoo.org/664628
+
+--- a/svapp/audio/AudioCallbackRecordTarget.cpp
++++ b/svapp/audio/AudioCallbackRecordTarget.cpp
+@@ -19,6 +19,7 @@
+ 
+ #include "data/model/WritableWaveFileModel.h"
+ 
++#include <QDateTime>
+ #include <QDir>
+ #include <QTimer>
+ 

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
index feed92ce32e..264d383f4b8 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -53,7 +53,10 @@ DEPEND="${RDEPEND}
 
 REQUIRED_USE="|| ( jack pulseaudio portaudio )"
 
-PATCHES=( "${FILESDIR}/notest.patch" )
+PATCHES=(
+	"${FILESDIR}/notest.patch"
+	"${FILESDIR}/${P}-qt-5.11.patch"
+)
 
 sv_disable_opt() {
 	einfo "Disabling $1"


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2017-06-15 12:45 Alexis Ballier
  0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier @ 2017-06-15 12:45 UTC (permalink / raw
  To: gentoo-commits

commit:     791a1edd422a657a8dc61f166db003d6c2c61161
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jun 15 12:40:32 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jun 15 12:43:25 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=791a1edd

media-sound/sonic-visualiser: regenerate capnproto files

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/sonic-visualiser/files/piper.capnp     | 364 +++++++++++++++++++++
 .../sonic-visualiser/sonic-visualiser-3.0.2.ebuild |   8 +
 2 files changed, 372 insertions(+)

diff --git a/media-sound/sonic-visualiser/files/piper.capnp b/media-sound/sonic-visualiser/files/piper.capnp
new file mode 100644
index 00000000000..6e99ff6849d
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/piper.capnp
@@ -0,0 +1,364 @@
+
+# Piper audio feature extraction: schema for low-level operation
+#
+# This file is formatted to 130 characters width, in order to fit the
+# comments next to the schema definitions.
+#
+# Copyright (c) 2015-2017 Queen Mary, University of London, provided
+# under a BSD-style licence. See the file COPYING for details.
+
+@0xc4b1c6c44c999206;
+
+using Cxx = import "/capnp/c++.capnp";
+$Cxx.namespace("piper");
+
+struct Basic {
+    # Basic metadata common to many Piper structures.
+
+    identifier         @0  :Text;                 # A computer-readable string. Must match the regex /^[a-zA-Z0-9_-]+$/.
+    name               @1  :Text;                 # A short human-readable name or label. Must be present.
+    description        @2  :Text;                 # An optional human-readable descriptive text that may accompany the name.
+}
+
+struct ParameterDescriptor {
+    # Properties of an adjustable parameter. A parameter's value is just a single
+    # float, but the descriptor explains how to interpret and present that value.
+    # A Piper feature extractor has a static list of parameters. The properties of
+    # a given parameter never change, in contrast to output descriptors, which
+    # may have different properties depending on the configuration of the extractor.
+
+    basic              @0  :Basic;                # Basic metadata about the parameter.
+    unit               @1  :Text;                 # Human-recognisable unit of the parameter (e.g. Hz). May be left empty.
+    minValue           @2  :Float32     = 0.0;    # Minimum value. Must be provided.
+    maxValue           @3  :Float32     = 0.0;    # Maximum value. Must be provided.
+    defaultValue       @4  :Float32     = 0.0;    # Default if the parameter is not set to anything else. Must be provided.
+    isQuantized        @5  :Bool        = false;  # True if parameter values are quantized to a particular resolution.
+    quantizeStep       @6  :Float32     = 0.0;    # Quantization resolution, if isQuantized.
+    valueNames         @7  :List(Text)  = [];     # Optional human-readable labels for the values, if isQuantized.
+}
+
+enum SampleType {
+    # How returned features are spaced on the input timeline.
+
+    oneSamplePerStep   @0;                        # Each process input returns a feature aligned with that input's timestamp.
+    fixedSampleRate    @1;                        # Features are equally spaced at a given sample rate.
+    variableSampleRate @2;                        # Features have their own individual timestamps.
+}
+
+struct StaticOutputDescriptor {
+
+    # Properties of an output, that is, a single stream of features
+    # produced in response to process and finish requests. A feature
+    # extractor may have any number of outputs, and it always
+    # calculates and returns features from all of them when
+    # processing; this is useful in cases where more than one feature
+    # can be easily calculated using a single method.
+    # 
+    # This structure contains the properties of an output that are
+    # static, i.e. that do not depend on the parameter values provided
+    # at configuration, excluding the Basic struct parameters like id
+    # and description.  The Basic struct properties are not included
+    # for historical reasons: they were already referenced separately
+    # in the OutputDescriptor and ExtractorStaticData before this
+    # struct was introduced.
+    
+    typeURI            @0  :Text;                 # URI indicating the sort of feature that this output returns (see docs).
+}
+
+struct ConfiguredOutputDescriptor {
+    # Properties of an output, that is, a single stream of features produced
+    # in response to process and finish requests. A feature extractor may
+    # have any number of outputs, and it always calculates and returns features
+    # from all of them when processing; this is useful in cases where more
+    # than one feature can be easily calculated using a single method.
+    # This structure contains the properties of an output that are not static,
+    # i.e. that may depend on the parameter values provided at configuration.
+
+    unit               @0  :Text;                 # Human-recognisable unit of the bin values in output features. May be empty.
+    hasFixedBinCount   @1  :Bool        = false;  # True if this output has an equal number of values in each returned feature.
+    binCount           @2  :Int32       = 0;      # Number of values per feature for this output, if hasFixedBinCount.
+    binNames           @3  :List(Text)  = [];     # Optional human-readable labels for the value bins, if hasFixedBinCount.
+    hasKnownExtents    @4  :Bool        = false;  # True if all feature values fall within the same fixed min/max range.
+    minValue           @5  :Float32     = 0.0;    # Minimum value in range for any value from this output, if hasKnownExtents.
+    maxValue           @6  :Float32     = 0.0;    # Maximum value in range for any value from this output, if hasKnownExtents.
+    isQuantized        @7  :Bool        = false;  # True if feature values are quantized to a particular resolution.
+    quantizeStep       @8  :Float32     = 0.0;    # Quantization resolution, if isQuantized.
+    sampleType         @9  :SampleType;           # How returned features from this output are spaced on the input timeline.
+    sampleRate         @10 :Float32     = 0.0;    # Sample rate (features per second) if sampleType == fixedSampleRate.
+    hasDuration        @11 :Bool        = false;  # True if features returned from this output will have a duration.
+}
+
+struct OutputDescriptor {
+    # All the properties of an output, both static (the basic metadata and static
+    # descriptor) and potentially dependent on configuration parameters (the
+    # configured descriptor).
+
+    basic              @0  :Basic;                # Basic metadata about the output.
+    configured         @1  :ConfiguredOutputDescriptor;    # Properties of the output that may depend on configuration parameters.
+    static             @2  :StaticOutputDescriptor;        # Properties (other than Basic) that do not depend on parameters.
+}
+
+enum InputDomain {
+    # Whether a feature extractor requires time-domain audio input (i.e.
+    # "normal" or "unprocessed" audio samples) or frequency-domain input
+    # (i.e. resulting from windowed, usually overlapping, short-time
+    # Fourier transforms).
+
+    timeDomain         @0;                        # The plugin requires time-domain audio samples as input.
+    frequencyDomain    @1;                        # The plugin requires input to have been pre-processed using windowed STFTs.
+}
+
+struct ExtractorStaticData {
+    # Static properties of a feature extractor. That is, metadata about the
+    # extractor that are the same regardless of how you configure or run it.
+
+    key                @0  :Text;                 # String that "globally" identifies the extractor, used to load it (see docs).
+    basic              @1  :Basic;                # Basic metadata about the extractor.
+    maker              @2  :Text;                 # Human-readable text naming the author or vendor of the extractor.
+    rights             @3  :Text;                 # Human-readable summary of copyright and/or licensing terms for the extractor.
+    version            @4  :Int32;                # Version number of extractor; must increase if new algorithm changes results.
+    category           @5  :List(Text);           # List of general->specific category labels for this extractor (see docs).
+    minChannelCount    @6  :Int32;                # Minimum number of input channels of audio this extractor can accept.
+    maxChannelCount    @7  :Int32;                # Maximum number of input channels of audio this extractor can accept.
+    parameters         @8  :List(ParameterDescriptor);    # List of configurable parameter properties for the feature extractor.
+    programs           @9  :List(Text);           # List of predefined programs. For backward-compatibility, not recommended.
+    inputDomain        @10 :InputDomain;          # Whether the extractor requires time-domain or frequency-domain input audio.
+    basicOutputInfo    @11 :List(Basic);          # Basic metadata about all of the outputs of the extractor.
+
+    struct SOPair {
+        # A mapping between output identifier and static descriptor for
+	# that output.
+	
+        output         @0  :Text;                 # Output id, matching the output's descriptor's basic identifier.
+        static         @1  :StaticOutputDescriptor;
+    }
+
+    staticOutputInfo   @12 :List(SOPair);         # Static descriptors for all outputs that have any static metadata.
+}
+
+struct RealTime {
+    # Time structure. When used as a timestamp, this is relative to "start
+    # of audio".
+    
+    sec                @0  :Int32       = 0;      # Number of seconds.
+    nsec               @1  :Int32       = 0;      # Number of nanoseconds. Must have same sign as sec unless sec == 0.
+}
+
+struct ProcessInput {
+    # Audio and timing input data provided to a process request.
+
+    inputBuffers       @0  :List(List(Float32));  # A single block of audio data (time or frequency domain) for each channel.
+    timestamp          @1  :RealTime;             # Time of start of block (time-domain) or "centre" of it (frequency-domain).
+}
+
+struct Feature {
+    # A single feature calculated and returned from a process or finish request.
+
+    hasTimestamp       @0  :Bool        = false;  # True if feature has a timestamp. Must be true for a variableSampleRate output.
+    timestamp          @1  :RealTime;             # Timestamp of feature, if hasTimestamp.
+    hasDuration        @2  :Bool        = false;  # True if feature has a duration. Must be true if output's hasDuration is true.
+    duration           @3  :RealTime;             # Duration of feature, if hasDuration.
+    label              @4  :Text;                 # Optional human-readable text attached to feature.
+    featureValues      @5  :List(Float32) = [];   # The feature values themselves (of size binCount, if output hasFixedBinCount).
+}
+
+struct FeatureSet {
+    # The set of all features, across all outputs, calculated and returned from
+    # a single process or finish request.
+
+    struct FSPair {
+        # A mapping between output identifier and ordered list of features for
+	# that output.
+	
+        output         @0  :Text;                 # Output id, matching the output's descriptor's basic identifier.
+        features       @1  :List(Feature) = [];   # Features calculated for that output during the current request, in time order.
+    }
+    
+    featurePairs       @0  :List(FSPair);         # The feature lists for all outputs for which any features have been calculated.
+}
+
+struct Framing {
+    # Determines how audio should be split up into individual buffers for input.
+    # If the feature extractor accepts frequency-domain input, then this
+    # applies prior to the STFT transform.
+    #
+    # These values are sometimes mandatory, but in other contexts one or both may
+    # be set to zero to mean "don't care". See documentation for structures that
+    # include a framing field for details.
+    
+    blockSize          @0  :Int32;                # Number of time-domain audio samples per buffer (on each channel).
+    stepSize           @1  :Int32;                # Number of samples to advance between buffers: equals blockSize for no overlap.
+}
+
+struct Configuration {
+    # Bundle of parameter values and other configuration data for a feature-
+    # extraction procedure.
+
+    struct PVPair {
+        # A mapping between parameter identifier and value.
+	
+        parameter      @0  :Text;                 # Parameter id, matching the parameter's descriptor's basic identifier.
+        value          @1  :Float32;              # Value to set parameter to (within constraints given in parameter descriptor).
+    }
+    
+    parameterValues    @0  :List(PVPair);         # Values for all parameters, or at least any that are to change from defaults.
+    currentProgram     @1  :Text;                 # Selection of predefined program. For backward-compatibility, not recommended. 
+    channelCount       @2  :Int32;                # Number of audio channels of input.
+    framing            @3  :Framing;              # Step and block size for framing the input.
+}
+
+enum AdapterFlag {
+    # Flags that may be used when requesting a server to load a feature
+    # extractor, to ask the server to do some of the work of framing and input
+    # conversion instead of leaving it to the client side. These affect the
+    # apparent behaviour of the loaded extractor.
+
+    adaptInputDomain   @0;                        # Input-domain conversion, so the extractor always expects time-domain input.
+    adaptChannelCount  @1;                        # Channel mixing or duplication, so any number of input channels is acceptable. 
+    adaptBufferSize    @2;                        # Framing, so the extractor accepts any blockSize of non-overlapping buffers.
+}
+
+const adaptAllSafe :List(AdapterFlag) =
+    [ adaptInputDomain, adaptChannelCount ];
+    # The set of adapter flags that can always be applied, leaving results unchanged.
+
+const adaptAll :List(AdapterFlag) =
+    [ adaptInputDomain, adaptChannelCount, adaptBufferSize ];
+    # The set of adapter flags that may cause "equivalent" results to be returned (see documentation).
+
+struct ListRequest {
+    # Request a server to provide a list of available feature extractors.
+    
+    from               @0  :List(Text);           # If non-empty, provide only extractors found in the given list of "libraries".
+}
+
+struct ListResponse {
+    # Response to a successful list request.
+    
+    available          @0  :List(ExtractorStaticData);    # List of static data about available feature extractors.
+}
+
+struct LoadRequest {
+    # Request a server to load a feature extractor and return a handle to it.
+    
+    key                @0  :Text;                 # Key as found in the extractor's static data structure.
+    inputSampleRate    @1  :Float32;              # Sample rate for input audio. Properties of the extractor may depend on this.
+    adapterFlags       @2  :List(AdapterFlag);    # Set of optional flags to make any framing and input conversion requests.
+}
+
+struct LoadResponse {
+    # Response to a successful load request.
+    
+    handle             @0  :Int32;                # Handle to be used to refer to the loaded feature extractor in future requests.
+    staticData         @1  :ExtractorStaticData;  # Static data about this feature extractor, identical to that in list response.
+    defaultConfiguration @2  :Configuration;      # Extractor's default parameter values and preferred input framing.
+}
+
+struct ConfigurationRequest {
+    # Request a server to configure a loaded feature extractor and prepare
+    # it for use. This request must be carried out on a feature extractor
+    # before any process request can be made.
+    
+    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
+    configuration      @1  :Configuration;        # Bundle of parameter values to set, and client's preferred input framing.
+}
+
+struct ConfigurationResponse {
+    # Response to a successful configuration request.
+
+    handle             @0  :Int32;                # Handle of extractor, as passed in the configuration request.
+    outputs            @1  :List(OutputDescriptor);       # Full set of properties of all outputs following configuration.
+    framing            @2  :Framing;              # Input framing that must be used for subsequent process requests.
+}
+
+struct ProcessRequest {
+    # Request a server to process a buffer of audio using a loaded and
+    # configured feature extractor.
+
+    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
+    processInput       @1  :ProcessInput;         # Audio in the input domain, with framing as in the configuration response.
+}
+
+struct ProcessResponse {
+    # Response to a successful process request.
+
+    handle             @0  :Int32;                # Handle of extractor, as passed in the process request.
+    features           @1  :FeatureSet;           # All features across all outputs calculated during this process request.
+}
+
+struct FinishRequest {
+    # Request a server to finish processing and unload a loaded feature
+    # extractor. This request may be made at any time -- the extractor does
+    # not have to have been configured or used. The extractor handle cannot
+    # be used again with this server afterwards.
+
+    handle             @0  :Int32;                # Handle as returned in the load response from the loading of this extractor.
+}
+
+struct FinishResponse {
+    # Response to a successful finish request.
+
+    handle             @0  :Int32;                # Handle of extractor, as passed in the finish request. May not be used again.
+    features           @1  :FeatureSet;           # Features the extractor has calculated now that it knows all input has ended.
+}
+
+struct Error {
+    # Response to any request that fails.
+
+    code               @0  :Int32;                # Error code. 
+    message            @1  :Text;                 # Error message.
+}
+
+struct RpcRequest {
+    # Request bundle for use when using Cap'n Proto serialisation without
+    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
+
+    id :union {
+        # Identifier used solely to associate a response packet with its
+	# originating request. Server does not examine the contents of this,
+	# it just copies the request id structure into the response.
+	
+        number         @0  :Int32;
+        tag            @1  :Text;
+        none           @2  :Void;
+    }
+    
+    request :union {
+        # For more details, see the documentation for the individual
+	# request structures.
+	
+	list           @3  :ListRequest;          # Provide a list of available feature extractors.
+	load           @4  :LoadRequest;          # Load a feature extractor and return a handle to it.
+	configure      @5  :ConfigurationRequest; # Configure a loaded feature extractor, set parameters, and prepare it for use.
+	process        @6  :ProcessRequest;       # Process a single fixed-size buffer of audio and return calculated features.
+	finish         @7  :FinishRequest;        # Get any remaining features and unload the extractor.
+    }
+}
+
+struct RpcResponse {
+    # Response bundle for use when using Cap'n Proto serialisation without
+    # Cap'n Proto RPC layer. For Cap'n Proto RPC, see piper.rpc.capnp.
+
+    id :union {
+        # Identifier used solely to associate a response packet with its
+	# originating request. Server does not examine the contents of this,
+	# it just copies the request id structure into the response.
+	
+        number         @0  :Int32;
+        tag            @1  :Text;
+        none           @2  :Void;
+    }
+
+    response :union {
+        # For more details, see the documentation for the individual
+	# response structures.
+	
+        error          @3  :Error;                # The request (of whatever type) failed.
+	list           @4  :ListResponse;         # List succeeded: here is static data about the requested extractors.
+	load           @5  :LoadResponse;         # Load succeeded: here is a handle for the loaded extractor.
+	configure      @6  :ConfigurationResponse;# Configure succeeded: ready to process, here are values such as block size.
+	process        @7  :ProcessResponse;      # Process succeeded: here are all features calculated from this input block.
+	finish         @8  :FinishResponse;       # Finish succeeded: extractor unloaded, here are all remaining features.
+    }
+}
+

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
index 30abc7213af..b15eff6a367 100644
--- a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
@@ -66,6 +66,14 @@ src_prepare() {
 	use pulseaudio || sv_disable_opt libpulse
 
 	eautoreconf
+
+	# Those need to be regenerated as they must match current capnproto version
+	einfo "Regenerating piper capnproto files"
+	rm -f piper-cpp/vamp-capnp/piper.capnp.* || die
+	mkdir -p piper/capnp || die
+	cp "${FILESDIR}/piper.capnp" piper/capnp/ || die
+	cd piper-cpp
+	emake vamp-capnp/piper.capnp.h
 }
 
 src_configure() {


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2017-05-25 14:50 Alexis Ballier
  0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier @ 2017-05-25 14:50 UTC (permalink / raw
  To: gentoo-commits

commit:     9b6f50df70013c44a749415cc3ca722a7e322a3c
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu May 25 14:50:00 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu May 25 14:50:11 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9b6f50df

media-sound/sonic-visualiser: Bump to 3.0.2, bug #616384

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 media-sound/sonic-visualiser/Manifest              |   1 +
 media-sound/sonic-visualiser/files/notest.patch    |  33 +++++++
 .../sonic-visualiser/sonic-visualiser-3.0.2.ebuild | 101 +++++++++++++++++++++
 3 files changed, 135 insertions(+)

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 6bc95a9bbcb..3eab3db5452 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1 +1,2 @@
 DIST sonic-visualiser-2.5.tar.gz 4112133 SHA256 5a66f20bae002876c64bc26d79dcba4f4c96c3c71ae160b5aafb40cfeacecdbe SHA512 ec48456f5b089453ee9e8bdca5449da92b248a9278423b38a63dda4598b0496432337a152d8b296e8c5dcc2b434bc68c8d1dde225e398bf9bee1f4bbb6c8d7e6 WHIRLPOOL 0038c197a731e503c01d4f69b3b1aa6d347df95e84bc4ed75b7cd670bb50eeeb615e1ae9bfb357d6414fbc338fdfce6179635e8390cf835c37f7c5029767df9f
+DIST sonic-visualiser-3.0.2.tar.gz 5123229 SHA256 9ca9c37e1da5e6197bb61e5b05b29544cbf8389523467efbd465527f1dd6d8b3 SHA512 25259df72175e397c63e76dca25f0099139c6569153c1e5750f90bcf5d661f20dd8c02aba53272567e72e661bfc66ec19cb3b3066795f978a6b76c826a5bf825 WHIRLPOOL 15ce603c4d34ffb0783138d7408ab903a3b1d1d776a997bf69c3d1de02f916f4d96e980e15b431450c6177d1d4ba85031b927dc7bdc9577bf6bceba2d3b37635

diff --git a/media-sound/sonic-visualiser/files/notest.patch b/media-sound/sonic-visualiser/files/notest.patch
new file mode 100644
index 00000000000..59b4d04f933
--- /dev/null
+++ b/media-sound/sonic-visualiser/files/notest.patch
@@ -0,0 +1,33 @@
+Index: sonic-visualiser-3.0.2/test-svcore-base.pro
+===================================================================
+--- sonic-visualiser-3.0.2.orig/test-svcore-base.pro
++++ sonic-visualiser-3.0.2/test-svcore-base.pro
+@@ -28,6 +28,3 @@ include(svcore/base/test/files.pri)
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/base/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/base/test/%1", $$file) }
+ 
+-!win32* {
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+Index: sonic-visualiser-3.0.2/test-svcore-data-fileio.pro
+===================================================================
+--- sonic-visualiser-3.0.2.orig/test-svcore-data-fileio.pro
++++ sonic-visualiser-3.0.2/test-svcore-data-fileio.pro
+@@ -28,6 +28,3 @@ include(svcore/data/fileio/test/files.pr
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/fileio/test/%1", $$file) }
+ 
+-!win32* {
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}
+Index: sonic-visualiser-3.0.2/test-svcore-data-model.pro
+===================================================================
+--- sonic-visualiser-3.0.2.orig/test-svcore-data-model.pro
++++ sonic-visualiser-3.0.2/test-svcore-data-model.pro
+@@ -28,6 +28,3 @@ include(svcore/data/model/test/files.pri
+ for (file, TEST_SOURCES) { SOURCES += $$sprintf("svcore/data/model/test/%1", $$file) }
+ for (file, TEST_HEADERS) { HEADERS += $$sprintf("svcore/data/model/test/%1", $$file) }
+ 
+-!win32* {
+-    QMAKE_POST_LINK = ./$${TARGET}
+-}

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
new file mode 100644
index 00000000000..30abc7213af
--- /dev/null
+++ b/media-sound/sonic-visualiser/sonic-visualiser-3.0.2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+inherit eutils qmake-utils autotools fdo-mime
+
+DESCRIPTION="Music audio files viewer and analiser"
+HOMEPAGE="http://www.sonicvisualiser.org/"
+SRC_URI="https://code.soundsoftware.ac.uk/attachments/download/2222/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
+
+RDEPEND="dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtxml:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtsvg:5
+	media-libs/libsndfile
+	media-libs/libsamplerate
+	app-arch/bzip2
+	>=media-libs/dssi-0.9.1
+	media-libs/liblrdf
+	media-libs/ladspa-sdk
+	media-libs/speex
+	>=media-libs/vamp-plugin-sdk-2.0
+	media-libs/rubberband
+	dev-libs/sord
+	dev-libs/serd
+	sci-libs/fftw:3.0
+	>=dev-libs/capnproto-0.6:=
+	osc? ( media-libs/liblo )
+	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
+	jack? ( media-sound/jack-audio-connection-kit )
+	mad? ( media-libs/libmad )
+	id3tag? ( media-libs/libid3tag )
+	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
+	pulseaudio? ( media-sound/pulseaudio )"
+
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	virtual/pkgconfig"
+
+REQUIRED_USE="|| ( jack pulseaudio portaudio )"
+
+sv_disable_opt() {
+	einfo "Disabling $1"
+	for i in . svapp svcore svgui ; do
+		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
+	done
+}
+
+src_prepare() {
+	epatch "${FILESDIR}/notest.patch"
+
+	use id3tag || sv_disable_opt id3tag
+	use jack || sv_disable_opt jack
+	use mad || sv_disable_opt mad
+	use ogg || sv_disable_opt fishsound
+	use ogg || sv_disable_opt oggz
+	use osc || sv_disable_opt liblo
+	use portaudio || sv_disable_opt portaudio
+	use pulseaudio || sv_disable_opt libpulse
+
+	eautoreconf
+}
+
+src_configure() {
+	export QMAKE="$(qt5_get_bindir)"/qmake
+	econf
+	eqmake5 -r sonic-visualiser.pro
+}
+
+src_test() {
+	for i in test-svcore-base test-svcore-data-fileio test-svcore-data-model ; do
+		einfo "Running ${i}"
+		./${i} || die
+	done
+}
+
+src_install() {
+	dobin ${PN} piper-vamp-simple-server piper-convert vamp-plugin-load-checker
+	dodoc README*
+	#install samples
+	insinto /usr/share/${PN}/samples
+	doins samples/*
+	# desktop entry
+	doicon icons/sv-icon.svg
+	domenu *.desktop
+}
+
+pkg_postinst() {
+	fdo-mime_desktop_database_update
+}
+
+pkg_postrm() {
+	fdo-mime_desktop_database_update
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/
@ 2016-12-31 11:54 Alexis Ballier
  0 siblings, 0 replies; 9+ messages in thread
From: Alexis Ballier @ 2016-12-31 11:54 UTC (permalink / raw
  To: gentoo-commits

commit:     eb31b18fe8af27c440605f9496fc72c967f092dd
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Sat Dec 31 11:47:10 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Sat Dec 31 11:47:10 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb31b18f

media-sound/sonic-visualiser: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 media-sound/sonic-visualiser/Manifest              |   3 -
 .../files/sonic-visualiser-1.7.1-liboggz11.patch   |  37 -------
 .../files/sonic-visualiser-1.8-configure.patch     |  11 ---
 .../files/sonic-visualiser-1.8-gcc46.patch         |  10 --
 .../files/sonic-visualiser-1.9-gcc47.patch         |  20 ----
 .../sonic-visualiser/sonic-visualiser-1.9.ebuild   |  92 ------------------
 .../sonic-visualiser/sonic-visualiser-2.3.ebuild   |  97 -------------------
 .../sonic-visualiser/sonic-visualiser-2.4.1.ebuild | 106 ---------------------
 8 files changed, 376 deletions(-)

diff --git a/media-sound/sonic-visualiser/Manifest b/media-sound/sonic-visualiser/Manifest
index 6fec4d5..6bc95a9 100644
--- a/media-sound/sonic-visualiser/Manifest
+++ b/media-sound/sonic-visualiser/Manifest
@@ -1,4 +1 @@
-DIST sonic-visualiser-1.9.tar.gz 1867608 SHA256 d899c219403d96c415809521ff71b7f326bf3c5015af496df7ae236de4712f02 SHA512 b626b1ddf59071b280b1da9d8733759784febefb5abcb7ac8fc9bfa1bd7beb45aa8f68e854122cddd6a85b393943c87671298759945ae1f771ccc4fbd9ba2a5e WHIRLPOOL c7e66421e133ec36ad26e7f44da6f1ed2b2378be5d33bb6f3a66f822a7b81422280053d4902e844d1c91dbcb8c4cb40a5000eb30e63bc8722c1c05d3fc94008d
-DIST sonic-visualiser-2.3.tar.gz 2909195 SHA256 0c90198d6974c8dfad7295498277f2ad8bd870b5e32d00e2aa22131bb3e006b8 SHA512 647b8e9a5e3547f7d8546318a63e68282ccec70a6710e90b97f5ddc1425038784f1f2da251dbae5db5b380737181de8e22561b33f4b86f7a6b4af336cdbdb7d3 WHIRLPOOL a7dd137f0d16bec5c462374932bd7e389f59fc19601bd2bd5e6872d4e5ce870f7414179e88bc3c13b46b42e10b06461d366146f09171a79531bece1db3303c89
-DIST sonic-visualiser-2.4.1.tar.gz 4155745 SHA256 cb57cefddd47bdb31130dbc6d6ed53dd1084cbcecf426f4df02bbf098e82d41a SHA512 9eb63ba8de670114d388e5faae6e8a16c732f05950324cee2c414d48cbe2e3a320b6876f4db578c01d08aa76de677ee295d5362160b03ab086eaba40c6f7f59f WHIRLPOOL 601764c75110545147620fe94e089bb0b71d874e7da1f7eb15ba01a39a541d80fa73605ea8d25c48d4d1db41b1eac92ec56e52bd557c7b2f41784274cc162ccd
 DIST sonic-visualiser-2.5.tar.gz 4112133 SHA256 5a66f20bae002876c64bc26d79dcba4f4c96c3c71ae160b5aafb40cfeacecdbe SHA512 ec48456f5b089453ee9e8bdca5449da92b248a9278423b38a63dda4598b0496432337a152d8b296e8c5dcc2b434bc68c8d1dde225e398bf9bee1f4bbb6c8d7e6 WHIRLPOOL 0038c197a731e503c01d4f69b3b1aa6d347df95e84bc4ed75b7cd670bb50eeeb615e1ae9bfb357d6414fbc338fdfce6179635e8390cf835c37f7c5029767df9f

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
deleted file mode 100644
index 6f2842c..00000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.7.1-liboggz11.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
-===================================================================
---- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.cpp
-+++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.cpp
-@@ -138,15 +138,15 @@ OggVorbisFileReader::DecodeThread::run()
- } 
- 
- int
--OggVorbisFileReader::readPacket(OGGZ *, ogg_packet *packet, long, void *data)
-+OggVorbisFileReader::readPacket(OGGZ *, oggz_packet *packet, long, void *data)
- {
-     OggVorbisFileReader *reader = (OggVorbisFileReader *)data;
-     FishSound *fs = reader->m_fishSound;
- 
--    fish_sound_prepare_truncation(fs, packet->granulepos, packet->e_o_s);
--    fish_sound_decode(fs, packet->packet, packet->bytes);
-+    fish_sound_prepare_truncation(fs, packet->op.granulepos, packet->op.e_o_s);
-+    fish_sound_decode(fs, packet->op.packet, packet->op.bytes);
- 
--    reader->m_bytesRead += packet->bytes;
-+    reader->m_bytesRead += packet->op.bytes;
- 
-     // The number of bytes read by this function is smaller than
-     // the file size because of the packet headers
-Index: sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
-===================================================================
---- sonic-visualiser-1.7.1.orig/data/fileio/OggVorbisFileReader.h
-+++ sonic-visualiser-1.7.1/data/fileio/OggVorbisFileReader.h
-@@ -82,7 +82,7 @@ protected:
-     bool m_cancelled;
-     int m_completion;
-  
--    static int readPacket(OGGZ *, ogg_packet *, long, void *);
-+    static int readPacket(OGGZ *, oggz_packet *, long, void *);
-     static int acceptFrames(FishSound *, float **, long, void *);
- 
-     class DecodeThread : public Thread

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
deleted file mode 100644
index 02752b7..00000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-configure.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- sonic-visualiser-1.8/configure.orig
-+++ sonic-visualiser-1.8/configure
-@@ -18,7 +18,7 @@
- 	\$(MAKE) --directory=svgui
- sub-svapp:
- 	\$(MAKE) --directory=svapp
--sub-sonic-visualiser:
-+sub-sonic-visualiser: sub-svcore sub-svgui sub-svapp
- 	\$(MAKE) --directory=sonic-visualiser
- EOF
- echo " *** Generated Makefile"

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
deleted file mode 100644
index 47ff291..00000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.8-gcc46.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- sonic-visualiser-1.8/svcore/base/ResizeableBitset.h.orig
-+++ sonic-visualiser-1.8/svcore/base/ResizeableBitset.h
-@@ -16,6 +16,7 @@
- #ifndef _RESIZEABLE_BITMAP_H_
- #define _RESIZEABLE_BITMAP_H_
- 
-+#include <cstddef>
- #include <vector>
- #include <stdint.h>
- 

diff --git a/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch b/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
deleted file mode 100644
index 19f9fb4..00000000
--- a/media-sound/sonic-visualiser/files/sonic-visualiser-1.9-gcc47.patch
+++ /dev/null
@@ -1,20 +0,0 @@
---- sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
-+++ sonic-visualiser-1.9/svcore/data/fileio/CodedAudioFileReader.cpp
-@@ -22,6 +22,7 @@
- #include "base/Serialiser.h"
- #include "base/Resampler.h"
- 
-+#include <stdint.h>
- #include <iostream>
- #include <QDir>
- #include <QMutexLocker>
---- sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
-+++ sonic-visualiser-1.9/svcore/data/model/WritableWaveFileModel.cpp
-@@ -26,6 +26,7 @@
- 
- #include <cassert>
- #include <iostream>
-+#include <stdint.h>
- 
- //#define DEBUG_WRITABLE_WAVE_FILE_MODEL 1
- 

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
deleted file mode 100644
index 24f752a..00000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-1.9.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils qt4-r2 autotools fdo-mime
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
-SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/194/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="fftw id3tag jack mad ogg osc +portaudio pulseaudio"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	fftw? ( sci-libs/fftw:3.0 )
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/liblrdf
-	dev-libs/redland
-	media-libs/ladspa-sdk
-	osc? ( media-libs/liblo )
-	media-libs/speex
-	>=media-libs/vamp-plugin-sdk-2.0
-	media-libs/rubberband
-	jack? ( media-sound/jack-audio-connection-kit )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in sonic-visualiser svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.8-configure.patch
-	epatch "${FILESDIR}"/${PN}-1.9-gcc47.patch
-	cd svcore
-	epatch "${FILESDIR}"/${PN}-1.7.1-liboggz11.patch
-
-	use fftw || sv_disable_opt fftw3f
-	use fftw || sv_disable_opt fftw3
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	for i in sonic-visualiser svapp svcore svgui ; do
-	   pushd "${S}"/$i > /dev/null
-	   eautoreconf
-	   popd > /dev/null
-	done
-}
-
-src_install() {
-	cd ${PN}
-	dobin ${PN}
-	dodoc README*
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu *.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-2.3.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.3.ebuild
deleted file mode 100644
index 29c3b81..00000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-2.3.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils qt4-r2 autotools fdo-mime
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
-SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/918/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
-
-RDEPEND="dev-qt/qtcore:4
-	dev-qt/qtgui:4
-	dev-qt/qttest:4
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/liblrdf
-	media-libs/ladspa-sdk
-	media-libs/speex
-	>=media-libs/vamp-plugin-sdk-2.0
-	media-libs/rubberband
-	dev-libs/sord
-	dev-libs/serd
-	sci-libs/fftw:3.0
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	eautoreconf
-}
-
-src_configure() {
-	econf
-	eqmake4
-}
-
-src_compile() {
-	# de parallelize a bit otherwise it fails...
-	emake sub-dataquay-lib-pro
-	emake sub-svcore
-	emake sub-svgui
-	emake sub-svapp
-	emake
-}
-
-src_install() {
-	cd ${PN}
-	dobin ${PN}
-	dodoc README*
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu *.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}

diff --git a/media-sound/sonic-visualiser/sonic-visualiser-2.4.1.ebuild b/media-sound/sonic-visualiser/sonic-visualiser-2.4.1.ebuild
deleted file mode 100644
index 0584fdc..00000000
--- a/media-sound/sonic-visualiser/sonic-visualiser-2.4.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils qmake-utils autotools fdo-mime
-
-DESCRIPTION="Music audio files viewer and analiser"
-HOMEPAGE="http://www.sonicvisualiser.org/"
-SRC_URI="http://code.soundsoftware.ac.uk/attachments/download/1185/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="id3tag jack mad ogg osc +portaudio pulseaudio"
-
-RDEPEND="dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtxml:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtnetwork:5
-	dev-qt/qttest:5
-	media-libs/libsndfile
-	media-libs/libsamplerate
-	app-arch/bzip2
-	>=media-libs/dssi-0.9.1
-	media-libs/liblrdf
-	media-libs/ladspa-sdk
-	media-libs/speex
-	>=media-libs/vamp-plugin-sdk-2.0
-	media-libs/rubberband
-	dev-libs/sord
-	dev-libs/serd
-	sci-libs/fftw:3.0
-	osc? ( media-libs/liblo )
-	portaudio? ( >=media-libs/portaudio-19_pre20071207 )
-	jack? ( media-sound/jack-audio-connection-kit )
-	mad? ( media-libs/libmad )
-	id3tag? ( media-libs/libid3tag )
-	ogg? ( media-libs/libfishsound >=media-libs/liboggz-1.1.0 )
-	pulseaudio? ( media-sound/pulseaudio )"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-REQUIRED_USE="|| ( jack pulseaudio portaudio )"
-
-sv_disable_opt() {
-	einfo "Disabling $1"
-	for i in . svapp svcore svgui ; do
-		sed -i -e "/$1/d" "${S}/$i/configure.ac" || die "failed to remove $1 support"
-	done
-}
-
-src_prepare() {
-	use id3tag || sv_disable_opt id3tag
-	use jack || sv_disable_opt jack
-	use mad || sv_disable_opt mad
-	use ogg || sv_disable_opt fishsound
-	use ogg || sv_disable_opt oggz
-	use osc || sv_disable_opt liblo
-	use portaudio || sv_disable_opt portaudio
-	use pulseaudio || sv_disable_opt libpulse
-
-	eautoreconf
-}
-
-src_configure() {
-	export QMAKE="$(qt5_get_bindir)"/qmake
-	econf
-	eqmake5 -r sonic-visualiser.pro
-}
-
-src_compile() {
-	# de parallelize a bit otherwise it fails...
-	emake sub-dataquay-lib-pro
-	emake sub-svcore
-	emake sub-svgui
-	emake sub-svapp
-	emake sub-sv-pro
-}
-
-src_test() {
-	emake sub-svcore-base-test
-	emake sub-svcore-data-fileio-test
-}
-
-src_install() {
-	cd ${PN}
-	dobin ${PN}
-	dodoc README*
-	#install samples
-	insinto /usr/share/${PN}/samples
-	doins samples/*
-	# desktop entry
-	doicon icons/sv-icon.svg
-	domenu *.desktop
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2024-10-31 22:47 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-06-15 10:21 [gentoo-commits] repo/gentoo:master commit in: media-sound/sonic-visualiser/files/, media-sound/sonic-visualiser/ Miroslav Šulc
  -- strict thread matches above, loose matches on Subject: below --
2024-10-31 22:47 Miroslav Šulc
2021-02-13 19:25 Miroslav Šulc
2020-11-09 12:02 Miroslav Šulc
2019-12-18 21:32 Miroslav Šulc
2018-10-11 12:42 Michael Palimaka
2017-06-15 12:45 Alexis Ballier
2017-05-25 14:50 Alexis Ballier
2016-12-31 11:54 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox