[gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/

[Miroslav Šulc]

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