public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: media-sound/easyeffects/files/, media-sound/easyeffects/
@ 2021-07-18  0:31 Marek Szuba
  0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2021-07-18  0:31 UTC (permalink / raw
  To: gentoo-commits

commit:     f2a1687a2fabdb008fbb1366a9b31ed11d44637e
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sun Jul 18 00:15:37 2021 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sun Jul 18 00:31:42 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f2a1687a

media-sound/easyeffects: improve dependencies and tweak metadata

Same thing as recent media-sound/pulseeffects changes. Had to drop the
ppc32 keyword due to gnome-extra/yelp, will request re-keywording.

Closes: https://bugs.gentoo.org/800713
Closes: https://bugs.gentoo.org/802528
Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 .../easyeffects/easyeffects-5.0.4-r1.ebuild        | 83 ++++++++++++++++++++++
 .../easyeffects-5.0.4-meson_no_automagic.patch     | 55 ++++++++++++++
 media-sound/easyeffects/metadata.xml               | 10 ++-
 3 files changed, 145 insertions(+), 3 deletions(-)

diff --git a/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
new file mode 100644
index 00000000000..2b949438898
--- /dev/null
+++ b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit gnome2-utils meson
+
+DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
+HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pipewire-gstreamer-legacy"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
+	EGIT_BRANCH="pipewire-gstreamer-legacy"
+else
+	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="bs2b calf rnnoise rubberband webrtc"
+
+DEPEND=">=dev-libs/boost-1.72:=
+	>=dev-cpp/glibmm-2.56.0:2
+	>=dev-cpp/gtkmm-3.24:3.0
+	>=dev-libs/glib-2.56:2
+	>=dev-libs/libsigc++-2.10:2
+	>=media-libs/gstreamer-1.12.5:1.0
+	media-libs/gst-plugins-base
+	>=media-libs/gst-plugins-bad-1.12.5:1.0
+	media-libs/libebur128
+	media-libs/libsndfile
+	>=media-libs/lilv-0.24.2-r1
+	>=media-libs/zita-convolver-3.0.0
+	>=media-video/pipewire-0.3.24[gstreamer]
+	>=x11-libs/gtk+-3.20:3
+	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
+	rnnoise? ( media-libs/rnnoise )"
+RDEPEND="!media-sound/pulseeffects
+	${DEPEND}
+	gnome-extra/yelp
+	>=media-libs/gst-plugins-good-1.12.5:1.0
+	>=media-libs/lsp-plugins-1.1.24[lv2]
+	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
+	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
+	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
+	sys-apps/dbus
+	calf? ( >=media-plugins/calf-0.90.1[lv2] )
+	rubberband? ( media-libs/rubberband[ladspa] )
+	webrtc? ( media-plugins/gst-plugins-webrtc )"
+# Only header files are used from libsamplerate so put it here rather than DEPEND
+# to avoid unnecessary cross-compilation.
+BDEPEND="dev-libs/appstream-glib
+	dev-util/desktop-file-utils
+	dev-util/itstool
+	media-libs/libsamplerate
+	sys-devel/gettext
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.4-meson_no_automagic.patch
+)
+
+src_configure() {
+	local emesonargs=(
+		$(meson_feature bs2b)
+		$(meson_feature rnnoise)
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	gnome2_gconf_install
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	gnome2_gconf_uninstall
+	gnome2_schemas_update
+	xdg_icon_cache_update
+}

diff --git a/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
new file mode 100644
index 00000000000..4e547d404f8
--- /dev/null
+++ b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
@@ -0,0 +1,55 @@
+--- a/meson.build
++++ b/meson.build
+@@ -4,7 +4,7 @@
+ 	'cpp',
+ 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
+ 	version: '5.0.4',
+-	meson_version: '>= 0.40.0'
++	meson_version: '>= 0.47.0'
+ )
+ 
+ add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
+--- a/meson_options.txt
++++ b/meson_options.txt
+@@ -0,0 +1,12 @@
++option(
++        'bs2b',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
++)
++option(
++        'rnnoise',
++        type: 'feature',
++        value: 'auto',
++        description: 'Enable rnnoise-based Noise Reduction plug-in'
++)
+--- a/src/meson.build
++++ b/src/meson.build
+@@ -108,7 +108,7 @@
+ 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
+ 	dependency('gstreamer-fft-1.0'),
+ 	dependency('lilv-0', version: '>=0.22', required: false),
+-	dependency('libbs2b', required: false),
++	dependency('libbs2b', required: get_option('bs2b')),
+ 	dependency('boost', version: '>=1.72', modules:['filesystem']),
+ 	dependency('sndfile'),
+ 	dependency('threads')
+--- a/src/rnnoise/meson.build
++++ b/src/rnnoise/meson.build
+@@ -1,4 +1,5 @@
+-dep_rnnoise = dependency('rnnoise', required: false)
++opt_rnnoise = get_option('rnnoise')
++dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
+ 
+ if dep_rnnoise.found()
+ 
+@@ -28,7 +29,7 @@
+   	cpp_args: plugins_cxx_args
+ )
+ 
+-else
++elif opt_rnnoise.auto()
+ 
+ message('could not find the RNNoise library')
+ 

