* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2016-03-31 12:22 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2016-03-31 12:22 UTC (permalink / raw
To: gentoo-commits
commit: cb7aafd6bb1bc403b096383487b0c996f7a8257b
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Thu Mar 31 12:18:49 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 12:22:38 2016 +0000
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 <polynomial-c <AT> 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..0000000
--- 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 )"
-DEPEND="${COMMON_DEPEND}
- 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
- # * if libsamplerate not requested, use libresample instead.
- econf \
- --enable-unicode \
- --enable-nyquist \
- $(use_enable ladspa) \
- --with-libsndfile=system \
- --with-expat=system \
- $(use_with libsamplerate) \
- $(use_with !libsamplerate libresample) \
- $(use_with vorbis libvorbis) \
- $(use_with mp3 libmad) \
- $(use_with flac libflac) \
- $(use_with id3tag libid3tag) \
- $(use_with sbsms) \
- $(use_with soundtouch) \
- $(use_with vamp libvamp) \
- $(use_with twolame libtwolame) \
- $(use_with ffmpeg) \
- $(use_with midi) \
- $(use_with alsa) \
- $(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Remove bad doc install
- rm -rf "${D}"/usr/share/doc
-
- # Install our docs
- dodoc README.txt
-}
diff --git a/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch b/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch
deleted file mode 100644
index 6754709..0000000
--- a/media-sound/audacity/files/audacity-1.3.13-ffmpeg.patch
+++ /dev/null
@@ -1,164 +0,0 @@
---- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpeg.cpp
-+++ audacity-src-1.3.13-beta/src/export/ExportFFmpeg.cpp
-@@ -352,7 +352,7 @@
- avcodec_get_context_defaults(mEncAudioCodecCtx);
-
- mEncAudioCodecCtx->codec_id = ExportFFmpegOptions::fmts[mSubFormat].codecid;
-- mEncAudioCodecCtx->codec_type = CODEC_TYPE_AUDIO;
-+ mEncAudioCodecCtx->codec_type = AVMEDIA_TYPE_AUDIO;
- mEncAudioCodecCtx->codec_tag = av_codec_get_tag((const AVCodecTag **)mEncFormatCtx->oformat->codec_tag,mEncAudioCodecCtx->codec_id);
- mSampleRate = (int)project->GetRate();
- mEncAudioCodecCtx->global_quality = -99999; //quality mode is off by default;
-@@ -403,7 +403,6 @@
- mEncAudioCodecCtx->flags2 = 0;
- if (gPrefs->Read(wxT("/FileFormats/FFmpegBitReservoir"),true)) mEncAudioCodecCtx->flags2 |= CODEC_FLAG2_BIT_RESERVOIR;
- if (gPrefs->Read(wxT("/FileFormats/FFmpegVariableBlockLen"),true)) mEncAudioCodecCtx->flags2 |= 0x0004; //WMA only?
-- mEncAudioCodecCtx->use_lpc = gPrefs->Read(wxT("/FileFormats/FFmpegUseLPC"),true);
- mEncAudioCodecCtx->compression_level = gPrefs->Read(wxT("/FileFormats/FFmpegCompLevel"),-1);
- mEncAudioCodecCtx->frame_size = gPrefs->Read(wxT("/FileFormats/FFmpegFrameSize"),(long)0);
- mEncAudioCodecCtx->lpc_coeff_precision = gPrefs->Read(wxT("/FileFormats/FFmpegLPCCoefPrec"),(long)0);
-@@ -569,7 +569,7 @@
- pkt.stream_index = mEncAudioStream->index;
- pkt.data = mEncAudioEncodedBuf;
- pkt.size = nEncodedBytes;
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
-
- // Set presentation time of frame (currently in the codec's timebase) in the stream timebase.
- if(mEncAudioCodecCtx->coded_frame && mEncAudioCodecCtx->coded_frame->pts != int64_t(AV_NOPTS_VALUE))
-@@ -656,7 +656,7 @@
-
- pkt.stream_index = mEncAudioStream->index;
- pkt.data = mEncAudioEncodedBuf;
-- pkt.flags |= PKT_FLAG_KEY;
-+ pkt.flags |= AV_PKT_FLAG_KEY;
-
- // Write the encoded audio frame to the output file.
- if ((ret = av_interleaved_write_frame(mEncFormatCtx, &pkt)) != 0)
---- audacity-src-1.3.13-beta.orig/src/export/ExportFFmpegDialogs.cpp
-+++ audacity-src-1.3.13-beta/src/export/ExportFFmpegDialogs.cpp
-@@ -1288,7 +1288,7 @@
- while ((codec = av_codec_next(codec)))
- {
- // We're only interested in audio and only in encoders
-- if (codec->type == CODEC_TYPE_AUDIO && codec->encode)
-+ if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode)
- {
- mCodecNames.Add(wxString::FromUTF8(codec->name));
- mCodecLongNames.Add(wxString::Format(wxT("%s - %s"),mCodecNames.Last().c_str(),wxString::FromUTF8(codec->long_name).c_str()));
-@@ -1528,7 +1528,7 @@
- // Find the codec, that is claimed to be compatible
- AVCodec *codec = avcodec_find_encoder(CompatibilityList[i].codec);
- // If it exists, is audio and has encoder
-- if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode)
-+ if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode)
- {
- // If it was selected - remember it's new index
- if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount();
-@@ -1543,7 +1543,7 @@
- AVCodec *codec = NULL;
- while ((codec = av_codec_next(codec)))
- {
-- if (codec->type == CODEC_TYPE_AUDIO && codec->encode)
-+ if (codec->type == AVMEDIA_TYPE_AUDIO && codec->encode)
- {
- if (mShownCodecNames.Index(wxString::FromUTF8(codec->name)) < 0)
- {
-@@ -1563,7 +1563,7 @@
- if (format != NULL)
- {
- AVCodec *codec = avcodec_find_encoder(format->audio_codec);
-- if (codec != NULL && (codec->type == CODEC_TYPE_AUDIO) && codec->encode)
-+ if (codec != NULL && (codec->type == AVMEDIA_TYPE_AUDIO) && codec->encode)
- {
- if ((id >= 0) && codec->id == id) index = mShownCodecNames.GetCount();
- mShownCodecNames.Add(wxString::FromUTF8(codec->name));
---- audacity-src-1.3.13-beta.orig/src/FFmpeg.cpp
-+++ audacity-src-1.3.13-beta/src/FFmpeg.cpp
-@@ -316,7 +316,7 @@
- pd.buf_size = 0;
- pd.buf = (unsigned char *) av_malloc(PROBE_BUF_MAX + AVPROBE_PADDING_SIZE);
- if (pd.buf == NULL) {
-- err = AVERROR_NOMEM;
-+ err = AVERROR(ENOMEM);
- goto fail;
- }
-
-@@ -381,7 +381,7 @@
-
- // Didn't find a suitable format, so bail
- if (!fmt) {
-- err = AVERROR_NOFMT;
-+ err = AVERROR(EILSEQ);
- goto fail;
- }
-
-@@ -855,7 +855,6 @@
- FFMPEG_INITDYN(codec, avcodec_find_decoder);
- FFMPEG_INITDYN(codec, avcodec_get_context_defaults);
- FFMPEG_INITDYN(codec, avcodec_open);
-- FFMPEG_INITDYN(codec, avcodec_decode_audio2);
- FFMPEG_INITDYN(codec, avcodec_decode_audio3);
- FFMPEG_INITDYN(codec, avcodec_encode_audio);
- FFMPEG_INITDYN(codec, avcodec_close);
---- audacity-src-1.3.13-beta.orig/src/FFmpeg.h
-+++ audacity-src-1.3.13-beta/src/FFmpeg.h
-@@ -559,7 +559,11 @@
- FFMPEG_FUNCTION_WITH_RETURN(
- void*,
- av_fast_realloc,
-+#if LIBAVUTIL_VERSION_MAJOR < 51
- (void *ptr, unsigned int *size, unsigned int min_size),
-+#else
-+ (void *ptr, unsigned int *size, size_t min_size),
-+#endif
- (ptr, size, min_size)
- );
- FFMPEG_FUNCTION_WITH_RETURN(
-@@ -747,7 +751,11 @@
- FFMPEG_FUNCTION_WITH_RETURN(
- void*,
- av_malloc,
-+#if LIBAVUTIL_VERSION_MAJOR < 51
- (unsigned int size),
-+#else
-+ (size_t size),
-+#endif
- (size)
- );
- FFMPEG_FUNCTION_NO_RETURN(
---- audacity-src-1.3.13-beta.orig/src/import/ImportFFmpeg.cpp
-+++ audacity-src-1.3.13-beta/src/import/ImportFFmpeg.cpp
-@@ -416,7 +416,7 @@
- // Fill the stream contexts
- for (unsigned int i = 0; i < mFormatContext->nb_streams; i++)
- {
-- if (mFormatContext->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+ if (mFormatContext->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
- {
- //Create a context
- streamContext *sc = new streamContext;
---- audacity-src-1.3.13-beta.orig/src/ondemand/ODDecodeFFmpegTask.cpp
-+++ audacity-src-1.3.13-beta/src/ondemand/ODDecodeFFmpegTask.cpp
-@@ -156,7 +156,7 @@
- //test the audio stream(s)
- for (unsigned int i = 0; i < ic->nb_streams; i++)
- {
-- if (ic->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
-+ if (ic->streams[i]->codec->codec_type == AVMEDIA_TYPE_AUDIO)
- {
- audioStreamExists = true;
- st = ic->streams[i];
-@@ -573,10 +573,10 @@
- }
- }
-
-- // avcodec_decode_audio2() expects the size of the output buffer as the 3rd parameter but
-+ // avcodec_decode_audio3() expects the size of the output buffer as the 3rd parameter but
- // also returns the number of bytes it decoded in the same parameter.
- sc->m_decodedAudioSamplesValidSiz = sc->m_decodedAudioSamplesSiz;
-- nBytesDecoded = avcodec_decode_audio2(sc->m_codecCtx,
-+ nBytesDecoded = avcodec_decode_audio3(sc->m_codecCtx,
- sc->m_decodedAudioSamples, // out
- &sc->m_decodedAudioSamplesValidSiz, // in/out
- pDecode, nDecodeSiz); // in
diff --git a/media-sound/audacity/files/audacity-1.3.14-typecast.patch b/media-sound/audacity/files/audacity-1.3.14-typecast.patch
deleted file mode 100644
index c010461..0000000
--- a/media-sound/audacity/files/audacity-1.3.14-typecast.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- audacity-src-1.3.14-beta/src/TrackPanel.cpp.orig
-+++ audacity-src-1.3.14-beta/src/TrackPanel.cpp
-@@ -2915,7 +2915,11 @@
- {
- // Make sure we always have the first linked track of a stereo track
- if (!mouseTrack->GetLinked() && mTracks->GetLink(mouseTrack))
-- mouseTrack = mTracks->GetLink(mouseTrack);
-+ mouseTrack =
-+#ifndef USE_MIDI
-+ (WaveTrack*)
-+#endif
-+ mTracks->GetLink(mouseTrack);
-
- // Temporary apply the offset because we want to see if the
- // track fits with the desired offset
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2016-09-17 13:16 David Seifert
0 siblings, 0 replies; 15+ messages in thread
From: David Seifert @ 2016-09-17 13:16 UTC (permalink / raw
To: gentoo-commits
commit: 5c43afe6861275a05aeb4d6b6e45cdbbccfef21b
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 17 13:15:50 2016 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sat Sep 17 13:16:35 2016 +0000
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 00000000..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
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2017-07-15 9:46 Pacho Ramos
0 siblings, 0 replies; 15+ messages in thread
From: Pacho Ramos @ 2017-07-15 9:46 UTC (permalink / raw
To: gentoo-commits
commit: 726527e0e8cd003d1bae981bdf99713939203982
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Jul 15 09:36:19 2017 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Jul 15 09:46:05 2017 +0000
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..00000000000
--- 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) \
- $(use_with soundtouch) \
- $(use_with vamp libvamp) \
- $(use_with twolame libtwolame) \
- $(use_with ffmpeg) \
- $(use_with midi) \
- $(use_with alsa) \
- $(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Remove bad doc install
- rm -rf "${D}"/usr/share/doc
-
- # Install our docs
- dodoc README.txt
-}
diff --git a/media-sound/audacity/audacity-2.0.5.ebuild b/media-sound/audacity/audacity-2.0.5.ebuild
deleted file mode 100644
index 66714bbf6ef..00000000000
--- a/media-sound/audacity/audacity-2.0.5.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2015 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 +libsoxr 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 )
- libsoxr? ( 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? ( >=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 )"
-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
- # * if libsamplerate not requested, use libresample instead.
- econf \
- --enable-unicode \
- --enable-nyquist \
- --disable-dynamic-loading \
- $(use_enable ladspa) \
- --with-libsndfile=system \
- --with-expat=system \
- $(use_with libsamplerate) \
- $(use_with !libsamplerate libresample) \
- $(use_with libsoxr) \
- $(use_with vorbis libvorbis) \
- $(use_with mp3 libmad) \
- $(use_with flac libflac) \
- $(use_with id3tag libid3tag) \
- $(use_with sbsms) \
- $(use_with soundtouch) \
- $(use_with vamp libvamp) \
- $(use_with twolame libtwolame) \
- $(use_with ffmpeg) \
- $(use_with midi) \
- $(use_with alsa) \
- $(use_with jack)
-}
-
-# $(use_with lv2 slv2) \
-# $(use_with ladspa liblrdf) \
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Remove bad doc install
- rm -rf "${D}"/usr/share/doc
-
- # Install our docs
- dodoc README.txt
-}
diff --git a/media-sound/audacity/files/audacity-1.3.13-automagic.patch b/media-sound/audacity/files/audacity-1.3.13-automagic.patch
deleted file mode 100644
index 4e7c2917e5d..00000000000
--- a/media-sound/audacity/files/audacity-1.3.13-automagic.patch
+++ /dev/null
@@ -1,61 +0,0 @@
---- audacity-src-1.3.13-beta.orig/configure.in
-+++ audacity-src-1.3.13-beta/configure.in
-@@ -173,6 +173,9 @@
- lib_preference=$withval,
- lib_preference="system local")
-
-+AC_ARG_WITH([alsa], AS_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
-+AC_ARG_WITH([jack], AS_HELP_STRING([--without-jack], [Build without jack library (default: test)]))
-+
- dnl AC_ARG_WITH(wx-version,
- dnl [AS_HELP_STRING([--with-wx-version],
- dnl [select wxWidgets version (if both installed) [2.8,]])],
-@@ -574,13 +577,21 @@
- ;;
- *)
- dnl Unix
-- AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
-- if [[ $have_alsa = "yes" ]] ; then
-- LIBS="$LIBS -lasound"
-- fi
-- PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-- if [[ $have_jack = "yes" ]] ; then
-- LIBS="$LIBS $JACK_LIBS"
-+ if test "x$with_alsa" != "xno"; then
-+ AC_CHECK_LIB(asound, snd_pcm_open, have_alsa=yes, have_alsa=no)
-+ if [[ $have_alsa = "yes" ]] ; then
-+ LIBS="$LIBS -lasound"
-+ else
-+ AC_MSG_WARN([Support for alsa not available])
-+ fi
-+ fi
-+ if test "x$with_jack" != "xno"; then
-+ PKG_CHECK_MODULES(JACK, jack, have_jack=yes, have_jack=no)
-+ if [[ $have_jack = "yes" ]] ; then
-+ LIBS="$LIBS $JACK_LIBS"
-+ else
-+ AC_MSG_WARN([Support for jack not available])
-+ fi
- fi
- AC_CHECK_LIB(hpi, HPI_SubSysCreate, have_asihpi=yes, have_asihpi=no, -lm)
- if [[ $have_asihpi = "yes" ]] ; then
---- audacity-src-1.3.13-beta.orig/lib-src/portmixer/configure.ac
-+++ audacity-src-1.3.13-beta/lib-src/portmixer/configure.ac
-@@ -31,6 +31,8 @@
- [AC_SUBST( cflags, ["$cflags -g"] ) AC_MSG_RESULT(yes)],
- [AC_SUBST( cflags, ["$cflags -O2"] ) AC_MSG_RESULT(no)])
-
-+AC_ARG_WITH([alsa], AC_HELP_STRING([--without-alsa], [Build without alsa library (default: test)]))
-+
- #
- # Check for portaudio path
- #
-@@ -133,7 +135,7 @@
- have_support=yes
- fi
-
--if [[ $have_alsa = "yes" ]] ; then
-+if [[ $have_alsa = "yes" -a "x$with_alsa" != "xno" ]] ; then
- AC_MSG_NOTICE([Including support for ALSA])
- AC_DEFINE(PX_USE_LINUX_ALSA)
- objects="$objects px_linux_alsa.o"
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index bb0dddb8d5b..b7c2db3a2bd 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -12,16 +12,6 @@
</maintainer>
<use>
<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
- <flag name="libsoxr">
- Uses <pkg>media-libs/soxr</pkg> as audio resampling library: Higher
- quality and much faster than both the included resampler and
- libsamplerate.
- </flag>
- <flag name="libsamplerate">
- Uses <pkg>media-libs/libsamplerate</pkg> as audio resampling library:
- Higher quality than the included resampler but lower quality and much
- slower than libsoxr.
- </flag>
<flag name="lv2">Add support for Ladspa V2</flag>
<flag name="midi">Enables MIDI support</flag>
<flag name="portmixer">Enable the internal portmixer feature</flag>
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2018-08-22 17:10 Andreas Sturmlechner
0 siblings, 0 replies; 15+ messages in thread
From: Andreas Sturmlechner @ 2018-08-22 17:10 UTC (permalink / raw
To: gentoo-commits
commit: da166eab920f04e1e532646e93b244793a65a65d
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Wed Aug 22 17:10:02 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Wed Aug 22 17:10:02 2018 +0000
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..00000000000
--- 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
- --with-libsoxr=system
- --with-portaudio
- --with-widgetextra=local
- --with-wx-version=${WX_GTK_VER}
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable ladspa)
- $(use_enable nls)
- $(use_enable vst)
- #$(use_with alsa)
- $(use_with ffmpeg)
- $(use_with flac libflac)
- $(use_with id3tag libid3tag)
- #$(use_with jack)
- $(use_with lame)
- $(use_with lv2)
- $(use_with mad libmad)
- $(use_with midi)
- $(use_with sbsms)
- $(use_with soundtouch)
- $(use_with twolame libtwolame)
- $(use_with vamp libvamp)
- $(use_with vorbis libvorbis)
- $(use_with portmixer)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Remove bad doc install
- rm -r "${D%/}"/usr/share/doc || die
-
- # Install our docs
- dodoc README.txt
-
- if use doc ; then
- docinto html
- dodoc -r "${WORKDIR}"/{m,man,manual}
- dodoc "${WORKDIR}"/{favicon.ico,index.html,quick_help.html}
- fi
-}
-
-pkg_postinst() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
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
deleted file mode 100644
index 0a227ebbf9f..00000000000
--- a/media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-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] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2019-08-28 7:44 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2019-08-28 7:44 UTC (permalink / raw
To: gentoo-commits
commit: e6b9364ffd66913edfbf0276653a7f881ca4bde6
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Wed Aug 28 07:43:54 2019 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Wed Aug 28 07:44:43 2019 +0000
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 <polynomial-c <AT> 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 00000000000..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-libs/portaudio-20
+ 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/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
+ --with-mod-nyq-bench
+ --with-portaudio
+ --with-widgetextra=local
+ --with-wx-version=${WX_GTK_VER}
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable ladspa)
+ $(use_enable nls)
+ $(use_enable vst)
+ $(use_with ffmpeg)
+ $(use_with flac libflac)
+ $(use_with id3tag libid3tag)
+ $(use_with lame)
+ $(use_with lv2)
+ $(use_with mad libmad)
+ $(use_with midi portmidi local)
+ $(use_with midi "" local)
+ $(use_with portmixer)
+ $(use_with sbsms)
+ $(use_with soundtouch)
+ $(use_with twolame libtwolame)
+ $(use_with vamp libvamp)
+ $(use_with vorbis libvorbis)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Remove bad doc install
+ rm -r "${ED}"/usr/share/doc || die
+
+ # Install our docs
+ einstalldocs
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
+ dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+ dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+ fi
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
new file mode 100644
index 00000000000..d4ec1a7320f
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.2-Fix-building-without-midi.patch
@@ -0,0 +1,71 @@
+diff -urpN a/src/Track.h b/src/Track.h
+--- a/src/Track.h 2019-05-04 13:38:57.000000000 +0300
++++ b/src/Track.h 2019-08-27 19:32:36.937551831 +0300
+@@ -53,10 +53,6 @@ using WaveTrackConstArray = std::vector
+
+ using NoteTrackConstArray = std::vector < std::shared_ptr< const NoteTrack > >;
+
+-#if defined(USE_MIDI)
+-class NoteTrack;
+-#endif
+-
+ class TrackList;
+
+ using ListOfTracks = std::list< std::shared_ptr< Track > >;
+@@ -74,9 +70,7 @@ enum class TrackKind
+ {
+ None,
+ Wave,
+-#if defined(USE_MIDI)
+ Note,
+-#endif
+ Label,
+ Time,
+ Audio,
+diff -urpN a/src/menus/FileMenus.cpp b/src/menus/FileMenus.cpp
+--- a/src/menus/FileMenus.cpp 2019-05-04 13:38:57.000000000 +0300
++++ b/src/menus/FileMenus.cpp 2019-08-27 19:32:36.939551720 +0300
+@@ -141,8 +141,6 @@ AudacityProject *DoImportMIDI(
+ }
+ #endif
+
+-#ifdef USE_MIDI
+-
+ // Menu handler functions
+
+ struct Handler : CommandHandlerObject {
+@@ -480,6 +478,7 @@ void OnImportLabels(const CommandContext
+ }
+ }
+
++#ifdef USE_MIDI
+ void OnImportMIDI(const CommandContext &context)
+ {
+ auto &project = context.project;
+@@ -496,7 +495,7 @@ void OnImportMIDI(const CommandContext &
+ if (!fileName.empty())
+ DoImportMIDI(&project, fileName);
+ }
+-#endif
++#endif // USE_MIDI
+
+ void OnImportRaw(const CommandContext &context)
+ {
+diff -urpN a/src/tracks/ui/TimeShiftHandle.cpp b/src/tracks/ui/TimeShiftHandle.cpp
+--- a/src/tracks/ui/TimeShiftHandle.cpp 2019-05-04 13:38:57.000000000 +0300
++++ b/src/tracks/ui/TimeShiftHandle.cpp 2019-08-27 19:32:36.940551665 +0300
+@@ -393,12 +393,12 @@ UIHandle::Result TimeShiftHandle::Click
+ ok = false;
+ else
+ captureClips = true;
+- },
+ #ifdef USE_MIDI
++ },
+ [&](NoteTrack *) {
+ captureClips = true;
+- }
+ #endif
++ }
+ );
+
+ if ( ! ok )
diff --git a/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
new file mode 100644
index 00000000000..fa785fdd6c5
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.2-fix_building_against_system_portaudio.patch
@@ -0,0 +1,56 @@
+From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite <ao2@ao2.it>
+Date: Tue, 7 Nov 2017 13:06:33 +0100
+Subject: [PATCH] Fix building against the system portaudio library
+
+Building against the system portaudio results in this error:
+
+./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
+audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
+unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
+./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
+collect2: error: ld returned 1 exit status
+Makefile:2349: recipe for target 'audacity' failed
+make[3]: *** [audacity] Error 1
+
+This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
+but is resolved as a C++ symbol at link time.
+
+Audacity fixes this in the local tree with this change:
+https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
+
+However this is not general enough for the portaudio debian package.
+
+Since PaUtil_GetTime() is the only function causing problems, just copy
+over the code where it's used.
+---
+ src/AudioIO.cpp | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+--- a/src/AudioIO.cpp
++++ b/src/AudioIO.cpp
+@@ -465,8 +465,23 @@ TimeTrack and AudioIOListener and whethe
+ #define ROUND(x) (int) ((x)+0.5)
+ //#include <string.h>
+ #include "../lib-src/portmidi/pm_common/portmidi.h"
+- #include "../lib-src/portaudio-v19/src/common/pa_util.h"
+ #include "NoteTrack.h"
++
++PaTime PaUtil_GetTime( void )
++{
++#ifdef HAVE_MACH_ABSOLUTE_TIME
++ return mach_absolute_time() * machSecondsConversionScaler_;
++#elif defined(HAVE_CLOCK_GETTIME)
++ struct timespec tp;
++ clock_gettime(CLOCK_REALTIME, &tp);
++ return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
++#else
++ struct timeval tv;
++ gettimeofday( &tv, NULL );
++ return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
++#endif
++}
++
+ #endif
+
+ #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2020-02-08 10:26 Miroslav Šulc
0 siblings, 0 replies; 15+ messages in thread
From: Miroslav Šulc @ 2020-02-08 10:26 UTC (permalink / raw
To: gentoo-commits
commit: c011df2ba115c9b79d4e8e4e8e5a214631bfc369
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Fri Jan 31 18:21:54 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Feb 8 10:26:15 2020 +0000
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 <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14517
Signed-off-by: Miroslav Šulc <fordfrog <AT> 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 00000000000..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-libs/portaudio-20
+ media-libs/soxr
+ x11-libs/wxGTK:${WX_GTK_VER}[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/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:' \
+ src/Experimental.h || die
+}
+
+src_configure() {
+ 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
+ --with-mod-nyq-bench
+ --with-portaudio
+ --with-widgetextra=local
+ --with-wx-version=${WX_GTK_VER}
+ $(use_enable cpu_flags_x86_sse sse)
+ $(use_enable ladspa)
+ $(use_enable nls)
+ $(use_enable vst)
+ $(use_with ffmpeg)
+ $(use_with flac libflac)
+ $(use_with id3tag libid3tag)
+ $(use_with lame)
+ $(use_with lv2)
+ $(use_with mad libmad)
+ $(use_with midi portmidi local)
+ $(use_with midi "" local)
+ $(use_with portmixer)
+ $(use_with sbsms)
+ $(use_with soundtouch)
+ $(use_with twolame libtwolame)
+ $(use_with vamp libvamp)
+ $(use_with vorbis libvorbis)
+ )
+ econf "${myeconfargs[@]}"
+}
+
+src_install() {
+ emake DESTDIR="${D}" install
+
+ # Remove bad doc install
+ rm -r "${ED}"/usr/share/doc || die
+
+ # Install our docs
+ einstalldocs
+
+ if use doc ; then
+ docinto html
+ dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
+ dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
+ dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
+ fi
+}
+
+pkg_preinst() {
+ xdg_pkg_preinst
+}
+
+pkg_postinst() {
+ xdg_pkg_postinst
+}
+
+pkg_postrm() {
+ xdg_pkg_postrm
+}
diff --git a/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch b/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch
new file mode 100644
index 00000000000..b44517fca80
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.3.3-Fix-building-against-system-portaudio.patch
@@ -0,0 +1,56 @@
+From 5f9482a191359f2c477763a36d2c865c5f186602 Mon Sep 17 00:00:00 2001
+From: Antonio Ospite <ao2@ao2.it>
+Date: Tue, 7 Nov 2017 13:06:33 +0100
+Subject: [PATCH] Fix building against the system portaudio library
+
+Building against the system portaudio results in this error:
+
+./src/AudioIO.cpp:983: undefined reference to `PaUtil_GetTime'
+audacity-AudioIO.o: In function `audacityAudioCallback(void const*, void*,
+unsigned long, PaStreamCallbackTimeInfo const*, unsigned long, void*)':
+./src/AudioIO.cpp:4630: undefined reference to `PaUtil_GetTime'
+collect2: error: ld returned 1 exit status
+Makefile:2349: recipe for target 'audacity' failed
+make[3]: *** [audacity] Error 1
+
+This is because PaUtil_GetTime is declared as a C symbol in pa_util.h
+but is resolved as a C++ symbol at link time.
+
+Audacity fixes this in the local tree with this change:
+https://github.com/audacity/audacity/commit/38fd97b8e26060332ab3e9e000a8882326a70ba7
+
+However this is not general enough for the portaudio debian package.
+
+Since PaUtil_GetTime() is the only function causing problems, just copy
+over the code where it's used.
+---
+ src/AudioIO.cpp | 17 ++++++++++++++++-
+ 1 file changed, 16 insertions(+), 1 deletion(-)
+
+--- a/src/AudioIO.cpp
++++ b/src/AudioIO.cpp
+@@ -480,8 +480,23 @@
+ #define ROUND(x) (int) ((x)+0.5)
+ //#include <string.h>
+ // #include "../lib-src/portmidi/pm_common/portmidi.h"
+- #include "../lib-src/portaudio-v19/src/common/pa_util.h"
+ #include "NoteTrack.h"
++
++PaTime PaUtil_GetTime( void )
++{
++#ifdef HAVE_MACH_ABSOLUTE_TIME
++ return mach_absolute_time() * machSecondsConversionScaler_;
++#elif defined(HAVE_CLOCK_GETTIME)
++ struct timespec tp;
++ clock_gettime(CLOCK_REALTIME, &tp);
++ return (PaTime)(tp.tv_sec + tp.tv_nsec * 1e-9);
++#else
++ struct timeval tv;
++ gettimeofday( &tv, NULL );
++ return (PaTime) tv.tv_usec * 1e-6 + tv.tv_sec;
++#endif
++}
++
+ #endif
+
+ #ifdef EXPERIMENTAL_AUTOMATED_INPUT_LEVEL_ADJUSTMENT
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2020-04-30 23:55 Lars Wendler
0 siblings, 0 replies; 15+ messages in thread
From: Lars Wendler @ 2020-04-30 23:55 UTC (permalink / raw
To: gentoo-commits
commit: 570aee4e7db0a9182bdca1e5cced4af0b5579e9c
Author: Alexander Tsoy <alexander <AT> tsoy <DOT> me>
AuthorDate: Sat Mar 14 07:33:45 2020 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Thu Apr 30 23:55:18 2020 +0000
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 <alexander <AT> tsoy.me>
Closes: https://github.com/gentoo/gentoo/pull/14949
Signed-off-by: Lars Wendler <polynomial-c <AT> 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 00000000000..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 <github@homerow.net>
+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 <sgtty.h>
+ #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
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2020-08-02 10:54 Miroslav Šulc
0 siblings, 0 replies; 15+ messages in thread
From: Miroslav Šulc @ 2020-08-02 10:54 UTC (permalink / raw
To: gentoo-commits
commit: 5a8d2f6d2fd27971422031f4a8311b5317288540
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sun Aug 2 10:54:24 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sun Aug 2 10:54:41 2020 +0000
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 <fordfrog <AT> 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 00000000000..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? ( media-libs/flac[cxx] )
+ id3tag? ( media-libs/libid3tag )
+ jack? ( virtual/jack )
+ lv2? (
+ dev-libs/serd
+ dev-libs/sord
+ media-libs/lilv
+ 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}"
+BDEPEND="app-arch/unzip
+ virtual/pkgconfig
+ nls? ( sys-devel/gettext )
+"
+
+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"
+)
+
+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)
+ -Daudacity_use_ladspa=$(usex ladspa)
+ -Daudacity_use_lame=system
+ -Daudacity_use_lv2=$(usex lv2 system off)
+ -Daudacity_use_mad=$(usex mad system off)
+ -Daudacity_use_midi=$(usex portmidi system off)
+ -Daudacity_use_nyquist=local
+ -Daudacity_use_ogg=$(usex ogg system off)
+ -Daudacity_use_pa_alsa=$(usex alsa)
+ -Daudacity_use_pa_jack=$(usex jack linked off)
+ -Daudacity_use_pa_oss=$(usex oss)
+ -Daudacity_use_pch=ON
+ -Daudacity_use_portaudio=local # only 'local' option is present
+ -Daudacity_use_portmixer=$(usex portmixer local off)
+ -Daudacity_use_portsmf=$(usex portsmf local off)
+ -Daudacity_use_sbsms=$(usex sbsms local off) # no 'system' option in configuration?
+ -Daudacity_use_sndfile=system
+ -Daudacity_use_soundtouch=system
+ -Daudacity_use_soxr=system
+ -Daudacity_use_twolame=$(usex twolame system off)
+ -Daudacity_use_vamp=$(usex vamp system off)
+ -Daudacity_use_vorbis=$(usex vorbis system off)
+ -Daudacity_use_vst=$(usex vst)
+ -Daudacity_use_wxwidgets=system
+ )
+
+ 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,manual}
+ 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-2.4.2-fix-gettimeofday.patch b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch
new file mode 100644
index 00000000000..0e6e3e5d8cb
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-gettimeofday.patch
@@ -0,0 +1,12 @@
+diff --git a/src/AudioIO.cpp b/src/AudioIO.cpp
+index 0187e39..28a5348 100644
+--- a/src/AudioIO.cpp
++++ b/src/AudioIO.cpp
+@@ -427,6 +427,7 @@ time warp info and AudioIOListener and whether the playback is looped.
+ #include <math.h>
+ #include <stdlib.h>
+ #include <algorithm>
++#include <sys/time.h>
+
+ #ifdef __WXMSW__
+ #include <malloc.h>
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch
new file mode 100644
index 00000000000..09b9fd0e868
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-metainfo.patch
@@ -0,0 +1,12 @@
+diff --git a/help/CMakeLists.txt b/help/CMakeLists.txt
+index 43a7714..0e8a3d8 100755
+--- a/help/CMakeLists.txt
++++ b/help/CMakeLists.txt
+@@ -40,6 +40,6 @@ if( NOT "${CMAKE_GENERATOR}" MATCHES "Xcode|Visual Studio*" )
+ install( FILES "${_SRCDIR}/audacity.1"
+ DESTINATION "${_MANDIR}/man1" )
+ install( FILES "${_SRCDIR}/audacity.appdata.xml"
+- DESTINATION "${_DATADIR}/appdata" )
++ DESTINATION "${_DATADIR}/metainfo" )
+ endif()
+
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch b/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch
new file mode 100644
index 00000000000..71160b4365e
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-vertical-track-resizing.patch
@@ -0,0 +1,14 @@
+--- a/src/menus/ViewMenus.cpp 2020-05-27 17:49:20.645538517 +0500
++++ b/src/menus/ViewMenus.cpp 2020-05-27 17:49:26.844538493 +0500
+@@ -4,10 +4,10 @@
+ #include "../CommonCommandFlags.h"
+ #include "../Menus.h"
+ #include "../Prefs.h"
++#include "../ProjectWindow.h"
+ #include "../Project.h"
+ #include "../ProjectHistory.h"
+ #include "../ProjectSettings.h"
+-#include "../ProjectWindow.h"
+ #include "../Track.h"
+ #include "../TrackInfo.h"
+ #include "../TrackPanel.h"
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index b7c2db3a2bd..7f3a6ec835a 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -14,7 +14,9 @@
<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
<flag name="lv2">Add support for Ladspa V2</flag>
<flag name="midi">Enables MIDI support</flag>
+ <flag name="portmidi">Enable support for MIDI via media-libs/portmidi</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="soundtouch">Enables soundtouch library support for pitch and
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2020-09-19 11:53 Miroslav Šulc
0 siblings, 0 replies; 15+ messages in thread
From: Miroslav Šulc @ 2020-09-19 11:53 UTC (permalink / raw
To: gentoo-commits
commit: 5cc9d2c25be36ffe088cb39216f042bd1116eedd
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Sat Sep 19 11:52:45 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Sep 19 11:52:59 2020 +0000
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 <fordfrog <AT> 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..00000000000
--- 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-libs/portaudio-19.06.00-r2
- media-libs/soxr
- x11-libs/wxGTK:3.0[X]
- alsa? ( media-libs/alsa-lib )
- ffmpeg? ( >=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}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-REQUIRED_USE="soundtouch? ( midi )"
-
-S="${WORKDIR}/${MY_P}-rc1"
-
-PATCHES=(
- "${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() {
- default
- # needed because of portmixer patch
- eautoreconf
-}
-
-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
- --with-libsoxr=system
- --with-portaudio
- --with-widgetextra=local
- --with-wx-version=${WX_GTK_VER}
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable ladspa)
- $(use_enable nls)
- $(use_enable vst)
- #$(use_with alsa)
- $(use_with ffmpeg)
- $(use_with flac libflac)
- $(use_with id3tag libid3tag)
- #$(use_with jack)
- $(use_with lame)
- $(use_with lv2)
- $(use_with mad libmad)
- $(use_with midi)
- $(use_with sbsms)
- $(use_with soundtouch)
- $(use_with twolame libtwolame)
- $(use_with vamp libvamp)
- $(use_with vorbis libvorbis)
- $(use_with portmixer)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Remove bad doc install
- rm -r "${D%/}"/usr/share/doc || die
-
- # Install our docs
- einstalldocs
-
- if use doc ; then
- docinto html
- dodoc -r "${WORKDIR}"/help/manual/{m,man,manual}
- dodoc "${WORKDIR}"/help/manual/{favicon.ico,index.html,quick_help.html}
- dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
- fi
-}
-
-pkg_postinst() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
- gnome2_icon_cache_update
- xdg_desktop_database_update
- xdg_mimeinfo_database_update
-}
diff --git a/media-sound/audacity/audacity-2.3.3.ebuild b/media-sound/audacity/audacity-2.3.3.ebuild
deleted file mode 100644
index 0418e4cc865..00000000000
--- a/media-sound/audacity/audacity-2.3.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# 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 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
- +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-libs/portaudio-20
- media-libs/soxr
- x11-libs/wxGTK:${WX_GTK_VER}[X]
- alsa? ( media-libs/alsa-lib )
- ffmpeg? ( >=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
- "${FILESDIR}"/${PN}-2.3.3-fno-common.patch
-)
-
-src_prepare() {
- default
-
- use midi || sed -i \
- -e 's:^\(#define EXPERIMENTAL_MIDI_OUT\):// \1:' \
- src/Experimental.h || die
-}
-
-src_configure() {
- 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
- --with-mod-nyq-bench
- --with-portaudio
- --with-widgetextra=local
- --with-wx-version=${WX_GTK_VER}
- $(use_enable cpu_flags_x86_sse sse)
- $(use_enable ladspa)
- $(use_enable nls)
- $(use_enable vst)
- $(use_with ffmpeg)
- $(use_with flac libflac)
- $(use_with id3tag libid3tag)
- $(use_with lame)
- $(use_with lv2)
- $(use_with mad libmad)
- $(use_with midi portmidi local)
- $(use_with midi "" local)
- $(use_with portmixer)
- $(use_with sbsms)
- $(use_with soundtouch)
- $(use_with twolame libtwolame)
- $(use_with vamp libvamp)
- $(use_with vorbis libvorbis)
- )
- econf "${myeconfargs[@]}"
-}
-
-src_install() {
- emake DESTDIR="${D}" install
-
- # Remove bad doc install
- rm -r "${ED}"/usr/share/doc || die
-
- # Install our docs
- einstalldocs
-
- if use doc ; then
- docinto html
- dodoc -r "${WORKDIR}"/manual/{m,man,manual}
- dodoc "${WORKDIR}"/manual/{favicon.ico,index.html,quick_help.html}
- dosym ../../doc/${PF}/html /usr/share/${PN}/help/manual
- fi
-}
-
-pkg_preinst() {
- xdg_pkg_preinst
-}
-
-pkg_postinst() {
- xdg_pkg_postinst
-}
-
-pkg_postrm() {
- xdg_pkg_postrm
-}
diff --git a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch b/media-sound/audacity/files/audacity-2.2.1-portmixer.patch
deleted file mode 100644
index 0df43f5c07a..00000000000
--- a/media-sound/audacity/files/audacity-2.2.1-portmixer.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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
deleted file mode 100644
index 56343e3ede2..00000000000
--- a/media-sound/audacity/files/audacity-2.2.2-automake.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-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
diff --git a/media-sound/audacity/files/audacity-2.2.2-midi.patch b/media-sound/audacity/files/audacity-2.2.2-midi.patch
deleted file mode 100644
index 10a0f1f6eb0..00000000000
--- a/media-sound/audacity/files/audacity-2.2.2-midi.patch
+++ /dev/null
@@ -1,168 +0,0 @@
-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;
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
deleted file mode 100644
index 5b922638aa5..00000000000
--- a/media-sound/audacity/files/audacity-2.3.3-fno-common.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From bcb460e5a9af2088d8081577b324ec20d0069ed8 Mon Sep 17 00:00:00 2001
-From: Leland Lucius <github@homerow.net>
-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 <sgtty.h>
- #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
-
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index 7f3a6ec835a..2457f6d4ce8 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -13,14 +13,11 @@
<use>
<flag name="id3tag">Enables ID3 tagging with id3tag library</flag>
<flag name="lv2">Add support for Ladspa V2</flag>
- <flag name="midi">Enables MIDI support</flag>
<flag name="portmidi">Enable support for MIDI via media-libs/portmidi</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="soundtouch">Enables soundtouch library support for 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] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2023-05-06 6:19 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2023-05-06 6:19 UTC (permalink / raw
To: gentoo-commits
commit: ef498907c07351ce8726b90e8bdf6c74080cedf2
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Sat May 6 06:18:15 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat May 6 06:19:07 2023 +0000
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 <sam <AT> 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 000000000000..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
+ "${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-deux.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.5-gcc13-deux.patch b/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch
new file mode 100644
index 000000000000..c9fdad5fbafd
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch
@@ -0,0 +1,57 @@
+https://github.com/audacity/audacity/issues/4489
+https://github.com/audacity/audacity/commit/a49d145ef5e3046273c879be0a21d48ecd4dcab7
+https://bugs.gentoo.org/899764
+
+--- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
++++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
+@@ -46,7 +46,8 @@ typedef uint64_t uintmax_t;
+ */
+ #endif
+
+-#include <stddef.h>
++#include <cstddef>
++#include <cstdint>
+ #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;
+--- a/src/effects/LoadEffects.cpp
++++ b/src/effects/LoadEffects.cpp
+@@ -154,9 +154,9 @@ void BuiltinEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
+ if (rediscoverAll ||
+ !pm.IsPluginRegistered(path, &pair.second->name.Msgid())
+ ){
+- DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident)
++ DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID&
+ {
+- const auto pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident);
++ const auto& pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident);
+ if(pair.second->excluded)
+ PluginManager::Get().EnablePlugin(pluginId, false);
+ return pluginId;
+--- a/libraries/lib-module-manager/PluginHost.cpp
++++ b/libraries/lib-module-manager/PluginHost.cpp
+@@ -37,11 +37,11 @@ namespace
+ TranslatableString errorMessage{};
+ auto validator = provider->MakeValidator();
+ auto numPlugins = provider->DiscoverPluginsAtPath(
+- pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident)
++ pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID&
+ {
+ //Workaround: use DefaultRegistrationCallback to create all descriptors for us
+ //and then put a copy into result
+- auto id = PluginManager::DefaultRegistrationCallback(provider, ident);
++ auto& id = PluginManager::DefaultRegistrationCallback(provider, ident);
+ if(const auto ptr = PluginManager::Get().GetPlugin(id))
+ {
+ auto desc = *ptr;
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2023-09-25 0:24 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2023-09-25 0:24 UTC (permalink / raw
To: gentoo-commits
commit: 46b0fc511e098676b8069a6012f1a81b57d5ff5c
Author: Sam James <sam <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 25 00:23:19 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 00:24:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46b0fc51
media-sound/audacity: style tweaks, add upstream refs
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/audacity/audacity-3.3.3.ebuild | 2 +-
media-sound/audacity/audacity-9999.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-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
index 55d1545cfcb8..82ce039fc3a4 100644
--- a/media-sound/audacity/audacity-9999.ebuild
+++ b/media-sound/audacity/audacity-9999.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 <mehw.is.me@inventati.org>
Date: Fri, 14 Jul 2023 21:17:45 +0000
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 <dmitry@crsib.me>
Date: Mon, 7 Aug 2023 17:12:49 +0300
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2023-09-25 0:24 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2023-09-25 0:24 UTC (permalink / raw
To: gentoo-commits
commit: f528815c332f51e266338f65336e9d85d134105b
Author: Matthew White <mehw.is.me <AT> inventati <DOT> org>
AuthorDate: Tue Aug 1 17:05:54 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Mon Sep 25 00:24:31 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f528815c
media-sound/audacity-3.3.3: version bump and new 9999 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 <mehw.is.me <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/32129
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-sound/audacity/Manifest | 1 +
media-sound/audacity/audacity-3.3.3.ebuild | 228 +++++++++++++++++++++
media-sound/audacity/audacity-9999.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 b8e48cab1c89cadb343a17fcb1d811a7363231152867f842ffff6dd8329103c9a407beb3f0b587e35e711070230c5c86d5aa97578b5a7c08bdbb029570677a24 SHA512 850ce4dc27e2c6d0b63bf0c0186deb417febc49b561e572a697f0e7ae2a7b2b3f39816b7beeacf9cbfb9525de85923e2ce6d06486fcf1855e34e2ecd1b7e3582
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 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 000000000000..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} = 9999* ]]; 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
+# 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.3.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.3.3-local-threadpool-libraries.patch"
+ "${FILESDIR}/${PN}-3.3.3-upstream-fix-rapidjson.patch"
+
+ # Add Findlibmad.cmake
+ "${FILESDIR}/${PN}-3.3.3-Findlibmad.patch"
+
+ # Fix includes
+ "${FILESDIR}/${PN}-3.3.3-fix-includes.patch"
+
+ # gettext 0.22
+ "${FILESDIR}/${PN}-3.3.3-gettext-0.22.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)
+
+ # 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
+}
diff --git a/media-sound/audacity/audacity-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
new file mode 100644
index 000000000000..55d1545cfcb8
--- /dev/null
+++ b/media-sound/audacity/audacity-9999.ebuild
@@ -0,0 +1,212 @@
+# 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} = 9999* ]]; 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 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
+ )
+ 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
+"
+
+PATCHES=(
+ # Equivalent to previous versions
+ "${FILESDIR}/${PN}-3.2.3-disable-ccache.patch"
+ # From Debian
+ "${FILESDIR}/${PN}-3.3.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.3.3-local-threadpool-libraries.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)
+
+ # 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_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
+}
diff --git a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
new file mode 100644
index 000000000000..9bf4176a39e0
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
@@ -0,0 +1,52 @@
+From b42dfbe2be1994ccfeff449b5c5cbe49994ffb38 Mon Sep 17 00:00:00 2001
+From: Matthew White <mehw.is.me@inventati.org>
+Date: Fri, 14 Jul 2023 21:17:45 +0000
+Subject: [PATCH] Add missing Findlibmad.cmake file
+
+This fixes compiling against the system installed libmad.
+---
+ cmake-proxies/cmake-modules/Findlibmad.cmake | 35 ++++++++++++++++++++
+ 1 file changed, 35 insertions(+)
+ create mode 100644 cmake-proxies/cmake-modules/Findlibmad.cmake
+
+diff --git a/cmake-proxies/cmake-modules/Findlibmad.cmake b/cmake-proxies/cmake-modules/Findlibmad.cmake
+new file mode 100644
+index 000000000000..0858c2d93e24
+--- /dev/null
++++ b/cmake-proxies/cmake-modules/Findlibmad.cmake
+@@ -0,0 +1,35 @@
++#[[
++A module to look for libmad
++]]
++
++if( NOT libmad_FOUND )
++ find_path( libmad_INCLUDE_DIR mad.h )
++ find_library( libmad_LIBRARIES NAMES mad )
++
++ if( libmad_INCLUDE_DIR AND libmad_LIBRARIES )
++ set( libmad_FOUND Yes )
++ endif()
++
++ if( libmad_FOUND )
++ if( NOT libmad_FIND_QUIETLY )
++ message( STATUS "Found mad: \n\tlibmad_INCLUDE_DIR: ${libmad_INCLUDE_DIR}\n\tlibmad_LIBRARIES: ${libmad_LIBRARIES}" )
++ endif()
++
++ if( NOT TARGET libmad::libmad )
++ add_library( libmad::libmad INTERFACE IMPORTED GLOBAL)
++
++ target_include_directories( libmad::libmad INTERFACE ${libmad_INCLUDE_DIR} )
++ target_link_libraries( libmad::libmad INTERFACE ${libmad_LIBRARIES} )
++ endif()
++ else()
++ if( libmad_FIND_REQUIRED )
++ message( FATAL_ERROR "Could not find libmad")
++ endif()
++ endif()
++
++ mark_as_advanced(
++ libmad_FOUND
++ libmad_INCLUDE_DIR
++ libmad_LIBRARIES
++ )
++endif()
diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
new file mode 100644
index 000000000000..2e8685a09a3f
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
@@ -0,0 +1,55 @@
+From 78ef36996c348b1c47f75e9885a56ac46b0aeec1 Mon Sep 17 00:00:00 2001
+From: Matthew White <mehw.is.me@inventati.org>
+Date: Fri, 14 Jul 2023 21:08:52 +0000
+Subject: [PATCH] Fix ImportMP3_MAD and ImportQT include directives
+
+This fixes 'file not found' errors.
+---
+ src/import/ImportMP3_MAD.cpp | 6 +++---
+ src/import/ImportQT.cpp | 8 ++++----
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/src/import/ImportMP3_MAD.cpp b/src/import/ImportMP3_MAD.cpp
+index fa26eaca49dd..9e6dfdf3a534 100644
+--- a/src/import/ImportMP3_MAD.cpp
++++ b/src/import/ImportMP3_MAD.cpp
+@@ -62,10 +62,10 @@ static Importer::RegisteredUnusableImportPlugin registered
+ #include <wx/file.h>
+
+ #include "Prefs.h"
+-#include "../Tags.h"
++#include "Tags.h"
+ #include "WaveTrack.h"
+-#include "../widgets/AudacityMessageBox.h"
+-#include "../widgets/ProgressDialog.h"
++#include "AudacityMessageBox.h"
++#include "ProgressDialog.h"
+
+ // PRL: include these last,
+ // and correct some preprocessor namespace pollution from wxWidgets that
+diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp
+index f931b5a63fc1..5b49c1630b7f 100644
+--- a/src/import/ImportQT.cpp
++++ b/src/import/ImportQT.cpp
+@@ -17,8 +17,8 @@
+
+ #include "Import.h"
+ #include "ImportPlugin.h"
+-#include "../widgets/AudacityMessageBox.h"
+-#include "../widgets/ProgressDialog.h"
++#include "AudacityMessageBox.h"
++#include "ProgressDialog.h"
+
+ #define DESC XO("QuickTime files")
+
+@@ -76,8 +76,8 @@ static Importer::RegisteredUnusableImportPlugin registered{
+ // There's a name collision between our Track and QuickTime's...workaround it
+ #undef Track
+
+-#include "../Tags.h"
+-#include "../WaveTrack.h"
++#include "Tags.h"
++#include "WaveTrack.h"
+
+ #define kQTAudioPropertyID_MaxAudioSampleSize 'mssz'
+
diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
new file mode 100644
index 000000000000..b3fcdb85b022
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
@@ -0,0 +1,95 @@
+This is an adapted version of:
+
+From: Benjamin Drung <benjamin.drung@canonical.com>
+Date: Thu, 22 Sep 2022 19:52:43 +0200
+Subject: Fix rpath for private libraries on Linux
+
+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
+
+diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
+--- a/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200
++++ b/CMakeLists.txt 2023-07-14 01:18:46.452163033 +0200
+@@ -412,6 +412,7 @@
+ 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 "${_PKGLIB}/modules" )
+diff -Nuar a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
+--- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake 2023-06-08 15:17:02.000000000 +0200
++++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake 2023-07-14 01:23:42.025628702 +0200
+@@ -338,6 +338,17 @@
+ 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()
++
+ define_property(TARGET PROPERTY AUDACITY_GRAPH_DEPENDENCIES
+ BRIEF_DOCS
+ "Propagates information used in generating a target dependency diagram"
+@@ -420,6 +431,13 @@
+ list( APPEND GRAPH_EDGES "\"${TARGET}\" -> \"${IMPORT}\" ${attributes}" )
+ 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()
++
+ endfunction()
+
+ function ( make_interface_alias TARGET REAL_LIBTYTPE )
+@@ -487,6 +505,7 @@
+ PROPERTIES
+ PREFIX ""
+ FOLDER "modules" # for IDE organization
++ INSTALL_RPATH "$ORIGIN/.."
+ )
+
+ if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
+@@ -501,6 +520,7 @@
+ PROPERTIES
+ PREFIX ""
+ FOLDER "libraries" # for IDE organization
++ INSTALL_RPATH "$ORIGIN"
+ )
+
+ if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
+diff -Nuar a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt
+--- a/modules/mod-script-pipe/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200
++++ b/modules/mod-script-pipe/CMakeLists.txt 2023-07-14 01:25:10.730068564 +0200
+@@ -15,3 +15,4 @@
+ )
+ audacity_module( mod-script-pipe "${SOURCES}" "Audacity"
+ "${DEFINES}" "" )
++install_audacity_module( mod-script-pipe )
+diff -Nuar a/src/CMakeLists.txt b/src/CMakeLists.txt
+--- a/src/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200
++++ b/src/CMakeLists.txt 2023-07-14 01:26:23.098427419 +0200
+@@ -1557,11 +1557,6 @@
+ RUNTIME
+ RESOURCE DESTINATION "${_PKGDATA}" )
+
+- install( DIRECTORY "${_DEST}/${_LIBDIR}/"
+- DESTINATION "${_LIBDIR}"
+- USE_SOURCE_PERMISSIONS
+- FILES_MATCHING PATTERN "*.so*" )
+-
+ install( FILES "${_INTDIR}/audacity.desktop"
+ DESTINATION "${_DATADIR}/applications" )
+ install( FILES "${topdir}/LICENSE.txt" "${topdir}/README.md"
diff --git a/media-sound/audacity/files/audacity-3.3.3-gettext-0.22.patch b/media-sound/audacity/files/audacity-3.3.3-gettext-0.22.patch
new file mode 100644
index 000000000000..9dad40d3e9e1
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-gettext-0.22.patch
@@ -0,0 +1,27 @@
+This is an adapted version of:
+
+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)"
diff --git a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
new file mode 100644
index 000000000000..a3ef6cf3859d
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
@@ -0,0 +1,30 @@
+This is an adapted version of:
+
+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
+
+diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/cmake-modules/DependenciesList.cmake
+--- a/cmake-proxies/cmake-modules/DependenciesList.cmake 2023-07-14 03:40:22.518292749 +0200
++++ b/cmake-proxies/cmake-modules/DependenciesList.cmake 2023-07-14 03:40:43.790398232 +0200
+@@ -56,7 +56,6 @@
+ audacity_find_package(PortAudio REQUIRED)
+
+ if( ${_OPT}has_networking )
+- audacity_find_package(ThreadPool REQUIRED)
+ audacity_find_package(CURL REQUIRED CONAN_PACKAGE_NAME libcurl)
+ endif()
+
+diff -Nuar a/libraries/lib-network-manager/CMakeLists.txt b/libraries/lib-network-manager/CMakeLists.txt
+--- a/libraries/lib-network-manager/CMakeLists.txt 2023-07-14 03:38:42.061794613 +0200
++++ b/libraries/lib-network-manager/CMakeLists.txt 2023-07-14 03:38:27.913724456 +0200
+@@ -43,4 +43,8 @@
+
+ set ( DEFINES INTERFACE "HAS_NETWORKING" )
+
++add_library ( threadpool::threadpool INTERFACE IMPORTED GLOBAL )
++target_include_directories ( threadpool::threadpool INTERFACE
++ ${CMAKE_SOURCE_DIR}/lib-src/threadpool
++)
+ audacity_library( ${TARGET} "${SOURCES}" "${LIBRARIES}" "${DEFINES}" "" )
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
new file mode 100644
index 000000000000..cb9da30bf423
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.3.3-upstream-fix-rapidjson.patch
@@ -0,0 +1,60 @@
+From 6edaa3f26b34adc65c109c1a5a85923e04330e2d Mon Sep 17 00:00:00 2001
+From: Dmitry Vedenko <dmitry@crsib.me>
+Date: Mon, 7 Aug 2023 17:12:49 +0300
+Subject: [PATCH] Fixes RapidJSON missing from Linux builds
+
+---
+ .../cmake-modules/dependencies/rapidjson.cmake | 15 +++++++++++++--
+ linux/packages/arch/dependencies.sh | 1 +
+ linux/packages/fedora34/dependencies.sh | 1 +
+ 3 files changed, 15 insertions(+), 2 deletions(-)
+
+diff --git a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+index c44aad81b8e4..ba95962a6eb6 100644
+--- a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
++++ b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+@@ -1,7 +1,18 @@
+ # CCI pakage appears to set the wrong value for the `cmake_target_name`
+
+-if(${_OPT}use_rapidjson STREQUAL "local")
++if(NOT ${_OPT}use_rapidjson STREQUAL "off")
+ if(NOT TARGET rapidjson::rapidjson)
+- add_library( rapidjson::rapidjson ALIAS rapidjson )
++ if(TARGET rapidjson)
++ add_library( rapidjson::rapidjson ALIAS rapidjson )
++ else()
++ # At least on Arch RapidJSONConfig.cmake does not define a target at all
++ # so we have to do it ourselves
++ add_library( rapidjson::rapidjson INTERFACE IMPORTED GLOBAL)
++ if (RAPIDJSON_INCLUDE_DIRS )
++ target_include_directories( rapidjson::rapidjson INTERFACE ${RAPIDJSON_INCLUDE_DIRS} )
++ elseif(RapidJSON_INCLUDE_DIR)
++ target_include_directories( rapidjson::rapidjson INTERFACE ${RapidJSON_INCLUDE_DIR} )
++ endif()
++ endif()
+ endif()
+ endif()
+diff --git a/linux/packages/arch/dependencies.sh b/linux/packages/arch/dependencies.sh
+index d34012442efd..8aa8792057d4 100755
+--- a/linux/packages/arch/dependencies.sh
++++ b/linux/packages/arch/dependencies.sh
+@@ -44,6 +44,7 @@ deps=(
+ wavpack
+ wxwidgets-gtk3
+ vst3sdk
++ rapidjson
+ )
+
+ pacman -Syu --noconfirm \
+diff --git a/linux/packages/fedora34/dependencies.sh b/linux/packages/fedora34/dependencies.sh
+index 8f6ce8ff2eb8..1e039612b095 100755
+--- a/linux/packages/fedora34/dependencies.sh
++++ b/linux/packages/fedora34/dependencies.sh
+@@ -54,6 +54,7 @@ deps=(
+ mesa-libEGL-devel
+ mpg123-devel
+ wavpack-devel
++ rapidjson
+ )
+
+ dnf install -y \
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2024-03-23 8:29 Sam James
0 siblings, 0 replies; 15+ messages in thread
From: Sam James @ 2024-03-23 8:29 UTC (permalink / raw
To: gentoo-commits
commit: c0000ef88867dbdc89ea1aeb12fc8169e9cb7a84
Author: Azamat H. Hackimov <azamat.hackimov <AT> gmail <DOT> com>
AuthorDate: Sun Feb 18 20:34:31 2024 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Sat Mar 23 08:29:08 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0000ef8
media-sound/audacity: drop 3.2.5-r1
Signed-off-by: Azamat H. Hackimov <azamat.hackimov <AT> gmail.com>
Closes: https://github.com/gentoo/gentoo/pull/35414
Signed-off-by: Sam James <sam <AT> 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 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-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..000000000000
--- 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
-# 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
- "${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-deux.patch"
-
- # gettext 0.22
- "${FILESDIR}/${PN}-3.2.5-gettext-0.22.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=OFF
- -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.5-gcc13-deux.patch b/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch
deleted file mode 100644
index c9fdad5fbafd..000000000000
--- a/media-sound/audacity/files/audacity-3.2.5-gcc13-deux.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-https://github.com/audacity/audacity/issues/4489
-https://github.com/audacity/audacity/commit/a49d145ef5e3046273c879be0a21d48ecd4dcab7
-https://bugs.gentoo.org/899764
-
---- a/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-+++ b/lib-src/libnyquist/nyquist/nyqstk/include/Stk.h
-@@ -46,7 +46,8 @@ typedef uint64_t uintmax_t;
- */
- #endif
-
--#include <stddef.h>
-+#include <cstddef>
-+#include <cstdint>
- #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;
---- a/src/effects/LoadEffects.cpp
-+++ b/src/effects/LoadEffects.cpp
-@@ -154,9 +154,9 @@ void BuiltinEffectsModule::AutoRegisterPlugins(PluginManagerInterface & pm)
- if (rediscoverAll ||
- !pm.IsPluginRegistered(path, &pair.second->name.Msgid())
- ){
-- DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident)
-+ DiscoverPluginsAtPath(path, ignoredErrMsg, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID&
- {
-- const auto pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident);
-+ const auto& pluginId = PluginManagerInterface::DefaultRegistrationCallback(provider, ident);
- if(pair.second->excluded)
- PluginManager::Get().EnablePlugin(pluginId, false);
- return pluginId;
---- a/libraries/lib-module-manager/PluginHost.cpp
-+++ b/libraries/lib-module-manager/PluginHost.cpp
-@@ -37,11 +37,11 @@ namespace
- TranslatableString errorMessage{};
- auto validator = provider->MakeValidator();
- auto numPlugins = provider->DiscoverPluginsAtPath(
-- pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident)
-+ pluginPath, errorMessage, [&](PluginProvider *provider, ComponentInterface *ident) -> const PluginID&
- {
- //Workaround: use DefaultRegistrationCallback to create all descriptors for us
- //and then put a copy into result
-- auto id = PluginManager::DefaultRegistrationCallback(provider, ident);
-+ auto& id = PluginManager::DefaultRegistrationCallback(provider, ident);
- if(const auto ptr = PluginManager::Get().GetPlugin(id))
- {
- auto desc = *ptr;
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
deleted file mode 100644
index f84508a2c903..000000000000
--- a/media-sound/audacity/files/audacity-3.2.5-gettext-0.22.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-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] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2024-04-16 22:57 Yixun Lan
0 siblings, 0 replies; 15+ messages in thread
From: Yixun Lan @ 2024-04-16 22:57 UTC (permalink / raw
To: gentoo-commits
commit: 72e8c24fcd0beb997a88f7d185a02a212abafe37
Author: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail <DOT> com>
AuthorDate: Tue Apr 16 19:03:31 2024 +0000
Commit: Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Tue Apr 16 22:53:49 2024 +0000
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 <limits>` 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 <mehw.is.me <AT> inventati.org>
Signed-off-by: Aliaksei Urbanski <aliaksei.urbanski <AT> gmail.com>
Signed-off-by: Yixun Lan <dlan <AT> 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-9999.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 000000000000..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-video/ffmpeg-5:= )
+ flac? ( media-libs/flac:=[cxx] )
+ id3tag? ( media-libs/libid3tag:= )
+ jack? ( virtual/jack )
+ 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 )
+ 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)
+ -Daudacity_use_ladspa=$(usex ladspa)
+ -Daudacity_use_lame=system
+ -Daudacity_use_lv2=$(usex lv2 system off)
+ -Daudacity_use_mad=$(usex mad system off)
+ -Daudacity_use_midi=$(usex portmidi system off)
+ -Daudacity_use_nyquist=local
+ -Daudacity_use_ogg=$(usex ogg system off)
+ -Daudacity_use_pa_alsa=$(usex alsa)
+ -Daudacity_use_pa_jack=$(usex jack linked off)
+ -Daudacity_use_pa_oss=$(usex oss)
+ -Daudacity_use_pch=OFF
+ -Daudacity_use_portaudio=local # only 'local' option is present
+ -Daudacity_use_portmixer=$(usex portmixer local off)
+ -Daudacity_use_portsmf=$(usex portsmf local off)
+ -Daudacity_use_sbsms=$(usex sbsms local off) # no 'system' option in configuration?
+ -Daudacity_use_sndfile=system
+ -Daudacity_use_soundtouch=system
+ -Daudacity_use_soxr=system
+ -Daudacity_use_twolame=$(usex twolame system off)
+ -Daudacity_use_vamp=$(usex vamp system off)
+ -Daudacity_use_vorbis=$(usex vorbis system off)
+ -Daudacity_use_vst=$(usex vst)
+ -Daudacity_use_wxwidgets=system
+ )
+
+ cmake_src_configure
+
+ # if git is not installed, this (empty) file is not being created and the compilation fails
+ # so we create it manually
+ touch "${BUILD_DIR}/src/private/RevisionIdent.h" || die "failed to create file"
+}
+
+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,manual}
+ 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/audacity-3.3.3.ebuild b/media-sound/audacity/audacity-3.3.3-r1.ebuild
similarity index 94%
rename from media-sound/audacity/audacity-3.3.3.ebuild
rename to media-sound/audacity/audacity-3.3.3-r1.ebuild
index 2cba5da71a87..82c770a5849d 100644
--- a/media-sound/audacity/audacity-3.3.3.ebuild
+++ b/media-sound/audacity/audacity-3.3.3-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} = 9999* ]]; then
inherit git-r3
EGIT_REPO_URI="https://github.com/audacity/audacity.git"
else
- KEYWORDS="amd64 ~arm64 ppc64 ~riscv ~x86"
+ 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"
@@ -36,8 +36,13 @@ LICENSE="GPL-2+
audiocom? ( ZLIB )
"
SLOT="0"
-IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 ogg
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mad mpg123 +ogg
opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+REQUIRED_USE="
+ mad? ( !mpg123 )
+ opus? ( ogg )
+ vorbis? ( ogg )
+"
RESTRICT="!test? ( test )"
# dev-db/sqlite:3 hard dependency.
@@ -77,10 +82,7 @@ RDEPEND="dev-db/sqlite:3
x11-libs/wxGTK:${WX_GTK_VER}[X]
sys-apps/util-linux
alsa? ( media-libs/alsa-lib )
- audiocom? (
- dev-libs/rapidjson
- net-misc/curl
- )
+ audiocom? ( net-misc/curl )
ffmpeg? ( media-video/ffmpeg )
flac? ( media-libs/flac:=[cxx] )
id3tag? ( media-libs/libid3tag:= )
@@ -93,7 +95,7 @@ RDEPEND="dev-db/sqlite:3
media-libs/suil
)
mad? ( media-libs/libmad )
- mpg123? ( media-sound/mpg123 )
+ mpg123? ( media-sound/mpg123-base )
ogg? ( media-libs/libogg )
opus? ( media-libs/opus )
sbsms? ( media-libs/libsbsms )
@@ -103,15 +105,13 @@ RDEPEND="dev-db/sqlite:3
wavpack? ( media-sound/wavpack )
"
DEPEND="${RDEPEND}
+ audiocom? ( dev-libs/rapidjson )
+ x11-base/xorg-proto
test? ( <dev-cpp/catch-3:0 )"
BDEPEND="app-arch/unzip
+ || ( dev-lang/nasm dev-lang/yasm )
sys-devel/gettext
- virtual/pkgconfig
-"
-
-REQUIRED_USE="
- mad? ( !mpg123 )
-"
+ virtual/pkgconfig"
PATCHES=(
# Equivalent to previous versions
@@ -137,6 +137,9 @@ PATCHES=(
# Allows running tests without conan
"${FILESDIR}/${PN}-3.3.3-remove-conan-test-dependency.patch"
+
+ # #920363
+ "${FILESDIR}/${PN}-3.4.2-audiocom-std-string.patch"
)
src_prepare() {
@@ -203,9 +206,9 @@ src_configure() {
-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_libopus=$(usex opus system off)
-Daudacity_use_libsndfile=system
+ -Daudacity_use_libvorbis=$(usex vorbis system off)
-Daudacity_use_portaudio=system
-Daudacity_use_midi=system
-Daudacity_use_vamp=$(usex vamp system off)
diff --git a/media-sound/audacity/audacity-3.4.2.ebuild b/media-sound/audacity/audacity-3.4.2-r1.ebuild
similarity index 94%
rename from media-sound/audacity/audacity-3.4.2.ebuild
rename to media-sound/audacity/audacity-3.4.2-r1.ebuild
index 69a039bc866a..f88c0660d2e3 100644
--- a/media-sound/audacity/audacity-3.4.2.ebuild
+++ b/media-sound/audacity/audacity-3.4.2-r1.ebuild
@@ -36,8 +36,12 @@ LICENSE="GPL-2+
audiocom? ( ZLIB )
"
SLOT="0"
-IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg
opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+REQUIRED_USE="
+ opus? ( ogg )
+ vorbis? ( ogg )
+"
RESTRICT="!test? ( test )"
# dev-db/sqlite:3 hard dependency.
@@ -65,7 +69,6 @@ RESTRICT="!test? ( test )"
RDEPEND="dev-db/sqlite:3
dev-libs/expat
dev-libs/glib:2
- dev-libs/rapidjson:=
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsndfile
@@ -95,9 +98,12 @@ RDEPEND="dev-db/sqlite:3
media-libs/sratom
media-libs/suil
)
- mpg123? ( media-sound/mpg123 )
+ mpg123? ( media-sound/mpg123-base )
ogg? ( media-libs/libogg )
- opus? ( media-libs/opus )
+ opus? (
+ media-libs/opus
+ media-libs/opusfile
+ )
sbsms? ( media-libs/libsbsms )
twolame? ( media-sound/twolame )
vamp? ( media-libs/vamp-plugin-sdk )
@@ -105,11 +111,12 @@ RDEPEND="dev-db/sqlite:3
wavpack? ( media-sound/wavpack )
"
DEPEND="${RDEPEND}
+ dev-libs/rapidjson
+ x11-base/xorg-proto
test? ( <dev-cpp/catch-3:0 )"
-BDEPEND="
+BDEPEND="|| ( dev-lang/nasm dev-lang/yasm )
sys-devel/gettext
- virtual/pkgconfig
-"
+ virtual/pkgconfig"
PATCHES=(
# Equivalent to previous versions
@@ -188,12 +195,13 @@ src_configure() {
-Daudacity_use_libmp3lame=system
-Daudacity_use_libmpg123=$(usex mpg123 system off)
-Daudacity_use_libogg=$(usex ogg system off)
- -Daudacity_use_libopus=$(usex flac system off)
+ -Daudacity_use_libopus=$(usex opus system off)
-Daudacity_use_libsndfile=system
-Daudacity_use_libvorbis=$(usex vorbis system off)
-Daudacity_use_lv2=$(usex lv2 system off)
-Daudacity_use_midi=system
-Daudacity_use_nyquist=local
+ -Daudacity_use_opusfile=$(usex opus system off)
-Daudacity_use_pch=off
-Daudacity_use_portaudio=system
-Daudacity_use_portmixer=$(usex portmixer system off)
diff --git a/media-sound/audacity/audacity-9999.ebuild b/media-sound/audacity/audacity-9999.ebuild
index 9246a3ee4e7c..470b89e1cfce 100644
--- a/media-sound/audacity/audacity-9999.ebuild
+++ b/media-sound/audacity/audacity-9999.ebuild
@@ -36,8 +36,12 @@ LICENSE="GPL-2+
audiocom? ( ZLIB )
"
SLOT="0"
-IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 ogg
+IUSE="alsa audiocom ffmpeg +flac id3tag +ladspa +lv2 mpg123 +ogg
opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+REQUIRED_USE="
+ opus? ( ogg )
+ vorbis? ( ogg )
+"
RESTRICT="!test? ( test )"
# dev-db/sqlite:3 hard dependency.
@@ -65,7 +69,6 @@ RESTRICT="!test? ( test )"
RDEPEND="dev-db/sqlite:3
dev-libs/expat
dev-libs/glib:2
- dev-libs/rapidjson:=
media-libs/libjpeg-turbo:=
media-libs/libpng:=
media-libs/libsndfile
@@ -95,9 +98,12 @@ RDEPEND="dev-db/sqlite:3
media-libs/sratom
media-libs/suil
)
- mpg123? ( media-sound/mpg123 )
+ mpg123? ( media-sound/mpg123-base )
ogg? ( media-libs/libogg )
- opus? ( media-libs/opus )
+ opus? (
+ media-libs/opus
+ media-libs/opusfile
+ )
sbsms? ( media-libs/libsbsms )
twolame? ( media-sound/twolame )
vamp? ( media-libs/vamp-plugin-sdk )
@@ -105,11 +111,12 @@ RDEPEND="dev-db/sqlite:3
wavpack? ( media-sound/wavpack )
"
DEPEND="${RDEPEND}
+ dev-libs/rapidjson
+ x11-base/xorg-proto
test? ( <dev-cpp/catch-3:0 )"
-BDEPEND="
+BDEPEND="|| ( dev-lang/nasm dev-lang/yasm )
sys-devel/gettext
- virtual/pkgconfig
-"
+ virtual/pkgconfig"
PATCHES=(
# Equivalent to previous versions
@@ -192,12 +199,13 @@ src_configure() {
-Daudacity_use_libmp3lame=system
-Daudacity_use_libmpg123=$(usex mpg123 system off)
-Daudacity_use_libogg=$(usex ogg system off)
- -Daudacity_use_libopus=$(usex flac system off)
+ -Daudacity_use_libopus=$(usex opus system off)
-Daudacity_use_libsndfile=system
-Daudacity_use_libvorbis=$(usex vorbis system off)
-Daudacity_use_lv2=$(usex lv2 system off)
-Daudacity_use_midi=system
-Daudacity_use_nyquist=local
+ -Daudacity_use_opusfile=$(usex opus system off)
-Daudacity_use_pch=off
-Daudacity_use_portaudio=system
-Daudacity_use_portmixer=$(usex portmixer system off)
diff --git a/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch
new file mode 100644
index 000000000000..09fb42ad2026
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-add-missing-include-limits.patch
@@ -0,0 +1,10 @@
+--- a/include/audacity/Types.h
++++ b/include/audacity/Types.h
+@@ -44,6 +44,7 @@
+
+ #include <algorithm>
+ #include <functional>
++#include <limits>
+ #include <type_traits>
+ #include <vector>
+ #include <wx/debug.h> // for wxASSERT
diff --git a/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch b/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch
new file mode 100644
index 000000000000..0500f7621e45
--- /dev/null
+++ b/media-sound/audacity/files/audacity-2.4.2-fix-libflac-undefined-references.patch
@@ -0,0 +1,61 @@
+From be29286502be6c41b76e652b02862fe987c1f49b Mon Sep 17 00:00:00 2001
+From: Matthew White <mehw.is.me@inventati.org>
+Date: Sun, 14 Apr 2024 04:03:34 +0000
+Subject: [PATCH] libflac: fix undefined references when libflac is disabled
+
+In the upstream master branch:
+ - future commit 2fbfd3e0a5ab803e2072cbac1b2be685c3adcf05 disabled
+ ondemand (aka OD) in CMakeLists.txt.
+ - future commit cbf1bb558e094e24cbb54c3bbd2bd45a1abbfb2a expunged
+ ondemand fully.
+
+Closes: https://bugs.gentoo.org/741969
+Closes: https://bugs.gentoo.org/884747
+---
+ src/CMakeLists.txt | 6 ++++--
+ src/ProjectFileManager.cpp | 4 +++-
+ 2 files changed, 7 insertions(+), 3 deletions(-)
+
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 93dc50c82..b2c4496ab 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -702,8 +702,10 @@ list( APPEND SOURCES
+ ondemand/ODComputeSummaryTask.h
+ ondemand/ODDecodeFFmpegTask.cpp
+ ondemand/ODDecodeFFmpegTask.h
+- ondemand/ODDecodeFlacTask.cpp
+- ondemand/ODDecodeFlacTask.h
++ $<$<BOOL:${USE_LIBFLAC}>:
++ ondemand/ODDecodeFlacTask.cpp
++ ondemand/ODDecodeFlacTask.h
++ >
+ ondemand/ODDecodeTask.cpp
+ ondemand/ODDecodeTask.h
+ ondemand/ODManager.cpp
+diff --git a/src/ProjectFileManager.cpp b/src/ProjectFileManager.cpp
+index de5eeee98..106c52c31 100644
+--- a/src/ProjectFileManager.cpp
++++ b/src/ProjectFileManager.cpp
+@@ -51,7 +51,9 @@ Paul Licameli split from AudacityProject.cpp
+ #include "import/ImportMIDI.h"
+ #include "commands/CommandContext.h"
+ #include "ondemand/ODComputeSummaryTask.h"
++#ifdef USE_LIBFLAC
+ #include "ondemand/ODDecodeFlacTask.h"
++#endif
+ #include "ondemand/ODManager.h"
+ #include "ondemand/ODTask.h"
+ #include "toolbars/SelectionBar.h"
+@@ -276,7 +278,7 @@ void ProjectFileManager::EnqueueODTasks()
+ while((odFlags|createdODTasks) != createdODTasks)
+ {
+ std::unique_ptr<ODTask> newTask;
+-#ifdef EXPERIMENTAL_OD_FLAC
++#if defined(EXPERIMENTAL_OD_FLAC) && defined(USE_LIBFLAC)
+ if(!(createdODTasks&ODTask::eODFLAC) && (odFlags & ODTask::eODFLAC)) {
+ newTask = std::make_unique<ODDecodeFlacTask>();
+ createdODTasks = createdODTasks | ODTask::eODFLAC;
+--
+2.44.0
+
diff --git a/media-sound/audacity/metadata.xml b/media-sound/audacity/metadata.xml
index 63566f7f9050..e17276dd00ed 100644
--- a/media-sound/audacity/metadata.xml
+++ b/media-sound/audacity/metadata.xml
@@ -21,8 +21,8 @@
<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="mpg123">Use <pkg>media-sound/mpg123-base</pkg> instead of
+ <pkg>media-libs/libmad</pkg> for 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>
^ permalink raw reply related [flat|nested] 15+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/
@ 2024-10-31 19:05 Miroslav Šulc
0 siblings, 0 replies; 15+ messages in thread
From: Miroslav Šulc @ 2024-10-31 19:05 UTC (permalink / raw
To: gentoo-commits
commit: 7a64113fee10ee2a0131aae6f2eb241f0f754b64
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Thu Oct 31 19:05:11 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Thu Oct 31 19:05:21 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a64113f
media-sound/audacity: bump to 3.7.0 + scrubbed patches
Closes: https://bugs.gentoo.org/937282
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/audacity/Manifest | 1 +
media-sound/audacity/audacity-3.7.0.ebuild | 227 +++++++++++++++++++++
...audacity-3.2.3-allow-overriding-alsa-jack.patch | 9 -
.../files/audacity-3.2.3-disable-ccache.patch | 8 -
.../audacity/files/audacity-3.3.3-Findlibmad.patch | 8 -
.../files/audacity-3.3.3-fix-includes.patch | 9 -
.../audacity/files/audacity-3.3.3-fix-rpaths.patch | 20 +-
...audacity-3.3.3-local-threadpool-libraries.patch | 10 +-
...dacity-3.3.3-remove-conan-test-dependency.patch | 6 -
.../audacity-3.3.3-upstream-fix-rapidjson.patch | 12 --
.../files/audacity-3.4.2-audiocom-std-string.patch | 6 -
...audacity-3.4.2-fix-build-with-use-lv2-off.patch | 6 -
...udacity-3.7.0-allow-overriding-alsa-jack.patch} | 17 +-
...ch => audacity-3.7.0-audiocom-std-string.patch} | 12 +-
...e.patch => audacity-3.7.0-disable-ccache.patch} | 13 +-
...udacity-3.7.0-local-threadpool-libraries.patch} | 18 +-
.../audacity/files/audacity-3.7.0-portsmf.patch | 11 +
17 files changed, 268 insertions(+), 125 deletions(-)
diff --git a/media-sound/audacity/Manifest b/media-sound/audacity/Manifest
index 291b854872b1..0abf0ef1fa63 100644
--- a/media-sound/audacity/Manifest
+++ b/media-sound/audacity/Manifest
@@ -1,3 +1,4 @@
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 audacity-sources-3.7.0.tar.gz 61801488 BLAKE2B 97ff912d60c07a4e7509ad60814b944f3a0feb6b892328aee9375d64673eb2460bc54ef0dc2385173d92f8121ce330d0529a48940b0e08a434cbf05a8912f05c SHA512 0306cae5c42eb3b86781e37866fe1f95c0564c5a14525c69bbe9cfd614ee31d5296fa845bfd4be5f7a4c3e9ac67224e75dd114a16df9b5c6d1a1c79ce1d874bb
DIST progschj-ThreadPool-20140926.h 2612 BLAKE2B 54d050ad443512e60e5c99449dd7133f3884c1067288cfc36b96c06855537b83d9b599cd8b8fb7f24e20cbc4898585b11d98d3a33dc7571a886b57c806ad3b14 SHA512 f927489de9afe0217bb0552c45bea238693f9f183a062cb12a48e19576dc50a4d0ba449a12397012ae790cc5ebd741decc08128b66f795310dba4778122e9f3d
diff --git a/media-sound/audacity/audacity-3.7.0.ebuild b/media-sound/audacity/audacity-3.7.0.ebuild
new file mode 100644
index 000000000000..3b9ac4e8b0de
--- /dev/null
+++ b/media-sound/audacity/audacity-3.7.0.ebuild
@@ -0,0 +1,227 @@
+# 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 virtualx
+
+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} = 9999* ]]; then
+ inherit git-r3
+ EGIT_REPO_URI="https://github.com/audacity/audacity.git"
+else
+ KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+ MY_P="Audacity-${PV}"
+ 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} )"
+
+# 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 mpg123 +ogg
+ opus +portmixer sbsms test twolame vamp +vorbis wavpack"
+REQUIRED_USE="
+ opus? ( ogg )
+ vorbis? ( ogg )
+"
+RESTRICT="!test? ( 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/libjpeg-turbo:=
+ media-libs/libpng:=
+ media-libs/libsndfile
+ media-libs/libsoundtouch:=
+ media-libs/portaudio[alsa?]
+ media-libs/portmidi
+ 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]
+ alsa? ( media-libs/alsa-lib )
+ audiocom? (
+ 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
+ )
+ mpg123? ( media-sound/mpg123-base )
+ ogg? ( media-libs/libogg )
+ opus? (
+ media-libs/opus
+ media-libs/opusfile
+ )
+ sbsms? ( media-libs/libsbsms )
+ twolame? ( media-sound/twolame )
+ vamp? ( media-libs/vamp-plugin-sdk )
+ vorbis? ( media-libs/libvorbis )
+ wavpack? ( media-sound/wavpack )
+"
+DEPEND="${RDEPEND}
+ dev-libs/rapidjson
+ x11-base/xorg-proto
+ test? ( <dev-cpp/catch-3:0 )"
+BDEPEND="|| ( dev-lang/nasm dev-lang/yasm )
+ sys-devel/gettext
+ virtual/pkgconfig"
+
+PATCHES=(
+ # fixes include path
+ "${FILESDIR}/audacity-3.7.0-portsmf.patch"
+
+ # disables ccache
+ "${FILESDIR}/audacity-3.7.0-disable-ccache.patch"
+
+ # Disables some header-based detection
+ "${FILESDIR}/audacity-3.7.0-allow-overriding-alsa-jack.patch"
+
+ # For has_networking
+ "${FILESDIR}/audacity-3.7.0-local-threadpool-libraries.patch"
+
+ # Allows running tests without conan
+ "${FILESDIR}/audacity-3.3.3-remove-conan-test-dependency.patch"
+
+ # #920363
+ "${FILESDIR}/audacity-3.7.0-audiocom-std-string.patch"
+)
+
+src_prepare() {
+ cmake_src_prepare
+
+ # 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
+
+ # Remove documentation incorrect installations
+ sed -i -e \
+ '/install( FILES "${topdir}\/LICENSE.txt" "${topdir}\/README.md"/,+1d' \
+ src/CMakeLists.txt || die
+}
+
+src_configure() {
+ setup-wxwidgets
+
+ # * always use system libraries if possible
+ # * 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_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_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_libflac=$(usex flac system off)
+ -Daudacity_use_libmp3lame=system
+ -Daudacity_use_libmpg123=$(usex mpg123 system off)
+ -Daudacity_use_libogg=$(usex ogg system off)
+ -Daudacity_use_libopus=$(usex opus system off)
+ -Daudacity_use_libsndfile=system
+ -Daudacity_use_libvorbis=$(usex vorbis system off)
+ -Daudacity_use_lv2=$(usex lv2 system off)
+ -Daudacity_use_midi=system
+ -Daudacity_use_nyquist=local
+ -Daudacity_use_opusfile=$(usex opus system off)
+ -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)
+ -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.
+ )
+
+ cmake_src_configure
+}
+
+src_test() {
+ virtx cmake_src_test
+}
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
index 53ac8edc33fb..00852c3889a9 100644
--- 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
@@ -4,13 +4,6 @@ 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)
@@ -23,8 +16,6 @@ index 42e765691..c18a939e6 100644
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)
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
index a40847bb941c..c18e9e521d62 100644
--- a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
+++ b/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
@@ -3,14 +3,6 @@ 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
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 7237614782b3..908d7efeb316 100644
--- a/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-Findlibmad.patch
@@ -7,14 +7,6 @@ Date: Fri, 14 Jul 2023 21:17:45 +0000
Subject: [PATCH] Add missing Findlibmad.cmake file
This fixes compiling against the system installed libmad.
----
- cmake-proxies/cmake-modules/Findlibmad.cmake | 35 ++++++++++++++++++++
- 1 file changed, 35 insertions(+)
- create mode 100644 cmake-proxies/cmake-modules/Findlibmad.cmake
-
-diff --git a/cmake-proxies/cmake-modules/Findlibmad.cmake b/cmake-proxies/cmake-modules/Findlibmad.cmake
-new file mode 100644
-index 000000000000..0858c2d93e24
--- /dev/null
+++ b/cmake-proxies/cmake-modules/Findlibmad.cmake
@@ -0,0 +1,35 @@
diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
index 2e8685a09a3f..4e9d2d0788d3 100644
--- a/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-fix-includes.patch
@@ -4,13 +4,6 @@ Date: Fri, 14 Jul 2023 21:08:52 +0000
Subject: [PATCH] Fix ImportMP3_MAD and ImportQT include directives
This fixes 'file not found' errors.
----
- src/import/ImportMP3_MAD.cpp | 6 +++---
- src/import/ImportQT.cpp | 8 ++++----
- 2 files changed, 7 insertions(+), 7 deletions(-)
-
-diff --git a/src/import/ImportMP3_MAD.cpp b/src/import/ImportMP3_MAD.cpp
-index fa26eaca49dd..9e6dfdf3a534 100644
--- a/src/import/ImportMP3_MAD.cpp
+++ b/src/import/ImportMP3_MAD.cpp
@@ -62,10 +62,10 @@ static Importer::RegisteredUnusableImportPlugin registered
@@ -27,8 +20,6 @@ index fa26eaca49dd..9e6dfdf3a534 100644
// PRL: include these last,
// and correct some preprocessor namespace pollution from wxWidgets that
-diff --git a/src/import/ImportQT.cpp b/src/import/ImportQT.cpp
-index f931b5a63fc1..5b49c1630b7f 100644
--- a/src/import/ImportQT.cpp
+++ b/src/import/ImportQT.cpp
@@ -17,8 +17,8 @@
diff --git a/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
index b3fcdb85b022..5588f2e2b968 100644
--- a/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-fix-rpaths.patch
@@ -8,9 +8,8 @@ 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
-diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
---- a/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200
-+++ b/CMakeLists.txt 2023-07-14 01:18:46.452163033 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -412,6 +412,7 @@
set( _LIBDIR "${CMAKE_INSTALL_LIBDIR}" )
set( _DATADIR "${CMAKE_INSTALL_DATADIR}" )
@@ -19,9 +18,8 @@ diff -Nuar a/CMakeLists.txt b/CMakeLists.txt
set( _PKGDATA "${_DATADIR}/audacity/" )
set( _MANDIR "${CMAKE_INSTALL_MANDIR}" )
set( _MODDIR "${_PKGLIB}/modules" )
-diff -Nuar a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
---- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake 2023-06-08 15:17:02.000000000 +0200
-+++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake 2023-07-14 01:23:42.025628702 +0200
+--- a/cmake-proxies/cmake-modules/AudacityFunctions.cmake
++++ b/cmake-proxies/cmake-modules/AudacityFunctions.cmake
@@ -338,6 +338,17 @@
set( "${var}" "${node}" PARENT_SCOPE )
endfunction()
@@ -70,17 +68,15 @@ diff -Nuar a/cmake-proxies/cmake-modules/AudacityFunctions.cmake b/cmake-proxies
)
if( NOT CMAKE_SYSTEM_NAME MATCHES "Windows|Darwin" )
-diff -Nuar a/modules/mod-script-pipe/CMakeLists.txt b/modules/mod-script-pipe/CMakeLists.txt
---- a/modules/mod-script-pipe/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200
-+++ b/modules/mod-script-pipe/CMakeLists.txt 2023-07-14 01:25:10.730068564 +0200
+--- a/modules/mod-script-pipe/CMakeLists.txt
++++ b/modules/mod-script-pipe/CMakeLists.txt
@@ -15,3 +15,4 @@
)
audacity_module( mod-script-pipe "${SOURCES}" "Audacity"
"${DEFINES}" "" )
+install_audacity_module( mod-script-pipe )
-diff -Nuar a/src/CMakeLists.txt b/src/CMakeLists.txt
---- a/src/CMakeLists.txt 2023-06-08 15:17:02.000000000 +0200
-+++ b/src/CMakeLists.txt 2023-07-14 01:26:23.098427419 +0200
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
@@ -1557,11 +1557,6 @@
RUNTIME
RESOURCE DESTINATION "${_PKGDATA}" )
diff --git a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
index a3ef6cf3859d..8ca232d5896a 100644
--- a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
+++ b/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
@@ -5,9 +5,8 @@ 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
-diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/cmake-modules/DependenciesList.cmake
---- a/cmake-proxies/cmake-modules/DependenciesList.cmake 2023-07-14 03:40:22.518292749 +0200
-+++ b/cmake-proxies/cmake-modules/DependenciesList.cmake 2023-07-14 03:40:43.790398232 +0200
+--- a/cmake-proxies/cmake-modules/DependenciesList.cmake
++++ b/cmake-proxies/cmake-modules/DependenciesList.cmake
@@ -56,7 +56,6 @@
audacity_find_package(PortAudio REQUIRED)
@@ -16,9 +15,8 @@ diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/
audacity_find_package(CURL REQUIRED CONAN_PACKAGE_NAME libcurl)
endif()
-diff -Nuar a/libraries/lib-network-manager/CMakeLists.txt b/libraries/lib-network-manager/CMakeLists.txt
---- a/libraries/lib-network-manager/CMakeLists.txt 2023-07-14 03:38:42.061794613 +0200
-+++ b/libraries/lib-network-manager/CMakeLists.txt 2023-07-14 03:38:27.913724456 +0200
+--- a/libraries/lib-network-manager/CMakeLists.txt
++++ b/libraries/lib-network-manager/CMakeLists.txt
@@ -43,4 +43,8 @@
set ( DEFINES INTERFACE "HAS_NETWORKING" )
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
index 63dd3b58f0f0..2898cd1a53cf 100644
--- 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
@@ -9,12 +9,6 @@ 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
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 c95676a18cfe..e3c110e72d07 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
@@ -6,14 +6,6 @@ From: Dmitry Vedenko <dmitry@crsib.me>
Date: Mon, 7 Aug 2023 17:12:49 +0300
Subject: [PATCH] Fixes RapidJSON missing from Linux builds
----
- .../cmake-modules/dependencies/rapidjson.cmake | 15 +++++++++++++--
- linux/packages/arch/dependencies.sh | 1 +
- linux/packages/fedora34/dependencies.sh | 1 +
- 3 files changed, 15 insertions(+), 2 deletions(-)
-
-diff --git a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
-index c44aad81b8e4..ba95962a6eb6 100644
--- a/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
+++ b/cmake-proxies/cmake-modules/dependencies/rapidjson.cmake
@@ -1,7 +1,18 @@
@@ -37,8 +29,6 @@ index c44aad81b8e4..ba95962a6eb6 100644
+ endif()
endif()
endif()
-diff --git a/linux/packages/arch/dependencies.sh b/linux/packages/arch/dependencies.sh
-index d34012442efd..8aa8792057d4 100755
--- a/linux/packages/arch/dependencies.sh
+++ b/linux/packages/arch/dependencies.sh
@@ -44,6 +44,7 @@ deps=(
@@ -49,8 +39,6 @@ index d34012442efd..8aa8792057d4 100755
)
pacman -Syu --noconfirm \
-diff --git a/linux/packages/fedora34/dependencies.sh b/linux/packages/fedora34/dependencies.sh
-index 8f6ce8ff2eb8..1e039612b095 100755
--- a/linux/packages/fedora34/dependencies.sh
+++ b/linux/packages/fedora34/dependencies.sh
@@ -54,6 +54,7 @@ deps=(
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
index f06799030b4b..3a0289c69a0f 100644
--- 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
@@ -9,12 +9,6 @@ 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 @@
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
index 8c47ff8642d7..4a21f19dd0e5 100644
--- 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
@@ -7,12 +7,6 @@ libraries/lib-lv2/LV2Utils.h:18:10: fatal error: lilv/lilv.h: No such file or di
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
diff --git a/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch b/media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch
similarity index 72%
copy from media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
copy to media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch
index 53ac8edc33fb..c0689d4724ac 100644
--- a/media-sound/audacity/files/audacity-3.2.3-allow-overriding-alsa-jack.patch
+++ b/media-sound/audacity/files/audacity-3.7.0-allow-overriding-alsa-jack.patch
@@ -4,16 +4,12 @@ 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
+REBASED
+
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -624,6 +624,9 @@ cmd_option( ${_OPT}use_portmixer "Build PortMixer support into Audacity" On)
+@@ -615,6 +607,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" )
@@ -23,13 +19,11 @@ index 42e765691..c18a939e6 100644
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)
+ set(CMAKE_REQUIRED_LIBRARIES portaudio::portaudio)
- check_include_file( "pa_jack.h" PA_HAS_JACK )
-
@@ -43,6 +37,3 @@ index 65a384fa0..1ddc8ed50 100644
if( PA_HAS_ALSA )
find_package( ALSA REQUIRED QUIET )
endif()
---
-2.39.0
-
diff --git a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch b/media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch
similarity index 73%
copy from media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
copy to media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch
index f06799030b4b..b844429c8776 100644
--- a/media-sound/audacity/files/audacity-3.4.2-audiocom-std-string.patch
+++ b/media-sound/audacity/files/audacity-3.7.0-audiocom-std-string.patch
@@ -9,12 +9,9 @@ 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
+REBASED
+
--- a/libraries/lib-cloud-audiocom/OAuthService.h
+++ b/libraries/lib-cloud-audiocom/OAuthService.h
@@ -12,6 +12,7 @@
@@ -23,8 +20,5 @@ index bd01f1656..18761df6d 100644
#include <functional>
+#include <string>
#include <string_view>
+ #include <string>
#include <mutex>
-
---
-2.43.0
-
diff --git a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch b/media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch
similarity index 70%
copy from media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
copy to media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch
index a40847bb941c..9c2b9ebebde6 100644
--- a/media-sound/audacity/files/audacity-3.2.3-disable-ccache.patch
+++ b/media-sound/audacity/files/audacity-3.7.0-disable-ccache.patch
@@ -3,17 +3,9 @@ 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
+@@ -140,14 +140,6 @@ set( CMAKE_PREFIX_PATH
set( CMAKE_CXX_STANDARD 17 )
set( CMAKE_CXX_STANDARD_REQUIRED ON )
@@ -28,6 +20,3 @@ index 9c1c7baf2..42e765691 100644
# Define option() prefix
set( _OPT "audacity_" )
---
-2.39.0
-
diff --git a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch b/media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch
similarity index 51%
copy from media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
copy to media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch
index a3ef6cf3859d..c47ae9bd508a 100644
--- a/media-sound/audacity/files/audacity-3.3.3-local-threadpool-libraries.patch
+++ b/media-sound/audacity/files/audacity-3.7.0-local-threadpool-libraries.patch
@@ -5,10 +5,11 @@ 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
-diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/cmake-modules/DependenciesList.cmake
---- a/cmake-proxies/cmake-modules/DependenciesList.cmake 2023-07-14 03:40:22.518292749 +0200
-+++ b/cmake-proxies/cmake-modules/DependenciesList.cmake 2023-07-14 03:40:43.790398232 +0200
-@@ -56,7 +56,6 @@
+REBASED
+
+--- a/cmake-proxies/cmake-modules/DependenciesList.cmake
++++ b/cmake-proxies/cmake-modules/DependenciesList.cmake
+@@ -63,7 +63,6 @@ endif()
audacity_find_package(PortAudio REQUIRED)
if( ${_OPT}has_networking )
@@ -16,12 +17,11 @@ diff -Nuar a/cmake-proxies/cmake-modules/DependenciesList.cmake b/cmake-proxies/
audacity_find_package(CURL REQUIRED CONAN_PACKAGE_NAME libcurl)
endif()
-diff -Nuar a/libraries/lib-network-manager/CMakeLists.txt b/libraries/lib-network-manager/CMakeLists.txt
---- a/libraries/lib-network-manager/CMakeLists.txt 2023-07-14 03:38:42.061794613 +0200
-+++ b/libraries/lib-network-manager/CMakeLists.txt 2023-07-14 03:38:27.913724456 +0200
-@@ -43,4 +43,8 @@
+--- a/libraries/lib-network-manager/CMakeLists.txt
++++ b/libraries/lib-network-manager/CMakeLists.txt
+@@ -53,4 +53,8 @@ PRIVATE
+ set ( DEFINES INTERFACE "HAS_NETWORKING" PRIVATE "WIN32_LEAN_AND_MEAN" )
- set ( DEFINES INTERFACE "HAS_NETWORKING" )
+add_library ( threadpool::threadpool INTERFACE IMPORTED GLOBAL )
+target_include_directories ( threadpool::threadpool INTERFACE
diff --git a/media-sound/audacity/files/audacity-3.7.0-portsmf.patch b/media-sound/audacity/files/audacity-3.7.0-portsmf.patch
new file mode 100644
index 000000000000..612f8b7b5161
--- /dev/null
+++ b/media-sound/audacity/files/audacity-3.7.0-portsmf.patch
@@ -0,0 +1,11 @@
+--- a/libraries/lib-note-track/WrapAllegro.h
++++ b/libraries/lib-note-track/WrapAllegro.h
+@@ -13,7 +13,7 @@
+ #elif defined(__linux__)
+
+ #include <cstring> // Allegro include fails if this header isn't included due to no memcpy
+-#include "allegro.h"
++#include <portsmf/allegro.h>
+
+ #else //_MSC_VER
+
^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2024-10-31 19:05 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-02 10:54 [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-10-31 19:05 Miroslav Šulc
2024-04-16 22:57 Yixun Lan
2024-03-23 8:29 Sam James
2023-09-25 0:24 Sam James
2023-09-25 0:24 Sam James
2023-05-06 6:19 Sam James
2020-09-19 11:53 Miroslav Šulc
2020-04-30 23:55 Lars Wendler
2020-02-08 10:26 Miroslav Šulc
2019-08-28 7:44 Lars Wendler
2018-08-22 17:10 Andreas Sturmlechner
2017-07-15 9:46 Pacho Ramos
2016-09-17 13:16 David Seifert
2016-03-31 12:22 Lars Wendler
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox