commit: 9e6d103a001dba57b31dc8f2f9bae44a752c3bd7 Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> AuthorDate: Fri Dec 15 11:34:06 2023 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Fri Dec 15 11:35:34 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e6d103a
media-sound/ardour: dropped obsolete 7.5-r3 Bug: https://bugs.gentoo.org/917663 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> media-sound/ardour/Manifest | 1 - media-sound/ardour/ardour-7.5-r3.ebuild | 194 ----------------------- media-sound/ardour/files/ardour-7.4-libc++.patch | 49 ------ 3 files changed, 244 deletions(-) diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest index 1c2296eb8879..10a2579f9759 100644 --- a/media-sound/ardour/Manifest +++ b/media-sound/ardour/Manifest @@ -1,3 +1,2 @@ -DIST Ardour-7.5.0.tar.bz2 13465772 BLAKE2B 647a6f952431c77ec6a66837e9668c75b69eb1a228c32c87772baf9a6dc18ab3554eea2c4056fe9d31c38acc398a3e55f681b66413bac49a9c8069f002c592c8 SHA512 9c3e37b5e4c12f2efd0fa567c2c0c7a324d3b4e6b86e2931b6574ca9bfdbc1e8af08bdf4d84bdc7cad9372d8015adb27410385bee0d6d8efec090bb26c319f8e DIST Ardour-8.1.0.tar.bz2 13835817 BLAKE2B 1d1e048ea8a23ba0a6b6cabda7c3d21ff9630ea02d70025fc414661612f8d674ffc2143578b3cd9cb43240a0fb823d731bbe14eac6b33816047ce4b04c4ff09f SHA512 d8e534b67b0b7daba0c6b384cb718d077739c538ee3371b3dd415589b34d03bdaf6270e8e2f953c6fd404ac52930a4e485cf0639b02fd5681a7b38584f5ce14c DIST Ardour-8.2.0.tar.bz2 13897958 BLAKE2B 54916b2f0ac3925f160df9536db61b1ece4ace3f9f4a09880c00661e328835a32c04a8faa2b04bb3fe34aeeb97064e0139f4e19524be1a17f33d7e773b893e1b SHA512 62962929201c649a0028c2cfc1e7e6acce3ab9ee24adbc5ebb5a7c3d70f73430c579801788f696769afd2d14d766eb2ef4936b5957dce2288a30cf671ca62ee1 diff --git a/media-sound/ardour/ardour-7.5-r3.ebuild b/media-sound/ardour/ardour-7.5-r3.ebuild deleted file mode 100644 index dbd8b4331e81..000000000000 --- a/media-sound/ardour/ardour-7.5-r3.ebuild +++ /dev/null @@ -1,194 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{9..12} ) -PYTHON_REQ_USE='threads(+)' -PLOCALES="ca cs de el en_GB es eu fr it ja ko nn pl pt pt_PT ru sv zh" -inherit toolchain-funcs flag-o-matic plocale python-any-r1 waf-utils desktop xdg - -DESCRIPTION="Digital Audio Workstation" -HOMEPAGE="https://ardour.org/"; - -if [[ ${PV} == *9999* ]]; then - EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git"; - inherit git-r3 -else - KEYWORDS="amd64 ~loong x86" - SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"; - S="${WORKDIR}/Ardour-${PV}.0" -fi - -LICENSE="GPL-2" -SLOT="7" -IUSE="doc jack nls phonehome pulseaudio cpu_flags_ppc_altivec cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" - -RDEPEND=" - dev-cpp/glibmm:2 - dev-cpp/gtkmm:2.4 - dev-libs/boost:= - dev-libs/glib:2 - dev-libs/libsigc++:2 - dev-libs/libxml2:2 - media-libs/alsa-lib - media-libs/aubio - media-libs/flac:= - media-libs/freetype:2 - media-libs/liblo - media-libs/liblrdf - media-libs/libsamplerate - media-libs/libsndfile - media-libs/libsoundtouch - media-libs/raptor:2 - media-libs/rubberband - media-libs/taglib - media-libs/vamp-plugin-sdk - net-libs/libwebsockets - net-misc/curl - sys-libs/readline:0= - sci-libs/fftw:3.0[threads] - virtual/libusb:1 - x11-libs/cairo - x11-libs/gtk+:2 - x11-libs/pango - jack? ( virtual/jack ) - pulseaudio? ( media-libs/libpulse ) - media-libs/lilv - media-libs/sratom - dev-libs/sord - media-libs/suil[X,gtk2] - media-libs/lv2" -# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to be able to unbundle... - -DEPEND="${RDEPEND} - ${PYTHON_DEPS} - dev-util/itstool - sys-devel/gettext - virtual/pkgconfig - doc? ( app-doc/doxygen[dot] ) - jack? ( virtual/jack )" - -PATCHES=( - "${FILESDIR}/${PN}-6.8-metadata.patch" - "${FILESDIR}/${PN}-7.4-libc++.patch" -) - -pkg_pretend() { - [[ $(tc-getLD) == *gold* ]] && (has_version sci-libs/fftw[openmp] || has_version sci-libs/fftw[threads]) && \ - ewarn "Linking with gold linker might produce broken executable, see bug #733972" -} - -pkg_setup() { - if has_version \>=dev-libs/libsigc++-2.6 ; then - append-cxxflags -std=c++11 - fi - python-any-r1_pkg_setup -} - -src_prepare() { - default - - # delete optimization flags - sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die - - # handle arch - MARCH=$(get-flag march) - OPTFLAGS="" - if use cpu_flags_x86_sse; then - if [[ ${MARCH} == "i686" ]] || [[ ${MARCH} == "i486" ]]; then - elog "You enabled sse but use an march that does not support sse!" - elog "We add -msse to the flags now, but please consider switching your march in make.conf!" - fi - OPTFLAGS="sse" - fi - if use cpu_flags_x86_mmx; then - if [[ ${MARCH} == "i486" ]]; then - elog "You enabled mmx with i486 set as march! You have been warned!" - fi - OPTFLAGS="${OPTFLAGS} mmx" - fi - if use cpu_flags_x86_3dnow; then - OPTFLAGS="${OPTFLAGS} 3dnow" - fi - sed 's/flag_line\ =\ o.*/flag_line\ =\ \": '"${OPTFLAGS}"' just some place holders\"/' \ - -i "${S}"/wscript || die - sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript || die - - # boost and shebang - append-flags "-lboost_system" - python_fix_shebang "${S}"/wscript - python_fix_shebang "${S}"/waf - - # handle locales - my_lcmsg() { - rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po - } - plocale_for_each_disabled_locale my_lcmsg -} - -src_configure() { - # avoid bug https://bugs.gentoo.org/800067 - local -x AS="$(tc-getCC) -c" - - local backends="alsa,dummy" - use jack && backends+=",jack" - use pulseaudio && backends+=",pulseaudio" - - tc-export CC CXX - local myconf=( - --configdir=/etc - --freedesktop - --noconfirm - --optimize - --with-backends=${backends} - $({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \ - echo "--fpu-optimization" || echo "--no-fpu-optimization") - $(usex doc "--docs" '') - $(usex nls "--nls" "--no-nls") - $(usex phonehome "--phone-home" "--no-phone-home") - # not possible right now --use-external-libs - # missing dependency: https://github.com/c4dm/qm-dsp - ) - - waf-utils_src_configure "${myconf[@]}" -} - -src_compile() { - waf-utils_src_compile - use nls && waf-utils_src_compile i18n -} - -src_install() { - local s - - waf-utils_src_install - - mv ${PN}.1 ${PN}${SLOT}.1 || die - doman ${PN}${SLOT}.1 - - for s in 16 22 32 48 256 512; do - newicon -s ${s} gtk2_ardour/resources/Ardour-icon_${s}px.png ardour${SLOT}.png - done - - # the build system still installs ardour6.png files so we get rid of those to not conflict with ardour:6 - find "${D}/usr/share/icons/" -name ardour6.png -delete - - sed -i \ - -e "s/\(^Name=\).*/\1Ardour ${SLOT}/" \ - -e 's/;AudioEditing;/;X-AudioEditing;/' \ - build/gtk2_ardour/ardour${SLOT}.desktop || die - domenu build/gtk2_ardour/ardour${SLOT}.desktop - - insinto /usr/share/mime/packages - newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml - rm "${D}/usr/share/mime/packages/ardour.xml" || die -} - -pkg_postinst() { - xdg_pkg_postinst - - elog "Please do _not_ report problems with the package to ${PN} upstream." - elog "If you think you've found a bug, check the upstream binary package" - elog "before you report anything to upstream." -} diff --git a/media-sound/ardour/files/ardour-7.4-libc++.patch b/media-sound/ardour/files/ardour-7.4-libc++.patch deleted file mode 100644 index 44d8b2ccca47..000000000000 --- a/media-sound/ardour/files/ardour-7.4-libc++.patch +++ /dev/null @@ -1,49 +0,0 @@ -From https://github.com/Ardour/ardour/pull/822/commits/c2ac82bfbacc583c49b306826dedec754633bbe7 Mon Sep 17 00:00:00 2001 -From: Violet Purcell <[email protected]> -Date: Thu, 21 Sep 2023 21:09:30 -0400 -Subject: [PATCH] Backport VST3 libc++ fix on linux - -LLVM libc++ does not have the ext/atomicity.h header. This fix is copied -from the upstream vst3_pluginterfaces repo. - -Signed-off-by: Violet Purcell <[email protected]> ---- a/libs/vst3/pluginterfaces/base/funknown.cpp -+++ b/libs/vst3/pluginterfaces/base/funknown.cpp -@@ -44,13 +44,23 @@ - #endif - - #if SMTG_OS_LINUX -+#if !defined (SMTG_USE_ATOMIC) -+#if defined (_LIBCPP_VERSION) -+#define SMTG_USE_ATOMIC 1 -+#else - #include <ext/atomicity.h> -+#endif -+#endif - /* UUID */ - #include <string> - #include <boost/uuid/uuid.hpp> - #include <boost/uuid/uuid_generators.hpp> - #endif - -+#if defined (SMTG_USE_ATOMIC) && SMTG_USE_ATOMIC -+#include <atomic> -+#endif -+ - namespace Steinberg { - - //------------------------------------------------------------------------ -@@ -79,7 +89,9 @@ namespace FUnknownPrivate { - //------------------------------------------------------------------------ - int32 PLUGIN_API atomicAdd (int32& var, int32 d) - { --#if SMTG_OS_WINDOWS -+#if SMTG_USE_ATOMIC -+ return atomic_fetch_add (reinterpret_cast<std::atomic_int_least32_t*> (&var), d) +d; -+#elif SMTG_OS_WINDOWS - return InterlockedExchangeAdd ((volatile long int*)&var, d) + d; - #elif SMTG_OS_MACOS - return OSAtomicAdd32Barrier (d, (int32_t*)&var); --- -2.42.0 -
