* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2017-06-05 9:45 Pacho Ramos
0 siblings, 0 replies; 12+ messages in thread
From: Pacho Ramos @ 2017-06-05 9:45 UTC (permalink / raw
To: gentoo-commits
commit: f73e0c56176dfc52d4ced771f89d0414487adcc2
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 5 09:42:13 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Mon Jun 5 09:44:47 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f73e0c56
media-sound/audacity: Drop old
Package-Manager: Portage-2.3.6, Repoman-2.3.2
media-sound/audacity/Manifest | 2 -
media-sound/audacity/audacity-2.1.2.ebuild | 102 ---------------------
.../audacity/files/audacity-2.1.2-fix-c++14.patch | 41 ---------
3 files changed, 145 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 638874aced3..494eb45fad1 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,5 +1,3 @@
DIST audacity-help-2.1.3.zip 20682229 SHA256 35a8f989ac8dfd24fa73716498feeffb82f838972280623309a557a3fa632a88 SHA512 4666d414628aaf611f98001350bdbcb761dac19ce4cc1e59d1a29e5d74056b9bfe4492a356bcd6c44aac9a3aaa24e30acd7bb9647ca10395fa8d5f0839f893ec WHIRLPOOL 413390d10f977da3ebd339ed7925a8e81efede5b322d0e5c96c21ab86f8dd3c800d9a5eaeb5a69a6655e7c76ba7010b0ccb4da14864d77891d3028da54d3de04
-DIST audacity-manual-2.1.2.zip 20533055 SHA256 5c80ae719e0314011443cf5caaa7e27d5733bf70b1b1549f0c5ef8a4f71e5c0b SHA512 f4313c50f12259838a869a135e6c1366e0d746657654a31b5f05ed3a6e330d67b4567db7533df54d461873813982c47b48b463ee607c88fe0f018c9f75f06fe8 WHIRLPOOL 64e56177e6584a9094c1690e3de08097e1f1da6f80cf4bc98c6671cf0517cd1de3a6e9d73ba599ce9387571d83834a9b9c38faa13414e0c80dd41512e6a74464
DIST audacity-minsrc-2.0.5.tar.xz 5314060 SHA256 e287541dd017f523fd9a06d5140b8f72fe9a0450709de7c398baffa106db2b79 SHA512 d126068e9916072a3c23809074a0a8eff2c3121663f37ee15680ec2731b540fa2d083f3e2eecdd3c288462fa164ffaf9e6cdb1c9e84a25af3fa8046ee6798004 WHIRLPOOL 106b4e8a6c4f1328d7d064b9b02abf636180ee151f3ac08d7e502424d4cce8fb8960fea0dc907625703cbfff808f82c556c3cf02f42aea186fb0aa00e4f967a0
-DIST audacity-minsrc-2.1.2.tar.xz 7233500 SHA256 0df79fe0647a4cd68e46ad40d6e73d2f8eaae413b6d8b186ac036be3554d7e44 SHA512 46bc68825d29e88b14a674749532345ab63673ea1b85ad0d2a1b72b0974c74d2175e0ef307dad735592d18e56c1e0c65f994f4ee05d9e0f1aec194cd02c930da WHIRLPOOL 7c5cb69e38154de21a88aae5e4710035e459ca093c7d116bb96bd99bdced2526d3c727c8930bb80faad78c20f8d9b6ce801c5858f370b53c1412373956b39b3f
DIST audacity-minsrc-2.1.3.tar.xz 8073388 SHA256 c8fe1d52a58cef05390118a7f458f89252a3aa70155b78e8e25c92c4eeaabf31 SHA512 96e8bc49ef431b964d67857387cd9e5c1b398becfcaa452e26ef7617f267b7688617a5312d4a9873a24ee34986ea411148369e0ce138d86fea9b520e2c74a3ef WHIRLPOOL 730c962b6ff0861d9f96a58fb7d1c97af73cbf0072d3b8560c0250b4a37568741762d2891d8fb5097e6456a014e1ebe1dce4a41e039af5feb48d7bc454b67483
diff --git a/media-sound/audacity/audacity-2.1.2.ebuild b/media-sound/audacity/audacity-2.1.2.ebuild
deleted file mode 100644
index 16f9d28c094..00000000000
--- a/media-sound/audacity/audacity-2.1.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils wxwidgets
-
-MY_P="${PN}-minsrc-${PV}"
-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}-manual-${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.2.0[cxx] )
- id3tag? ( media-libs/libid3tag )
- jack? ( >=media-sound/jack-audio-connection-kit-0.103.0 )
- 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}
-
-src_prepare() {
- epatch "${FILESDIR}/${PN}-2.1.2-fix-c++14.patch"
-}
-
-src_configure() {
- WX_GTK_VER="3.0"
- need-wxwidgets unicode
-
- # * always use system libraries if possible
- # * options listed in the order that configure --help lists them
- econf \
- $(use_enable nls) \
- --enable-unicode \
- $(use_enable cpu_flags_x86_sse sse) \
- --disable-dynamic-loading \
- --enable-nyquist \
- $(use_enable ladspa) \
- $(use_enable vst) \
- --with-wx-version=${WX_GTK_VER} \
- --with-expat=system \
- $(use_with ffmpeg) \
- $(use_with lame) \
- $(use_with flac libflac) \
- $(use_with id3tag libid3tag) \
- $(use_with mad libmad) \
- $(use_with sbsms) \
- --with-libsndfile=system \
- $(use_with soundtouch) \
- --with-libsoxr=system \
- $(use_with twolame libtwolame) \
- $(use_with vamp libvamp) \
- $(use_with vorbis libvorbis) \
- $(use_with lv2) \
- --with-portaudio \
- $(use_with midi) \
- --with-widgetextra=local \
- $(use_with portmixer)
-# $(use_with alsa) \
-# $(use_with jack)
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Remove bad doc install
- rm -rf "${D}"/usr/share/doc
-
- # Install our docs
- dodoc README.txt
-
- use doc && dohtml -r "${WORKDIR}"/help/manual
-}
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
deleted file mode 100644
index 32bcf42fd8a..00000000000
--- a/media-sound/audacity/files/audacity-2.1.2-fix-c++14.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-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
-
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2018-02-18 11:13 Lars Wendler
0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2018-02-18 11:13 UTC (permalink / raw
To: gentoo-commits
commit: fa8c4f250b9a44c2a30d47bf7351e5fba08dc794
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 18 11:13:03 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Sun Feb 18 11:13:03 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa8c4f25
media-sound/audacity: Fixed USE="id3tag" compilation.
Closes: https://github.com/gentoo/gentoo/pull/6843
Closes: https://bugs.gentoo.org/636722
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/audacity/audacity-2.2.1.ebuild | 10 ++-
.../files/audacity-2.2.1-without-libid3tag.patch | 87 ++++++++++++++++++++++
2 files changed, 96 insertions(+), 1 deletion(-)
diff --git a/media-sound/audacity/audacity-2.2.1.ebuild b/media-sound/audacity/audacity-2.2.1.ebuild
index 34176a73de4..1e1c6ebc158 100644
--- a/media-sound/audacity/audacity-2.2.1.ebuild
+++ b/media-sound/audacity/audacity-2.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI=5
@@ -49,6 +49,14 @@ 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
diff --git a/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch b/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch
new file mode 100644
index 00000000000..0a227ebbf9f
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch
@@ -0,0 +1,87 @@
+From 499c6b4f36102325541cdad55afe5dc3a0e23b37 Mon Sep 17 00:00:00 2001
+From: Richard Ash <richardash1981@users.noreply.github.com>
+Date: Sun, 7 Jan 2018 17:06:33 +0000
+Subject: [PATCH] Fix building without libid3tag (#230)
+
+* Fix building without libid3tag
+
+Extend the pull Audacity#214 from torto9 to fix building
+with twolame but without libid3tag
+---
+ src/export/ExportMP2.cpp | 3 +++
+ src/export/ExportMP3.cpp | 2 ++
+ src/export/ExportPCM.cpp | 2 ++
+ src/import/ImportPCM.cpp | 2 ++
+ 4 files changed, 9 insertions(+)
+
+diff --git a/src/export/ExportMP2.cpp b/src/export/ExportMP2.cpp
+index 1aa259aed..cae2b7dcb 100644
+--- a/src/export/ExportMP2.cpp
++++ b/src/export/ExportMP2.cpp
+@@ -322,10 +322,13 @@ wxWindow *ExportMP2::OptionsCreate(wxWindow *parent, int format)
+ return safenew ExportMP2Options(parent, format);
+ }
+
++
++#ifdef USE_LIBID3TAG
+ struct id3_tag_deleter {
+ void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
+ };
+ using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
++#endif
+
+ // returns buffer len; caller frees
+ int ExportMP2::AddTags(
+diff --git a/src/export/ExportMP3.cpp b/src/export/ExportMP3.cpp
+index e0f8aa824..34963fc63 100644
+--- a/src/export/ExportMP3.cpp
++++ b/src/export/ExportMP3.cpp
+@@ -2009,10 +2009,12 @@ int ExportMP3::AskResample(int bitrate, int rate, int lowrate, int highrate)
+ return wxAtoi(choice->GetStringSelection());
+ }
+
++#ifdef USE_LIBID3TAG
+ struct id3_tag_deleter {
+ void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
+ };
+ using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
++#endif
+
+ // returns buffer len; caller frees
+ int ExportMP3::AddTags(AudacityProject *WXUNUSED(project), ArrayOf<char> &buffer, bool *endOfFile, const Tags *tags)
+diff --git a/src/export/ExportPCM.cpp b/src/export/ExportPCM.cpp
+index eb2369977..021dec4aa 100644
+--- a/src/export/ExportPCM.cpp
++++ b/src/export/ExportPCM.cpp
+@@ -700,10 +700,12 @@ bool ExportPCM::AddStrings(AudacityProject * WXUNUSED(project), SNDFILE *sf, con
+ return true;
+ }
+
++#ifdef USE_LIBID3TAG
+ struct id3_tag_deleter {
+ void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
+ };
+ using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
++#endif
+
+ bool ExportPCM::AddID3Chunk(wxString fName, const Tags *tags, int sf_format)
+ {
+diff --git a/src/import/ImportPCM.cpp b/src/import/ImportPCM.cpp
+index c943b0ae1..5790551c3 100644
+--- a/src/import/ImportPCM.cpp
++++ b/src/import/ImportPCM.cpp
+@@ -335,10 +335,12 @@ static wxString AskCopyOrEdit()
+ return oldCopyPref;
+ }
+
++#ifdef USE_LIBID3TAG
+ struct id3_tag_deleter {
+ void operator () (id3_tag *p) const { if (p) id3_tag_delete(p); }
+ };
+ using id3_tag_holder = std::unique_ptr<id3_tag, id3_tag_deleter>;
++#endif
+
+ ProgressResult PCMImportFileHandle::Import(TrackFactory *trackFactory,
+ TrackHolders &outTracks,
+--
+2.13.6
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2018-02-21 11:08 Lars Wendler
0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2018-02-21 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 2756b165ad00e4e78bfe5b02a3c0f5bd6f6be82c
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 11:08:36 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 11:08:51 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2756b165
media-sound/audacity: Fixed compilation with USE="-portmixer"
Closes: https://bugs.gentoo.org/624264
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/audacity/audacity-2.2.2.ebuild | 9 +++-
.../audacity/files/audacity-2.2.1-portmixer.patch | 36 ++++++++++++++++
.../audacity/files/audacity-2.2.2-automake.patch | 48 ++++++++++++++++++++++
3 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index cb2b8ea861f..5c71e713a5d 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
EAPI=5
-inherit eutils gnome2-utils wxwidgets xdg-utils
+inherit autotools eutils gnome2-utils wxwidgets xdg-utils
MY_P="${PN}-minsrc-${PV}"
DOC_PV="${PV}"
@@ -50,11 +50,16 @@ REQUIRED_USE="soundtouch? ( midi )"
S="${WORKDIR}/${MY_P}-rc1"
PATCHES=(
- "${FILESDIR}/${PN}-2.2.2-midi.patch"
+ "${FILESDIR}/${PN}-2.2.1-portmixer.patch" #624264
+ "${FILESDIR}/${PN}-2.2.2-automake.patch" # or else eautoreconf breaks
+ "${FILESDIR}/${PN}-2.2.2-midi.patch" #637110
)
src_prepare() {
epatch "${PATCHES[@]}"
+
+ # needed because of portmixer patch
+ eautoreconf
}
src_configure() {
diff --git a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch
new file mode 100644
index 00000000000..0df43f5c07a
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/624264
+
+Patch by Vladimir
+
+--- audacity-minsrc-2.2.1-rc3/configure.ac
++++ audacity-minsrc-2.2.1-rc3/configure.ac
+@@ -540,7 +540,7 @@
+ [compile with PortMixer [default=yes]])],
+ use_portmixer=$withval,
+ use_portmixer="yes")
+-
++AM_CONDITIONAL([USE_PORTMIXER], [test "$use_portmixer" = yes])
+
+ AC_CANONICAL_HOST
+
+--- audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am
++++ audacity-minsrc-2.2.1-rc3/lib-src/Makefile.am
+@@ -92,7 +92,6 @@
+ libsoxr \
+ lib-widget-extra \
+ lv2 \
+- portmixer \
+ portsmf \
+ sbsms \
+ $(NULL)
+@@ -156,8 +155,10 @@
+ SUBDIRS += portaudio-v19
+ endif
+
++if USE_PORTMIXER
+ # Note: portmixer needs to be linked against (the local or system) portaudio.
+ SUBDIRS += portmixer
++endif
+
+ if USE_LOCAL_PORTSMF
+ SUBDIRS += portsmf
diff --git a/media-sound/audacity/files/audacity-2.2.2-automake.patch b/media-sound/audacity/files/audacity-2.2.2-automake.patch
new file mode 100644
index 00000000000..56343e3ede2
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.2.2-automake.patch
@@ -0,0 +1,48 @@
+Remove subdirs that are non-exisitng in the tarball
+or else autoreconf breaks.
+
+--- audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am
++++ audacity-minsrc-2.2.2-rc1/lib-src/Makefile.am
+@@ -107,18 +107,6 @@
+ SUBDIRS = FileDialog
+ OPTIONAL_SUBDIRS =
+
+-if USE_LOCAL_EXPAT
+-OPTIONAL_SUBDIRS += expat
+-endif
+-
+-if USE_LOCAL_LIBID3TAG
+-OPTIONAL_SUBDIRS += libid3tag
+-endif
+-
+-if USE_LOCAL_LIBMAD
+-OPTIONAL_SUBDIRS += libmad
+-endif
+-
+ if USE_LOCAL_LIBNYQUIST
+ SUBDIRS += libnyquist
+ endif
+@@ -131,23 +119,10 @@
+ OPTIONAL_SUBDIRS += libsoxr
+ endif
+
+-if USE_LOCAL_LIBSOUNDTOUCH
+-OPTIONAL_SUBDIRS += soundtouch
+-endif
+-
+ if USE_LOCAL_LIBTWOLAME
+ OPTIONAL_SUBDIRS += twolame
+ endif
+
+-if USE_LOCAL_LIBVORBIS
+-OPTIONAL_SUBDIRS += libogg libvorbis
+-endif
+-
+-if USE_LOCAL_LIBFLAC
+-# Note: libflac needs to be linked against (the local or system) libogg.
+-OPTIONAL_SUBDIRS += libflac
+-endif
+-
+ if USE_LOCAL_LV2
+ SUBDIRS += lv2
+ endif
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2018-02-21 11:08 Lars Wendler
0 siblings, 0 replies; 12+ messages in thread
From: Lars Wendler @ 2018-02-21 11:08 UTC (permalink / raw
To: gentoo-commits
commit: 18dbd4fcf1bca48ad8b368346bfe73e2f2f40f02
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Wed Feb 21 10:42:32 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Feb 21 11:08:50 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=18dbd4fc
media-sound/audacity: Fixed compilation with USE="-midi"
Thanks to Matt Whitlock for providing the initial patch.
Closes: https://bugs.gentoo.org/637110
Package-Manager: Portage-2.3.24, Repoman-2.3.6
media-sound/audacity/audacity-2.2.2.ebuild | 8 +
.../audacity/files/audacity-2.2.2-midi.patch | 168 +++++++++++++++++++++
2 files changed, 176 insertions(+)
diff --git a/media-sound/audacity/audacity-2.2.2.ebuild b/media-sound/audacity/audacity-2.2.2.ebuild
index af62f464499..cb2b8ea861f 100644
--- a/media-sound/audacity/audacity-2.2.2.ebuild
+++ b/media-sound/audacity/audacity-2.2.2.ebuild
@@ -49,6 +49,14 @@ REQUIRED_USE="soundtouch? ( midi )"
S="${WORKDIR}/${MY_P}-rc1"
+PATCHES=(
+ "${FILESDIR}/${PN}-2.2.2-midi.patch"
+)
+
+src_prepare() {
+ epatch "${PATCHES[@]}"
+}
+
src_configure() {
local WX_GTK_VER="3.0"
need-wxwidgets unicode
diff --git a/media-sound/audacity/files/audacity-2.2.2-midi.patch b/media-sound/audacity/files/audacity-2.2.2-midi.patch
new file mode 100644
index 00000000000..10a0f1f6eb0
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.2.2-midi.patch
@@ -0,0 +1,168 @@
+https://bugs.gentoo.org/637110
+
+Original patch by Matt Whitlock
+Forward-ported from version 2.2.0 to 2.2.2
+
+--- audacity-minsrc-2.2.2-rc1/src/AudioIO.cpp
++++ audacity-minsrc-2.2.2-rc1/src/AudioIO.cpp
+@@ -976,6 +976,7 @@
+ };
+ #endif
+
++#ifdef EXPERIMENTAL_MIDI_OUT
+ // return the system time as a double
+ static double streamStartTime = 0; // bias system time to small number
+
+@@ -995,6 +996,7 @@
+
+ return PaUtil_GetTime() - streamStartTime;
+ }
++#endif
+
+ const int AudioIO::StandardRates[] = {
+ 8000,
+@@ -1803,6 +1805,7 @@
+ }
+ #endif
+
++#ifdef EXPERIMENTAL_MIDI_OUT
+ // We use audio latency to estimate how far ahead of DACS we are writing
+ if (mPortStreamV19 != NULL && mLastPaError == paNoError) {
+ const PaStreamInfo* info = Pa_GetStreamInfo(mPortStreamV19);
+@@ -1811,6 +1814,7 @@
+ mAudioOutLatency = info->outputLatency;
+ mSystemMinusAudioTimePlusLatency += mAudioOutLatency;
+ }
++#endif
+
+ return (mLastPaError == paNoError);
+ }
+@@ -1955,8 +1959,10 @@
+
+ double playbackTime = 4.0;
+
++#ifdef EXPERIMENTAL_MIDI_OUT
+ streamStartTime = 0;
+ streamStartTime = SystemTime(mUsingAlsa);
++#endif
+
+ #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
+ bool scrubbing = (options.pScrubbingOptions != nullptr);
+@@ -2830,7 +2836,9 @@
+
+ mPlaybackTracks.clear();
+ mCaptureTracks.clear();
++#ifdef HAVE_MIDI
+ mMidiPlaybackTracks.clear();
++#endif
+
+ #ifdef EXPERIMENTAL_SCRUBBING_SUPPORT
+ mScrubQueue.reset();
+@@ -4669,13 +4677,13 @@
+ (float *)alloca(framesPerBuffer*numPlaybackChannels * sizeof(float)) :
+ (float *)outputBuffer;
+
++#ifdef EXPERIMENTAL_MIDI_OUT
+ if (gAudioIO->mCallbackCount++ == 0) {
+ // This is effectively mSystemMinusAudioTime when the buffer is empty:
+ gAudioIO->mStartTime = SystemTime(gAudioIO->mUsingAlsa) - gAudioIO->mT0;
+ // later, mStartTime - mSystemMinusAudioTime will tell us latency
+ }
+
+-#ifdef EXPERIMENTAL_MIDI_OUT
+ /* GSW: Save timeInfo in case MidiPlayback needs it */
+ gAudioIO->mAudioCallbackClockTime = PaUtil_GetTime();
+
+@@ -5051,7 +5059,9 @@
+ : gAudioIO->mTime >= gAudioIO->mT1))
+ // PRL: singalling MIDI output complete is necessary if
+ // not USE_MIDI_THREAD, otherwise it's harmlessly redundant
++#ifdef EXPERIMENTAL_MIDI_OUT
+ gAudioIO->mMidiOutputComplete = true,
++#endif
+ callbackReturn = paComplete;
+ }
+
+@@ -5114,7 +5124,9 @@
+
+ // PRL: singalling MIDI output complete is necessary if
+ // not USE_MIDI_THREAD, otherwise it's harmlessly redundant
++#ifdef EXPERIMENTAL_MIDI_OUT
+ gAudioIO->mMidiOutputComplete = true,
++#endif
+ callbackReturn = paComplete;
+ }
+ }
+--- audacity-minsrc-2.2.2-rc1/src/Project.cpp
++++ audacity-minsrc-2.2.2-rc1/src/Project.cpp
+@@ -460,10 +460,11 @@
+ } );
+
+ for (const auto &name : sortednames) {
+-
++#ifdef USE_MIDI
+ if (Importer::IsMidi(name))
+ AudacityProject::DoImportMIDI(mProject, name);
+ else
++#endif
+ mProject->Import(name);
+ }
+
+@@ -3046,9 +3047,11 @@
+ #endif
+
+ {
++#ifdef USE_MIDI
+ if (Importer::IsMidi(fileName))
+ DoImportMIDI(this, fileName);
+ else
++#endif
+ Import(fileName);
+
+ ZoomAfterImport(nullptr);
+--- audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
++++ audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackButtonHandle.cpp
+@@ -9,6 +9,9 @@
+ **********************************************************************/
+
+ #include "../../../../Audacity.h"
++
++#ifdef USE_MIDI
++
+ #include "NoteTrackButtonHandle.h"
+
+ #include "../../../../HitTestResult.h"
+@@ -113,3 +116,4 @@
+ return RefreshCode::RefreshNone;
+ }
+
++#endif
+--- audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
++++ audacity-minsrc-2.2.2-rc1/src/tracks/playabletrack/notetrack/ui/NoteTrackVZoomHandle.cpp
+@@ -9,6 +9,9 @@
+ **********************************************************************/
+
+ #include "../../../../Audacity.h"
++
++#ifdef USE_MIDI
++
+ #include "NoteTrackVZoomHandle.h"
+ #include "../../../../Experimental.h"
+ #include "NoteTrackVRulerControls.h"
+@@ -332,3 +335,5 @@
+ TrackVRulerControls::DrawZooming
+ ( dc, mRect, panelRect, mZoomStart, mZoomEnd );
+ }
++
++#endif
+--- audacity-minsrc-2.2.2-rc1/src/tracks/ui/TimeShiftHandle.cpp
++++ audacity-minsrc-2.2.2-rc1/src/tracks/ui/TimeShiftHandle.cpp
+@@ -604,7 +604,7 @@
+ {
+ trySnap = true;
+ if (pTrack->GetKind() == Track::Wave) {
+- auto wt = static_cast<const WaveTrack *>(pTrack);
++ auto wt = static_cast<const WaveTrack *>(pTrack.get());
+ const double rate = wt->GetRate();
+ // set it to a sample point
+ desiredSlideAmount = rint(desiredSlideAmount * rate) / rate;
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2020-08-06 4:57 Miroslav Šulc
0 siblings, 0 replies; 12+ messages in thread
From: Miroslav Šulc @ 2020-08-06 4:57 UTC (permalink / raw
To: gentoo-commits
commit: 9043667c3f03113d9bed94fc64132e2519b17657
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Aug 6 04:57:26 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Aug 6 04:57:26 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9043667c
media-sound/audacity: fixed compilation wrt portaudio in 2.4.2-r1
patch by Matt Whitlock <gentoo <AT> mattwhitlock.name>
Closes: https://bugs.gentoo.org/735810
Package-Manager: Portage-3.0.1, Repoman-2.3.23
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/audacity/audacity-2.4.2-r1.ebuild | 1 +
.../files/audacity-2.4.2-add-missing-include-portaudio.patch | 11 +++++++++++
2 files changed, 12 insertions(+)
diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index 4f3f3dae4ec..e55b34a8ae8 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -62,6 +62,7 @@ PATCHES=(
"${FILESDIR}/${P}-fix-vertical-track-resizing.patch"
"${FILESDIR}/${P}-fix-gettimeofday.patch"
"${FILESDIR}/${P}-fix-metainfo.patch"
+ "${FILESDIR}/${P}-add-missing-include-portaudio.patch"
)
src_prepare() {
diff --git a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch
new file mode 100644
index 00000000000..7b845bc3181
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-portaudio.patch
@@ -0,0 +1,11 @@
+diff -Naur a/src/AudioIOBase.cpp b/src/AudioIOBase.cpp
+--- a/src/AudioIOBase.cpp 2020-06-19 15:16:47.000000000 +0000
++++ b/src/AudioIOBase.cpp 2020-08-04 19:43:27.985734707 +0000
+@@ -21,6 +21,7 @@
+ #include "prefs/RecordingPrefs.h"
+ #include "widgets/MeterPanelBase.h"
+
++#include "portaudio.h"
+ #if USE_PORTMIXER
+ #include "portmixer.h"
+ #endif
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2020-09-02 8:33 Miroslav Šulc
0 siblings, 0 replies; 12+ messages in thread
From: Miroslav Šulc @ 2020-09-02 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 6128f01f2648d14c91363ddc89f868d8938a4b2e
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Sep 2 08:32:47 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Sep 2 08:33:04 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6128f01f
media-sound/audacity: disabled ccache in 2.4.2-r1
Closes: https://bugs.gentoo.org/735642
Package-Manager: Portage-3.0.5, Repoman-3.0.1
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/audacity/audacity-2.4.2-r1.ebuild | 1 +
.../files/audacity-2.4.2-disable-ccache.patch | 19 +++++++++++++++++++
2 files changed, 20 insertions(+)
diff --git a/media-sound/audacity/audacity-2.4.2-r1.ebuild b/media-sound/audacity/audacity-2.4.2-r1.ebuild
index e6c8898ad22..f7df783a70c 100644
--- a/media-sound/audacity/audacity-2.4.2-r1.ebuild
+++ b/media-sound/audacity/audacity-2.4.2-r1.ebuild
@@ -65,6 +65,7 @@ PATCHES=(
"${FILESDIR}/${P}-fix-gettimeofday.patch"
"${FILESDIR}/${P}-fix-metainfo.patch"
"${FILESDIR}/${P}-add-missing-include-portaudio.patch"
+ "${FILESDIR}/${P}-disable-ccache.patch"
)
src_prepare() {
diff --git a/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch b/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch
new file mode 100644
index 00000000000..03acf6a2058
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-disable-ccache.patch
@@ -0,0 +1,19 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 4ff5430..9c9dbf6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -69,14 +69,6 @@ set( CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake-proxies/cmake-modules)
+ set( CMAKE_CXX_STANDARD 14 )
+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
+
+-# Use ccache if available
+-find_program( CCACHE_PROGRAM ccache )
+-mark_as_advanced( FORCE CCACHE_PROGRAM )
+-
+-if( CCACHE_PROGRAM )
+- set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
+-endif()
+-
+ # Our very own project
+ project( Audacity )
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2023-01-20 22:18 Arsen Arsenović
0 siblings, 0 replies; 12+ messages in thread
From: Arsen Arsenović @ 2023-01-20 22:18 UTC (permalink / raw
To: gentoo-commits
commit: 75e46d7319ae344ddd180417ff380bcda495d9a8
Author: Arsen Arsenović <arsen <AT> gentoo <DOT> org>
AuthorDate: Fri Jan 20 21:25:40 2023 +0000
Commit: Arsen Arsenović <arsen <AT> gentoo <DOT> org>
CommitDate: Fri Jan 20 22:15:48 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=75e46d73
media-sound/audacity: add 3.2.3
This update also links against system portaudio.
Keywords dropped to ~amd64 due to media-libs/portsmf.
Closes: https://bugs.gentoo.org/777366
Closes: https://bugs.gentoo.org/822978
Closes: https://github.com/gentoo/gentoo/pull/28715
Signed-off-by: Arsen Arsenović <arsen <AT> gentoo.org>
media-sound/audacity/Manifest | 3 +
media-sound/audacity/audacity-3.2.3.ebuild | 223 +++++++++++++++++++++
...y-3.2.3-allow-finding-rapidjson-pkgconfig.patch | 24 +++
...audacity-3.2.3-allow-overriding-alsa-jack.patch | 48 +++++
.../files/audacity-3.2.3-disable-ccache.patch | 33 +++
.../audacity/files/audacity-3.2.3-fix-rpaths.patch | 144 +++++++++++++
.../audacity-3.2.3-remove-conan-threadpool.patch | 58 ++++++
media-sound/audacity/metadata.xml | 10 +-
8 files changed, 541 insertions(+), 2 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 9c6a1401ae13..d2043bedc60f 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,2 +1,5 @@
DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
+DIST Audacity-3.2.3.tar.gz 57017395 BLAKE2B 3b74c381c9d8e5cbd22e3e53a2e497a45cc48f61b79395b1e17c15e4c645c661ad544cd050885f104562f0f05d08c9e52821f1b9737c32f5f7942d6b8f3102fb SHA512 759eb951ecbc690501c32a7cfc78b3c6f083ed62a4b57cc7935eef7b5dfd930ab4022c54e90de9523a4664ae7749868303fc4e597f19b319f23b07a9776a23cb
DIST audacity-manual-2.4.2.zip 22459298 BLAKE2B 001ca56f73c3c48f9b49b3b6478c6de6fb4c305fb869b11d93e41d5aee7ee45133bd7047c4d281fed4859d6c6061352dfaeb995e7b2602e42e09ab04e05e00dc SHA512 8afc7faffb0da87efe0c2cb64f8593777357252b4893ae0522ec7b37b4f7806ad9582ca9e4b751d085c2598aba6b580dacd805daa00b236a4ff8f6663a80135c
+DIST audacity-manual-3.2.3.tar.gz 22264928 BLAKE2B 7b9441a7d6c2ca05d1be0a2635a7685cff3960f03380c04229a6b2155453a8da861f185adf38f430f2c23214a6fc794533ed7ee23362801fb31eef32977e4a25 SHA512 6978ac874f9318fd283098ea5a4b6aa7096acdab229c7bb96c8da33413ed326b1de0c262132e03e4e8127cf0a430a182fb718c9c753556832aea7c527bf5c2cb
+DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
diff --git a/media-sound/audacity/audacity-3.2.3.ebuild b/media-sound/audacity/audacity-3.2.3.ebuild
new file mode 100644
index 000000000000..ad84d68e3e60
--- /dev/null
+++ b/media-sound/audacity/audacity-3.2.3.ebuild
@@ -0,0 +1,223 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+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"
+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-3.100-r3
+ 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-0.24.6-r2
+ media-libs/lv2
+ media-libs/sratom
+ media-libs/suil
+ )
+ mad? ( >=media-libs/libmad-0.15.1b )
+ 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
+ "${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
+ "${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ local header_subs="${S}/lib-src/header-substitutes"
+ cat <<-EOF >"${header_subs}/allegro.h" || die
+ /* Hack the allegro.h header substitute to use system headers. */
+ #include <portsmf/allegro.h>
+ EOF
+
+ # Keep in sync with has_networking and the ThreadPool.h SRC_URI.
+ if use audiocom; then
+ mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
+ cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
+ "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+ fi
+}
+
+src_configure() {
+ setup-wxwidgets
+
+ # * always use system libraries if possible
+ # * options listed roughly in the order specified in
+ # cmake-proxies/CMakeLists.txt
+ # * USE_VST was omitted, it appears to no longer have dependencies
+ # (this is different from VST3)
+ local mycmakeargs=(
+ # Tell the CMake-based build system it's building a release.
+ -DAUDACITY_BUILD_LEVEL=2
+ -Daudacity_use_nyquist=local
+ #-Daudacity_use_pch leaving it to the default behavior
+ -Daudacity_use_portmixer=$(usex portmixer system off)
+ -Daudacity_use_soxr=system
+
+ -Daudacity_conan_enabled=OFF
+
+ -Daudacity_has_networking=$(usex audiocom on off)
+ # Not useful on Gentoo.
+ -Daudacity_has_updates_check=OFF
+ -Daudacity_has_audiocom_upload=$(usex audiocom on off)
+ -Daudacity_has_threadpool=local
+
+ # The VST3 SDK is unpackaged, and it appears to be under a breed
+ # of a proprietary license and the GPL.
+ -Daudacity_has_vst3=OFF
+ -Daudacity_lib_preference=system
+ -Daudacity_obey_system_dependencies=ON
+ -Daudacity_use_expat=system
+ -Daudacity_use_ffmpeg=$(usex ffmpeg loaded off)
+ -Daudacity_use_libid3tag=$(usex id3tag system off)
+ -Daudacity_use_ladspa=$(usex ladspa)
+ -Daudacity_use_lame=system
+ -Daudacity_use_wxwidgets=system
+ -Daudacity_use_libmp3lame=system
+ -Daudacity_use_libmpg123=$(usex mpg123 system off)
+ -Daudacity_use_libmad=$(usex mad system off)
+ -Daudacity_use_wavpack=$(usex wavpack system off)
+ -Daudacity_use_libogg=$(usex ogg system off)
+ -Daudacity_use_libflac=$(usex flac system off)
+ -Daudacity_use_libopus=$(usex flac system off)
+ -Daudacity_use_libvorbis=$(usex vorbis system off)
+ -Daudacity_use_libsndfile=system
+ -Daudacity_use_portaudio=system
+ -Daudacity_use_midi=system
+ -Daudacity_use_vamp=$(usex vamp system off)
+ -Daudacity_use_lv2=$(usex lv2 system off)
+ -Daudacity_use_portsmf=system
+ -Daudacity_use_sbsms=$(usex sbsms system off)
+ -Daudacity_use_soundtouch=system
+ -Daudacity_use_twolame=$(usex twolame system off)
+
+ # Disable telemetry features.
+ -Daudacity_has_sentry_reporting=off
+ -Daudacity_has_crashreports=off
+
+ # See the allow-overriding-alsa-jack.patch patch
+ -DPA_HAS_ALSA=$(usex alsa on off)
+ ## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
+ ## AFAICT it introduces no deps as-is, but that could change.
+ ## Similar goes for PA_HAS_JACK.
+ )
+
+ cmake_src_configure
+}
+
+src_install() {
+ cmake_src_install
+
+ # Remove bad doc install
+ rm -r "${ED}"/usr/share/doc || die
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${WORKDIR}"/help/manual/{m,man}
+ dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+ dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+ fi
+}
diff --git a/media-sound/audacity/files/audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch b/media-sound/audacity/files/audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch
new file mode 100644
index 000000000000..d36f51bc2098
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.3-allow-finding-rapidjson-pkgconfig.patch
@@ -0,0 +1,24 @@
+From 0a786020046c9d608f1e2f463575d4ca8febf909 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Sun, 18 Dec 2022 13:41:06 +0100
+Subject: [PATCH 3/3] Add pkg-config fallback for RapidJSON
+
+---
+ cmake-proxies/CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
+index 7568bb32f..db40dcf63 100644
+--- a/cmake-proxies/CMakeLists.txt
++++ b/cmake-proxies/CMakeLists.txt
+@@ -289,6 +289,7 @@ if( ${_OPT}has_sentry_reporting OR ${_OPT}has_audiocom_upload )
+ RapidJSON
+ rapidjson/1.1.0
+ REQUIRED
++ PKG_CONFIG "RapidJSON"
+ )
+ endif()
+
+--
+2.39.0
+
diff --git a/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch b/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
new file mode 100644
index 000000000000..53ac8edc33fb
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
@@ -0,0 +1,48 @@
+From e46dbcb9763f4367705c66009703f15ff0ff5558 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Sat, 17 Dec 2022 21:13:56 +0100
+Subject: [PATCH] portmixer: Allow overriding PA_HAS_{ALSA,JACK}
+
+Not included for OSS as OSS is always included AFAICT.
+---
+ CMakeLists.txt | 3 +++
+ lib-src/portmixer/CMakeLists.txt | 9 ++++++---
+ 2 files changed, 9 insertions(+), 3 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 42e765691..c18a939e6 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -624,6 +624,9 @@ cmd_option( ${_OPT}use_portmixer "Build PortMixer support into Audacity" On)
+ if( ${_OPT}use_portmixer )
+ set(USE_PORTMIXER Yes)
+ add_subdirectory( "lib-src/portmixer" )
++else()
++ # Suppress bogus warnings about unused variables
++ set (unusedIgnore "${PA_HAS_ALSA}${PA_HAS_JACK}${PA_HAS_OSS}")
+ endif()
+
+ cmd_option( ${_OPT}use_nyquist "Build Nyquist support into Audacity" On)
+diff --git a/lib-src/portmixer/CMakeLists.txt b/lib-src/portmixer/CMakeLists.txt
+index 65a384fa0..1ddc8ed50 100644
+--- a/lib-src/portmixer/CMakeLists.txt
++++ b/lib-src/portmixer/CMakeLists.txt
+@@ -8,9 +8,12 @@ if (UNIX AND NOT APPLE)
+ include(CheckIncludeFile)
+ set(CMAKE_REQUIRED_LIBRARIES PortAudio::PortAudio)
+
+- check_include_file( "pa_jack.h" PA_HAS_JACK )
+-
+- check_include_file( "pa_linux_alsa.h" PA_HAS_ALSA )
++ if ( NOT DEFINED PA_HAS_JACK )
++ check_include_file( "pa_jack.h" PA_HAS_JACK )
++ endif()
++ if ( NOT DEFINED PA_HAS_ALSA )
++ check_include_file( "pa_linux_alsa.h" PA_HAS_ALSA )
++ endif()
+ if( PA_HAS_ALSA )
+ find_package( ALSA REQUIRED QUIET )
+ endif()
+--
+2.39.0
+
diff --git a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
new file mode 100644
index 000000000000..a40847bb941c
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
@@ -0,0 +1,33 @@
+From afd777fbcbaa9e9c14b80374c60ecd631eb537ea Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Fri, 16 Dec 2022 23:37:36 +0100
+Subject: [PATCH] Don't force enable ccache
+
+---
+Analogous to the similar patches in prior versions.
+
+CMakeLists.txt | 8 --------
+ 1 file changed, 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 9c1c7baf2..42e765691 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -142,14 +142,6 @@ set( CMAKE_PREFIX_PATH
+ set( CMAKE_CXX_STANDARD 17 )
+ set( CMAKE_CXX_STANDARD_REQUIRED ON )
+
+-# Use ccache if available
+-find_program( CCACHE_PROGRAM ccache )
+-mark_as_advanced( FORCE CCACHE_PROGRAM )
+-
+-if( CCACHE_PROGRAM )
+- set_property( GLOBAL PROPERTY RULE_LAUNCH_COMPILE "${CCACHE_PROGRAM}" )
+-endif()
+-
+ # Define option() prefix
+ set( _OPT "audacity_" )
+
+--
+2.39.0
+
diff --git a/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch b/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch
new file mode 100644
index 000000000000..2f1578211c9c
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.3-fix-rpaths.patch
@@ -0,0 +1,144 @@
+From: Benjamin Drung <benjamin.drung@canonical.com>
+Date: Thu, 22 Sep 2022 19:52:43 +0200
+Subject: Fix rpath for private libraries on Linux
+
+Installing audacity on Linux will produce private libraries that have
+`RUNPATH` set to the build directory instead of the installation
+directory.
+
+The root cause is that the library directory is copied to the
+installation directory without touching the libraries. The cmake wiki
+says in RPATH handling caveats [1]: "Since install-side RPATH tweaking
+is an operation that is done by target-specific installation handling,
+any target that should have its install RPATH changed (e.g. to
+`CMAKE_INSTALL_RPATH`) needs to end up in the installation via an
+`install(TARGETS ...)` signature and not via directory-based copying."
+
+So replace `install(DIRECTORY ...)` by individual `install(TARGETS ...)`
+for the libraries and modules. Then cmake will replace the `RUNPATH` to
+`$ORIGIN/../lib/audacity`, which is still incorrect. Therefore set
+`INSTALL_RPATH` explicitly.
+
+Fixes: https://github.com/audacity/audacity/issues/3289
+Forwarded: https://github.com/audacity/audacity/pull/3671
+[1] https://gitlab.kitware.com/cmake/community/-/wikis/doc/cmake/RPATH-handling#caveats
+Signed-off-by: Benjamin Drung <benjamin.drung@canonical.com>
+---
+ CMakeLists.txt | 1 +
+ cmake-proxies/cmake-modules/AudacityFunctions.cmake | 19 +++++++++++++++++++
+ modules/CMakeLists.txt | 7 -------
+ modules/mod-script-pipe/CMakeLists.txt | 1 +
+ src/CMakeLists.txt | 10 ----------
+ 5 files changed, 21 insertions(+), 17 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8428c8c..b9ff631 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -389,6 +389,7 @@ set( INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}" )
+ set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" )
+ set( _DATADIR "${CMAKE_INSTALL_DATADIR}" )
+ set( _PKGLIB "${_LIBDIR}/audacity" )
++set( _PKGMODULE "${_PKGLIB}/modules" )
+ set( _PKGDATA "${_DATADIR}/audacity/" )
+ set( _MANDIR "${CMAKE_INSTALL_MANDIR}" )
+ set( _MODDIR "${_DEST}/modules" )
+diff --git a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
+index 47682eb..a8f144f 100644
+--- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake
++++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
+@@ -338,6 +338,17 @@ function( canonicalize_node_name var node )
+ set( "${var}" "${node}" PARENT_SCOPE )
+ endfunction()
+
++# Call install(TARGETS...) only on Linux systems (i.e. exclude MacOS and Windows)
++macro( install_target_linux target destination )
++ if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" AND NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
++ install( TARGETS "${target}" DESTINATION "${destination}" )
++ endif()
++endmacro()
++
++macro( install_audacity_module target )
++ install_target_linux( "${target}" "${_PKGMODULE}" )
++endmacro()
++
+ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
+ ADDITIONAL_DEFINES ADDITIONAL_LIBRARIES LIBTYPE )
+
+@@ -382,6 +393,7 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
+ PROPERTIES
+ PREFIX ""
+ FOLDER "modules" # for IDE organization
++ INSTALL_RPATH "$ORIGIN/.."
+ )
+ if( CMAKE_HOST_SYSTEM_NAME MATCHES "Darwin" )
+ add_custom_command(
+@@ -423,6 +435,7 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
+ PREFIX ""
+ FOLDER "libraries" # for IDE organization
+ INSTALL_NAME_DIR ""
++ INSTALL_RPATH "$ORIGIN"
+ BUILD_WITH_INSTALL_NAME_DIR YES
+ )
+ endif()
+@@ -525,6 +538,12 @@ function( audacity_module_fn NAME SOURCES IMPORT_TARGETS
+ endforeach()
+ set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE )
+
++ # Note: Some modules set EXCLUDE_FROM_ALL afterwards to not be installed.
++ # Therefore only install libraries, but not modules here.
++ if( NOT REAL_LIBTYPE STREQUAL "MODULE" )
++ install_target_linux( "${TARGET}" "${_PKGLIB}" )
++ endif()
++
+ # collect unit test targets if they are present
+ if(EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/tests")
+ add_subdirectory(tests)
+diff --git a/modules/CMakeLists.txt b/modules/CMakeLists.txt
+index d464383..15dead4 100644
+--- a/modules/CMakeLists.txt
++++ b/modules/CMakeLists.txt
+@@ -16,12 +16,5 @@ foreach( MODULE ${MODULES} )
+ add_subdirectory("${MODULE}")
+ endforeach()
+
+-if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin" )
+- if( NOT "${CMAKE_GENERATOR}" MATCHES "Visual Studio*")
+- install( DIRECTORY "${_DEST}/modules"
+- DESTINATION "${_PKGLIB}" )
+- endif()
+-endif()
+-
+ #propagate collected edges up to root CMakeLists.txt
+ set( GRAPH_EDGES "${GRAPH_EDGES}" PARENT_SCOPE )
+diff --git a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt
+index 5ee1862..ccfd50f 100644
+--- a/modules/mod-script-pipe/CMakeLists.txt
++++ b/modules/mod-script-pipe/CMakeLists.txt
+@@ -15,3 +15,4 @@ set( DEFINES
+ )
+ audacity_module( mod-script-pipe "${SOURCES}" "Audacity"
+ "${DEFINES}" "" )
++install_audacity_module( mod-script-pipe )
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 7b90c1b..c5f30ad 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -1621,17 +1621,7 @@ else()
+ DESTINATION "."
+ RESOURCE DESTINATION "${_APPDIR}/Resources" )
+ else()
+-
+ install( TARGETS ${TARGET} RUNTIME )
+-
+- install( DIRECTORY "${_DEST}/${_LIBDIR}/"
+- DESTINATION "${_LIBDIR}"
+- USE_SOURCE_PERMISSIONS
+- FILES_MATCHING PATTERN "*.so*" )
+-
+- install( CODE "set( _LIBDIR \"${_LIBDIR}\")" )
+- install( SCRIPT "${CMAKE_SOURCE_DIR}/scripts/build/linux/fix_rpath.cmake" )
+-
+ install( FILES "${_INTDIR}/audacity.desktop"
+ DESTINATION "${_DATADIR}/applications" )
+ install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.txt"
diff --git a/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch b/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch
new file mode 100644
index 000000000000..1940ec8a6d9f
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.3-remove-conan-threadpool.patch
@@ -0,0 +1,58 @@
+From 7b5f56ec441fb472b61bae14e1efa353db4d7aca Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Arsen=20Arsenovi=C4=87?= <arsen@aarsen.me>
+Date: Sun, 18 Dec 2022 13:37:35 +0100
+Subject: [PATCH] Allow using local dependency for threadpool
+
+We pull it in manually.
+---
+ cmake-proxies/CMakeLists.txt | 27 +++++++++++++++++++--------
+ 1 file changed, 19 insertions(+), 8 deletions(-)
+
+diff --git a/cmake-proxies/CMakeLists.txt b/cmake-proxies/CMakeLists.txt
+index 81bbf2efd..474814f07 100644
+--- a/cmake-proxies/CMakeLists.txt
++++ b/cmake-proxies/CMakeLists.txt
+@@ -258,12 +258,22 @@ if( ${_OPT}has_networking )
+ set ( curl_ssl "openssl" )
+ endif ()
+
+- add_conan_lib(
+- ThreadPool
+- threadpool/20140926
+- REQUIRED
+- ALWAYS_ALLOW_CONAN_FALLBACK
+- )
++ if ( ${_OPT}has_threadpool STREQUAL "local" )
++ # Gentoo: Hack in Portage-downloaded ThreadPool.h.
++ # This follows somewhat-like-upstream conventions, except it doesn't use
++ # the proxy library mechanism because there's no library.
++ add_library ( ThreadPool::ThreadPool INTERFACE IMPORTED GLOBAL )
++ target_include_directories ( ThreadPool::ThreadPool INTERFACE
++ ${CMAKE_SOURCE_DIR}/lib-src/threadpool
++ )
++ else()
++ add_conan_lib(
++ ThreadPool
++ threadpool/20140926
++ REQUIRED
++ ALWAYS_ALLOW_CONAN_FALLBACK
++ )
++ endif()
+
+ add_conan_lib(
+ CURL
+@@ -276,8 +286,9 @@ if( ${_OPT}has_networking )
+ CONAN_OPTIONS
+ libcurl:with_ssl=${curl_ssl}
+ libcurl:shared=True
+- )
+-
++ )
++else()
++ set(unused "${${_OPT}has_threadpool}")
+ endif()
+
+ if( NOT CMAKE_SYSTEM_NAME MATCHES "Darwin|Windows")
+--
+2.39.0
+
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index d65acf902382..b55217fe7ef8 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -10,14 +10,20 @@
<name>Richard Ash</name>
<description>Upstream - please CC on bugs that concerns upstream</description>
</maintainer>
+ <upstream>
+ <remote-id type="github">audacity/audacity</remote-id>
+ </upstream>
<use>
+ <flag name="audiocom">Enable integrated uploading to audio.com</flag>
<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
<flag name="lv2">Add support for Ladspa V2</flag>
+ <flag name="mpg123">Use <pkg>media-sound/mpg123</pkg> instead of
+ <pkg>media-libs/libmad</pkg> for decoding MPEG decoding</flag>
<flag name="portmidi">Enable support for MIDI via <pkg>media-libs/portmidi</pkg></flag>
<flag name="portmixer">Enable the internal portmixer feature</flag>
<flag name="portsmf">Enable support for Portable Standard Midi File Library</flag>
- <flag name="sbsms">Enables sbsms library support for slower, more accurate
- pitch and tempo changing</flag>
+ <flag name="sbsms">Enables sbsms library support for slower, more
+ accurate pitch and tempo changing</flag>
<flag name="twolame">Enables twolame support (MPEG Audio Layer 2 encoder)</flag>
<flag name="vamp">Enables vamp plugins support (Audio analysing plugins)</flag>
<flag name="vst">Enable VST plugin support</flag>
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2023-04-15 0:47 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2023-04-15 0:47 UTC (permalink / raw
To: gentoo-commits
commit: 0e748c0d213d1fde1baa4cdbe01252c409d3341f
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 15 00:45:02 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Apr 15 00:45:02 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e748c0d
media-sound/audacity: add partial GCC 13 fix
Closes: https://bugs.gentoo.org/899764
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/audacity/audacity-3.2.5.ebuild | 3 +++
.../audacity/files/audacity-3.2.5-gcc13.patch | 25 ++++++++++++++++++++++
2 files changed, 28 insertions(+)
diff --git a/media-sound/audacity/audacity-3.2.5.ebuild b/media-sound/audacity/audacity-3.2.5.ebuild
index 9b1ee5735698..0d2e26a3d311 100644
--- a/media-sound/audacity/audacity-3.2.5.ebuild
+++ b/media-sound/audacity/audacity-3.2.5.ebuild
@@ -122,6 +122,9 @@ PATCHES=(
# For has_networking
"${FILESDIR}/${PN}-3.2.3-remove-conan-threadpool.patch"
"${FILESDIR}/${PN}-3.2.3-allow-finding-rapidjson-pkgconfig.patch"
+
+ # GCC 13
+ "${FILESDIR}/${PN}-3.2.5-gcc13.patch"
)
src_prepare() {
diff --git a/media-sound/audacity/files/audacity-3.2.5-gcc13.patch b/media-sound/audacity/files/audacity-3.2.5-gcc13.patch
new file mode 100644
index 000000000000..265d73fd9e71
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.5-gcc13.patch
@@ -0,0 +1,25 @@
+https://github.com/audacity/audacity/issues/4489
+https://bugs.gentoo.org/899764
+
+--- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
++++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
+@@ -47,6 +47,7 @@
+ #endif
+
+ #include <stddef.h>
++#include <stdint.h>
+ #include <string>
+ #include <iostream>
+ #include <sstream>
+@@ -355,10 +356,6 @@
+ typedef signed int SINT32;
+ typedef float FLOAT32;
+ typedef double FLOAT64;
+-// added by RBD
+-#ifdef __linux__
+-#define intptr_t long
+-#endif
+
+ // The default sampling rate.
+ const StkFloat SRATE = 44100.0;
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2023-06-30 12:31 David Seifert
0 siblings, 0 replies; 12+ messages in thread
From: David Seifert @ 2023-06-30 12:31 UTC (permalink / raw
To: gentoo-commits
commit: 59188fa2f4f5c378c475a2d687dedf7b746453bf
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 30 12:31:11 2023 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Fri Jun 30 12:31:11 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59188fa2
media-sound/audacity: fix gettext 0.22 breakage
Closes: https://bugs.gentoo.org/909201
Signed-off-by: David Seifert <soap <AT> gentoo.org>
media-sound/audacity/audacity-3.2.5-r1.ebuild | 3 ++
.../files/audacity-3.2.5-gettext-0.22.patch | 36 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/media-sound/audacity/audacity-3.2.5-r1.ebuild b/media-sound/audacity/audacity-3.2.5-r1.ebuild
index b23b0ca973d6..b9ffe050c949 100644
--- a/media-sound/audacity/audacity-3.2.5-r1.ebuild
+++ b/media-sound/audacity/audacity-3.2.5-r1.ebuild
@@ -125,6 +125,9 @@ PATCHES=(
# GCC 13
"${FILESDIR}/${PN}-3.2.5-gcc13-deux.patch"
+
+ # gettext 0.22
+ "${FILESDIR}/${PN}-3.2.5-gettext-0.22.patch"
)
src_prepare() {
diff --git a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
new file mode 100644
index 000000000000..f84508a2c903
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
@@ -0,0 +1,36 @@
+https://bugs.gentoo.org/909201
+upstream fix: https://github.com/audacity/audacity/pull/4866
+
+--- a/locale/be.po
++++ b/locale/be.po
+@@ -3097,7 +3097,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "Памылка (магчыма, файл не запісаны): %hs"
++msgstr "Памылка (магчыма, файл не запісаны): %s"
+
+ #: src/FileFormats.cpp
+ #, fuzzy
+--- a/locale/fa.po
++++ b/locale/fa.po
+@@ -3053,7 +3053,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %hs"
++msgstr "خطا (ممکن است در پرونده نوشته شده باشد) : %s"
+
+ #: src/FileFormats.cpp
+ msgid "&Copy uncompressed files into the project (safer)"
+--- a/locale/fr.po
++++ b/locale/fr.po
+@@ -3142,7 +3142,7 @@
+ #: src/FileFormats.cpp
+ #, c-format
+ msgid "Error (file may not have been written): %s"
+-msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %hs"
++msgstr "Erreur (le fichier pourrait ne pas avoir été écrit) : %s"
+
+ # trebmuh to check (accélérateur)
+ #: src/FileFormats.cpp
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2024-01-16 3:36 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2024-01-16 3:36 UTC (permalink / raw
To: gentoo-commits
commit: 62fba13fd0b86e6428ea2eae77138219cb2110b6
Author: Matoro Mahri <matoro_gentoo <AT> matoro <DOT> tk>
AuthorDate: Tue Jan 16 01:29:25 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Jan 16 03:35:54 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62fba13f
media-sound/audacity: wire up tests
Patch not submitted upstream yet.
See: https://github.com/audacity/audacity/discussions/5841
Bug: https://bugs.gentoo.org/916258
Signed-off-by: Matoro Mahri <matoro_gentoo <AT> matoro.tk>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/audacity/audacity-3.3.3.ebuild | 20 +++++++----
media-sound/audacity/audacity-9999.ebuild | 20 +++++++----
...dacity-3.3.3-remove-conan-test-dependency.patch | 39 ++++++++++++++++++++++
3 files changed, 67 insertions(+), 12 deletions(-)
diff --git a/media-sound/audacity/audacity-3.3.3.ebuild b/media-sound/audacity/audacity-3.3.3.ebuild
index 4e68dd30ca14..f77da513d7d2 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3.ebuild
@@ -5,7 +5,7 @@ EAPI=8
WX_GTK_VER="3.2-gtk3"
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg virtualx
DESCRIPTION="Free crossplatform audio editor"
HOMEPAGE="https://www.audacityteam.org/"
@@ -37,10 +37,8 @@ LICENSE="GPL-2+
"
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"
+ opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+RESTRICT="!test? ( test )"
# dev-db/sqlite:3 hard dependency.
# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -104,7 +102,8 @@ RDEPEND="dev-db/sqlite:3
vorbis? ( media-libs/libvorbis )
wavpack? ( media-sound/wavpack )
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/catch:0 )"
BDEPEND="app-arch/unzip
sys-devel/gettext
virtual/pkgconfig
@@ -135,6 +134,9 @@ PATCHES=(
# gettext 0.22
"${FILESDIR}/${PN}-3.3.3-gettext-0.22.patch"
+
+ # Allows running tests without conan
+ "${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
)
src_prepare() {
@@ -215,11 +217,17 @@ src_configure() {
## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
## AFAICT it introduces no deps as-is, but that could change.
## Similar goes for PA_HAS_JACK.
+
+ -Daudacity_has_tests=$(usex test ON OFF)
)
cmake_src_configure
}
+src_test() {
+ virtx cmake_src_test
+}
+
src_install() {
cmake_src_install
diff --git a/media-sound/audacity/audacity-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
index ad59e3249ef7..d245b905cad3 100644
--- a/media-sound/audacity/audacity-9999.ebuild
+++ b/media-sound/audacity/audacity-9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
WX_GTK_VER="3.2-gtk3"
-inherit cmake wxwidgets xdg
+inherit cmake wxwidgets xdg virtualx
DESCRIPTION="Free crossplatform audio editor"
HOMEPAGE="https://www.audacityteam.org/"
@@ -37,10 +37,8 @@ LICENSE="GPL-2+
"
SLOT="0"
IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
- opus +portmixer sbsms twolame vamp +vorbis wavpack"
-
-# The testsuite consists of two tests, 50% of which fail.
-RESTRICT="test"
+ opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+RESTRICT="!test? ( test )"
# dev-db/sqlite:3 hard dependency.
# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -103,7 +101,8 @@ RDEPEND="dev-db/sqlite:3
vorbis? ( media-libs/libvorbis )
wavpack? ( media-sound/wavpack )
"
-DEPEND="${RDEPEND}"
+DEPEND="${RDEPEND}
+ test? ( dev-cpp/catch:0 )"
BDEPEND="app-arch/unzip
sys-devel/gettext
virtual/pkgconfig
@@ -120,6 +119,9 @@ PATCHES=(
# For has_networking
"${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+
+ # Allows running tests without conan
+ "${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
)
src_prepare() {
@@ -199,11 +201,17 @@ src_configure() {
## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
## AFAICT it introduces no deps as-is, but that could change.
## Similar goes for PA_HAS_JACK.
+
+ -Daudacity_has_tests=$(usex test ON OFF)
)
cmake_src_configure
}
+src_test() {
+ virtx cmake_src_test
+}
+
src_install() {
cmake_src_install
diff --git a/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
new file mode 100644
index 000000000000..63dd3b58f0f0
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-remove-conan-test-dependency.patch
@@ -0,0 +1,39 @@
+https://bugs.gentoo.org/916258
+https://github.com/audacity/audacity/discussions/5841
+https://github.com/matoro/audacity/commit/270be88a9390eb25c2f4b16030f6897f08a6a685
+
+From 270be88a9390eb25c2f4b16030f6897f08a6a685 Mon Sep 17 00:00:00 2001
+From: matoro <matoro@users.noreply.github.com>
+Date: Mon, 15 Jan 2024 20:21:08 -0500
+Subject: [PATCH] Remove dependency on conan for unit tests
+
+These run fine with catch2 installed from system package manager; there
+is no reason to enforce conan dependency.
+---
+ CMakeLists.txt | 12 ++++--------
+ 1 file changed, 4 insertions(+), 8 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index cbe79a43b933..7b682c4e729d 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -228,15 +228,11 @@ cmd_option( ${_OPT}has_url_schemes_support
+ "Build custom URL schemes support into Audacity"
+ Off)
+
+-include( CMakeDependentOption )
+-
+-cmake_dependent_option(
+- ${_OPT}has_tests
++cmd_option( ${_OPT}has_tests
+ "Enables automated testing support"
+- On
+- "${_OPT}conan_enabled"
+- Off
+-)
++ On)
++
++include( CMakeDependentOption )
+
+ cmake_dependent_option(
+ ${_OPT}has_audiocom_upload
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2024-03-23 8:29 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2024-03-23 8:29 UTC (permalink / raw
To: gentoo-commits
commit: 2dd375c26a958c83bee4119b499fa65adb4b3f29
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Feb 18 20:31:20 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:29:07 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dd375c2
media-sound/audacity: add 3.4.2, update 9999
Closes: https://bugs.gentoo.org/916782
Closes: https://bugs.gentoo.org/920363
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/audacity/Manifest | 3 +-
...{audacity-9999.ebuild => audacity-3.4.2.ebuild} | 103 +++++++++------------
media-sound/audacity/audacity-9999.ebuild | 94 +++++++++----------
.../files/audacity-3.4.2-audiocom-std-string.patch | 30 ++++++
4 files changed, 123 insertions(+), 107 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 6af378802534..ab7fe68fc43e 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,6 +1,7 @@
DIST Audacity-2.4.2.tar.gz 61248430 BLAKE2B bb7e31e22d2a09c38767b019ed5c2c2be31741594715d73452fc4622d171a6209e87009b6f820873cc1cff2f6b85547a3dea0a2d8d4dd7195617509e571ee9b8 SHA512 0d9cdabf5ba2c7207e8d8e4a8bdfc3e7d32277386436ecb480e3ff781720f5449a56b310ba91c78ca67afb752e2ab736abd5b7ce40d19d153bfc4a2067343a3d
DIST Audacity-3.2.5.tar.gz 57017533 BLAKE2B b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 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 e3c96282b5eeffe5854781cfe316fb40c10212c9bc07a081433cf947363f79892e7397b53a31aa33337b5d0b6a00e14bd420d6f064515455055233a45f5ebf47 SHA512 9bd2f2b3268ff7259f1fa0957ab3f15e7b58d72a3199be4e271bac67d9d0b44967b2b783ea36f9392ed1bdf004274754468b3902c3a72a204d08333a5c07894c
-DIST Audacity-3.3.3.tar.gz 57120215 BLAKE2B 566aa2529f2708c80eb8e2887c3f3b2a1477d0825133b960f824d0697716d5b5e3a3ba0bcb14a20afc2eba7ac544da154339d1cd37261225b06326e8ee3f730c SHA512 c484e747f5207785b1872d031be2c3c50e7bbce087909c41930e593e2ab5777e0ab527a2770d90d89854bdd131e3f1f7afe3696b30420e3d8370e9f95527c937
+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-9999.ebuild b/media-sound/audacity/audacity-3.4.2.ebuild
similarity index 78%
copy from media-sound/audacity/audacity-9999.ebuild
copy to media-sound/audacity/audacity-3.4.2.ebuild
index be537c7c96c0..27f06abecfde 100644
--- a/media-sound/audacity/audacity-9999.ebuild
+++ b/media-sound/audacity/audacity-3.4.2.ebuild
@@ -5,7 +5,7 @@ EAPI=8
WX_GTK_VER="3.2-gtk3"
-inherit cmake flag-o-matic wxwidgets xdg virtualx
+inherit cmake wxwidgets xdg virtualx
DESCRIPTION="Free crossplatform audio editor"
HOMEPAGE="https://www.audacityteam.org/"
@@ -20,10 +20,10 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git"
else
- KEYWORDS="~amd64 ~riscv"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
MY_P="Audacity-${PV}"
- S="${WORKDIR}/${PN}-${MY_P}"
- SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz"
+ S="${WORKDIR}/${PN}-sources-${PV}"
+ SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
fi
SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
@@ -39,7 +39,6 @@ SLOT="0"
IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
opus +portmixer sbsms test twolame vamp +vorbis wavpack"
RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( mpg123 )"
# dev-db/sqlite:3 hard dependency.
# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -66,7 +65,9 @@ REQUIRED_USE="test? ( mpg123 )"
RDEPEND="dev-db/sqlite:3
dev-libs/expat
dev-libs/glib:2
- dev-libs/rapidjson
+ dev-libs/rapidjson:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
media-libs/libsndfile
media-libs/libsoundtouch:=
media-libs/portaudio[alsa?]
@@ -74,13 +75,13 @@ RDEPEND="dev-db/sqlite:3
media-libs/portsmf:=
media-libs/soxr
media-sound/lame
+ sys-apps/util-linux
+ sys-libs/zlib:=
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 )
@@ -105,77 +106,73 @@ RDEPEND="dev-db/sqlite:3
"
DEPEND="${RDEPEND}
test? ( <dev-cpp/catch-3:0 )"
-BDEPEND="app-arch/unzip
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig
"
PATCHES=(
# Equivalent to previous versions
- "${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+ "${FILESDIR}/audacity-3.2.3-disable-ccache.patch"
# From Debian
- "${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+ "${FILESDIR}/audacity-3.3.3-fix-rpaths.patch"
# Disables some header-based detection
- "${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+ "${FILESDIR}/audacity-3.2.3-allow-overriding-alsa-jack.patch"
# For has_networking
- "${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+ "${FILESDIR}/audacity-3.3.3-local-threadpool-libraries.patch"
# Allows running tests without conan
- "${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
+ "${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
+
+ # #920363
+ "${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
)
src_prepare() {
cmake_src_prepare
- local header_subs="${S}/libraries/lib-note-track"
- cat <<-EOF >"${header_subs}/WrapAllegro.h" || die
- /* Hack the allegro.h header substitute to use system headers. */
- #include <portsmf/allegro.h>
- EOF
-
# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
if use audiocom; then
- mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
- cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
- "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+ mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+ cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+ "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
fi
+
+ # Remove documentation incorrect installations
+ sed -i -e \
+ '/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+ src/CMakeLists.txt || die
}
src_configure() {
- # -Werror=strict-aliasing
- # Reportedly also -Werror=odr but I could not get that far.
- # https://bugs.gentoo.org/915226
- # https://github.com/audacity/audacity/issues/6096
- append-flags -fno-strict-aliasing
- filter-lto
-
setup-wxwidgets
# * always use system libraries if possible
- # * options listed roughly in the order specified in
- # cmake-proxies/CMakeLists.txt
# * USE_VST was omitted, it appears to no longer have dependencies
# (this is different from VST3)
local mycmakeargs=(
# Tell the CMake-based build system it's building a release.
-DAUDACITY_BUILD_LEVEL=2
- -Daudacity_use_nyquist=local
- -Daudacity_use_pch=OFF
- -Daudacity_use_portmixer=$(usex portmixer system off)
- -Daudacity_use_soxr=system
- -Daudacity_conan_enabled=OFF
+ -Daudacity_conan_enabled=off
-Daudacity_has_networking=$(usex audiocom on off)
# Not useful on Gentoo.
-Daudacity_has_updates_check=OFF
-Daudacity_has_audiocom_upload=$(usex audiocom on off)
+ # Disable telemetry features.
+ -Daudacity_has_sentry_reporting=off
+ -Daudacity_has_crashreports=off
+
+ -Daudacity_has_tests=$(usex test on off)
+
# The VST3 SDK is unpackaged, and it appears to be under a breed
# of a proprietary license and the GPL.
- -Daudacity_has_vst3=OFF
+ -Daudacity_has_vst3=off
+
-Daudacity_lib_preference=system
-Daudacity_obey_system_dependencies=ON
-Daudacity_use_expat=system
@@ -184,34 +181,33 @@ src_configure() {
-Daudacity_use_ladspa=$(usex ladspa)
-Daudacity_use_lame=system
-Daudacity_use_wxwidgets=system
+ -Daudacity_use_libflac=$(usex flac system off)
-Daudacity_use_libmp3lame=system
-Daudacity_use_libmpg123=$(usex mpg123 system off)
- -Daudacity_use_wavpack=$(usex wavpack system off)
-Daudacity_use_libogg=$(usex ogg system off)
- -Daudacity_use_libflac=$(usex flac system off)
-Daudacity_use_libopus=$(usex flac system off)
- -Daudacity_use_libvorbis=$(usex vorbis system off)
-Daudacity_use_libsndfile=system
- -Daudacity_use_portaudio=system
- -Daudacity_use_midi=system
- -Daudacity_use_vamp=$(usex vamp system off)
+ -Daudacity_use_libvorbis=$(usex vorbis system off)
-Daudacity_use_lv2=$(usex lv2 system off)
+ -Daudacity_use_midi=system
+ -Daudacity_use_nyquist=local
+ -Daudacity_use_pch=off
+ -Daudacity_use_portaudio=system
+ -Daudacity_use_portmixer=$(usex portmixer system off)
-Daudacity_use_portsmf=system
+ -Daudacity_use_rapidjson=system
-Daudacity_use_sbsms=$(usex sbsms system off)
-Daudacity_use_soundtouch=system
+ -Daudacity_use_soxr=system
-Daudacity_use_twolame=$(usex twolame system off)
-
- # Disable telemetry features.
- -Daudacity_has_sentry_reporting=off
- -Daudacity_has_crashreports=off
+ -Daudacity_use_vamp=$(usex vamp system off)
+ -Daudacity_use_wavpack=$(usex wavpack system off)
# See the allow-overriding-alsa-jack.patch patch
-DPA_HAS_ALSA=$(usex alsa on off)
## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
## AFAICT it introduces no deps as-is, but that could change.
## Similar goes for PA_HAS_JACK.
-
- -Daudacity_has_tests=$(usex test ON OFF)
)
cmake_src_configure
@@ -220,10 +216,3 @@ src_configure() {
src_test() {
virtx cmake_src_test
}
-
-src_install() {
- cmake_src_install
-
- # Remove bad doc install
- rm -r "${ED}"/usr/share/doc || die
-}
diff --git a/media-sound/audacity/audacity-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
index be537c7c96c0..9246a3ee4e7c 100644
--- a/media-sound/audacity/audacity-9999.ebuild
+++ b/media-sound/audacity/audacity-9999.ebuild
@@ -20,10 +20,10 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git"
else
- KEYWORDS="~amd64 ~riscv"
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
MY_P="Audacity-${PV}"
- S="${WORKDIR}/${PN}-${MY_P}"
- SRC_URI="https://github.com/audacity/audacity/archive/${MY_P}.tar.gz"
+ S="${WORKDIR}/${PN}-sources-${PV}"
+ SRC_URI="https://github.com/audacity/audacity/releases/download/Audacity-${PV}/${PN}-sources-${PV}.tar.gz"
fi
SRC_URI+=" audiocom? ( ${MY_THREADPOOL} )"
@@ -39,7 +39,6 @@ SLOT="0"
IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
opus +portmixer sbsms test twolame vamp +vorbis wavpack"
RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( mpg123 )"
# dev-db/sqlite:3 hard dependency.
# dev-libs/glib:2, x11-libs/gtk+:3 hard dependency, from
@@ -66,7 +65,9 @@ REQUIRED_USE="test? ( mpg123 )"
RDEPEND="dev-db/sqlite:3
dev-libs/expat
dev-libs/glib:2
- dev-libs/rapidjson
+ dev-libs/rapidjson:=
+ media-libs/libjpeg-turbo:=
+ media-libs/libpng:=
media-libs/libsndfile
media-libs/libsoundtouch:=
media-libs/portaudio[alsa?]
@@ -74,13 +75,13 @@ RDEPEND="dev-db/sqlite:3
media-libs/portsmf:=
media-libs/soxr
media-sound/lame
+ sys-apps/util-linux
+ sys-libs/zlib:=
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 )
@@ -105,42 +106,44 @@ RDEPEND="dev-db/sqlite:3
"
DEPEND="${RDEPEND}
test? ( <dev-cpp/catch-3:0 )"
-BDEPEND="app-arch/unzip
+BDEPEND="
sys-devel/gettext
virtual/pkgconfig
"
PATCHES=(
# Equivalent to previous versions
- "${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+ "${FILESDIR}/audacity-3.2.3-disable-ccache.patch"
# From Debian
- "${FILESDIR}/${PN}-3.3.3-fix-rpaths.patch"
+ "${FILESDIR}/audacity-3.3.3-fix-rpaths.patch"
# Disables some header-based detection
- "${FILESDIR}/${PN}-3.2.3-allow-overriding-alsa-jack.patch"
+ "${FILESDIR}/audacity-3.2.3-allow-overriding-alsa-jack.patch"
# For has_networking
- "${FILESDIR}/${PN}-3.3.3-local-threadpool-libraries.patch"
+ "${FILESDIR}/audacity-3.3.3-local-threadpool-libraries.patch"
# Allows running tests without conan
- "${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
+ "${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
+
+ # #920363
+ "${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
)
src_prepare() {
cmake_src_prepare
- local header_subs="${S}/libraries/lib-note-track"
- cat <<-EOF >"${header_subs}/WrapAllegro.h" || die
- /* Hack the allegro.h header substitute to use system headers. */
- #include <portsmf/allegro.h>
- EOF
-
# Keep in sync with has_networking and the ThreadPool.h SRC_URI.
if use audiocom; then
- mkdir -p "${S}/"/lib-src/threadpool/ThreadPool/ || die
- cp "${DISTDIR}"/progschj-ThreadPool-"${MY_THREADPOOL_DATE}".h \
- "${S}"/lib-src/threadpool/ThreadPool/ThreadPool.h || die
+ mkdir -p "${S}/lib-src/threadpool/ThreadPool/" || die
+ cp "${DISTDIR}/progschj-ThreadPool-${MY_THREADPOOL_DATE}.h" \
+ "${S}/lib-src/threadpool/ThreadPool/ThreadPool.h" || die
fi
+
+ # Remove documentation incorrect installations
+ sed -i -e \
+ '/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+ src/CMakeLists.txt || die
}
src_configure() {
@@ -154,28 +157,29 @@ src_configure() {
setup-wxwidgets
# * always use system libraries if possible
- # * options listed roughly in the order specified in
- # cmake-proxies/CMakeLists.txt
# * USE_VST was omitted, it appears to no longer have dependencies
# (this is different from VST3)
local mycmakeargs=(
# Tell the CMake-based build system it's building a release.
-DAUDACITY_BUILD_LEVEL=2
- -Daudacity_use_nyquist=local
- -Daudacity_use_pch=OFF
- -Daudacity_use_portmixer=$(usex portmixer system off)
- -Daudacity_use_soxr=system
- -Daudacity_conan_enabled=OFF
+ -Daudacity_conan_enabled=off
-Daudacity_has_networking=$(usex audiocom on off)
# Not useful on Gentoo.
-Daudacity_has_updates_check=OFF
-Daudacity_has_audiocom_upload=$(usex audiocom on off)
+ # Disable telemetry features.
+ -Daudacity_has_sentry_reporting=off
+ -Daudacity_has_crashreports=off
+
+ -Daudacity_has_tests=$(usex test on off)
+
# The VST3 SDK is unpackaged, and it appears to be under a breed
# of a proprietary license and the GPL.
- -Daudacity_has_vst3=OFF
+ -Daudacity_has_vst3=off
+
-Daudacity_lib_preference=system
-Daudacity_obey_system_dependencies=ON
-Daudacity_use_expat=system
@@ -184,34 +188,33 @@ src_configure() {
-Daudacity_use_ladspa=$(usex ladspa)
-Daudacity_use_lame=system
-Daudacity_use_wxwidgets=system
+ -Daudacity_use_libflac=$(usex flac system off)
-Daudacity_use_libmp3lame=system
-Daudacity_use_libmpg123=$(usex mpg123 system off)
- -Daudacity_use_wavpack=$(usex wavpack system off)
-Daudacity_use_libogg=$(usex ogg system off)
- -Daudacity_use_libflac=$(usex flac system off)
-Daudacity_use_libopus=$(usex flac system off)
- -Daudacity_use_libvorbis=$(usex vorbis system off)
-Daudacity_use_libsndfile=system
- -Daudacity_use_portaudio=system
- -Daudacity_use_midi=system
- -Daudacity_use_vamp=$(usex vamp system off)
+ -Daudacity_use_libvorbis=$(usex vorbis system off)
-Daudacity_use_lv2=$(usex lv2 system off)
+ -Daudacity_use_midi=system
+ -Daudacity_use_nyquist=local
+ -Daudacity_use_pch=off
+ -Daudacity_use_portaudio=system
+ -Daudacity_use_portmixer=$(usex portmixer system off)
-Daudacity_use_portsmf=system
+ -Daudacity_use_rapidjson=system
-Daudacity_use_sbsms=$(usex sbsms system off)
-Daudacity_use_soundtouch=system
+ -Daudacity_use_soxr=system
-Daudacity_use_twolame=$(usex twolame system off)
-
- # Disable telemetry features.
- -Daudacity_has_sentry_reporting=off
- -Daudacity_has_crashreports=off
+ -Daudacity_use_vamp=$(usex vamp system off)
+ -Daudacity_use_wavpack=$(usex wavpack system off)
# See the allow-overriding-alsa-jack.patch patch
-DPA_HAS_ALSA=$(usex alsa on off)
## Keep watch of PA_HAS_OSS in lib-src/portmixer/CMakeLists.txt;
## AFAICT it introduces no deps as-is, but that could change.
## Similar goes for PA_HAS_JACK.
-
- -Daudacity_has_tests=$(usex test ON OFF)
)
cmake_src_configure
@@ -220,10 +223,3 @@ src_configure() {
src_test() {
virtx cmake_src_test
}
-
-src_install() {
- cmake_src_install
-
- # Remove bad doc install
- rm -r "${ED}"/usr/share/doc || die
-}
diff --git a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
new file mode 100644
index 000000000000..f06799030b4b
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
@@ -0,0 +1,30 @@
+From 23f1df0b13c46cef746674434640588864f8c453 Mon Sep 17 00:00:00 2001
+From: "Azamat H. Hackimov" <azamat.hackimov@gmail.com>
+Date: Sun, 18 Feb 2024 23:16:28 +0300
+Subject: [PATCH] Fix compilation with audiocom
+
+Fix error `OAuthService.h: error: field mAccessToken has incomplete type
+std::string {aka std::_cxx11::basic_string<char>}`
+
+See: https://bugs.gentoo.org/920363
+
+Signed-off-by: Azamat H. Hackimov <azamat.hackimov@gmail.com>
+---
+ libraries/lib-cloud-audiocom/OAuthService.h | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/libraries/lib-cloud-audiocom/OAuthService.h b/libraries/lib-cloud-audiocom/OAuthService.h
+index bd01f1656..18761df6d 100644
+--- a/libraries/lib-cloud-audiocom/OAuthService.h
++++ b/libraries/lib-cloud-audiocom/OAuthService.h
+@@ -12,6 +12,7 @@
+
+ #include <chrono>
+ #include <functional>
++#include <string>
+ #include <string_view>
+ #include <mutex>
+
+--
+2.43.0
+
^ permalink raw reply related [flat|nested] 12+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/
@ 2024-04-02 10:28 Sam James
0 siblings, 0 replies; 12+ messages in thread
From: Sam James @ 2024-04-02 10:28 UTC (permalink / raw
To: gentoo-commits
commit: 02f3b7274ed135a62f48821833e86413d42ad947
Author: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Tue Apr 2 10:19:47 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Apr 2 10:28:03 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=02f3b727
media-sound/audacity: fix build with USE="-lv2" in 3.4.2
Due to a bug in the upstream, Audacity 3.4.2 can't be built with USE="-lv2".
At the same time, there is a fix available in the upstream.
Closes: https://bugs.gentoo.org/928380
Co-authored-by: Chris Mayo <aklhfex <AT> gmail.com>
Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35887
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/audacity/audacity-3.4.2.ebuild | 3 ++
...audacity-3.4.2-fix-build-with-use-lv2-off.patch | 36 ++++++++++++++++++++++
2 files changed, 39 insertions(+)
diff --git a/media-sound/audacity/audacity-3.4.2.ebuild b/media-sound/audacity/audacity-3.4.2.ebuild
index 27f06abecfde..69a039bc866a 100644
--- a/media-sound/audacity/audacity-3.4.2.ebuild
+++ b/media-sound/audacity/audacity-3.4.2.ebuild
@@ -128,6 +128,9 @@ PATCHES=(
# #920363
"${FILESDIR}/audacity-3.4.2-audiocom-std-string.patch"
+
+ # Fix build with USE="-lv2"
+ "${FILESDIR}/audacity-3.4.2-fix-build-with-use-lv2-off.patch"
)
src_prepare() {
diff --git a/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
new file mode 100644
index 000000000000..8c47ff8642d7
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.4.2-fix-build-with-use-lv2-off.patch
@@ -0,0 +1,36 @@
+From e10034c19ed1911b730637fbc722030eb3dfd04b Mon Sep 17 00:00:00 2001
+From: Chris Mayo <aklhfex@gmail.com>
+Date: Wed, 22 Nov 2023 19:29:05 +0000
+Subject: [PATCH] Fix build with -Daudacity_use_lv2=off
+
+libraries/lib-lv2/LV2Utils.h:18:10: fatal error: lilv/lilv.h: No such file or directory
+ 18 | #include "lilv/lilv.h" // for lilv_free
+ | ^~~~~~~~~~~~~
+compilation terminated.
+---
+ libraries/CMakeLists.txt | 5 ++++-
+ 1 file changed, 4 insertions(+), 1 deletion(-)
+
+diff --git a/libraries/CMakeLists.txt b/libraries/CMakeLists.txt
+index b1ebefa1b023..879cd948791d 100644
+--- a/libraries/CMakeLists.txt
++++ b/libraries/CMakeLists.txt
+@@ -50,7 +50,6 @@ set( LIBRARIES
+ lib-vst3
+ lib-snapping
+ lib-vst
+- lib-lv2
+ lib-ladspa
+ lib-audio-unit
+ lib-playable-track
+@@ -63,6 +62,10 @@ set( LIBRARIES
+ lib-viewport
+ )
+
++if ( ${_OPT}use_lv2 )
++ list( APPEND LIBRARIES lib-lv2)
++endif()
++
+ if ( ${_OPT}has_networking )
+ list( APPEND LIBRARIES lib-network-manager)
+ endif()
^ permalink raw reply related [flat|nested] 12+ messages in thread
end of thread, other threads:[~2024-04-02 10:28 UTC | newest]
Thread overview: 12+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-04-02 10:28 [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/files/, media-sound/audacity/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-03-23 8:29 Sam James
2024-01-16 3:36 Sam James
2023-06-30 12:31 David Seifert
2023-04-15 0:47 Sam James
2023-01-20 22:18 Arsen Arsenović
2020-09-02 8:33 Miroslav Šulc
2020-08-06 4:57 Miroslav Šulc
2018-02-21 11:08 Lars Wendler
2018-02-21 11:08 Lars Wendler
2018-02-18 11:13 Lars Wendler
2017-06-05 9:45 Pacho Ramos
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox