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" +}
