commit: 73a3c7b2a51490b90bac392264c1a91d76f0fbb2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 25 09:13:52 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov 25 09:14:16 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73a3c7b2
media-sound/ardour: bump to 6.5 + updated live
Package-Manager: Portage-3.0.10, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/ardour/Manifest | 1 +
.../{ardour-9999.ebuild => ardour-6.5.ebuild} | 39 ++++++++++++----------
media-sound/ardour/ardour-9999.ebuild | 30 ++++++++---------
3 files changed, 38 insertions(+), 32 deletions(-)
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index a713cb887b9..94d27c2607f 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1 +1,2 @@
DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B
6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487
SHA512
ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
+DIST Ardour-6.5.0.tar.bz2 12000901 BLAKE2B
a44ba0b6b071e6b0c9b4bad86c1454584e4f1ee360de490e176af022d5862d57bde97edbe5f8d0ed2fbc5597ab6d8d1ef7f4a2691e7183d59b38d5a143c2d5e7
SHA512
28bb0939c12b687e136de7a8b1ce28f1065d4040bdc171e228c648586bd5d3bd25ab00c677aa55f835e060cc8cbd0a1d1c283c018e4ab0d72d8bde0eb0a26f2a
diff --git a/media-sound/ardour/ardour-9999.ebuild
b/media-sound/ardour/ardour-6.5.ebuild
similarity index 84%
copy from media-sound/ardour/ardour-9999.ebuild
copy to media-sound/ardour/ardour-6.5.ebuild
index 7df4f32fbde..1630d219290 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-6.5.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999* ]]; then
inherit git-r3
else
KEYWORDS="~amd64 ~x86"
- SRC_URI="https://community.ardour.org/src/Ardour-${PV}.0.tar.bz2";
+
SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2";
S="${WORKDIR}/Ardour-${PV}.0"
fi
@@ -24,13 +24,13 @@ SLOT="6"
IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse
cpu_flags_x86_mmx cpu_flags_x86_3dnow"
RDEPEND="
- >=dev-cpp/glibmm-2.32.0
- >=dev-cpp/gtkmm-2.16:2.4
- >=dev-cpp/libgnomecanvasmm-2.26:2.6
+ dev-cpp/glibmm
+ dev-cpp/gtkmm:2.4
+ dev-cpp/libgnomecanvasmm:2.6
dev-libs/boost:=
- >=dev-libs/glib-2.10.1:2
+ dev-libs/glib:2
dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
+ dev-libs/libxml2:2
dev-libs/libxslt
>=gnome-base/libgnomecanvas-2
media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
media-libs/freetype:2
media-libs/libart_lgpl
media-libs/liblo
- >=media-libs/liblrdf-0.4.0-r20
- >=media-libs/libsamplerate-0.1
- >=media-libs/libsndfile-1.0.18
- >=media-libs/libsoundtouch-1.6.0
+ media-libs/liblrdf
+ media-libs/libsamplerate
+ media-libs/libsndfile
+ media-libs/libsoundtouch
media-libs/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
+ media-libs/rubberband
+ media-libs/taglib
media-libs/vamp-plugin-sdk
net-misc/curl
sys-libs/readline:0=
sci-libs/fftw:3.0[threads]
virtual/libusb:1
x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
+ x11-libs/gtk+:2
x11-libs/pango
jack? ( virtual/jack )
pulseaudio? ( media-sound/pulseaudio )
media-libs/lilv
media-libs/sratom
dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0"
-# !bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to
be able to unbundle...
+ media-libs/suil
+ media-libs/lv2"
+# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to
be able to unbundle...
DEPEND="${RDEPEND}
${PYTHON_DEPS}
@@ -70,6 +70,11 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
doc? ( app-doc/doxygen[dot] )"
+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
@@ -78,7 +83,7 @@ pkg_setup() {
}
src_prepare() {
- eapply_user
+ default
sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\
\'\','/' -i "${S}"/wscript || die
MARCH=$(get-flag march)
OPTFLAGS=""
diff --git a/media-sound/ardour/ardour-9999.ebuild
b/media-sound/ardour/ardour-9999.ebuild
index 7df4f32fbde..b4637a515b8 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -24,13 +24,13 @@ SLOT="6"
IUSE="altivec doc jack nls phonehome pulseaudio cpu_flags_x86_sse
cpu_flags_x86_mmx cpu_flags_x86_3dnow"
RDEPEND="
- >=dev-cpp/glibmm-2.32.0
- >=dev-cpp/gtkmm-2.16:2.4
- >=dev-cpp/libgnomecanvasmm-2.26:2.6
+ dev-cpp/glibmm
+ dev-cpp/gtkmm:2.4
+ dev-cpp/libgnomecanvasmm:2.6
dev-libs/boost:=
- >=dev-libs/glib-2.10.1:2
+ dev-libs/glib:2
dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
+ dev-libs/libxml2:2
dev-libs/libxslt
>=gnome-base/libgnomecanvas-2
media-libs/alsa-lib
@@ -39,29 +39,29 @@ RDEPEND="
media-libs/freetype:2
media-libs/libart_lgpl
media-libs/liblo
- >=media-libs/liblrdf-0.4.0-r20
- >=media-libs/libsamplerate-0.1
- >=media-libs/libsndfile-1.0.18
- >=media-libs/libsoundtouch-1.6.0
+ media-libs/liblrdf
+ media-libs/libsamplerate
+ media-libs/libsndfile
+ media-libs/libsoundtouch
media-libs/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
+ media-libs/rubberband
+ media-libs/taglib
media-libs/vamp-plugin-sdk
net-misc/curl
sys-libs/readline:0=
sci-libs/fftw:3.0[threads]
virtual/libusb:1
x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
+ x11-libs/gtk+:2
x11-libs/pango
jack? ( virtual/jack )
pulseaudio? ( media-sound/pulseaudio )
media-libs/lilv
media-libs/sratom
dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0"
-# !bundled-libs? ( media-sound/fluidsynth ) at leat libltc is missing to
be able to unbundle...
+ media-libs/suil
+ media-libs/lv2"
+# !bundled-libs? ( media-sound/fluidsynth ) at least libltc is missing to
be able to unbundle...
DEPEND="${RDEPEND}
${PYTHON_DEPS}
