From 7e662ec84fc13cef513542e4030f47017d030187 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Oct 2022 19:40:50 +0100 Subject: gentoo auto-resync : 12:10:2022 - 19:40:50 --- media-sound/klick/Manifest | 3 +- media-sound/klick/files/klick-0.12.2-gcc6.patch | 92 +++++++++++++++++-------- media-sound/klick/klick-0.12.2-r2.ebuild | 55 --------------- 3 files changed, 64 insertions(+), 86 deletions(-) delete mode 100644 media-sound/klick/klick-0.12.2-r2.ebuild (limited to 'media-sound/klick') diff --git a/media-sound/klick/Manifest b/media-sound/klick/Manifest index 3bb6c8939df0..e6bb170a65dc 100644 --- a/media-sound/klick/Manifest +++ b/media-sound/klick/Manifest @@ -1,6 +1,5 @@ -AUX klick-0.12.2-gcc6.patch 1513 BLAKE2B 70eac0137fc8b4ffa25ccb86789efe7fc45cb9d68ac5160e962e0178637a3406221019c07d4a4035aa4baba00c4d883c005f6190f92cd81888277531ed232c41 SHA512 15d5fadd81f5dcb837ac4f91d62b99834fd192a508d5df9647df994b65807fc3de25eaceccad9b39535dc56abb83feb2f48109cf46d95d1ddb68a8212d096ad3 +AUX klick-0.12.2-gcc6.patch 2684 BLAKE2B 528a2f41e4ea7dc7dbdc36cfb79493998c6941b248a4a8cfc758881ef96a6f8ab49bb230713ece38271c69d1f7833d89e98b238083029d7edb5671f3cbd90f63 SHA512 a5023a129a4e2ac2e5b2bb3e264ae27c1cac25ea640629260f281b2849ce71a23920df1a514b88a67290909b5f1a9ae8fe433de1468b23a20bb9e1b9a6774142 AUX klick-0.12.2-sconstruct.patch 1836 BLAKE2B 1e22becd7205fe5f9717b18d1d63f7dfc8b265d995c2d503553676c3d281fb7df818375f1fd76f64067d6d3150124c6f162dc42842d1a7ddf2ef39cf9a95e66a SHA512 0db89995a39962e91085c761cf9eb07470ab20a16dd90ae77e1e34bf912ede28aca15a8c7f7708fdfbafe3c84f3b92059aa01f160b936e20a32cd69fbc6d03c1 DIST klick-0.12.2.tar.gz 111801 BLAKE2B 990743d079927fae0768c9fd7c979b88055e2886ae7d9f6a25116dbdea5b295b82446c6ac5c7e9af35f48058126bc925c4495f5776fb7cd4c6266741cd6c02bb SHA512 e0da321b4f5573e8a0b7ef53a554bf33b6d999b7125c62648d5ad64278107b429effa573187327d7c6fe5ae07bf9c7f81b96f069358315b2ee9166480f6dae7f -EBUILD klick-0.12.2-r2.ebuild 1083 BLAKE2B 56b91729dedc79d6f5718d2d38801483f9530b49a44be395b54b3709f1615e8b9501babea8c3dc79a7d4f9dc649c9a7290270b8590541fcca0a2a64e22eb6b45 SHA512 8268dcfb3c7adf45469d367a9c5c7d92ffaa558d4e473bc93099fe76638a083fb5f7c8cf582f58cdda768f80d5c6c6129fc5d71bcf51c8c766a406cceb1e193a EBUILD klick-0.12.2-r3.ebuild 1082 BLAKE2B 2440555f5de20232a37c526cc80e79c90f9389e433ad532f956a21d86ff16e3ffdcce1a3e4b747dc822dbbabc6e5bb86ae50e0af21bfdffad5bbbdabc466d151 SHA512 1ab6f94402a193b12a01bfe3bcba844fe4fefb2ae251983af36542fe00a08f8e883092fb0ab7be78a1df9dc13591642cf18fc7681238d3f1a7f1ef26e2e9cb8b MISC metadata.xml 546 BLAKE2B 6f3499cca20243d15ae34193598bd09d8d88a40759744b440834fcab459d71e383d1584c575e346ea376552a1f0a40c098d9892b9963af1a75846dfaa4542420 SHA512 af8a15367d57e8592ee6271ac2ee6844170fd953542b9bd7d83ead0c5461b948a63513045d936f27766f8caa0b68e270bc6f500072db453eaca767cde98d239f diff --git a/media-sound/klick/files/klick-0.12.2-gcc6.patch b/media-sound/klick/files/klick-0.12.2-gcc6.patch index c8c07121e497..016d221d30e0 100644 --- a/media-sound/klick/files/klick-0.12.2-gcc6.patch +++ b/media-sound/klick/files/klick-0.12.2-gcc6.patch @@ -1,44 +1,78 @@ ---- klick-0.12.2/src/metronome_map.hh.old 2016-09-21 22:17:41.364102201 -0400 -+++ klick-0.12.2/src/metronome_map.hh 2016-09-21 22:28:50.611858765 -0400 -@@ -48,7 +48,7 @@ +Description: Fix build with gcc-6. +Author: Jaromír Mikeš +Forwarded: dominic.sacre@gmx.de + +Index: klick/src/metronome_map.hh +=================================================================== +--- klick.orig/src/metronome_map.hh ++++ klick/src/metronome_map.hh +@@ -48,7 +48,7 @@ class MetronomeMap virtual void timebase_callback(position_t *); private: - static double const TICKS_PER_BEAT = 1920.0; -+ static double const TICKS_PER_BEAT; ++ static double constexpr TICKS_PER_BEAT = 1920.0; // transport position nframes_t _current; ---- klick-0.12.2/src/metronome_map.cc.old 2016-09-21 22:27:01.551067088 -0400 -+++ klick-0.12.2/src/metronome_map.cc 2016-09-21 22:28:49.027158380 -0400 -@@ -195,3 +195,5 @@ - p->beats_per_minute = _pos.map_entry().tempi[n]; - } - } -+ -+double const MetronomeMap::TICKS_PER_BEAT = 1920.0; ---- klick-0.12.2/src/metronome_simple.hh.old 2016-09-21 22:18:57.674628602 -0400 -+++ klick-0.12.2/src/metronome_simple.hh 2016-09-21 22:29:04.307859355 -0400 -@@ -58,9 +58,9 @@ - +Index: klick/src/metronome_simple.hh +=================================================================== +--- klick.orig/src/metronome_simple.hh ++++ klick/src/metronome_simple.hh +@@ -59,8 +59,8 @@ class MetronomeSimple private: -- static int const MAX_TAPS = 5; + static int const MAX_TAPS = 5; - static float const MAX_TAP_AGE = 3.0; - static float const TAP_DIFF = 0.2; -+ static int const MAX_TAPS; -+ static float const MAX_TAP_AGE; -+ static float const TAP_DIFF; ++ static float constexpr MAX_TAP_AGE = 3.0; ++ static float constexpr TAP_DIFF = 0.2; float _tempo; float _tempo_increment, _tempo_start, _tempo_limit; ---- klick-0.12.2/src/metronome_simple.cc.old 2016-09-21 22:27:24.883846428 -0400 -+++ klick-0.12.2/src/metronome_simple.cc 2016-09-21 22:28:46.015859632 -0400 -@@ -217,3 +217,7 @@ +Index: klick/src/tempomap.cc +=================================================================== +--- klick.orig/src/tempomap.cc ++++ klick/src/tempomap.cc +@@ -57,17 +57,17 @@ static char const regex_blank[] = "^[[:b + // matches any valid line in a tempomap file + static char const regex_valid[] = + // label +- "^[[:blank:]]*("REGEX_LABEL":)?" \ ++ "^[[:blank:]]*(" REGEX_LABEL":)?" \ + // bars +- "[[:blank:]]*"REGEX_INT"" \ ++ "[[:blank:]]*" REGEX_INT"" \ + // meter +- "([[:blank:]]+"REGEX_INT"/"REGEX_INT")?" \ ++ "([[:blank:]]+" REGEX_INT"/" REGEX_INT")?" \ + // tempo +- "[[:blank:]]+"REGEX_FLOAT"(-"REGEX_FLOAT"|((,"REGEX_FLOAT")*))?" \ ++ "[[:blank:]]+" REGEX_FLOAT"(-" REGEX_FLOAT"|((," REGEX_FLOAT")*))?" \ + // pattern +- "([[:blank:]]+"REGEX_PATTERN")?" \ ++ "([[:blank:]]+" REGEX_PATTERN")?" \ + // volume +- "([[:blank:]]+"REGEX_FLOAT")?" \ ++ "([[:blank:]]+" REGEX_FLOAT")?" \ + // comment + "[[:blank:]]*(#.*)?$"; + +@@ -87,13 +87,13 @@ static int const + // matches valid tempo parameters on the command line + static char const regex_cmdline[] = + // bars +- "^[[:blank:]]*("REGEX_INT"[[:blank:]]+)?" \ ++ "^[[:blank:]]*(" REGEX_INT"[[:blank:]]+)?" \ + // meter +- "("REGEX_INT"/"REGEX_INT"[[:blank:]]+)?" \ ++ "(" REGEX_INT"/" REGEX_INT"[[:blank:]]+)?" \ + // tempo +- REGEX_FLOAT"(-"REGEX_FLOAT"/"REGEX_FLOAT")?" \ ++ REGEX_FLOAT"(-" REGEX_FLOAT"/" REGEX_FLOAT")?" \ + // pattern +- "([[:blank:]]+"REGEX_PATTERN")?[[:blank:]]*$"; ++ "([[:blank:]]+" REGEX_PATTERN")?[[:blank:]]*$"; - _frame += nframes; - } -+ -+int const MetronomeSimple::MAX_TAPS = 5; -+float const MetronomeSimple::MAX_TAP_AGE = 3.0; -+float const MetronomeSimple::TAP_DIFF = 0.2; + static int const + RE_NMATCHES_CMD = 15, diff --git a/media-sound/klick/klick-0.12.2-r2.ebuild b/media-sound/klick/klick-0.12.2-r2.ebuild deleted file mode 100644 index d7417732e2e2..000000000000 --- a/media-sound/klick/klick-0.12.2-r2.ebuild +++ /dev/null @@ -1,55 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -PYTHON_COMPAT=( python3_{7..9} ) - -inherit python-any-r1 scons-utils toolchain-funcs - -DESCRIPTION="An advanced command-line based metronome for JACK" -HOMEPAGE="http://das.nasophon.de/klick" -SRC_URI="http://das.nasophon.de/download/${P}.tar.gz" - -LICENSE="GPL-2+" -SLOT="0" -KEYWORDS="~amd64 ~ppc ~x86" -IUSE="debug osc rubberband" - -RDEPEND="media-libs/libsamplerate - media-libs/libsndfile - virtual/jack - osc? ( media-libs/liblo ) - rubberband? ( media-libs/rubberband )" -DEPEND="${RDEPEND} - dev-libs/boost" -BDEPEND="virtual/pkgconfig" - -PATCHES=( - "${FILESDIR}"/${P}-sconstruct.patch - "${FILESDIR}"/${P}-gcc6.patch -) - -HTML_DOCS=( doc/manual.html ) - -src_configure() { - MYSCONS=( - CXX="$(tc-getCXX)" - CXXFLAGS="${CXXFLAGS}" - LINKFLAGS="${LDFLAGS}" - PREFIX="${EPREFIX}/usr" - DESTDIR="${D}" - DEBUG=$(usex debug) - OSC=$(usex osc) - RUBBERBAND=$(usex rubberband) - ) -} - -src_compile() { - escons "${MYSCONS[@]}" -} - -src_install() { - escons "${MYSCONS[@]}" install - einstalldocs -} -- cgit v1.2.3