diff --git a/media-sound/easyeffects/metadata.xml b/media-sound/easyeffects/metadata.xml
index e4010fa254c..67cca67386d 100644
--- a/media-sound/easyeffects/metadata.xml
+++ b/media-sound/easyeffects/metadata.xml
@@ -10,9 +10,13 @@
 		<name>Matthew Thode</name>
 	</maintainer>
 	<use>
-		<flag name="bs2b">Enable use of media-libs/libbs2b</flag>
-		<flag name="calf">Enable use of media-plugins/calf for adding various FX</flag>
-		<flag name="rubberband">Enable usse of media-libs/rubberband for the pitch shifting FX</flag>
+		<flag name="bs2b">Enable use of <pkg>media-libs/libbs2b</pkg> for the crossfeed FX</flag>
+		<flag name="calf">Enable use of <pkg>media-plugins/calf</pkg> for adding various FX</flag>
+		<flag name="rnnoise">Enable use of <pkg>media-libs/rnnoise</pkg> for the neural network-based
+			noise-reduction FX</flag>
+		<flag name="rubberband">Enable use of <pkg>media-libs/rubberband</pkg> for the pitch-shifting FX</flag>
+		<flag name="webrtc">Enable use of <pkg>media-plugins/gst-plugins-webrtc</pkg> for various
+			voice-enhancement FX</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">wwmm/easyeffects</remote-id>


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

* [gentoo-commits] repo/gentoo:master commit in: media-sound/easyeffects/files/, media-sound/easyeffects/
@ 2022-01-01 14:12 Marek Szuba
  0 siblings, 0 replies; 2+ messages in thread
