[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: 72e8c24fcd0beb997a88f7d185a02a212abafe37
Author: Aliaksei Urbanski gmail com>
AuthorDate: Tue Apr 16 19:03:31 2024 +
Commit: Yixun Lan gentoo org>
CommitDate: Tue Apr 16 22:53:49 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e8c24f
media-sound/audacity: fix various issues
The flac USE flag was mistakenly used
instead of the opus USE flag for configuring.
Also, Audacity 3.4.2 introduced a brand new
USE_OPUSFILE option which must be set properly.
These changes:
- fix the opus USE flag
- add proper REQUIRED_USE
- replace media-sound/mpg123 with media-sound/mpg123-base
- move dev-libs/rapidjson from RDEPEND to DEPEND
- fix missing `#include ` for 2.4.2-r4
- limit media-video/ffmpeg to <5 for 2.4.2-r4
- add x11-base/xorg-proto to DEPEND
- add some ASM to BDEPEND
- add audacity-3.4.2-audiocom-std-string.patch to PATCHES for 3.3.3-r1
- add audacity-2.4.2-fix-libflac-undefined-references.patch to PATCHES for
2.4.2-r4
- reset KEYWORDS for 2.4.2-r4 and 3.3.3-r1
Closes: https://bugs.gentoo.org/741969
Closes: https://bugs.gentoo.org/884747
Closes: https://bugs.gentoo.org/910723
Closes: https://bugs.gentoo.org/922595
Closes: https://bugs.gentoo.org/927659
Closes: https://github.com/gentoo/gentoo/pull/35903
Co-authored-by: Matthew White inventati.org>
Signed-off-by: Aliaksei Urbanski gmail.com>
Signed-off-by: Yixun Lan gentoo.org>
media-sound/audacity/audacity-2.4.2-r4.ebuild | 135 +
...acity-3.3.3.ebuild => audacity-3.3.3-r1.ebuild} | 33 ++---
...acity-3.4.2.ebuild => audacity-3.4.2-r1.ebuild} | 24 ++--
media-sound/audacity/audacity-.ebuild | 24 ++--
...audacity-2.4.2-add-missing-include-limits.patch | 10 ++
...ty-2.4.2-fix-libflac-undefined-references.patch | 61 ++
media-sound/audacity/metadata.xml | 4 +-
7 files changed, 258 insertions(+), 33 deletions(-)
diff --git a/media-sound/audacity/audacity-2.4.2-r4.ebuild
b/media-sound/audacity/audacity-2.4.2-r4.ebuild
new file mode 100644
index ..b29bbbcdba5e
--- /dev/null
+++ b/media-sound/audacity/audacity-2.4.2-r4.ebuild
@@ -0,0 +1,135 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/;
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+ doc? (
https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="alsa doc ffmpeg +flac id3tag jack +ladspa +lv2 mad ogg oss
+ portmidi +portmixer portsmf sbsms twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+ media-libs/libsndfile
+ media-libs/libsoundtouch:=
+ media-libs/portaudio[alsa?]
+ media-libs/soxr
+ >=media-sound/lame-3.100-r3
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ alsa? ( media-libs/alsa-lib )
+ ffmpeg? ( =media-libs/lilv-0.24.6-r2
+ media-libs/lv2
+ media-libs/sratom
+ media-libs/suil
+ )
+ mad? ( >=media-libs/libmad-0.15.1b )
+ ogg? ( media-libs/libogg )
+ portmidi? ( media-libs/portmidi )
+ sbsms? ( media-libs/libsbsms )
+ twolame? ( media-sound/twolame )
+ vamp? ( media-libs/vamp-plugin-sdk )
+ vorbis? ( media-libs/libvorbis )
+"
+DEPEND="${RDEPEND}
+ x11-base/xorg-proto"
+BDEPEND="app-arch/unzip
+ || ( dev-lang/nasm dev-lang/yasm )
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+REQUIRED_USE="portmidi? ( portsmf )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+ "${FILESDIR}/${P}-fix-vertical-track-resizing.patch"
+ "${FILESDIR}/${P}-fix-gettimeofday.patch"
+ "${FILESDIR}/${P}-fix-metainfo.patch"
+ "${FILESDIR}/${P}-add-missing-include-limits.patch"
+ "${FILESDIR}/${P}-add-missing-include-portaudio.patch"
+ "${FILESDIR}/${P}-disable-ccache.patch"
+ "${FILESDIR}/${P}-fix-libflac-undefined-references.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+}
+
+src_configure() {
+ setup-wxwidgets
+ append-cxxflags -std=gnu++14
+
+ # * always use system libraries if possible
+ # * options listed in the order that cmake-gui lists them
+ local mycmakeargs=(
+# --disable-dynamic-loading
+ -Daudacity_lib_preference=system
+ -Daudacity_use_expat=system
+ -Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+ -Daudacity_use_flac=$(usex flac system off)
+ -Daudacity_use_id3tag=$(usex id3tag system off)
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: cef88867dbdc89ea1aeb12fc8169e9cb7a84
Author: Azamat H. Hackimov gmail com>
AuthorDate: Sun Feb 18 20:34:31 2024 +
Commit: Sam James gentoo org>
CommitDate: Sat Mar 23 08:29:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cef8
media-sound/audacity: drop 3.2.5-r1
Signed-off-by: Azamat H. Hackimov gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35414
Signed-off-by: Sam James gentoo.org>
media-sound/audacity/Manifest | 2 -
media-sound/audacity/audacity-3.2.5-r1.ebuild | 229 -
.../audacity/files/audacity-3.2.5-gcc13-deux.patch | 57 -
.../files/audacity-3.2.5-gettext-0.22.patch| 36
4 files changed, 324 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index ab7fe68fc43e..28fe9c10d805 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,7 +1,5 @@
DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
SHA512
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B
b8e48cab1c89cadb343a17fcb1d811a7363231152867f8426dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24
SHA512
850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B
566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c
SHA512
c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
SHA512
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B
e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa7b5d0b6a00e14bd420d6f064515455055233a45f5ebf47
SHA512
9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
DIST audacity-sources-3.4.2.tar.gz 57499669 BLAKE2B
deb7cda94903826900c6d900883573a03a587ec3e03c6773a5452e3252f4c61ec76f09975f8e275b0fb8941f4e7d10eca66387d2f7c0a3f033ff4e1b1f08acc5
SHA512
5c754d2faa5867a98f24e8eae3fdb5d640483830ea9b62f94c6670e3689d87e61df6c14e9d557717d9fbfaca3b207188325369d8876248f1fc9edad43e4b500c
DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
SHA512
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild
b/media-sound/audacity/audacity-3.2.5-r1.ebuild
deleted file mode 100644
index 2eb91ea6190a..
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ /dev/null
@@ -1,229 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-WX_GTK_VER="3.2-gtk3"
-
-inherit cmake wxwidgets xdg
-
-MY_P="Audacity-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://www.audacityteam.org/;
-
-# A header-only thread pool library, without a build system, about 100
-# lines of code. Probably not worth packaging individually. Check
-# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
-MY_THREADPOOL_DATE=20140926
-MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
-> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
-SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
- doc? (
https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz
)
- audiocom? ( ${MY_THREADPOOL} )"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-# GPL-2+, GPL-3 - Audacity itself
-# ZLIB - The ThreadPool single-header library
-# CC-BY-3.0 - Documentation
-LICENSE="GPL-2+
- GPL-3
- doc? ( CC-BY-3.0 )
- audiocom? ( ZLIB )
-"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
- opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
-
-# dev-db/sqlite:3 hard dependency.
-# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
-#
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: 46b0fc511e098676b8069a6012f1a81b57d5ff5c
Author: Sam James gentoo org>
AuthorDate: Mon Sep 25 00:23:19 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Sep 25 00:24:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b0fc51
media-sound/audacity: style tweaks, add upstream refs
Signed-off-by: Sam James gentoo.org>
media-sound/audacity/audacity-3.3.3.ebuild | 2 +-
media-sound/audacity/audacity-.ebuild | 2 +-
media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch | 3 +++
media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch | 3 +++
4 files changed, 8 insertions(+), 2 deletions(-)
diff --git a/media-sound/audacity/audacity-3.3.3.ebuild
b/media-sound/audacity/audacity-3.3.3.ebuild
index 986fcd8fb4bb..4f1b16d516a1 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -26,7 +26,7 @@ else
SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;
fi
-SRC_URI+=$'\n'"audiocom? ( ${MY_THREADPOOL} )"
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
# GPL-2+, GPL-3 - Audacity itself
# ZLIB - The ThreadPool single-header library
diff --git a/media-sound/audacity/audacity-.ebuild
b/media-sound/audacity/audacity-.ebuild
index 55d1545cfcb8..82ce039fc3a4 100644
--- a/media-sound/audacity/audacity-.ebuild
+++ b/media-sound/audacity/audacity-.ebuild
@@ -26,7 +26,7 @@ else
SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;
fi
-SRC_URI+=$'\n'"audiocom? ( ${MY_THREADPOOL} )"
+SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
# GPL-2+, GPL-3 - Audacity itself
# ZLIB - The ThreadPool single-header library
diff --git a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
index 9bf4176a39e0..7237614782b3 100644
--- a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
@@ -1,3 +1,6 @@
+https://github.com/audacity/audacity/pull/4916
+https://github.com/audacity/audacity/pull/4917
+
From b42dfbe2be1994ccfeff449b5c5cbe49994ffb38 Mon Sep 17 00:00:00 2001
From: Matthew White
Date: Fri, 14 Jul 2023 21:17:45 +
diff --git
a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
index cb9da30bf423..c95676a18cfe 100644
--- a/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
@@ -1,3 +1,6 @@
+https://github.com/audacity/audacity/commit/6edaa3f26b34adc65c109c1a5a85923e04330e2d
+https://github.com/audacity/audacity/pull/4918
+
From 6edaa3f26b34adc65c109c1a5a85923e04330e2d Mon Sep 17 00:00:00 2001
From: Dmitry Vedenko
Date: Mon, 7 Aug 2023 17:12:49 +0300
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: f528815c332f51e266338f65336e9d85d134105b
Author: Matthew White inventati org>
AuthorDate: Tue Aug 1 17:05:54 2023 +
Commit: Sam James gentoo org>
CommitDate: Mon Sep 25 00:24:31 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f528815c
media-sound/audacity-3.3.3: version bump and new ebuild
NOTE: Upstream planned the removal of libmad support with the merge of
the https://github.com/audacity/audacity/pull/4384 PR.
Closes: https://bugs.gentoo.org/906959
Closes: https://bugs.gentoo.org/910398
Package-Manager: portage-3.0.49-r1
Signed-off-by: Matteo Bianco inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/32129
Signed-off-by: Sam James gentoo.org>
media-sound/audacity/Manifest | 1 +
media-sound/audacity/audacity-3.3.3.ebuild | 228 +
media-sound/audacity/audacity-.ebuild | 212 +++
.../audacity/files/audacity-3.3.3-Findlibmad.patch | 52 +
.../files/audacity-3.3.3-fix-includes.patch| 55 +
.../audacity/files/audacity-3.3.3-fix-rpaths.patch | 95 +
.../files/audacity-3.3.3-gettext-0.22.patch| 27 +++
...audacity-3.3.3-local-threadpool-libraries.patch | 30 +++
.../audacity-3.3.3-upstream-fix-rapidjson.patch| 60 ++
9 files changed, 760 insertions(+)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 4c36f4db70da..6af378802534 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -2,4 +2,5 @@ DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B
bb7e31e22d2a09c38767b019ed5c2c2be317
DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B
b8e48cab1c89cadb343a17fcb1d811a7363231152867f8426dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24
SHA512
850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
SHA512
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
DIST audacity-manual-3.2.5.tar.gz 22260237 BLAKE2B
e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa7b5d0b6a00e14bd420d6f064515455055233a45f5ebf47
SHA512
9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
+DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B
566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c
SHA512
c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B
54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14
SHA512
f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
diff --git a/media-sound/audacity/audacity-3.3.3.ebuild
b/media-sound/audacity/audacity-3.3.3.ebuild
new file mode 100644
index ..986fcd8fb4bb
--- /dev/null
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -0,0 +1,228 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets xdg
+
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://www.audacityteam.org/;
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code. Probably not worth packaging individually. Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
-> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+
+if [[ ${PV} = * ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/audacity/audacity.git;
+else
+ KEYWORDS="~amd64 ~riscv"
+ MY_P="Audacity-${PV}"
+ S="${WORKDIR}/${PN}-${MY_P}"
+ SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz;
+fi
+
+SRC_URI+=$'\n'"audiocom? ( ${MY_THREADPOOL} )"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+ GPL-3
+ audiocom? ( ZLIB )
+"
+SLOT="0"
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+ opus +portmixer sbsms twolame vamp +vorbis wavpack"
+
+# The testsuite consists of two tests, 50% of which fail.
+RESTRICT="test"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+#
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: ef498907c07351ce8726b90e8bdf6c74080cedf2
Author: Sam James gentoo org>
AuthorDate: Sat May 6 06:18:15 2023 +
Commit: Sam James gentoo org>
CommitDate: Sat May 6 06:19:07 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ef498907
media-sound/audacity: fix build w/ gcc 13
Closes: https://bugs.gentoo.org/903771
Signed-off-by: Sam James gentoo.org>
media-sound/audacity/audacity-3.2.5-r1.ebuild | 226 +
.../audacity/files/audacity-3.2.5-gcc13-deux.patch | 57 ++
2 files changed, 283 insertions(+)
diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild
b/media-sound/audacity/audacity-3.2.5-r1.ebuild
new file mode 100644
index ..504ee61be19b
--- /dev/null
+++ b/media-sound/audacity/audacity-3.2.5-r1.ebuild
@@ -0,0 +1,226 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.2-gtk3"
+
+inherit cmake wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+
+# A header-only thread pool library, without a build system, about 100
+# lines of code. Probably not worth packaging individually. Check
+# cmake-proxies/CMakeLists.txt and search for "ThreadPool".
+MY_THREADPOOL_DATE=20140926
+MY_THREADPOOL="https://raw.githubusercontent.com/progschj/ThreadPool/9a42ec1329f259a5f4881a291db1dcb8f2ad9040/ThreadPool.h
-> progschj-ThreadPool-${MY_THREADPOOL_DATE}.h"
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+ doc? (
https://github.com/audacity/audacity-manual/releases/download/v${PV}/audacity-manual-${PV}.tar.gz
)
+ audiocom? ( ${MY_THREADPOOL} )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+# GPL-2+, GPL-3 - Audacity itself
+# ZLIB - The ThreadPool single-header library
+# CC-BY-3.0 - Documentation
+LICENSE="GPL-2+
+ GPL-3
+ doc? ( CC-BY-3.0 )
+ audiocom? ( ZLIB )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="alsa audiocom doc ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+ opus +portmixer sbsms twolame vamp +vorbis wavpack"
+
+# The testsuite consists of two tests, 50% of which fail.
+RESTRICT="test"
+
+# dev-db/sqlite:3 hard dependency.
+# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
+# cmake-proxies/cmake-modules/dependencies/wxwidgets.cmake
+# sys-apps/util-linux hard dependency, from cmake-proxies/CMakeLists.txt
+# for libuuid
+# portmidi became non-optional: building without it results in build
+# failures, even with some of the Debian patches. It's probably not
+# in our best interest to fix that as a patch series.
+# glib, gtk and gdk are all directly relied on in the source, not just
+
+# Libraries used at runtime via dlopen:
+# - dev-libs/{serd,sord} - for LV2 support
+# - media-libs/{opus,sratom} :: For Opus and LV2 respectively
+# - media-sound/lame :: For MP3 export
+# - media-video/ffmpeg :: For generic FFMPEG export
+# This one has the interesting property of many versions being
+# supported at runtime. See: libraries/lib-ffmpeg-support/impl
+# Current support grid:
+# - Lavf - 5[789]
+# - Lavc - 5[789]
+# - Lavu - 5[2567]
+
+RDEPEND="dev-db/sqlite:3
+ dev-libs/expat
+ dev-libs/glib:2
+ media-libs/libsndfile
+ media-libs/libsoundtouch:=
+ media-libs/portaudio[alsa?]
+ media-libs/portmidi
+ media-libs/portsmf:=
+ media-libs/soxr
+ media-sound/lame
+ x11-libs/gdk-pixbuf:2
+ x11-libs/gtk+:3
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ sys-apps/util-linux
+ alsa? ( media-libs/alsa-lib )
+ audiocom? (
+ dev-libs/rapidjson
+ net-misc/curl
+ )
+ ffmpeg? ( media-video/ffmpeg )
+ flac? ( media-libs/flac:=[cxx] )
+ id3tag? ( media-libs/libid3tag:= )
+ lv2? (
+ dev-libs/serd
+ dev-libs/sord
+ media-libs/lilv
+ media-libs/lv2
+ media-libs/sratom
+ media-libs/suil
+ )
+ mad? ( media-libs/libmad )
+ mpg123? ( media-sound/mpg123 )
+ ogg? ( media-libs/libogg )
+ opus? ( media-libs/opus )
+ sbsms? ( media-libs/libsbsms )
+ twolame? ( media-sound/twolame )
+ vamp? ( media-libs/vamp-plugin-sdk )
+ vorbis? ( media-libs/libvorbis )
+ wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+ sys-devel/gettext
+ virtual/pkgconfig
+"
+
+REQUIRED_USE="
+ mad? ( !mpg123 )
+"
+
+PATCHES=(
+ # Equivalent to previous versions
+ "${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+ # From Debian
+ "${FILESDIR}/${PN}-3.2.3-fix-rpaths.patch"
+
+ # Disables some header-based detection
+ "${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+
+ # For has_networking
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: 5cc9d2c25be36ffe088cb39216f042bd1116eedd
Author: Miroslav Šulc gentoo org>
AuthorDate: Sat Sep 19 11:52:45 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Sep 19 11:52:59 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cc9d2c2
media-sound/audacity: removed obsolete 2.2.2 and 2.3.3
Closes: https://bugs.gentoo.org/699946
Closes: https://bugs.gentoo.org/646820
Closes: https://bugs.gentoo.org/618326
Closes: https://bugs.gentoo.org/626586
Closes: https://bugs.gentoo.org/632712
Package-Manager: Portage-3.0.7, Repoman-3.0.1
Signed-off-by: Miroslav Šulc gentoo.org>
media-sound/audacity/Manifest | 4 -
media-sound/audacity/audacity-2.2.2.ebuild | 131
media-sound/audacity/audacity-2.3.3.ebuild | 137 -
.../audacity/files/audacity-2.2.1-portmixer.patch | 36 -
.../audacity/files/audacity-2.2.2-automake.patch | 48 --
.../audacity/files/audacity-2.2.2-midi.patch | 168 -
.../audacity/files/audacity-2.3.3-fno-common.patch | 62
media-sound/audacity/metadata.xml | 3 -
8 files changed, 589 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index b52eb2a23f6..9c6a1401ae1 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,2 @@
-DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B
a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846
SHA512
0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
SHA512
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
-DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
SHA512
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
-DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B
f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84
SHA512
2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
SHA512
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
-DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
SHA512
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild
b/media-sound/audacity/audacity-2.2.2.ebuild
deleted file mode 100644
index 414cf0f7772..000
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools gnome2-utils wxwidgets xdg-utils
-
-MY_P="${PN}-minsrc-${PV}"
-DOC_PV="${PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="https://web.audacityteam.org/;
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
- doc? (
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
- # wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
- +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis
+vst"
-
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
- dev-libs/expat
- >=media-libs/libsndfile-1.0.0
- >=media-libs/portaudio-19_pre
- =media-video/ffmpeg-1.2:= )
- flac? ( >=media-libs/flac-1.3.1[cxx] )
- id3tag? ( media-libs/libid3tag )
- jack? ( virtual/jack )
- lame? ( >=media-sound/lame-3.70 )
- lv2? ( media-libs/lv2 )
- mad? ( >=media-libs/libmad-0.14.2b )
- midi? ( media-libs/portmidi )
- sbsms? ( media-libs/libsbsms )
- soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
- twolame? ( media-sound/twolame )
- vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
- vorbis? ( >=media-libs/libvorbis-1.0
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: 5a8d2f6d2fd27971422031f4a8311b5317288540
Author: Miroslav Šulc gentoo org>
AuthorDate: Sun Aug 2 10:54:24 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sun Aug 2 10:54:41 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a8d2f6d
media-sound/audacity: bump to 2.4.2 + switched to cmake
Closes: https://bugs.gentoo.org/725268
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc gentoo.org>
media-sound/audacity/Manifest | 2 +
media-sound/audacity/audacity-2.4.2.ebuild | 124 +
.../files/audacity-2.4.2-fix-gettimeofday.patch| 12 ++
.../files/audacity-2.4.2-fix-metainfo.patch| 12 ++
...udacity-2.4.2-fix-vertical-track-resizing.patch | 14 +++
media-sound/audacity/metadata.xml | 2 +
6 files changed, 166 insertions(+)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 910df0fff27..8242e7c042b 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,8 @@
DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B
968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802
SHA512
a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B
a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846
SHA512
0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
+DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B
bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8
SHA512
0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
SHA512
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B
6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44
SHA512
5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B
f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84
SHA512
2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
+DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B
001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc
SHA512
8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
SHA512
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
diff --git a/media-sound/audacity/audacity-2.4.2.ebuild
b/media-sound/audacity/audacity-2.4.2.ebuild
new file mode 100644
index 000..833ff268bdc
--- /dev/null
+++ b/media-sound/audacity/audacity-2.4.2.ebuild
@@ -0,0 +1,124 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit cmake flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+ doc? (
https://dev.gentoo.org/~fordfrog/distfiles/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame
+ +lv2 mad midi nls ogg oss portmidi +portmixer portsmf sbsms +soundtouch
twolame vamp +vorbis +vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+ media-libs/libsndfile
+ media-libs/libsoundtouch
+ media-libs/portaudio[alsa?]
+ media-libs/soxr
+ media-sound/lame
+ x11-libs/wxGTK:${WX_GTK_VER}[X]
+ alsa? ( media-libs/alsa-lib )
+ ffmpeg? ( media-video/ffmpeg:= )
+ flac? (
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: 570aee4e7db0a9182bdca1e5cced4af0b5579e9c
Author: Alexander Tsoy tsoy me>
AuthorDate: Sat Mar 14 07:33:45 2020 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Apr 30 23:55:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=570aee4e
media-sound/audacity: Fix building with -fno-common
Closes: https://bugs.gentoo.org/709840
Signed-off-by: Alexander Tsoy tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14949
Signed-off-by: Lars Wendler gentoo.org>
media-sound/audacity/audacity-2.3.3.ebuild | 1 +
.../audacity/files/audacity-2.3.3-fno-common.patch | 62 ++
2 files changed, 63 insertions(+)
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild
b/media-sound/audacity/audacity-2.3.3.ebuild
index d72fafa615e..0418e4cc865 100644
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -55,6 +55,7 @@ BDEPEND="app-arch/unzip
PATCHES=(
"${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+ "${FILESDIR}"/${PN}-2.3.3-fno-common.patch
)
src_prepare() {
diff --git a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
new file mode 100644
index 000..5b922638aa5
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
@@ -0,0 +1,62 @@
+From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
+From: Leland Lucius
+Date: Mon, 16 Dec 2019 00:59:33 -0600
+Subject: [PATCH] Misc changes to get new Nyquist to build
+
+[backport of bd6ec9c0ed9fe94ae2f6e171969ae8a9fe45c11d]
+---
+ lib-src/libnyquist/nyquist/cmt/cmtio.h | 4 ++--
+ lib-src/libnyquist/nyquist/cmt/userio.c | 4
+ lib-src/libnyquist/nyquist/sys/unix/io.c | 6 +++---
+ 3 files changed, 9 insertions(+), 5 deletions(-)
+
+diff --git a/lib-src/libnyquist/nyquist/cmt/cmtio.h
b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+index 3e50ad957..232862b50 100644
+--- a/lib-src/libnyquist/nyquist/cmt/cmtio.h
b/lib-src/libnyquist/nyquist/cmt/cmtio.h
+@@ -1,7 +1,7 @@
+ #define NOCHAR -2
+
+-int IOinputfd;
+-int IOnochar;
++extern int IOinputfd;
++extern int IOnochar;
+
+ int IOsetup(int inputfd);
+ int IOcleanup(void);
+diff --git a/lib-src/libnyquist/nyquist/cmt/userio.c
b/lib-src/libnyquist/nyquist/cmt/userio.c
+index f442376c5..a33ac98c9 100644
+--- a/lib-src/libnyquist/nyquist/cmt/userio.c
b/lib-src/libnyquist/nyquist/cmt/userio.c
+@@ -153,6 +153,10 @@ extern int debug;
+ #include "xlisp.h"
+ #endif
+
++int IOinputfd; /* input file descriptor (usually 0) */
++
++int IOnochar; /* Value to be returned by IOgetchar()
++ where there is no input to be had */
+
+ /
+ *
+diff --git a/lib-src/libnyquist/nyquist/sys/unix/io.c
b/lib-src/libnyquist/nyquist/sys/unix/io.c
+index 21b2abed8..f3e499c0d 100644
+--- a/lib-src/libnyquist/nyquist/sys/unix/io.c
b/lib-src/libnyquist/nyquist/sys/unix/io.c
+@@ -16,10 +16,10 @@
+ #include
+ #include "cext.h"
+
+-int IOinputfd; /* input file descriptor (usually 0) */
++extern int IOinputfd; /* input file descriptor (usually 0) */
+
+-int IOnochar; /* Value to be returned by IOgetchar()
+- where there is no input to be had */
++extern int IOnochar; /* Value to be returned by IOgetchar()
++ where there is no input to be had */
+
+ static struct sgttyb IOoldmodes, IOcurrentmodes;
+ /* Initial and current tty modes */
+--
+2.24.1
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: c011df2ba115c9b79d4e8e4e8e5a214631bfc369
Author: Alexander Tsoy tsoy me>
AuthorDate: Fri Jan 31 18:21:54 2020 +
Commit: Miroslav Šulc gentoo org>
CommitDate: Sat Feb 8 10:26:15 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c011df2b
media-sound/audacity: Version bump to 2.3.3
Also switch to wxGTK "3.0-gtk3" slot.
Closes: https://bugs.gentoo.org/700942
Signed-off-by: Alexander Tsoy tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14517
Signed-off-by: Miroslav Šulc gentoo.org>
media-sound/audacity/Manifest | 2 +
media-sound/audacity/audacity-2.3.3.ebuild | 139 +
...3.3-Fix-building-against-system-portaudio.patch | 56 +
3 files changed, 197 insertions(+)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 252b82de0a3..910df0fff27 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,4 +1,6 @@
DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B
968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802
SHA512
a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
+DIST Audacity-2.3.3.tar.gz 62073352 BLAKE2B
a87f9ada8dd2ffeda86fecd194333dc53b5f1fe086c179dd904cebc912f5bff5a7d4be0c2584a6633a7dc4dadabc3ad438b45ab5fbbee573cc39ee91dfd62846
SHA512
0789d5bc27933c688b8c99e0d9d9ca65f3b0c59cf74a235feee094a1815bdb59a32a4f50d2938b8fb9d72b0c5ba88451d02f90c5163931774a2088463562c5ef
DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
SHA512
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B
6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44
SHA512
5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
+DIST audacity-manual-2.3.3.zip 15135177 BLAKE2B
f281fea3344513152f0841e11e5dcdfea591d7dced046028fd67954e6a34a0f7bad41cb37215d4b784d92c6ee64038918e521e1117dc0ccbc0101404d1388c84
SHA512
2612396ef61aa6e07e0ff1cc5f473dcdc34d8a166f95a9e4986bf491e8b0502c08641d9ef4c64adc19c1b22fe21514afcc5c3bed585b49e7e7c3c851fe532cd4
DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
SHA512
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild
b/media-sound/audacity/audacity-2.3.3.ebuild
new file mode 100644
index 000..ceb9bb0503a
--- /dev/null
+++ b/media-sound/audacity/audacity-2.3.3.ebuild
@@ -0,0 +1,139 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+WX_GTK_VER="3.0-gtk3"
+
+inherit flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+ doc? (
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
+S="${WORKDIR}/${PN}-${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+ +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis
+vst"
+
+RESTRICT="test"
+
+RDEPEND="dev-libs/expat
+ >=media-libs/libsndfile-1.0.0
+ >=media-libs/portaudio-19.06.00-r2[alsa?]
+ =media-video/ffmpeg-1.2:= )
+ )
+ flac? ( >=media-libs/flac-1.3.1[cxx] )
+ id3tag? ( media-libs/libid3tag )
+ jack? ( virtual/jack )
+ lame? ( >=media-sound/lame-3.70 )
+ lv2? (
+ media-libs/lilv
+ media-libs/lv2
+ media-libs/suil
+ )
+ mad? ( >=media-libs/libmad-0.14.2b )
+ sbsms? ( media-libs/libsbsms )
+ soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+ twolame? ( media-sound/twolame )
+ vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+ vorbis? ( >=media-libs/libvorbis-1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="app-arch/unzip
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.3-Fix-building-against-system-portaudio.patch
+)
+
+src_prepare() {
+ default
+
+ use midi || sed -i \
+ -e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: e6b9364ffd66913edfbf0276653a7f881ca4bde6
Author: Alexander Tsoy tsoy me>
AuthorDate: Wed Aug 28 07:43:54 2019 +
Commit: Lars Wendler gentoo org>
CommitDate: Wed Aug 28 07:44:43 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6b9364f
media-sound/audacity: Bump to version 2.3.2
Closes: https://bugs.gentoo.org/680028
Package-Manager: Portage-2.3.73, Repoman-2.3.17
Signed-off-by: Lars Wendler gentoo.org>
media-sound/audacity/Manifest | 2 +
media-sound/audacity/audacity-2.3.2.ebuild | 141 +
.../audacity-2.3.2-Fix-building-without-midi.patch | 71 +++
...3.2-fix_building_against_system_portaudio.patch | 56
4 files changed, 270 insertions(+)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 907b27be528..252b82de0a3 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,2 +1,4 @@
+DIST Audacity-2.3.2.tar.gz 61972597 BLAKE2B
968c3d877392af92e2a23d8357fe65c3eb608122185d037e741ed6165d1acb3af70fc15dce63140eff14cd032fb3e3dc1b8b4f7bca9016f8e0e56aaef8a27802
SHA512
a59d6e9e974d5f78f5ca561e3bea31fc1b3e88f9ea60b2df7ce8bcec264d886f3fdc8f20030e11a86daff8ffeb735850b5e5f73c45fbef0bfcc58692423e7cd0
DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
SHA512
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
+DIST audacity-manual-2.3.2.zip 21163508 BLAKE2B
6a0ec89567db63164e897aad21af6fb31557e2519640788c781b21e885c0f704174529d9abf3e8645ccb3bca0f7b987fa708b1ce64597b282357b823e8addd44
SHA512
5e541065236badfdc2331681e43dee2564f933c33a3a588806f189acc8d8285a2c60bf9bc0c7052c6cb23fa1ee29a9f5e0428540cd556901dcf896def1c7c0ac
DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
SHA512
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
diff --git a/media-sound/audacity/audacity-2.3.2.ebuild
b/media-sound/audacity/audacity-2.3.2.ebuild
new file mode 100644
index 000..1f561978a5f
--- /dev/null
+++ b/media-sound/audacity/audacity-2.3.2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic wxwidgets xdg
+
+MY_P="Audacity-${PV}"
+DOC_PV="${PV}"
+DESCRIPTION="Free crossplatform audio editor"
+HOMEPAGE="https://web.audacityteam.org/;
+# wget doesn't seem to work on FossHub links, so we mirror
+SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz
+ doc? (
https://dev.gentoo.org/~polynomial-c/dist/${PN}-manual-${DOC_PV}.zip )"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~mips ~x86"
+IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
+ +lv2 mad midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis
+vst"
+
+RESTRICT="test"
+
+RDEPEND=">=app-arch/zip-2.3
+ dev-libs/expat
+ >=media-libs/libsndfile-1.0.0
+ >=media-libs/portaudio-19.06.00-r2[alsa?]
+ =media-video/ffmpeg-1.2:= )
+ )
+ flac? ( >=media-libs/flac-1.3.1[cxx] )
+ id3tag? ( media-libs/libid3tag )
+ jack? ( virtual/jack )
+ lame? ( >=media-sound/lame-3.70 )
+ lv2? (
+ media-libs/lilv
+ media-libs/lv2
+ media-libs/suil
+ )
+ mad? ( >=media-libs/libmad-0.14.2b )
+ sbsms? ( media-libs/libsbsms )
+ soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
+ twolame? ( media-sound/twolame )
+ vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
+ vorbis? ( >=media-libs/libvorbis-1.0 )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+S="${WORKDIR}/${PN}-${MY_P}"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-2.3.2-fix_building_against_system_portaudio.patch
+ "${FILESDIR}"/${PN}-2.3.2-Fix-building-without-midi.patch
+)
+
+src_prepare() {
+ default
+
+ use midi || sed -i \
+ -e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
+ src/Experimental.h || die
+}
+
+src_configure() {
+ local WX_GTK_VER="3.0"
+ setup-wxwidgets
+ append-cxxflags -std=gnu++14
+
+ # * always use system libraries if possible
+ # * options listed in the order that configure --help lists them
+ local myeconfargs=(
+ --disable-dynamic-loading
+ --enable-nyquist=local
+ --enable-unicode
+ --with-expat
+ --with-lib-preference=system
+ --with-libsndfile
+ --with-libsoxr
+ --with-mod-script-pipe
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: da166eab920f04e1e532646e93b244793a65a65d
Author: Andreas Sturmlechner gentoo org>
AuthorDate: Wed Aug 22 17:10:02 2018 +
Commit: Andreas Sturmlechner gentoo org>
CommitDate: Wed Aug 22 17:10:02 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=da166eab
media-sound/audacity: Drop 2.2.1
Package-Manager: Portage-2.3.48, Repoman-2.3.10
media-sound/audacity/Manifest | 1 -
media-sound/audacity/audacity-2.2.1.ebuild | 123 -
.../files/audacity-2.2.1-without-libid3tag.patch | 87 ---
3 files changed, 211 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index d02bd38a5d5..1ac62e940a0 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,5 +1,4 @@
DIST audacity-help-2.1.3.zip 20682229 BLAKE2B
f3a7c5870c2fd10e5d1420c03ea608d39e9768989ac106b6b1554994646200fb58550bb07ba889002dc652e9c2ea5a16f2ee87daa1e66433fc6f322d24fbc564
SHA512
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
DIST audacity-manual-2.2.2.zip 13501474 BLAKE2B
f0289f22dc4134b31f38d4acee3bda9f915829842030f8454cce1801377d177c32a7f35077673ce7db0a0f059a644d8146457e6a6377c5f6abc01c11da6a4f53
SHA512
a34ded796157d763fa024e0a235ecce7c67a68bcce86b487f8c022d45d8337fe550e40f56df4155a16293b974511d0bcf130cb086b3594bc0c42d9d0f84f1e86
DIST audacity-minsrc-2.1.3.tar.xz 8073388 BLAKE2B
4ab323ad9daa93c568d46d00cb3a7f2460a3b6022b990f1eb1759790cd343d5e61d6080c94a7cd00f25c72280f3a459c79049292fdca69be89644e539f04c119
SHA512
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
-DIST audacity-minsrc-2.2.1.tar.xz 8111992 BLAKE2B
99b4a7602ed8e03714ff8c59c226ba98fb35344964d5033e541079f7f12a71f6c5264aa60613d02cdb6f254d5a542dc9380e6dfbfd870f2f3536c031c0cec54e
SHA512
92c094e4903c438b0aac27b1fb6c9ccc9ca089e4d3123769ff23e434de1e6a519482b42588a54f56afdf5d2013e5681fce3d143f9e092731a9511d4bba31cfaa
DIST audacity-minsrc-2.2.2.tar.xz 8210700 BLAKE2B
b887cff6994f2d5315b5d22b47d460a6b7c7b7af4f212585740a7534dc1345a8b3cda701a8541fabeef1aedf30cd336466798b2da4ef62ed010152540ee02d26
SHA512
8e52b4456a3a328a9933961746722ab5c545d17f7c05f3ae4aa83ba5d4f8323590ffa070de9462163362032b372aa48bc61fc96459e5565eec29a146b7a0351c
diff --git a/media-sound/audacity/audacity-2.2.1.ebuild
b/media-sound/audacity/audacity-2.2.1.ebuild
deleted file mode 100644
index 1e1c6ebc158..000
--- a/media-sound/audacity/audacity-2.2.1.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets xdg-utils
-
-MY_P="${PN}-minsrc-${PV}"
-DOC_PV="2.1.3"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${MY_P}.tar.xz
- doc? (
https://dev.gentoo.org/~polynomial-c/dist/${PN}-help-${DOC_PV}.zip )"
- # wget doesn't seem to work on FossHub links, so we mirror
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~mips ~ppc ~ppc64 ~x86"
-IUSE="alsa cpu_flags_x86_sse doc ffmpeg +flac id3tag jack +ladspa +lame libav
- +lv2 mad +midi nls +portmixer sbsms +soundtouch twolame vamp +vorbis
+vst"
-RESTRICT="test"
-
-RDEPEND=">=app-arch/zip-2.3
- dev-libs/expat
- >=media-libs/libsndfile-1.0.0
- =media-libs/portaudio-19*
- media-libs/soxr
- x11-libs/wxGTK:3.0[X]
- alsa? ( media-libs/alsa-lib )
- ffmpeg? ( libav? ( media-video/libav:= )
- !libav? ( >=media-video/ffmpeg-1.2:= ) )
- flac? ( >=media-libs/flac-1.3.1[cxx] )
- id3tag? ( media-libs/libid3tag )
- jack? ( virtual/jack )
- lame? ( >=media-sound/lame-3.70 )
- lv2? ( media-libs/lv2 )
- mad? ( >=media-libs/libmad-0.14.2b )
- midi? ( media-libs/portmidi )
- sbsms? ( media-libs/libsbsms )
- soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
- twolame? ( media-sound/twolame )
- vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
- vorbis? ( >=media-libs/libvorbis-1.0 )"
-DEPEND="${RDEPEND}
- app-arch/xz-utils
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S="${WORKDIR}/${MY_P}-rc3"
-
-PATCHES=(
- "${FILESDIR}/${P}-without-libid3tag.patch"
-)
-
-src_prepare() {
- epatch "${PATCHES[@]}"
-}
-
-src_configure() {
- local WX_GTK_VER="3.0"
- need-wxwidgets unicode
-
- # * always use system libraries if possible
- # * options listed in the order that configure --help lists them
- local myeconfargs=(
- --disable-dynamic-loading
- --enable-nyquist
- --enable-unicode
- --with-expat=system
- --with-libsndfile=system
-
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: 726527e0e8cd003d1bae981bdf99713939203982
Author: Pacho Ramos gentoo org>
AuthorDate: Sat Jul 15 09:36:19 2017 +
Commit: Pacho Ramos gentoo org>
CommitDate: Sat Jul 15 09:46:05 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=726527e0
media-sound/audacity: Drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-sound/audacity/Manifest | 1 -
media-sound/audacity/audacity-2.0.5-r2.ebuild | 100
media-sound/audacity/audacity-2.0.5.ebuild | 101 -
.../audacity/files/audacity-1.3.13-automagic.patch | 61 -
media-sound/audacity/metadata.xml | 10 --
5 files changed, 273 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 494eb45fad1..901f6dc8175 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,3 +1,2 @@
DIST audacity-help-2.1.3.zip 20682229 SHA256
35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512
4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec
WHIRLPOOL
413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
-DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256
e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512
d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
WHIRLPOOL
106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256
c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512
96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef
WHIRLPOOL
730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483
diff --git a/media-sound/audacity/audacity-2.0.5-r2.ebuild
b/media-sound/audacity/audacity-2.0.5-r2.ebuild
deleted file mode 100644
index 19daf4ede7a..000
--- a/media-sound/audacity/audacity-2.0.5-r2.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils wxwidgets autotools versionator
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="mirror://gentoo/${MY_T}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ~ppc ppc64 x86"
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms
soundtouch twolame vamp vorbis"
-RESTRICT="test"
-
-COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
- >=app-arch/zip-2.3
- >=media-libs/libsndfile-1.0.0
- dev-libs/expat
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
- !libsamplerate? ( media-libs/soxr )
- vorbis? ( >=media-libs/libvorbis-1.0 )
- mp3? ( >=media-libs/libmad-0.14.2b )
- flac? ( >=media-libs/flac-1.2.0[cxx] )
- id3tag? ( media-libs/libid3tag )
- sbsms? ( media-libs/libsbsms )
- soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
- vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
- twolame? ( media-sound/twolame )
- ffmpeg? ( virtual/ffmpeg )
- alsa? ( media-libs/alsa-lib )
- jack? ( virtual/jack )"
-# Crashes at startup here...
-# lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-# ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
- mp3? ( >=media-sound/lame-3.70 )"
-DEPEND="${COMMON_DEPEND}
- app-arch/xz-utils
- virtual/pkgconfig"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S=${WORKDIR}/${MY_P}
-
-src_prepare() {
- epatch "${FILESDIR}"/${PN}-1.3.13-automagic.patch
-
- AT_M4DIR="${S}/m4" eautoreconf
-}
-
-src_configure() {
- WX_GTK_VER="2.8"
- need-wxwidgets unicode
-
- # * always use system libraries if possible
- # * options listed in the order that configure --help lists them
- # * use libsoxr if libsamplerate is not requested
- econf \
- --enable-unicode \
- --enable-nyquist \
- --disable-dynamic-loading \
- $(use_enable ladspa) \
- --with-libsndfile=system \
- --with-expat=system \
- $(use_with libsamplerate) \
- $(use_with !libsamplerate libsoxr) \
- $(use_with vorbis libvorbis) \
- $(use_with mp3 libmad) \
- $(use_with flac libflac) \
- $(use_with id3tag libid3tag) \
- $(use_with sbsms) \
-
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: 5c43afe6861275a05aeb4d6b6e45cdbbccfef21b
Author: David Seifert gentoo org>
AuthorDate: Sat Sep 17 13:15:50 2016 +
Commit: David Seifert gentoo org>
CommitDate: Sat Sep 17 13:16:35 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5c43afe6
media-sound/audacity: Allow for compiling with GCC 6
Gentoo-bug: 592448
* Patch by OpenSUSE
Package-Manager: portage-2.3.0
media-sound/audacity/audacity-2.1.2.ebuild | 7 ++--
.../audacity/files/audacity-2.1.2-fix-c++14.patch | 41 ++
2 files changed, 44 insertions(+), 4 deletions(-)
diff --git a/media-sound/audacity/audacity-2.1.2.ebuild
b/media-sound/audacity/audacity-2.1.2.ebuild
index 0a0dd61..4331f0c 100644
--- a/media-sound/audacity/audacity-2.1.2.ebuild
+++ b/media-sound/audacity/audacity-2.1.2.ebuild
@@ -49,10 +49,9 @@ REQUIRED_USE="soundtouch? ( midi )"
S=${WORKDIR}/${MY_P}
-#src_prepare() {
-# epatch "${FILESDIR}"/${P}-automagic.patch
-# AT_M4DIR="${S}/m4" eautoreconf
-#}
+src_prepare() {
+ epatch "${FILESDIR}/${PN}-2.1.2-fix-c++14.patch"
+}
src_configure() {
WX_GTK_VER="3.0"
diff --git a/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch
b/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch
new file mode 100644
index ..32bcf42
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch
@@ -0,0 +1,41 @@
+Fix building with C++14, which errors out due to bool -> T* conversions
+See also: https://bugs.gentoo.org/show_bug.cgi?id=592448
+
+Patch by OpenSUSE
+
+Index: src/effects/vamp/LoadVamp.cpp
+===
+--- src/effects/vamp/LoadVamp.cpp.orig
src/effects/vamp/LoadVamp.cpp
+@@ -266,7 +266,7 @@ Plugin *VampEffectsModule::FindPlugin(co
+Plugin *vp = PluginLoader::getInstance()->loadPlugin(key, 48000); // rate
doesn't matter here
+if (!vp)
+{
+- return false;
++ return NULL;
+}
+
+// We limit the listed plugin outputs to those whose results can
+Index: src/import/ImportFLAC.cpp
+===
+--- src/import/ImportFLAC.cpp.orig
src/import/ImportFLAC.cpp
+@@ -296,7 +296,7 @@ ImportFileHandle *FLACImportPlugin::Open
+int cnt;
+wxFile binaryFile;
+if (!binaryFile.Open(filename)) {
+- return false; // File not found
++ return NULL; // File not found
+}
+
+ #ifdef USE_LIBID3TAG
+@@ -313,7 +313,7 @@ ImportFileHandle *FLACImportPlugin::Open
+
+if (cnt == wxInvalidOffset || strncmp(buf, FLAC_HEADER, 4) != 0) {
+ // File is not a FLAC file
+- return false;
++ return NULL;
+}
+
+// Open the file for import
+
[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
commit: cb7aafd6bb1bc403b096383487b0c996f7a8257b
Author: Lars Wendler gentoo org>
AuthorDate: Thu Mar 31 12:18:49 2016 +
Commit: Lars Wendler gentoo org>
CommitDate: Thu Mar 31 12:22:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb7aafd6
media-sound/audacity: Removed old.
Package-Manager: portage-2.2.28
Signed-off-by: Lars Wendler gentoo.org>
media-sound/audacity/Manifest | 1 -
media-sound/audacity/audacity-2.0.2.ebuild | 98
.../audacity/files/audacity-1.3.13-ffmpeg.patch| 164 -
.../audacity/files/audacity-1.3.14-typecast.patch | 15 --
4 files changed, 278 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index a630944..b4de984 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,5 @@
DIST audacity-manual-2.1.1.zip 20224419 SHA256
fac323e5a5c34036ba4cf85800030e7ed7027e0e577abc31a3cda7c03ed30dc1 SHA512
0d5cc3e629ba66d03f54e151a18f455a7da09c1f19133ab647d791439625d0fd8e8cfd8dedbab0719aeb803850633bb3b8e2ca4d6fa3d4b1f3784720cd80ed84
WHIRLPOOL
4b6208e290900336a67f24eaa08d0e0b30f8762cdd846415d2aa1290bfa0736da6bacaf253f2815b472a963730c121ae5546a798d8d19609f34743d90d63236b
DIST audacity-manual-2.1.2.zip 20533055 SHA256
5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512
f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8
WHIRLPOOL
64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464
-DIST audacity-minsrc-2.0.2.tar.bz2 6794285 SHA256
ac8a5ec62a5748de7f885fb3f82a6b6acdb26b28276827a678ec17ce65b9879d SHA512
3099c01b099306ee77c3df569a7412c230006ba8e7f85d6e79f0bc0373cc4c95f231aab7e1bde0d297afa3c1db7fe6dc125715d803dc78a47df4b716d7423d2e
WHIRLPOOL
3fe42264f20920d1cadd3386c4521ce557c5f10ee5168cb4222843a25894de6a0106f2ed4246a5ab827fd4765a30cca21d81945092f5fe21bd1009483e098868
DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256
e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512
d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004
WHIRLPOOL
106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
DIST audacity-minsrc-2.1.1.tar.xz 7154008 SHA256
49972a1e84d1747590dfba06cbbf1030718f3880d2678819dc2e765828377872 SHA512
36ffaf40452b2b89d5c2308edc5fe1ed1a49460e16eed324904825229a14e9fd11e5beeda61bd9b38d7f06746c0945f68aef99ac81d78ac97c09c389d100651d
WHIRLPOOL
240715af6b17aa424e50fc6727fffac83368236afc4d3d376274d8e554d7bf2439a55ae22f439669c4e3115668ec875425aacde7f5aee6d7b05975f7466f5762
DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256
0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512
46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da
WHIRLPOOL
7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f
diff --git a/media-sound/audacity/audacity-2.0.2.ebuild
b/media-sound/audacity/audacity-2.0.2.ebuild
deleted file mode 100644
index 438ab4e..000
--- a/media-sound/audacity/audacity-2.0.2.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-
-inherit eutils wxwidgets autotools versionator
-
-MY_PV=$(replace_version_separator 3 -)
-MY_P="${PN}-src-${MY_PV}"
-MY_T="${PN}-minsrc-${MY_PV}"
-DESCRIPTION="Free crossplatform audio editor"
-HOMEPAGE="http://web.audacityteam.org/;
-SRC_URI="mirror://gentoo/${MY_T}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~mips ppc ppc64 x86"
-IUSE="alsa ffmpeg flac id3tag jack ladspa libsamplerate midi mp3 sbsms
soundtouch twolame vamp vorbis"
-RESTRICT="test"
-
-COMMON_DEPEND="x11-libs/wxGTK:2.8[X]
- >=app-arch/zip-2.3
- >=media-libs/libsndfile-1.0.0
- dev-libs/expat
- libsamplerate? ( >=media-libs/libsamplerate-0.1.2 )
- vorbis? ( >=media-libs/libvorbis-1.0 )
- mp3? ( >=media-libs/libmad-0.14.2b )
- flac? ( >=media-libs/flac-1.2.0[cxx] )
- id3tag? ( media-libs/libid3tag )
- sbsms? ( media-libs/libsbsms )
- soundtouch? ( >=media-libs/libsoundtouch-1.3.1 )
- vamp? ( >=media-libs/vamp-plugin-sdk-2.0 )
- twolame? ( media-sound/twolame )
- ffmpeg? ( virtual/ffmpeg )
- alsa? ( media-libs/alsa-lib )
- jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )"
-# Crashes at startup here...
-# lv2? ( >=media-libs/slv2-0.6.0 )
-# Disabled upstream ATM
-# ladspa? ( >=media-libs/liblrdf-0.4.0 )
-
-RDEPEND="${COMMON_DEPEND}
- mp3? ( >=media-sound/lame-3.70 )"
