From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 453F4138334 for ; Wed, 22 Aug 2018 17:10:20 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 89923E07D8; Wed, 22 Aug 2018 17:10:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 444FAE07D8 for ; Wed, 22 Aug 2018 17:10:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 74082335C32 for ; Wed, 22 Aug 2018 17:10:16 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4044D2BA for ; Wed, 22 Aug 2018 17:10:13 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1534957802.da166eab920f04e1e532646e93b244793a65a65d.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-sound/audacity/, media-sound/audacity/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-sound/audacity/Manifest media-sound/audacity/audacity-2.2.1.ebuild media-sound/audacity/files/audacity-2.2.1-without-libid3tag.patch X-VCS-Directories: media-sound/audacity/files/ media-sound/audacity/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: da166eab920f04e1e532646e93b244793a65a65d X-VCS-Branch: master Date: Wed, 22 Aug 2018 17:10:13 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 6f8da8d0-f9c2-44b1-b7d3-4f988e995dbd X-Archives-Hash: a7959d47140faa0f57b4e33a3adf7066 commit: da166eab920f04e1e532646e93b244793a65a65d Author: Andreas Sturmlechner gentoo org> AuthorDate: Wed Aug 22 17:10:02 2018 +0000 Commit: Andreas Sturmlechner gentoo 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 -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; -+#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; -+#endif - - // returns buffer len; caller frees - int ExportMP3::AddTags(AudacityProject *WXUNUSED(project), ArrayOf &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; -+#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; -+#endif - - ProgressResult PCMImportFileHandle::Import(TrackFactory *trackFactory, - TrackHolders &outTracks, --- -2.13.6