From: Marek Szuba @ 2022-01-01 14:12 UTC (permalink / raw
  To: gentoo-commits

commit:     cb069fdbc06f840c7118f171c43158c8c09e17cd
Author:     Marek Szuba <marecki <AT> gentoo <DOT> org>
AuthorDate: Sat Jan  1 13:56:54 2022 +0000
Commit:     Marek Szuba <marecki <AT> gentoo <DOT> org>
CommitDate: Sat Jan  1 13:56:54 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb069fdb

media-sound/easyeffects: drop 5.0.4-r1, 6.1.4

Signed-off-by: Marek Szuba <marecki <AT> gentoo.org>

 media-sound/easyeffects/Manifest                   |  2 -
 .../easyeffects/easyeffects-5.0.4-r1.ebuild        | 84 ----------------------
 media-sound/easyeffects/easyeffects-6.1.4.ebuild   | 78 --------------------
 .../easyeffects-5.0.4-meson_no_automagic.patch     | 55 --------------
 4 files changed, 219 deletions(-)

diff --git a/media-sound/easyeffects/Manifest b/media-sound/easyeffects/Manifest
index bbdffda6c702..9bddf89d64fa 100644
--- a/media-sound/easyeffects/Manifest
+++ b/media-sound/easyeffects/Manifest
@@ -1,3 +1 @@
-DIST easyeffects-5.0.4.tar.gz 2070912 BLAKE2B 848d2fa6fc1290b6fc25e13c4bbe4d8df932af63b8fb7e9642c6e24b29360dd17efba71ae0daae265538cd9cde1d9e33de453b0c469e3d54709a3f337cd583a7 SHA512 78074341c8376a4918d09950fd7db8804346cd2e00d6849da464662643809010eeb1d009c44ca5d3eadd2faf3bb9c43a18a41b7c3e77b883beff44618967b30e
-DIST easyeffects-6.1.4.tar.gz 1959269 BLAKE2B b3a4b7f2e1816353bfda4d232f380483e33316c166d8b6e7e704cb86ac07e99fac14bac68e7748a3731ee76d07317d62cb4cae90c39cdbd77d794ef8151de71b SHA512 104e1efaf2790d052bcc0d7512a86e86fe12041ea9020cb0c3664c723bcfb79a96e071ad3cb5b36cf2d77acc5deecea0adcd36c409410e20aaeac908923e9e9b
 DIST easyeffects-6.1.5.tar.gz 1696731 BLAKE2B ad091c64fa7ece0f569a09ed551be0498b48f2f6f5346de51bd358942cd440663a05bb7271e1e6e8ca29427a799b12a03c26a763498a2f1f2c3093a784b92e2c SHA512 0f4505e429416186f3af4338c1c7b5afac0f0ec343749bd9bcc8cf222349b2cb25714de493236c57b1dd60dfcc3e1359cab15cdeabb661f4cb20591b518f70a6

diff --git a/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild b/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
deleted file mode 100644
index a83848d083ab..000000000000
--- a/media-sound/easyeffects/easyeffects-5.0.4-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils meson
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects/tree/pipewire-gstreamer-legacy"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-	EGIT_BRANCH="pipewire-gstreamer-legacy"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="bs2b calf rnnoise rubberband webrtc zamaudio"
-
-DEPEND=">=dev-libs/boost-1.72:=
-	>=dev-cpp/glibmm-2.56.0:2
-	>=dev-cpp/gtkmm-3.24:3.0
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-2.10:2
-	>=media-libs/gstreamer-1.12.5:1.0
-	media-libs/gst-plugins-base
-	>=media-libs/gst-plugins-bad-1.12.5:1.0
-	media-libs/libebur128
-	media-libs/libsndfile
-	>=media-libs/lilv-0.24.2-r1
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.24[gstreamer]
-	>=x11-libs/gtk+-3.20:3
-	bs2b? ( >=media-plugins/gst-plugins-bs2b-1.12.5:1.0 )
-	rnnoise? ( media-libs/rnnoise )"
-RDEPEND="!media-sound/pulseeffects
-	${DEPEND}
-	gnome-extra/yelp
-	>=media-libs/gst-plugins-good-1.12.5:1.0
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	>=media-plugins/gst-plugins-ladspa-1.12.5:1.0
-	>=media-plugins/gst-plugins-lv2-1.12.5:1.0
-	>=media-plugins/gst-plugins-pulse-1.12.5:1.0
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	rubberband? ( media-libs/rubberband[ladspa] )
-	webrtc? ( media-plugins/gst-plugins-webrtc )
-	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	media-libs/libsamplerate
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0.4-meson_no_automagic.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature bs2b)
-		$(meson_feature rnnoise)
-	)
-	meson_src_configure
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}

diff --git a/media-sound/easyeffects/easyeffects-6.1.4.ebuild b/media-sound/easyeffects/easyeffects-6.1.4.ebuild
deleted file mode 100644
index e99c0e46a097..000000000000
--- a/media-sound/easyeffects/easyeffects-6.1.4.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit gnome2-utils flag-o-matic meson
-
-DESCRIPTION="Limiter, auto volume and many other plugins for PipeWire applications"
-HOMEPAGE="https://github.com/wwmm/easyeffects"
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/wwmm/easyeffects"
-else
-	SRC_URI="https://github.com/wwmm/easyeffects/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="calf +doc mda-lv2 zamaudio"
-
-# Tests fail since 6.1.0 due to upstream changes to the metainfo file.
-# TODO: check this every release.
-RESTRICT="test"
-
-DEPEND=">=dev-cpp/glibmm-2.68:2.68
-	>=dev-cpp/gtkmm-4.2.0:4.0
-	dev-cpp/nlohmann_json
-	>=dev-libs/glib-2.56:2
-	>=dev-libs/libsigc++-3.0.6:3
-	media-libs/libbs2b
-	>=media-libs/libebur128-1.2.0
-	media-libs/libsndfile
-	>=media-libs/lilv-0.22
-	>=media-libs/lv2-1.18.2
-	media-libs/rnnoise
-	media-libs/rubberband[ladspa]
-	media-libs/speexdsp
-	>=media-libs/zita-convolver-3.0.0
-	>=media-video/pipewire-0.3.31
-	sci-libs/fftw:3.0
-	>=gui-libs/gtk-4.2.1:4"
-RDEPEND="${DEPEND}
-	>=media-libs/lsp-plugins-1.1.24[lv2]
-	sys-apps/dbus
-	calf? ( >=media-plugins/calf-0.90.1[lv2] )
-	doc? ( gnome-extra/yelp )
-	mda-lv2? ( media-plugins/mda-lv2 )
-	zamaudio? ( media-plugins/zam-plugins )"
-# Only header files are used from libsamplerate so put it here rather than DEPEND
-# to avoid unnecessary cross-compilation.
-BDEPEND="dev-libs/appstream-glib
-	dev-util/desktop-file-utils
-	dev-util/itstool
-	media-libs/libsamplerate
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != "binary" ]] ; then
-		if ! test-flag-CXX -std=c++20 ; then
-			die "You need at least GCC 8 or Clang 10 for C++20-specific compiler flags"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	gnome2_gconf_install
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_gconf_uninstall
-	gnome2_schemas_update
-	xdg_icon_cache_update
-}

diff --git a/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch b/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
deleted file mode 100644
index 4e547d404f80..000000000000
--- a/media-sound/easyeffects/files/easyeffects-5.0.4-meson_no_automagic.patch
+++ /dev/null
@@ -1,55 +0,0 @@
---- a/meson.build
-+++ b/meson.build
-@@ -4,7 +4,7 @@
- 	'cpp',
- 	default_options : ['cpp_std=c++17','buildtype=debugoptimized'],
- 	version: '5.0.4',
--	meson_version: '>= 0.40.0'
-+	meson_version: '>= 0.47.0'
- )
- 
- add_global_arguments('-DG_LOG_DOMAIN="pulseeffects"', language : 'c')
---- a/meson_options.txt
-+++ b/meson_options.txt
-@@ -0,0 +1,12 @@
-+option(
-+        'bs2b',
-+        type: 'feature',
-+        value: 'auto',
-+        description: 'Enable bs2b-based Crossfeed plug-in for improving headphone listening of stereo audio records'
-+)
-+option(
-+        'rnnoise',
-+        type: 'feature',
-+        value: 'auto',
-+        description: 'Enable rnnoise-based Noise Reduction plug-in'
-+)
---- a/src/meson.build
-+++ b/src/meson.build
-@@ -108,7 +108,7 @@
- 	dependency('gstreamer-plugins-bad-1.0', version: '>=1.12.5'),
- 	dependency('gstreamer-fft-1.0'),
- 	dependency('lilv-0', version: '>=0.22', required: false),
--	dependency('libbs2b', required: false),
-+	dependency('libbs2b', required: get_option('bs2b')),
- 	dependency('boost', version: '>=1.72', modules:['filesystem']),
- 	dependency('sndfile'),
- 	dependency('threads')
---- a/src/rnnoise/meson.build
-+++ b/src/rnnoise/meson.build
-@@ -1,4 +1,5 @@
--dep_rnnoise = dependency('rnnoise', required: false)
-+opt_rnnoise = get_option('rnnoise')
-+dep_rnnoise = dependency('rnnoise', required: opt_rnnoise)
- 
- if dep_rnnoise.found()
- 
-@@ -28,7 +29,7 @@
-   	cpp_args: plugins_cxx_args
- )
- 
--else
-+elif opt_rnnoise.auto()
- 
- message('could not find the RNNoise library')
- 


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

end of thread, other threads:[~2022-01-01 14:12 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-07-18  0:31 [gentoo-commits] repo/gentoo:master commit in: media-sound/easyeffects/files/, media-sound/easyeffects/ Marek Szuba
  -- strict thread matches above, loose matches on Subject: below --
2022-01-01 14:12 Marek Szuba

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