* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2015-08-17 15:12 Andreas Schuerch
0 siblings, 0 replies; 11+ messages in thread
From: Andreas Schuerch @ 2015-08-17 15:12 UTC (permalink / raw
To: gentoo-commits
commit: e54afaad3f3a5a669be1c81df85984d0ebb58f90
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 15:06:47 2015 +0000
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 15:06:47 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e54afaad
corrected rev-numbering patch wrt 557990. Thanks Lars Wendler for the patch and Daniel Bautista for reporting
Package-Manager: portage-2.2.20.1
media-sound/ardour/ardour-4.1.ebuild | 2 +-
media-sound/ardour/ardour-4.2.ebuild | 2 +-
.../ardour/files/ardour-4.x-revision-naming.patch | 38 ++++++++++++++++++++++
3 files changed, 40 insertions(+), 2 deletions(-)
diff --git a/media-sound/ardour/ardour-4.1.ebuild b/media-sound/ardour/ardour-4.1.ebuild
index 4830a49..29167b3 100644
--- a/media-sound/ardour/ardour-4.1.ebuild
+++ b/media-sound/ardour/ardour-4.1.ebuild
@@ -84,7 +84,7 @@ src_unpack() {
src_prepare(){
if ! [ ${PV} = 9999 ]; then
- epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+ epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
touch "${S}/libs/ardour/revision.cc"
fi
$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
diff --git a/media-sound/ardour/ardour-4.2.ebuild b/media-sound/ardour/ardour-4.2.ebuild
index 4830a49..29167b3 100644
--- a/media-sound/ardour/ardour-4.2.ebuild
+++ b/media-sound/ardour/ardour-4.2.ebuild
@@ -84,7 +84,7 @@ src_unpack() {
src_prepare(){
if ! [ ${PV} = 9999 ]; then
- epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+ epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
touch "${S}/libs/ardour/revision.cc"
fi
$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
diff --git a/media-sound/ardour/files/ardour-4.x-revision-naming.patch b/media-sound/ardour/files/ardour-4.x-revision-naming.patch
new file mode 100644
index 0000000..d558f47
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.x-revision-naming.patch
@@ -0,0 +1,38 @@
+--- ardour-4.2/wscript
++++ ardour-4.2/wscript
+@@ -162,7 +162,7 @@
+ if os.path.isdir (os.path.join(os.getcwd(), '.git')):
+ rev = fetch_git_revision ()
+ else:
+- rev = fetch_tarball_revision ()
++ rev = os.environ['PV']
+
+ #
+ # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
+@@ -238,16 +238,16 @@
+ return version
+
+ def create_stored_revision():
+- rev = ""
+- if os.path.exists('.git'):
+- rev = fetch_git_revision();
+- print("Git version: " + rev + "\n")
+- elif os.path.exists('libs/ardour/revision.cc'):
+- print("Using packaged revision")
+- return
+- else:
+- print("Missing libs/ardour/revision.cc. Blame the packager.")
+- sys.exit(-1)
++ rev = os.environ['PV'] + "-gentoo"
++# if os.path.exists('.git'):
++# rev = fetch_git_revision();
++# print("Git version: " + rev + "\n")
++# elif os.path.exists('libs/ardour/revision.cc'):
++# print("Using packaged revision")
++# return
++# else:
++# print("Missing libs/ardour/revision.cc. Blame the packager.")
++# sys.exit(-1)
+
+ try:
+ #
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2015-08-17 15:39 Ben de Groot
0 siblings, 0 replies; 11+ messages in thread
From: Ben de Groot @ 2015-08-17 15:39 UTC (permalink / raw
To: gentoo-commits
commit: 1af77d448c006a4a7be70005b803334911c0cf69
Author: Ben de Groot <yngwin <AT> gentoo <DOT> org>
AuthorDate: Mon Aug 17 14:38:34 2015 +0000
Commit: Ben de Groot <yngwin <AT> gentoo <DOT> org>
CommitDate: Mon Aug 17 14:38:34 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1af77d44
media-sound/ardour: update revision naming patch
Thanks to Lars Wendler for rolling a new patch.
Bug: 557990
Package-Manager: portage-2.2.20.1
.../{ardour-4.2.ebuild => ardour-4.2-r1.ebuild} | 2 +-
.../ardour/files/ardour-4.2-revision-naming.patch | 38 ++++++++++++++++++++++
2 files changed, 39 insertions(+), 1 deletion(-)
diff --git a/media-sound/ardour/ardour-4.2.ebuild b/media-sound/ardour/ardour-4.2-r1.ebuild
similarity index 98%
rename from media-sound/ardour/ardour-4.2.ebuild
rename to media-sound/ardour/ardour-4.2-r1.ebuild
index 4830a49..c4f8bc4 100644
--- a/media-sound/ardour/ardour-4.2.ebuild
+++ b/media-sound/ardour/ardour-4.2-r1.ebuild
@@ -84,7 +84,7 @@ src_unpack() {
src_prepare(){
if ! [ ${PV} = 9999 ]; then
- epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
+ epatch "${FILESDIR}"/${PN}-4.2-revision-naming.patch
touch "${S}/libs/ardour/revision.cc"
fi
$(use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch)
diff --git a/media-sound/ardour/files/ardour-4.2-revision-naming.patch b/media-sound/ardour/files/ardour-4.2-revision-naming.patch
new file mode 100644
index 0000000..d558f47
--- /dev/null
+++ b/media-sound/ardour/files/ardour-4.2-revision-naming.patch
@@ -0,0 +1,38 @@
+--- ardour-4.2/wscript
++++ ardour-4.2/wscript
+@@ -162,7 +162,7 @@
+ if os.path.isdir (os.path.join(os.getcwd(), '.git')):
+ rev = fetch_git_revision ()
+ else:
+- rev = fetch_tarball_revision ()
++ rev = os.environ['PV']
+
+ #
+ # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
+@@ -238,16 +238,16 @@
+ return version
+
+ def create_stored_revision():
+- rev = ""
+- if os.path.exists('.git'):
+- rev = fetch_git_revision();
+- print("Git version: " + rev + "\n")
+- elif os.path.exists('libs/ardour/revision.cc'):
+- print("Using packaged revision")
+- return
+- else:
+- print("Missing libs/ardour/revision.cc. Blame the packager.")
+- sys.exit(-1)
++ rev = os.environ['PV'] + "-gentoo"
++# if os.path.exists('.git'):
++# rev = fetch_git_revision();
++# print("Git version: " + rev + "\n")
++# elif os.path.exists('libs/ardour/revision.cc'):
++# print("Using packaged revision")
++# return
++# else:
++# print("Missing libs/ardour/revision.cc. Blame the packager.")
++# sys.exit(-1)
+
+ try:
+ #
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2016-12-06 9:48 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2016-12-06 9:48 UTC (permalink / raw
To: gentoo-commits
commit: 72c8f5aac8cdca4a8391bb7829dbb812860672fb
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 6 09:00:48 2016 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Tue Dec 6 09:48:24 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72c8f5aa
media-sound/ardour: Removed old.
Package-Manager: portage-2.3.3
media-sound/ardour/Manifest | 7 -
media-sound/ardour/ardour-2.8.14-r1.ebuild | 84 ------------
media-sound/ardour/ardour-4.0-r2.ebuild | 140 --------------------
media-sound/ardour/ardour-4.1.ebuild | 139 --------------------
media-sound/ardour/ardour-4.2-r1.ebuild | 128 ------------------
media-sound/ardour/ardour-4.4.ebuild | 134 -------------------
media-sound/ardour/ardour-4.6.ebuild | 139 --------------------
media-sound/ardour/ardour-5.0.ebuild | 143 ---------------------
media-sound/ardour/files/ardour-3.0-syslibs.patch | 35 -----
media-sound/ardour/files/ardour-3.2-syslibs.patch | 35 -----
media-sound/ardour/files/ardour-3.5-syslibs.patch | 37 ------
media-sound/ardour/files/ardour-3.5.403-sse.patch | 24 ----
.../ardour/files/ardour-3.5.7-syslibs.patch | 36 ------
.../ardour/files/ardour-4.0-revision-naming.patch | 78 -----------
14 files changed, 1159 deletions(-)
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index bc5cfa2..34a7187 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,11 +1,4 @@
-DIST ardour-2.8.14.tar.bz2 2169985 SHA256 e07e483a12354c00d821dafbec5f5d2690062b758205daceab723bf1e9a633fe SHA512 0d861cfe99645ff5f7847b5e3296a1dfb6d8f15e8686ac79819b114843988b669b117bcfce89a77435d7af252b50bbfa790eb206f69dfff39f7c97126cf26540 WHIRLPOOL 75382e17152d7eea18820f7e72fff2f29553edfd4e15609f73842411edf5605d1ca2a2a8497e08747f5c210393822dc32a1b90e72cdff9774ab4c2a060de6073
DIST ardour-2.8.16.tar.bz2 2169916 SHA256 37ee32119ba105fa0883faa7e18c58ecd5276894568da224a554d9ef49075e40 SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d WHIRLPOOL 357b45e506da05b1ce17f006c3e2b22b17150b5556e06785b961b308d958fb66fa82b3e01d1d5e596e43caf6b9d1c83287696a6c694e54114fed5825e2fc5a51
-DIST ardour-4.0.tar.gz 9189038 SHA256 ea1131a24774d5f8dcab4ac7ea3b36bd427b1e4d0bef6f3db0681bc4ca131cf1 SHA512 2317c5818fe89386319f12062f0af0d08b07f569d6f775b7ecfa4f3a4bb1f565e05f3ff32f05f591c5628bdd402eda5bce4be4f8fa89da6c2092d5edb2c9ae7a WHIRLPOOL 854145ed135f6b23222ab2d6022e31b09221cac0d326fa17c5ee88e4e8ebd033e69c447fcbac35a925ff23974cc8b2b13c076014118977bbc88836124a912ad4
-DIST ardour-4.1.tar.gz 9247567 SHA256 1d5eac009f3c84aee11c4e7d1c548747cb5a43eddac92b4e640342b79cc808b9 SHA512 5e13301ca5d8140498256d43729d770c6222b220d2c817651304746a7cc20fe8450b094d978bc9559b9ec7b5a7a95ca1c5131be5b51c78835e75b3b7bbb1be82 WHIRLPOOL 3699ea7f29c9df30ddfa3ad9a1e05f6a3cbccddaf5ae1804679b6c1a50e8b800e14f06760e8d9d44a4ac2631f32db595048640c01b9c967f060bfaee11f28a73
-DIST ardour-4.2.tar.gz 9484009 SHA256 c8af454e974be3222bceb374d5b3d126af6c9766326f7e276acb8ef2fa21cfa4 SHA512 cb1d8144216ff959dac1b371c5ec2b99e0fc2137c105fda5c38460c7f148d7f575761453b24ea5ab7c58139a6839b92ee863c6a5485ab4a009da7c362471a2b3 WHIRLPOOL f9d7df4687c4d1a402c43ba43acee9f3b1423f8dcc691ef69590554f49530be5df0ef57f0f20b67ba0efb50690cdc744015f1917bb2051857d496c5cf000f948
-DIST ardour-4.4.tar.gz 9511090 SHA256 d567e99c4476c0122006c85d09a8e4eab93db28be7be99d338ea66be8581bfcf SHA512 8df3e4552b0ccdd76c5ccf06224594325bb8c02f897bb79bd983531a2f4f56c60185b6080e2f8eddb6a274b9d48dc93a47ddc5471e05b253d492c09be816dde0 WHIRLPOOL 86e298b7defa5249c0632368bae64ddde2175e5f5ece66b4932485a4216ae0613b81e2f736f54e7f00a600be5e238fe41559fe2290f3aebbb36b208184aefc25
-DIST ardour-4.6.tar.gz 10033725 SHA256 79a3b063f2413d79c4bb2930505e0f6628848258051869095588a50940f49f6b SHA512 8fdda5f6efde18a66d89605f0a4d14756ce573ffc5de54e7229c7aa76ab11cbba33bdb775fb5c5dde86f4d308c2a96b904a0298d7b9c598300ab35e835f2ea0a WHIRLPOOL 0f4e054cdb2a1022f860354d70e4517bebee66e0711f16b4e3b19ebc8f354e364fd1a91e64aa3f7c692f3251ee261cdc2fda29215cef58c9a8cebcc20708af72
DIST ardour-4.7.tar.gz 9863149 SHA256 dfa3d102b3f7bb0702969153d22d9311ac98c587f691760ab0f1d3f4f455a86d SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096 WHIRLPOOL eb94b56a919d0088a312414f45475f53ee8c7f618d85f9ffcf5f27719422c2035ff4608108ecbe0f521d54ed1ad40c06ada0a1cb8f7d70531320f40aa107e4b4
-DIST ardour-5.0.tar.bz2 8825191 SHA256 7278193d7583c6c4c08a0f64b3a61d9d276933483573f96fdb857750ceef4f48 SHA512 3913e14e16906136422d573fc3d11d6159248e3dede8614acf6bb2e33950e3e5ff2e6597b394e3ce270b79e0bf926ae4b72d5daa2f01cd04da8e42d13bef7ba8 WHIRLPOOL a354e8095a78bfccb3d7b9d55b5915165f8b21b7102bf0f129f43a9ba301be9b1a40598eff7421f0422892be2d24e479cf6eb555dfb563f8a860bf61f0afa533
DIST ardour-5.3.tar.bz2 8244811 SHA256 1289002cb81e372b663f9d66e2923c066b64c48f9bec3a9884f7a59cb007945a SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f WHIRLPOOL b7d999805f2b5dda2dc1fd92cbec76d499b15c0f7517c208e7c6b46b624dcd759b0c25a4ee9ec23d974500873c93a8b76e1f45395a25936d5641e47e3027f038
DIST ardour-5.5.tar.bz2 9237459 SHA256 867605614f6840341d37c388f6c5acf803579172b7d7edbebb4c8e36c8bfde1f SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c WHIRLPOOL 16a7cdc5b5893bbd4e6e86bf3f6d06dc236ad3c7062ba51f313fc472fd46e63f9508f761e9d20ff929e915591fc1d3153098b115909671e4c357003b6c21f733
diff --git a/media-sound/ardour/ardour-2.8.14-r1.ebuild b/media-sound/ardour/ardour-2.8.14-r1.ebuild
deleted file mode 100644
index 5d99b70..00000000
--- a/media-sound/ardour/ardour-2.8.14-r1.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=4
-inherit eutils flag-o-matic toolchain-funcs scons-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
- media-libs/liblo
- sci-libs/fftw:3.0
- media-libs/freetype:2
- >=dev-libs/glib-2.10.1:2
- dev-cpp/glibmm:2
- >=x11-libs/gtk+-2.8.1:2
- >=dev-libs/libxml2-2.6:2
- >=media-libs/libsndfile-1.0.18
- >=media-libs/libsamplerate-0.1
- >=media-libs/rubberband-1.6.0
- >=media-libs/libsoundtouch-1.6.0
- media-libs/flac
- media-libs/raptor:2
- >=media-libs/liblrdf-0.4.0-r20
- >=media-sound/jack-audio-connection-kit-0.120
- >=gnome-base/libgnomecanvas-2
- media-libs/vamp-plugin-sdk
- dev-libs/libxslt
- dev-libs/libsigc++:2
- >=dev-cpp/gtkmm-2.16:2.4
- >=dev-cpp/libgnomecanvasmm-2.26:2.6
- media-libs/alsa-lib
- x11-libs/pango
- x11-libs/cairo
- media-libs/libart_lgpl
- virtual/libusb:0
- dev-libs/boost
- curl? ( net-misc/curl )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/suil
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.8.11-flags.patch \
- "${FILESDIR}"/${P}-syslibs.patch \
- "${FILESDIR}"/${P}-boost-150.patch
-
-}
-
-src_compile() {
- local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && echo 1 || echo 0)
- tc-export CC CXX
- mkdir -p "${D}"
-
- escons \
- DESTDIR="${D}" \
- FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \
- PREFIX=/usr \
- SYSLIBS=1 \
- $(use_scons curl FREESOUND) \
- $(use_scons debug DEBUG) \
- $(use_scons nls NLS) \
- $(use_scons lv2 LV2)
-}
-
-src_install() {
- escons install
- doman ${PN}.1
- newicon icons/icon/ardour_icon_mac.png ${PN}.png
- make_desktop_entry ardour2 ardour2 ardour AudioVideo
-}
diff --git a/media-sound/ardour/ardour-4.0-r2.ebuild b/media-sound/ardour/ardour-4.0-r2.ebuild
deleted file mode 100644
index 3c42277..00000000
--- a/media-sound/ardour/ardour-4.0-r2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
- KEYWORDS=""
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-2
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
- media-libs/liblo
- sci-libs/fftw:3.0
- media-libs/freetype:2
- >=dev-libs/glib-2.10.1:2
- >=dev-cpp/glibmm-2.32.0
- >=x11-libs/gtk+-2.8.1:2
- >=dev-libs/libxml2-2.6:2
- >=media-libs/libsndfile-1.0.18
- >=media-libs/libsamplerate-0.1
- >=media-libs/rubberband-1.6.0
- >=media-libs/libsoundtouch-1.6.0
- media-libs/flac
- media-libs/raptor:2
- >=media-libs/liblrdf-0.4.0-r20
- >=gnome-base/libgnomecanvas-2
- media-libs/vamp-plugin-sdk
- dev-libs/libxslt
- dev-libs/libsigc++:2
- >=dev-cpp/gtkmm-2.16:2.4
- >=dev-cpp/libgnomecanvasmm-2.26:2.6
- media-libs/alsa-lib
- x11-libs/pango
- x11-libs/cairo
- media-libs/libart_lgpl
- virtual/libusb:0
- dev-libs/boost
- >=media-libs/taglib-1.7
- net-misc/curl
- jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- >=media-sound/jack-audio-connection-kit-0.120
- sys-devel/gettext
- doc? ( app-doc/doxygen[dot] )"
- if ! [ ${PV} = 9999 ]; then
- DEPEND="${DEPEND}"
- fi
-
-src_unpack() {
- if [ ${PV} = 9999 ]; then
- git-2_src_unpack
- else
- unpack ${A}
- fi
-}
-
-src_prepare(){
- if ! [ ${PV} = 9999 ]; then
- epatch "${FILESDIR}"/${PN}-4.0-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
- sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
- sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
- sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
- append-flags "-lboost_system"
-}
-
-src_configure() {
- if use cpu_flags_x86_sse; then
- MARCH=$(get-flag march)
- for ARCHWOSSE in i686 i486; do
- if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
- for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
- is-flag ${SSEOPT} && SSEON="yes"
- done
- if [ -z ${SSEON} ]; then
- append-flags -msse
- elog "You enabled sse but use an march that does not support sse!"
- elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
- fi
- fi
- done
- fi
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --optimize \
- --no-jack-metadata \
- --nls \
- $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \
- $(use lv2 && echo "--lv2" || echo "--no-lv2") \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
- $(use doc && echo "--docs")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
- make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}
diff --git a/media-sound/ardour/ardour-4.1.ebuild b/media-sound/ardour/ardour-4.1.ebuild
deleted file mode 100644
index 8506b89..00000000
--- a/media-sound/ardour/ardour-4.1.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [ ${PV} = 9999 ]; then
- KEYWORDS=""
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-2
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
- media-libs/liblo
- sci-libs/fftw:3.0
- media-libs/freetype:2
- >=dev-libs/glib-2.10.1:2
- >=dev-cpp/glibmm-2.32.0
- >=x11-libs/gtk+-2.8.1:2
- >=dev-libs/libxml2-2.6:2
- >=media-libs/libsndfile-1.0.18
- >=media-libs/libsamplerate-0.1
- >=media-libs/rubberband-1.6.0
- >=media-libs/libsoundtouch-1.6.0
- media-libs/flac
- media-libs/raptor:2
- >=media-libs/liblrdf-0.4.0-r20
- >=gnome-base/libgnomecanvas-2
- media-libs/vamp-plugin-sdk
- dev-libs/libxslt
- dev-libs/libsigc++:2
- >=dev-cpp/gtkmm-2.16:2.4
- >=dev-cpp/libgnomecanvasmm-2.26:2.6
- media-libs/alsa-lib
- x11-libs/pango
- x11-libs/cairo
- media-libs/libart_lgpl
- virtual/libusb:0
- dev-libs/boost:=
- >=media-libs/taglib-1.7
- net-misc/curl
- jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- virtual/pkgconfig
- >=media-sound/jack-audio-connection-kit-0.120
- sys-devel/gettext
- doc? ( app-doc/doxygen[dot] )"
- if ! [ ${PV} = 9999 ]; then
- DEPEND="${DEPEND}"
- fi
-
-src_unpack() {
- if [ ${PV} = 9999 ]; then
- git-2_src_unpack
- else
- unpack ${A}
- fi
-}
-
-src_prepare(){
- if ! [ ${PV} = 9999 ]; then
- epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
- sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' -i "${S}"/wscript
- sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' -i "${S}"/wscript
- sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' -i "${S}"/wscript
- append-flags "-lboost_system"
-}
-
-src_configure() {
- if use cpu_flags_x86_sse; then
- MARCH=$(get-flag march)
- for ARCHWOSSE in i686 i486; do
- if [[ ${MARCH} = ${ARCHWOSSE} ]]; then
- for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
- is-flag ${SSEOPT} && SSEON="yes"
- done
- if [ -z ${SSEON} ]; then
- append-flags -msse
- elog "You enabled sse but use an march that does not support sse!"
- elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
- fi
- fi
- done
- fi
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --optimize \
- --nls \
- $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --libjack=weak") \
- $(use lv2 && echo "--lv2" || echo "--no-lv2") \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
- $(use doc && echo "--docs")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
- make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to do a donation upstream at ardour.org. Thanks!"
-}
diff --git a/media-sound/ardour/ardour-4.2-r1.ebuild b/media-sound/ardour/ardour-4.2-r1.ebuild
deleted file mode 100644
index 63d0028..00000000
--- a/media-sound/ardour/ardour-4.2-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 cpu_flags_x86_sse"
-
-RDEPEND="
- >=dev-cpp/glibmm-2.32.0
- >=dev-cpp/gtkmm-2.16:2.4
- >=dev-cpp/libgnomecanvasmm-2.26:2.6
- dev-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sci-libs/fftw:3.0
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=media-sound/jack-audio-connection-kit-0.120
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-src_prepare(){
- if ! [[ ${PV} == *9999* ]]; then
- epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- epatch "${FILESDIR}"/${PN}-3.5.403-sse.patch
- sed -e 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ program_flags'/g' \
- -i "${S}"/wscript
- sed -e 's/'compiler_flags.append\ \(\'-DPROGRAM_'/'program_flags.append\ \(\'-DPROGRAM_'/g' \
- -i "${S}"/wscript
- sed -e '/compiler_flags\ \=\ \[\]/a \ \ \ \ program_flags\ \=\ \[\]' \
- -i "${S}"/wscript
- append-flags "-lboost_system"
-}
-
-src_configure() {
- if use cpu_flags_x86_sse; then
- MARCH=$(get-flag march)
- for ARCHWOSSE in i686 i486; do
- if [[ ${MARCH} == ${ARCHWOSSE} ]]; then
- for SSEOPT in -msse -msse2 -msse3 -mssse3 -msse4 -msse4.1 -msse4.2; do
- is-flag ${SSEOPT} && SSEON="yes"
- done
- if [[ -z ${SSEON} ]]; then
- append-flags -msse
- elog "You enabled sse but use an march that does not support sse!"
- elog "We add -msse to the cflags now, but please consider switching your march in make.conf!"
- fi
- fi
- done
- fi
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --optimize \
- --nls \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex lv2 "--lv2" "--no-lv2") \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
- $(usex doc "--docs" '')
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
- make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}
diff --git a/media-sound/ardour/ardour-4.4.ebuild b/media-sound/ardour/ardour-4.4.ebuild
deleted file mode 100644
index e679540..00000000
--- a/media-sound/ardour/ardour-4.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sci-libs/fftw:3.0
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- >=media-sound/jack-audio-connection-kit-0.120
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
-}
-
-src_prepare(){
- if ! [[ ${PV} == *9999* ]]; then
- epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript
- MARCH=$(get-flag march)
- 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 sse 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
- sed 's/cpu\ ==\ .*/cpu\ ==\ "LeaveMarchAsIs":/' -i "${S}"/wscript
- append-flags "-lboost_system"
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex lv2 "--lv2" "--no-lv2") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon icons/icon/ardour_icon_mac.png ${PN}${SLOT}.png
- make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}
diff --git a/media-sound/ardour/ardour-4.6.ebuild b/media-sound/ardour/ardour-4.6.ebuild
deleted file mode 100644
index 6ef94c0..00000000
--- a/media-sound/ardour/ardour-4.6.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sci-libs/fftw:3.0
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- if ! [[ ${PV} == *9999* ]]; then
- epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex lv2 "--lv2" "--no-lv2") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
- make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}
diff --git a/media-sound/ardour/ardour-5.0.ebuild b/media-sound/ardour/ardour-5.0.ebuild
deleted file mode 100644
index e5a98c6..00000000
--- a/media-sound/ardour/ardour-5.0.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack lv2 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sci-libs/fftw:3.0[threads]
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( >=media-sound/jack-audio-connection-kit-0.120 )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- if ! [[ ${PV} == *9999* ]]; then
- epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex lv2 "--lv2" "--no-lv2") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
- make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}."
- 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-3.0-syslibs.patch b/media-sound/ardour/files/ardour-3.0-syslibs.patch
deleted file mode 100644
index 6b8deb6..00000000
--- a/media-sound/ardour/files/ardour-3.0-syslibs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -rupN ardour-3.0/libs/ardour/wscript newardour-3.0/libs/ardour/wscript
---- ardour-3.0/libs/ardour/wscript 2013-03-10 22:13:52.000000000 +0100
-+++ newardour-3.0/libs/ardour/wscript 2013-03-15 08:04:07.428001597 +0100
-@@ -287,7 +287,8 @@ def configure(conf):
-
- # we don't try to detect this, since its part of our source tree
-
-- conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-+ autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
-+ autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
- conf.define('USE_RUBBERBAND', 1) # controls whether we actually use it
-
- conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-@@ -378,7 +379,7 @@ def build(bld):
- obj.target = 'ardour'
- obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
- 'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
-- 'OSX','BOOST','CURL','DL']
-+ 'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
- obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
- 'libvampplugin','libtaglib','librubberband',
- 'libaudiographer','libltc']
-diff -rupN ardour-3.0/wscript newardour-3.0/wscript
---- ardour-3.0/wscript 2013-03-10 22:13:59.000000000 +0100
-+++ newardour-3.0/wscript 2013-03-15 08:03:00.639999789 +0100
-@@ -31,9 +31,7 @@ children = [
- 'libs/vamp-sdk',
- 'libs/qm-dsp',
- 'libs/vamp-plugins',
-- 'libs/taglib',
- 'libs/libltc',
-- 'libs/rubberband',
- 'libs/surfaces',
- 'libs/panners',
- 'libs/timecode',
diff --git a/media-sound/ardour/files/ardour-3.2-syslibs.patch b/media-sound/ardour/files/ardour-3.2-syslibs.patch
deleted file mode 100644
index 6b8deb6..00000000
--- a/media-sound/ardour/files/ardour-3.2-syslibs.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-diff -rupN ardour-3.0/libs/ardour/wscript newardour-3.0/libs/ardour/wscript
---- ardour-3.0/libs/ardour/wscript 2013-03-10 22:13:52.000000000 +0100
-+++ newardour-3.0/libs/ardour/wscript 2013-03-15 08:04:07.428001597 +0100
-@@ -287,7 +287,8 @@ def configure(conf):
-
- # we don't try to detect this, since its part of our source tree
-
-- conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-+ autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
-+ autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
- conf.define('USE_RUBBERBAND', 1) # controls whether we actually use it
-
- conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-@@ -378,7 +379,7 @@ def build(bld):
- obj.target = 'ardour'
- obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
- 'JACK','SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
-- 'OSX','BOOST','CURL','DL']
-+ 'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
- obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
- 'libvampplugin','libtaglib','librubberband',
- 'libaudiographer','libltc']
-diff -rupN ardour-3.0/wscript newardour-3.0/wscript
---- ardour-3.0/wscript 2013-03-10 22:13:59.000000000 +0100
-+++ newardour-3.0/wscript 2013-03-15 08:03:00.639999789 +0100
-@@ -31,9 +31,7 @@ children = [
- 'libs/vamp-sdk',
- 'libs/qm-dsp',
- 'libs/vamp-plugins',
-- 'libs/taglib',
- 'libs/libltc',
-- 'libs/rubberband',
- 'libs/surfaces',
- 'libs/panners',
- 'libs/timecode',
diff --git a/media-sound/ardour/files/ardour-3.5-syslibs.patch b/media-sound/ardour/files/ardour-3.5-syslibs.patch
deleted file mode 100644
index a80e3a3..00000000
--- a/media-sound/ardour/files/ardour-3.5-syslibs.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-diff --git a/libs/ardour/wscript b/libs/ardour/wscript
-index 4d56983..41dd54a 100644
---- a/libs/ardour/wscript
-+++ b/libs/ardour/wscript
-@@ -287,7 +287,8 @@ def configure(conf):
-
- # we don't try to detect this, since its part of our source tree
-
-- conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-+ autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
-+ autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
- conf.define('USE_RUBBERBAND', 1) # controls whether we actually use it
-
- conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-@@ -332,7 +333,7 @@ def build(bld):
- obj.target = 'ardour'
- obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
- 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
-- 'OSX','BOOST','CURL','DL']
-+ 'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
- obj.use = ['libpbd','libmidipp','libevoral','libvamphost',
- 'libvampplugin','libtaglib','librubberband',
- 'libaudiographer','libltc','libtimecode']
-diff --git a/wscript b/wscript
-index 3d01632..e84f4bf 100644
---- a/wscript
-+++ b/wscript
-@@ -24,9 +24,7 @@ children = [
- 'libs/vamp-sdk',
- 'libs/qm-dsp',
- 'libs/vamp-plugins',
-- 'libs/taglib',
- 'libs/libltc',
-- 'libs/rubberband',
- 'libs/surfaces',
- 'libs/panners',
- 'libs/backends',
diff --git a/media-sound/ardour/files/ardour-3.5.403-sse.patch b/media-sound/ardour/files/ardour-3.5.403-sse.patch
deleted file mode 100644
index 194da5f..00000000
--- a/media-sound/ardour/files/ardour-3.5.403-sse.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -rupN ardouroriginal/libs/ardour/wscript ardour-3.5.403/libs/ardour/wscript
---- ardouroriginal/libs/ardour/wscript 2014-10-24 19:18:10.981000000 +0200
-+++ ardour-3.5.403/libs/ardour/wscript 2014-10-24 19:19:36.115000000 +0200
-@@ -385,7 +385,7 @@ def build(bld):
- if bld.is_defined('AUDIOUNIT_SUPPORT'):
- obj.source += [ 'audio_unit.cc' ]
-
-- if Options.options.fpu_optimization:
-+ if bld.env['FPU_OPTIMIZATION']:
- if (bld.env['build_target'] == 'i386' or bld.env['build_target'] == 'i686'):
- obj.source += [ 'sse_functions_xmm.cc', 'sse_functions.s' ]
- elif bld.env['build_target'] == 'x86_64':
-diff -rupN ardouroriginal/wscript ardour-3.5.403/wscript
---- ardouroriginal/wscript 2014-10-24 19:18:10.989000000 +0200
-+++ ardour-3.5.403/wscript 2014-10-24 19:20:20.160000000 +0200
-@@ -675,6 +675,8 @@ def configure(conf):
- conf.env['PHONE_HOME'] = True
- if opts.fpu_optimization:
- conf.env['FPU_OPTIMIZATION'] = True
-+ else:
-+ conf.env['FPU_OPTIMIZATION'] = False
- if opts.nls:
- conf.define('ENABLE_NLS', 1)
- conf.env['ENABLE_NLS'] = True
diff --git a/media-sound/ardour/files/ardour-3.5.7-syslibs.patch b/media-sound/ardour/files/ardour-3.5.7-syslibs.patch
deleted file mode 100644
index 2f8ab10..00000000
--- a/media-sound/ardour/files/ardour-3.5.7-syslibs.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -rupN a/ardour-3.5.74/libs/ardour/wscript b/ardour-3.5.74/libs/ardour/wscript
---- a/ardour-3.5.74/libs/ardour/wscript 2013-11-05 20:20:03.000000000 +0100
-+++ b/ardour-3.5.74/libs/ardour/wscript 2013-11-08 09:51:41.553000000 +0100
-@@ -287,7 +287,8 @@ def configure(conf):
-
- # we don't try to detect this, since its part of our source tree
-
-- conf.define('HAVE_RUBBERBAND', 1) # controls whether we think we have it
-+ autowaf.check_pkg(conf, 'taglib', uselib_store='TAGLIB', atleast_version='1.7')
-+ autowaf.check_pkg(conf, 'rubberband', uselib_store='RUBBERBAND', atleast_version='1.4')
- conf.define('USE_RUBBERBAND', 1) # controls whether we actually use it
-
- conf.define('CURRENT_SESSION_FILE_VERSION', CURRENT_SESSION_FILE_VERSION)
-@@ -332,7 +333,7 @@ def build(bld):
- obj.target = 'ardour'
- obj.uselib = ['GLIBMM','GTHREAD','AUBIO','SIGCPP','XML','UUID',
- 'SNDFILE','SAMPLERATE','LRDF','AUDIOUNITS',
-- 'OSX','BOOST','CURL','DL']
-+ 'OSX','BOOST','CURL','DL','RUBBERBAND','TAGLIB']
- obj.use = ['libpbd','libmidipp','libevoral','libvampplugin',
- 'libaudiographer','libltc','libtimecode']
- if bld.is_defined('USE_EXTERNAL_LIBS'):
-diff -rupN a/ardour-3.5.74/wscript b/ardour-3.5.74/wscript
---- a/ardour-3.5.74/wscript 2013-11-05 20:20:03.000000000 +0100
-+++ b/ardour-3.5.74/wscript 2013-11-08 09:49:27.594000000 +0100
-@@ -56,9 +56,7 @@ children = [
- 'libs/vamp-sdk',
- 'libs/qm-dsp',
- 'libs/vamp-plugins',
-- 'libs/taglib',
- 'libs/libltc',
-- 'libs/rubberband',
- 'libs/surfaces',
- 'libs/panners',
- 'libs/backends',
-
diff --git a/media-sound/ardour/files/ardour-4.0-revision-naming.patch b/media-sound/ardour/files/ardour-4.0-revision-naming.patch
deleted file mode 100644
index 360ddc6..00000000
--- a/media-sound/ardour/files/ardour-4.0-revision-naming.patch
+++ /dev/null
@@ -1,78 +0,0 @@
-diff -rupN ardour-4.0-vanilla/wscript ardour-4.0/wscript
---- ardour-4.0-vanilla/wscript 2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/wscript 2015-04-20 18:26:50.849812000 +0200
-@@ -137,29 +137,29 @@ def fetch_tarball_revision ():
- if not os.path.exists ('libs/ardour/revision.cc'):
- print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc')
- sys.exit (1)
-- with open('libs/ardour/revision.cc') as f:
-- content = f.readlines()
-- remove_punctuation_map = dict((ord(char), None) for char in '";')
-- return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
--
--if os.path.isdir (os.path.join(os.getcwd(), '.git')):
-- rev = fetch_git_revision ()
--else:
-- rev = fetch_tarball_revision ()
-+# with open('libs/ardour/revision.cc') as f:
-+# content = f.readlines()
-+# remove_punctuation_map = dict((ord(char), None) for char in '";')
-+# return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map)
-+
-+#if os.path.isdir (os.path.join(os.getcwd(), '.git')):
-+# rev = fetch_git_revision ()
-+#else:
-+# rev = fetch_tarball_revision ()
-
- #
- # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit
- # or, if right at the same rev as a release, MAJOR.MINOR[-rcX]
- #
-
--parts = rev.split ('.', 1)
--MAJOR = parts[0]
--other = parts[1].split('-', 1)
--MINOR = other[0]
--if len(other) > 1:
-- MICRO = other[1].rsplit('-',1)[0].replace('-','.')
--else:
-- MICRO = '0'
-+#parts = rev.split ('.', 1)
-+MAJOR = '4'
-+#other = parts[1].split('-', 1)
-+MINOR = '0'
-+#if len(other) > 1:
-+# MICRO = other[1].rsplit('-',1)[0].replace('-','.')
-+#else:
-+MICRO = 'gentoo'
-
- V = MAJOR + '.' + MINOR + '.' + MICRO
- VERSION = V
-@@ -216,16 +216,16 @@ def fetch_gcc_version (CC):
- return version
-
- def create_stored_revision():
-- rev = ""
-- if os.path.exists('.git'):
-- rev = fetch_git_revision();
-- print("Git version: " + rev + "\n")
-- elif os.path.exists('libs/ardour/revision.cc'):
-- print("Using packaged revision")
-- return
-- else:
-- print("Missing libs/ardour/revision.cc. Blame the packager.")
-- sys.exit(-1)
-+ rev = "4.0-gentoo"
-+# if os.path.exists('.git'):
-+# rev = fetch_git_revision();
-+# print("Git version: " + rev + "\n")
-+# elif os.path.exists('libs/ardour/revision.cc'):
-+# print("Using packaged revision")
-+# return
-+# else:
-+# print("Missing libs/ardour/revision.cc. Blame the packager.")
-+# sys.exit(-1)
-
- try:
- #
-
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2018-06-11 21:18 Lars Wendler
0 siblings, 0 replies; 11+ messages in thread
From: Lars Wendler @ 2018-06-11 21:18 UTC (permalink / raw
To: gentoo-commits
commit: e23feed1818bd47ce44a3340276e2b21bc77ae2f
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 11 21:13:38 2018 +0000
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
CommitDate: Mon Jun 11 21:18:00 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e23feed1
media-sound/ardour: Removed old.
Package-Manager: Portage-2.3.40, Repoman-2.3.9
media-sound/ardour/Manifest | 8 --
media-sound/ardour/ardour-2.8.16-r1.ebuild | 82 ------------
media-sound/ardour/ardour-4.7-r1.ebuild | 138 --------------------
media-sound/ardour/ardour-4.7-r2.ebuild | 139 --------------------
media-sound/ardour/ardour-5.10.ebuild | 141 --------------------
media-sound/ardour/ardour-5.3-r1.ebuild | 143 ---------------------
media-sound/ardour/ardour-5.5-r1.ebuild | 141 --------------------
media-sound/ardour/ardour-5.6-r1.ebuild | 141 --------------------
media-sound/ardour/ardour-5.8-r1.ebuild | 141 --------------------
media-sound/ardour/ardour-5.9.ebuild | 141 --------------------
media-sound/ardour/files/ardour-2.8.11-flags.patch | 28 ----
.../ardour/files/ardour-2.8.14-boost-150.patch | 13 --
.../ardour/files/ardour-2.8.14-syslibs.patch | 108 ----------------
media-sound/ardour/files/ardour-4.0-lv2.patch | 56 --------
media-sound/ardour/files/ardour-4.7-gcc.patch | 100 --------------
media-sound/ardour/metadata.xml | 3 -
16 files changed, 1523 deletions(-)
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index 218f86e373b..2715b3fb7e1 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,9 +1 @@
-DIST ardour-2.8.16.tar.bz2 2169916 BLAKE2B 47db892002f439312efdeec9840d96045a9852b078d4cd88de2fe089f510b904028cb7b0a2d2d39cf004a1bf60127bbfa91af6b9ff1118f3729f9c6d2363d14f SHA512 02e74883cf466fcd5588ec8f2fd9d032b4611071d630b412c853a7ae7cb46045c0cde4308abbc78da3f54aae0ab1c32a980b8d1e1a965c8633ef43d8e08e0d0d
-DIST ardour-4.7.tar.gz 9863149 BLAKE2B 1b81230a1add69506ad703b09cd683fad0ba5c78c30c1701b913ed42690665201541ff01ada9e5b913fc7000df1622cc9fb9b56fa95e46a48d6608ac4fc90f13 SHA512 5daff563ec0b2dc38ec6ca55bb12526ef54da9d8d5a29a9fd6d869f54b83e6fe5ff3c28ef654e6700455110b4a46ce42a33902eb66d96330c6c0948eb3cd3096
-DIST ardour-5.10.tar.bz2 8844840 BLAKE2B 5dd0834b96e56d6ae215f30ab70a28e1cc5f1045ce1c118977fc7dd58e80b8093f1337d4836ca1b68035da7f6f600b36009c6d853e9e001f4f7d549ea62626e2 SHA512 4dc8c43ed81b931e855f4a19b5674712a8322edaa06f466d5dd0eb93076a67da12795944c8f17b30b89bb5e87f54279fc2b21d147d48e98e5cb69a3f965a8bb8
DIST ardour-5.12.tar.bz2 8852834 BLAKE2B 0409d920ab0abc9e52a40cc343c5481d53292bea6e5c89c58328f95c53f7f09f30ce421f2ed0da0e3fdb4eaeeb5a25da0d07ed1d4c382b5b607f3b89324eca1b SHA512 c4b4332bddb2406924119c181622801725f4a7dd7741c1a66ddbc2236542764b786337da2f0a751f3bbe6e0389b5da765eb19b14a6a90c8f8a7fd68231e5067d
-DIST ardour-5.3.tar.bz2 8244811 BLAKE2B d2635ef720c03ec84bf481f09244c6fad78b857dcda52d7a40e0da9ce5c0a37f9cf5c8355429f86e17ddccb857a7b75c07481408dae2f10b8c71215e9ef8fa9e SHA512 464c311cd3f3f4a580ad451be7a8143a3f2f7454364426c952e757999aba92af6611d0bc31f4d5e0ca301a3c79e4cd1ec19b01ec9941f34e6fa4cf338149291f
-DIST ardour-5.5.tar.bz2 9237459 BLAKE2B 71e967202e46a7e7db1fc2717a8d27470e411dd686a5fd858da57aff72be1e277e20bd9f2568073cc91d21b6124af3ac3bf6024781fae344b83f4900025dc838 SHA512 63132681dda7890b8f455a8142935f0bdce28e718b98d1d79a9207ad86b25d31698285d28871bb5043b3b859efd8b1fb8b7b7324fa3abd952a7a9c8e1691e09c
-DIST ardour-5.6.tar.bz2 8590451 BLAKE2B ffafbac62d5bddfff2f4b4bda92692c1c7644050eec444e209f6b4d3b5c300c7ee39d46cd249196ca64b8a43c8716e5fc35272895dd059061669de629100697a SHA512 6d7c72f4bb91e0d9d63dfb2273108e3f61bddac9c21f1f58fe6cb73d5f0a028e735d226c3aa2d1404916b566a103d556a2934b083a4c5d629ec7e28c0abd34f9
-DIST ardour-5.8.tar.bz2 8669692 BLAKE2B 6628d0c6f81feb96f1d3bc5453cbeb3d5d7c012a2efa1e800d84fd1101c651bb4092e599ef6725507c6243a94107242a496b1b4f6df884bcaa8954c0f71a6861 SHA512 96b3a81f8c48f66839fb8cddeec5ed0c4a95a6092eab15eacb69007cf093cc6572c308e37c8acbc0194eeecf809980c22c04449fe65d683c298d8d0611e7950e
-DIST ardour-5.9.tar.bz2 8830842 BLAKE2B 4c025475528f7b0b58b18b9a075abab4805efa538af774bd7aa4b86da98c4df1ee639bb253f4326a11924d577c49a7af8c77098edf63a76205c60880bdac31b3 SHA512 1ba713f3953456260df9d183b30730c959f2707f8c9dd1280a3ab5eb5d9dbdd0e81db98150346f60f777f6bd02eeaaf9f9bcf43cf2ec0b5addce3b50fcbf7413
diff --git a/media-sound/ardour/ardour-2.8.16-r1.ebuild b/media-sound/ardour/ardour-2.8.16-r1.ebuild
deleted file mode 100644
index 20db704fb18..00000000000
--- a/media-sound/ardour/ardour-2.8.16-r1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils flag-o-matic toolchain-funcs scons-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="~amd64 ~x86"
-IUSE="altivec curl debug nls lv2 cpu_flags_x86_sse"
-
-RDEPEND="media-libs/aubio
- media-libs/liblo
- sci-libs/fftw:3.0
- media-libs/freetype:2
- >=dev-libs/glib-2.10.1:2
- dev-cpp/glibmm:2
- >=x11-libs/gtk+-2.8.1:2
- >=dev-libs/libxml2-2.6:2
- >=media-libs/libsndfile-1.0.18
- >=media-libs/libsamplerate-0.1
- >=media-libs/rubberband-1.6.0
- >=media-libs/libsoundtouch-1.6.0
- media-libs/flac
- media-libs/raptor:2
- >=media-libs/liblrdf-0.4.0-r20
- virtual/jack
- >=gnome-base/libgnomecanvas-2
- media-libs/vamp-plugin-sdk
- dev-libs/libxslt
- dev-libs/libsigc++:2
- >=dev-cpp/gtkmm-2.16:2.4
- >=dev-cpp/libgnomecanvasmm-2.26:2.6
- media-libs/alsa-lib
- x11-libs/pango
- x11-libs/cairo
- media-libs/libart_lgpl
- virtual/libusb:0
- dev-libs/boost
- curl? ( net-misc/curl )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/suil
- )"
-DEPEND="${RDEPEND}
- virtual/pkgconfig
- nls? ( sys-devel/gettext )"
-
-src_prepare() {
- epatch \
- "${FILESDIR}"/${PN}-2.8.11-flags.patch \
- "${FILESDIR}"/${PN}-2.8.14-syslibs.patch \
- "${FILESDIR}"/${PN}-2.8.14-boost-150.patch
-}
-
-src_compile() {
- local FPU_OPTIMIZATION=$($(use altivec || use cpu_flags_x86_sse) && echo 1 || echo 0)
- tc-export CC CXX
- mkdir -p "${D}"
-
- escons \
- DESTDIR="${D}" \
- FPU_OPTIMIZATION="${FPU_OPTIMIZATION}" \
- PREFIX=/usr \
- SYSLIBS=1 \
- $(use_scons curl FREESOUND) \
- $(use_scons debug DEBUG) \
- $(use_scons nls NLS) \
- $(use_scons lv2 LV2)
-}
-
-src_install() {
- escons install
- doman ${PN}.1
- newicon icons/icon/ardour_icon_mac.png ${PN}.png
- make_desktop_entry ardour2 ardour2 ardour AudioVideo
-}
diff --git a/media-sound/ardour/ardour-4.7-r1.ebuild b/media-sound/ardour/ardour-4.7-r1.ebuild
deleted file mode 100644
index 166114e42cd..00000000000
--- a/media-sound/ardour/ardour-4.7-r1.ebuild
+++ /dev/null
@@ -1,138 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sci-libs/fftw:3.0
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- if ! [[ ${PV} == *9999* ]]; then
- epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex lv2 "--lv2" "--no-lv2") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
- make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}
diff --git a/media-sound/ardour/ardour-4.7-r2.ebuild b/media-sound/ardour/ardour-4.7-r2.ebuild
deleted file mode 100644
index dfce82a22d0..00000000000
--- a/media-sound/ardour/ardour-4.7-r2.ebuild
+++ /dev/null
@@ -1,139 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-LICENSE="GPL-2"
-SLOT="4"
-IUSE="altivec doc jack lv2 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sci-libs/fftw:3.0[threads]
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- if ! [[ ${PV} == *9999* ]]; then
- epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- epatch "${FILESDIR}"/${PN}-4.7-gcc.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex lv2 "--lv2" "--no-lv2") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon icons/icon/ardour_icon_tango_48px_red.png ${PN}${SLOT}.png
- make_desktop_entry ardour4 ardour4 ardour4 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}"
-}
diff --git a/media-sound/ardour/ardour-5.10.ebuild b/media-sound/ardour/ardour-5.10.ebuild
deleted file mode 100644
index 8998723b507..00000000000
--- a/media-sound/ardour/ardour-5.10.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sys-libs/readline:0=
- sci-libs/fftw:3.0[threads]
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- eapply_user
- if ! [[ ${PV} == *9999* ]]; then
- eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- --lv2 \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
- make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}."
- 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/ardour-5.3-r1.ebuild b/media-sound/ardour/ardour-5.3-r1.ebuild
deleted file mode 100644
index d6f899d2432..00000000000
--- a/media-sound/ardour/ardour-5.3-r1.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="http://fossies.org/linux/misc/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack lv2 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sys-libs/readline:0=
- sci-libs/fftw:3.0[threads]
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- lv2? (
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0
- )"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- if ! [[ ${PV} == *9999* ]]; then
- epatch "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- use lv2 || epatch "${FILESDIR}"/${PN}-4.0-lv2.patch
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex lv2 "--lv2" "--no-lv2") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
- make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}."
- 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/ardour-5.5-r1.ebuild b/media-sound/ardour/ardour-5.5-r1.ebuild
deleted file mode 100644
index 8998723b507..00000000000
--- a/media-sound/ardour/ardour-5.5-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sys-libs/readline:0=
- sci-libs/fftw:3.0[threads]
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- eapply_user
- if ! [[ ${PV} == *9999* ]]; then
- eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- --lv2 \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
- make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}."
- 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/ardour-5.6-r1.ebuild b/media-sound/ardour/ardour-5.6-r1.ebuild
deleted file mode 100644
index 8998723b507..00000000000
--- a/media-sound/ardour/ardour-5.6-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sys-libs/readline:0=
- sci-libs/fftw:3.0[threads]
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- eapply_user
- if ! [[ ${PV} == *9999* ]]; then
- eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- --lv2 \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
- make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}."
- 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/ardour-5.8-r1.ebuild b/media-sound/ardour/ardour-5.8-r1.ebuild
deleted file mode 100644
index 8998723b507..00000000000
--- a/media-sound/ardour/ardour-5.8-r1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sys-libs/readline:0=
- sci-libs/fftw:3.0[threads]
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- eapply_user
- if ! [[ ${PV} == *9999* ]]; then
- eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- --lv2 \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
- make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}."
- 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/ardour-5.9.ebuild b/media-sound/ardour/ardour-5.9.ebuild
deleted file mode 100644
index 8998723b507..00000000000
--- a/media-sound/ardour/ardour-5.9.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 )
-PYTHON_REQ_USE='threads(+)'
-#EPYTHON='python2.7'
-inherit eutils toolchain-funcs flag-o-matic python-any-r1 waf-utils
-
-DESCRIPTION="Digital Audio Workstation"
-HOMEPAGE="http://ardour.org/"
-
-if [[ ${PV} == *9999* ]]; then
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
- inherit git-r3
-else
- KEYWORDS="~amd64 ~x86"
- SRC_URI="mirror://gentoo/Ardour-${PV}.0.tar.bz2 -> ${P}.tar.bz2"
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-SLOT="5"
-IUSE="altivec doc jack 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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- media-libs/vamp-plugin-sdk
- net-misc/curl
- sys-libs/readline:0=
- sci-libs/fftw:3.0[threads]
- virtual/libusb:0
- x11-libs/cairo
- >=x11-libs/gtk+-2.8.1:2
- x11-libs/pango
- jack? ( virtual/jack )
- >=media-libs/slv2-0.6.1
- media-libs/lilv
- media-libs/sratom
- dev-libs/sord
- >=media-libs/suil-0.6.10
- >=media-libs/lv2-1.4.0"
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-pkg_setup() {
- if has_version \>=dev-libs/libsigc++-2.6 ; then
- append-cxxflags -std=c++11
- fi
- python-any-r1_pkg_setup
-}
-
-src_prepare(){
- eapply_user
- if ! [[ ${PV} == *9999* ]]; then
- eapply "${FILESDIR}"/${PN}-4.x-revision-naming.patch
- touch "${S}/libs/ardour/revision.cc"
- fi
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
-}
-
-src_configure() {
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --prefix=/usr \
- --configdir=/etc \
- --nls \
- --optimize \
- --lv2 \
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization")
-}
-
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
- make_desktop_entry ardour5 ardour5 ardour5 AudioVideo
-}
-
-pkg_postinst() {
- elog "If you are using Ardour and want to keep its development alive"
- elog "then please consider to make a donation upstream at ${HOMEPAGE}."
- 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-2.8.11-flags.patch b/media-sound/ardour/files/ardour-2.8.11-flags.patch
deleted file mode 100644
index 607b072cffa..00000000000
--- a/media-sound/ardour/files/ardour-2.8.11-flags.patch
+++ /dev/null
@@ -1,28 +0,0 @@
---- ardour-2.8.11/SConstruct.orig
-+++ ardour-2.8.11/SConstruct
-@@ -414,6 +414,15 @@
- if os.environ.has_key('CXX'):
- context['CXX'] = os.environ['CXX']
-
-+ if os.environ.has_key('CFLAGS'):
-+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
-+
-+ if os.environ.has_key('CXXFLAGS'):
-+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
-+
-+ if os.environ.has_key('LDFLAGS'):
-+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
-+
- if os.environ.has_key('DISTCC_HOSTS'):
- context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
- context['ENV']['HOME'] = os.environ['HOME']
-@@ -807,9 +816,6 @@
- if env['DEBUG'] == 1:
- env.Append(CCFLAGS=" ".join (debug_flags))
- env.Append(LINKFLAGS=" ".join (debug_flags))
--else:
-- env.Append(CCFLAGS=" ".join (opt_flags))
-- env.Append(LINKFLAGS=" ".join (opt_flags))
-
- if env['STL_DEBUG'] == 1:
- env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG")
diff --git a/media-sound/ardour/files/ardour-2.8.14-boost-150.patch b/media-sound/ardour/files/ardour-2.8.14-boost-150.patch
deleted file mode 100644
index 0d23568a309..00000000000
--- a/media-sound/ardour/files/ardour-2.8.14-boost-150.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- /home/mad/ardour-2.8.14/SConstruct 2012-11-21 00:30:54.000000000 +0100
-+++ SConstruct 2012-11-21 17:34:02.000000000 +0100
-@@ -955,7 +961,9 @@
- # FLAC ....
- #
-
--# boost (we don't link against boost, just use some header files)
-+# boost (we need to link against boost with >=1.50. header files alone will not work anymore)
-+
-+env.Append(LIBS=['boost_system'])
-
- libraries['boost'] = LibraryInfo ()
- prep_libcheck(env, libraries['boost'])
diff --git a/media-sound/ardour/files/ardour-2.8.14-syslibs.patch b/media-sound/ardour/files/ardour-2.8.14-syslibs.patch
deleted file mode 100644
index a06c3b04e27..00000000000
--- a/media-sound/ardour/files/ardour-2.8.14-syslibs.patch
+++ /dev/null
@@ -1,108 +0,0 @@
---- SConstruct
-+++ SConstruct
-@@ -891,39 +891,6 @@
-
-
- #
--# these are part of the Ardour source tree because they are C++
--#
--
--libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
-- LIBPATH='#libs/vamp-sdk',
-- CPPPATH='#libs/vamp-sdk')
--libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk',
-- LIBPATH='#libs/vamp-sdk',
-- CPPPATH='#libs/vamp-sdk')
--
--env['RUBBERBAND'] = False
--
--conf = Configure (env)
--
--if conf.CheckHeader ('fftw3.h'):
-- env['RUBBERBAND'] = True
-- libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
-- LIBPATH='#libs/rubberband',
-- CPPPATH='#libs/rubberband',
-- CCFLAGS='-DUSE_RUBBERBAND')
--else:
-- print ""
-- print "-------------------------------------------------------------------------"
-- print "You do not have the FFTW single-precision development package installed."
-- print "This prevents Ardour from using the Rubberband library for timestretching"
-- print "and pitchshifting. It will fall back on SoundTouch for timestretch, and "
-- print "pitchshifting will not be available."
-- print "-------------------------------------------------------------------------"
-- print ""
--
--conf.Finish()
--
--#
- # Check for libusb
-
- libraries['usb'] = LibraryInfo ()
-@@ -1109,10 +1076,22 @@
- # Comment the previous line and uncomment this for old versions of Debian:
- #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
-
-- libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
-- LIBPATH='#libs/appleutility',
-- CPPPATH='#libs/appleutility')
-+ #libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
-+ # LIBPATH='#libs/appleutility',
-+ # CPPPATH='#libs/appleutility')
-
-+ env['RUBBERBAND'] = True
-+ env.Append (CXXFLAGS="-DUSE_RUBBERBAND")
-+ libraries['rubberband'] = LibraryInfo()
-+ libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband')
-+
-+ libraries['vamp-sdk'] = LibraryInfo()
-+ libraries['vamp-sdk'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
-+ libraries['vamp'] = LibraryInfo()
-+ libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
-+ libraries['vamphost'] = LibraryInfo()
-+ libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk')
-+
- coredirs = [
- 'templates',
- 'manual'
-@@ -1122,7 +1101,6 @@
- 'libs/pbd',
- 'libs/midi++2',
- 'libs/ardour',
-- 'libs/vamp-sdk',
- 'libs/vamp-plugins/',
- # these are unconditionally included but have
- # tests internally to avoid compilation etc
-@@ -1138,8 +1116,7 @@
- gtk_subdirs = [
- # 'libs/flowcanvas',
- 'libs/gtkmm2ext',
-- 'gtk2_ardour',
-- clearlooks_version
-+ 'gtk2_ardour'
- ]
-
- else:
-@@ -1251,9 +1228,9 @@
- # timestretch libraries
- #
-
--timefx_subdirs = []
--if env['RUBBERBAND']:
-- timefx_subdirs += ['libs/rubberband']
-+#timefx_subdirs = []
-+#if env['RUBBERBAND']:
-+# timefx_subdirs += ['libs/rubberband']
-
- #
- # Tools
-@@ -1441,7 +1418,7 @@
- for subdir in coredirs:
- SConscript (subdir + '/SConscript')
-
--for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]:
-+for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs, tools_subdirs ]:
- for subdir in sublistdir:
- SConscript (subdir + '/SConscript')
-
diff --git a/media-sound/ardour/files/ardour-4.0-lv2.patch b/media-sound/ardour/files/ardour-4.0-lv2.patch
deleted file mode 100644
index a79e3f20c44..00000000000
--- a/media-sound/ardour/files/ardour-4.0-lv2.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-diff -rupN ardour-4.0-vanilla/libs/ardour/automatable.cc ardour-4.0/libs/ardour/automatable.cc
---- ardour-4.0-vanilla/libs/ardour/automatable.cc 2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/libs/ardour/automatable.cc 2015-04-21 16:32:14.943812000 +0200
-@@ -34,7 +34,11 @@
- #include "ardour/plugin.h"
- #include "ardour/plugin_insert.h"
- #include "ardour/session.h"
-+
-+#ifdef LV2_SUPPORT
- #include "ardour/uri_map.h"
-+#endif
-+
- #include "ardour/value_as_string.h"
-
- #include "i18n.h"
-diff -rupN ardour-4.0-vanilla/libs/ardour/buffer_set.cc ardour-4.0/libs/ardour/buffer_set.cc
---- ardour-4.0-vanilla/libs/ardour/buffer_set.cc 2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/libs/ardour/buffer_set.cc 2015-04-21 16:40:44.216812000 +0200
-@@ -34,8 +34,8 @@
- #include "ardour/midi_buffer.h"
- #include "ardour/port.h"
- #include "ardour/port_set.h"
--#include "ardour/uri_map.h"
- #ifdef LV2_SUPPORT
-+#include "ardour/uri_map.h"
- #include "ardour/lv2_plugin.h"
- #include "lv2_evbuf.h"
- #endif
-diff -rupN ardour-4.0-vanilla/libs/ardour/event_type_map.cc ardour-4.0/libs/ardour/event_type_map.cc
---- ardour-4.0-vanilla/libs/ardour/event_type_map.cc 2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/libs/ardour/event_type_map.cc 2015-04-21 16:47:28.489812000 +0200
-@@ -24,7 +24,9 @@
- #include "ardour/event_type_map.h"
- #include "ardour/parameter_descriptor.h"
- #include "ardour/parameter_types.h"
-+#ifdef LV2_SUPPORT
- #include "ardour/uri_map.h"
-+#endif
- #include "evoral/Parameter.hpp"
- #include "evoral/ParameterDescriptor.hpp"
- #include "evoral/midi_events.h"
-diff -rupN ardour-4.0-vanilla/libs/ardour/globals.cc ardour-4.0/libs/ardour/globals.cc
---- ardour-4.0-vanilla/libs/ardour/globals.cc 2015-04-18 00:23:10.000000000 +0200
-+++ ardour-4.0/libs/ardour/globals.cc 2015-04-21 16:54:33.404812000 +0200
-@@ -106,8 +106,9 @@
- #include "ardour/runtime_functions.h"
- #include "ardour/session_event.h"
- #include "ardour/source_factory.h"
-+#ifdef LV2_SUPPORT
- #include "ardour/uri_map.h"
--
-+#endif
- #include "audiographer/routines.h"
-
- #if defined (__APPLE__)
-
diff --git a/media-sound/ardour/files/ardour-4.7-gcc.patch b/media-sound/ardour/files/ardour-4.7-gcc.patch
deleted file mode 100644
index 685eb2ab117..00000000000
--- a/media-sound/ardour/files/ardour-4.7-gcc.patch
+++ /dev/null
@@ -1,100 +0,0 @@
---- libs/gtkmm2ext/actions.cc.old 2016-02-19 02:28:56.000000000 +0100
-+++ libs/gtkmm2ext/actions.cc 2017-06-05 03:32:48.762688016 +0200
-@@ -401,7 +401,7 @@
- gtkmm2.6, so we fall back to the C level.
- */
-
-- if (ui_manager == 0) {
-+ if (ui_manager == (Glib::RefPtr<Gtk::UIManager>) 0) {
- return RefPtr<Action> ();
- }
-
---- libs/gtkmm2ext/fastmeter.cc.old 2016-02-19 02:28:56.000000000 +0100
-+++ libs/gtkmm2ext/fastmeter.cc 2017-06-05 05:01:57.075834979 +0200
-@@ -731,7 +731,7 @@
-
- Glib::RefPtr<Gdk::Window> win;
-
-- if ((win = get_window()) == 0) {
-+ if ((win = get_window()) == (Glib::RefPtr<Gdk::Window>) 0) {
- queue_draw ();
- return;
- }
-
---- gtk2_ardour/editor.cc.old 2016-02-19 02:28:56.000000000 +0100
-+++ gtk2_ardour/editor.cc 2017-06-05 05:38:20.971481110 +0200
-@@ -714,16 +714,16 @@
- list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- Glib::RefPtr<Gdk::Pixbuf> icon;
-
-- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
-+ if (icon = ::get_icon ("ardour_icon_16px")) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
-+ if (icon = ::get_icon ("ardour_icon_22px")) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
-+ if (icon = ::get_icon ("ardour_icon_32px")) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
-+ if (icon = ::get_icon ("ardour_icon_48px")) {
- window_icons.push_back (icon);
- }
- if (!window_icons.empty()) {
-
---- gtk2_ardour/fft_graph.cc.old 2016-02-19 02:28:56.000000000 +0100
-+++ gtk2_ardour/fft_graph.cc 2017-06-05 06:21:56.644212996 +0200
-@@ -203,7 +203,7 @@
-
-
-
-- if (graph_gc == 0) {
-+ if (graph_gc == (Glib::RefPtr<Gdk::GC>) 0) {
- graph_gc = GC::create( get_window() );
- }
-
-@@ -213,7 +213,7 @@
-
- graph_gc->set_rgb_fg_color( grey );
-
-- if (layout == 0) {
-+ if (layout == (Glib::RefPtr<Pango::Layout>) 0) {
- layout = create_pango_layout ("");
- layout->set_font_description (get_style()->get_font());
- }
-
---- gtk2_ardour/startup.cc.old 2016-02-19 02:28:56.000000000 +0100
-+++ gtk2_ardour/startup.cc 2017-06-05 06:41:27.091051601 +0200
-@@ -79,23 +79,23 @@
- set_position (WIN_POS_CENTER);
- set_border_width (12);
-
-- if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == 0) {
-+ if ((icon_pixbuf = ::get_icon ("ardour_icon_48px")) == (Glib::RefPtr<Gdk::Pixbuf>) 0) {
- throw failed_constructor();
- }
-
- list<Glib::RefPtr<Gdk::Pixbuf> > window_icons;
- Glib::RefPtr<Gdk::Pixbuf> icon;
-
-- if ((icon = ::get_icon ("ardour_icon_16px")) != 0) {
-+ if (icon = ::get_icon ("ardour_icon_16px")) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_22px")) != 0) {
-+ if (icon = ::get_icon ("ardour_icon_22px")) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_32px")) != 0) {
-+ if (icon = ::get_icon ("ardour_icon_32px")) {
- window_icons.push_back (icon);
- }
-- if ((icon = ::get_icon ("ardour_icon_48px")) != 0) {
-+ if (icon = ::get_icon ("ardour_icon_48px")) {
- window_icons.push_back (icon);
- }
- if (!window_icons.empty ()) {
-
diff --git a/media-sound/ardour/metadata.xml b/media-sound/ardour/metadata.xml
index c770fdfe0e9..20dec2c8d4e 100644
--- a/media-sound/ardour/metadata.xml
+++ b/media-sound/ardour/metadata.xml
@@ -5,9 +5,6 @@
<email>proaudio@gentoo.org</email>
<name>Gentoo ProAudio Project</name>
</maintainer>
- <use>
- <flag name="lv2">Add support for Ladspa V2</flag>
- </use>
<upstream>
<remote-id type="github">Ardour/ardour</remote-id>
</upstream>
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2020-11-13 8:34 Miroslav Šulc
0 siblings, 0 replies; 11+ messages in thread
From: Miroslav Šulc @ 2020-11-13 8:34 UTC (permalink / raw
To: gentoo-commits
commit: e2a338c9bbe6c03873acf3a71728cfce002bb1ac
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Nov 13 08:34:37 2020 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Nov 13 08:34:37 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e2a338c9
media-sound/ardour: removed obsolete 6.2-r1
Package-Manager: Portage-3.0.9, Repoman-3.0.2
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/ardour/Manifest | 1 -
media-sound/ardour/ardour-6.2-r1.ebuild | 157 -------
.../ardour/files/ardour-6.2-fix-no-nls.patch | 474 ---------------------
...-6.2-use-signed-int-for-atomic-operations.patch | 69 ---
4 files changed, 701 deletions(-)
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index c97770ccc71..a713cb887b9 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
-DIST Ardour-6.2.0.tar.bz2 11042230 BLAKE2B 7039b0ea7a8550d5372ce795bc978f3d6129828cc6e93d98ce8ba74c6fab3db0e4343142d75e9684f9dffdaebf1ee634f8ab0165f510eb658d32d890f6417b63 SHA512 d4c20968738ec2fef382fc1109f1b17560863c4eb0f7cf5c42b79e9a610916e57e6c01985a2ca2a66b8647e99c10bd98c16e05eb81a7811e73e482f7af11e4a8
DIST Ardour-6.3.0.tar.bz2 11863993 BLAKE2B 6b50d0e4b1effc8893cf555098f51458920db6c26a2db8f3c75a5eed56a4d8dafa1565717da2a75577f3068cbce4777f502eaf96f275ed3fd042c6388b842487 SHA512 ce1a6f1b92adb2df0c8863ead9b5f3d8c62a810b224262bda75bca4c09b11826266794260c63bb40ec8d75fbba6fb746a0dff4526311ab1035a3a8ebf0de2dd0
diff --git a/media-sound/ardour/ardour-6.2-r1.ebuild b/media-sound/ardour/ardour-6.2-r1.ebuild
deleted file mode 100644
index a35b090054a..00000000000
--- a/media-sound/ardour/ardour-6.2-r1.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python3_{6,7,8,9} )
-PYTHON_REQ_USE='threads(+)'
-PLOCALES="cs de el en_GB es eu fr it ja nn pl pt pt_PT ru sv zh"
-inherit eutils toolchain-funcs flag-o-matic l10n python-any-r1 waf-utils
-
-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 x86"
- SRC_URI="https://dev.gentoo.org/~fordfrog/distfiles/Ardour-${PV}.0.tar.bz2"
- S="${WORKDIR}/Ardour-${PV}.0"
-fi
-
-LICENSE="GPL-2"
-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-libs/boost:=
- >=dev-libs/glib-2.10.1:2
- dev-libs/libsigc++:2
- >=dev-libs/libxml2-2.6:2
- dev-libs/libxslt
- >=gnome-base/libgnomecanvas-2
- media-libs/alsa-lib
- media-libs/aubio
- media-libs/flac
- 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/raptor:2
- >=media-libs/rubberband-1.6.0
- >=media-libs/taglib-1.7
- 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/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...
-
-DEPEND="${RDEPEND}
- ${PYTHON_DEPS}
- jack? ( virtual/jack )
- sys-devel/gettext
- virtual/pkgconfig
- doc? ( app-doc/doxygen[dot] )"
-
-PATCHES=(
- "${FILESDIR}/${P}-fix-no-nls.patch"
- "${FILESDIR}/${P}-use-signed-int-for-atomic-operations.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
- sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
- 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
- append-flags "-lboost_system"
- python_fix_shebang "${S}"/wscript
- python_fix_shebang "${S}"/waf
- my_lcmsg() {
- rm -f {gtk2_ardour,gtk2_ardour/appdata,libs/ardour,libs/gtkmm2ext}/po/${1}.po
- }
- l10n_for_each_disabled_locale_do my_lcmsg
-}
-
-src_configure() {
- local backends="alsa"
- use jack && backends+=",jack"
- use pulseaudio && backends+=",pulseaudio"
-
- tc-export CC CXX
- mkdir -p "${D}"
- waf-utils_src_configure \
- --destdir="${D}" \
- --configdir=/etc \
- --optimize \
- --with-backends=${backends} \
- $(usex doc "--docs" '') \
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \
- $(usex phonehome "--phone-home" "--no-phone-home") \
- $(usex nls "--nls" "--no-nls")
-#not possible right now --use-external-libs
-}
-src_compile() {
- waf-utils_src_compile
- use nls && waf-utils_src_compile i18n
-}
-src_install() {
- waf-utils_src_install
- mv ${PN}.1 ${PN}${SLOT}.1
- doman ${PN}${SLOT}.1
- newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png
- make_desktop_entry ardour6 ardour6 ardour6 AudioVideo
-}
-
-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-6.2-fix-no-nls.patch b/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
deleted file mode 100644
index cc03d0baff5..00000000000
--- a/media-sound/ardour/files/ardour-6.2-fix-no-nls.patch
+++ /dev/null
@@ -1,474 +0,0 @@
-From fcd347fe0c11e8e04aebc086da328921f54b947f Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Wed, 19 Aug 2020 17:39:32 +0200
-Subject: [PATCH 1/2] Fix --no-nls, i18n include order in libs -- #8361
-
-Ardour's "pbd/i18n.h" needs to be included last,
-after any include that may indirectly pull in getext or libintl.
-
-For that reason "pbd/i18n.h" must not be used in header files either.
----
- libs/ardour/ardour/disk_reader.h | 7 +------
- libs/ardour/ardour/disk_writer.h | 4 +---
- libs/ardour/ardour/transport_master.h | 3 +--
- libs/ardour/disk_reader.cc | 6 ++++++
- libs/ardour/disk_writer.cc | 6 ++++++
- libs/ardour/port.cc | 3 ++-
- libs/ardour/port_engine_shared.cc | 3 ++-
- libs/ardour/region.cc | 3 ++-
- libs/ardour/transport_fsm.cc | 3 ++-
- libs/ardour/transport_master.cc | 2 +-
- libs/surfaces/contourdesign/button_config_widget.cc | 3 ++-
- libs/surfaces/contourdesign/contourdesign_gui.cc | 4 ++--
- libs/surfaces/contourdesign/jump_distance_widget.cc | 2 +-
- .../surfaces/generic_midi/generic_midi_control_protocol.cc | 3 ++-
- 14 files changed, 31 insertions(+), 21 deletions(-)
-
-diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h
-index 724c091b3..d9773bbeb 100644
---- a/libs/ardour/ardour/disk_reader.h
-+++ b/libs/ardour/ardour/disk_reader.h
-@@ -22,8 +22,6 @@
-
- #include <boost/optional.hpp>
-
--#include "pbd/i18n.h"
--
- #include "evoral/Curve.h"
-
- #include "ardour/disk_io.h"
-@@ -46,10 +44,7 @@ public:
-
- bool set_name (std::string const& str);
-
-- std::string display_name () const
-- {
-- return std::string (_("player"));
-- }
-+ std::string display_name () const;
-
- static samplecnt_t chunk_samples ()
- {
-diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h
-index 2bd753a00..511b6bc4f 100644
---- a/libs/ardour/ardour/disk_writer.h
-+++ b/libs/ardour/ardour/disk_writer.h
-@@ -23,8 +23,6 @@
- #include <list>
- #include <vector>
-
--#include "pbd/i18n.h"
--
- #include "ardour/disk_io.h"
- #include "ardour/midi_buffer.h"
-
-@@ -42,7 +40,7 @@ public:
- ~DiskWriter ();
-
- bool set_name (std::string const& str);
-- std::string display_name () const { return std::string (_ ("recorder")); }
-+ std::string display_name () const;
-
- bool recordable () const { return _flags & Recordable; }
-
-diff --git a/libs/ardour/ardour/transport_master.h b/libs/ardour/ardour/transport_master.h
-index d6b554ef8..af98c0b3a 100644
---- a/libs/ardour/ardour/transport_master.h
-+++ b/libs/ardour/ardour/transport_master.h
-@@ -29,7 +29,6 @@
-
- #include <ltc.h>
-
--#include "pbd/i18n.h"
- #include "pbd/properties.h"
- #include "pbd/signals.h"
- #include "pbd/statefuldestructible.h"
-@@ -123,7 +122,7 @@ struct LIBARDOUR_API SafeTime {
-
- do {
- if (tries == 10) {
-- std::cerr << X_("SafeTime: atomic read of current time failed, sleeping!") << std::endl;
-+ std::cerr << "SafeTime: atomic read of current time failed, sleeping!" << std::endl;
- Glib::usleep (20);
- tries = 0;
- }
-diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc
-index 252a84a65..5fa694485 100644
---- a/libs/ardour/disk_reader.cc
-+++ b/libs/ardour/disk_reader.cc
-@@ -76,6 +76,12 @@ DiskReader::~DiskReader ()
- DEBUG_TRACE (DEBUG::Destruction, string_compose ("DiskReader %1 @ %2 deleted\n", _name, this));
- }
-
-+std::string
-+DiskReader::display_name () const
-+{
-+ return std::string (_("player"));
-+}
-+
- void
- DiskReader::ReaderChannelInfo::resize (samplecnt_t bufsize)
- {
-diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc
-index aee4f9301..34aa3f1e9 100644
---- a/libs/ardour/disk_writer.cc
-+++ b/libs/ardour/disk_writer.cc
-@@ -85,6 +85,12 @@ DiskWriter::default_chunk_samples ()
- return 65536;
- }
-
-+std::string
-+DiskWriter::display_name () const
-+{
-+ return std::string (_ ("recorder"));
-+}
-+
- void
- DiskWriter::WriterChannelInfo::resize (samplecnt_t bufsize)
- {
-diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc
-index 9bc318a14..8be47efbd 100644
---- a/libs/ardour/port.cc
-+++ b/libs/ardour/port.cc
-@@ -26,7 +26,6 @@
- #include "pbd/compose.h"
- #include "pbd/error.h"
- #include "pbd/failed_constructor.h"
--#include "pbd/i18n.h"
-
- #include "ardour/audioengine.h"
- #include "ardour/debug.h"
-@@ -34,6 +33,8 @@
- #include "ardour/port_engine.h"
- #include "ardour/rc_configuration.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/libs/ardour/port_engine_shared.cc b/libs/ardour/port_engine_shared.cc
-index f8ab0e204..ad32762f0 100644
---- a/libs/ardour/port_engine_shared.cc
-+++ b/libs/ardour/port_engine_shared.cc
-@@ -21,10 +21,11 @@
- #include <regex.h>
-
- #include "pbd/error.h"
--#include "pbd/i18n.h"
-
- #include "ardour/port_engine_shared.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
-
- BackendPort::BackendPort (PortEngineSharedImpl &b, const std::string& name, PortFlags flags)
-diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc
-index cb42f1d2c..ab6042af3 100644
---- a/libs/ardour/region.cc
-+++ b/libs/ardour/region.cc
-@@ -30,7 +30,6 @@
-
- #include <glibmm/threads.h>
-
--#include "pbd/i18n.h"
- #include "pbd/types_convert.h"
- #include "pbd/xml++.h"
-
-@@ -47,6 +46,8 @@
- #include "ardour/transient_detector.h"
- #include "ardour/types_convert.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/libs/ardour/transport_fsm.cc b/libs/ardour/transport_fsm.cc
-index 484106785..59de3d1de 100644
---- a/libs/ardour/transport_fsm.cc
-+++ b/libs/ardour/transport_fsm.cc
-@@ -22,7 +22,6 @@
- #include <boost/none.hpp>
-
- #include "pbd/error.h"
--#include "pbd/i18n.h"
- #include "pbd/pthread_utils.h"
- #include "pbd/stacktrace.h"
-
-@@ -31,6 +30,8 @@
- #include "ardour/session.h"
- #include "ardour/transport_fsm.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
-
-diff --git a/libs/ardour/transport_master.cc b/libs/ardour/transport_master.cc
-index ea56a860b..e76fd5eb6 100644
---- a/libs/ardour/transport_master.cc
-+++ b/libs/ardour/transport_master.cc
-@@ -21,7 +21,6 @@
-
- #include "pbd/boost_debug.h"
- #include "pbd/debug.h"
--#include "pbd/i18n.h"
-
- #include "ardour/audioengine.h"
- #include "ardour/debug.h"
-@@ -32,6 +31,7 @@
- #include "ardour/types_convert.h"
- #include "ardour/utils.h"
-
-+#include "pbd/i18n.h"
-
- namespace ARDOUR {
- namespace Properties {
-diff --git a/libs/surfaces/contourdesign/button_config_widget.cc b/libs/surfaces/contourdesign/button_config_widget.cc
-index 785c8c6b1..f46f80f12 100644
---- a/libs/surfaces/contourdesign/button_config_widget.cc
-+++ b/libs/surfaces/contourdesign/button_config_widget.cc
-@@ -24,12 +24,13 @@
- #include "gtkmm2ext/actions.h"
- #include "gtkmm2ext/action_model.h"
-
--#include "pbd/i18n.h"
- #include "pbd/strsplit.h"
- #include "pbd/signals.h"
-
- #include "button_config_widget.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace Gtk;
- using namespace ArdourSurface;
-diff --git a/libs/surfaces/contourdesign/contourdesign_gui.cc b/libs/surfaces/contourdesign/contourdesign_gui.cc
-index 3d061b060..ed58c787d 100644
---- a/libs/surfaces/contourdesign/contourdesign_gui.cc
-+++ b/libs/surfaces/contourdesign/contourdesign_gui.cc
-@@ -37,12 +37,12 @@
-
- #include "widgets/ardour_button.h"
-
--#include "pbd/i18n.h"
--
- #include "contourdesign.h"
- #include "jump_distance_widget.h"
- #include "button_config_widget.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace ArdourSurface;
-
- class ContourDesignGUI : public Gtk::VBox, public PBD::ScopedConnectionList
-diff --git a/libs/surfaces/contourdesign/jump_distance_widget.cc b/libs/surfaces/contourdesign/jump_distance_widget.cc
-index 8469658a1..dacc3a752 100644
---- a/libs/surfaces/contourdesign/jump_distance_widget.cc
-+++ b/libs/surfaces/contourdesign/jump_distance_widget.cc
-@@ -21,10 +21,10 @@
- #include <gtkmm/spinbutton.h>
-
- #include "gtkmm2ext/utils.h"
--#include "pbd/i18n.h"
-
- #include "jump_distance_widget.h"
-
-+#include "pbd/i18n.h"
-
- using namespace std;
- using namespace Gtk;
-diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-index c5ba0b794..31e5383dc 100644
---- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc
-@@ -41,7 +41,6 @@
- #include "pbd/error.h"
- #include "pbd/failed_constructor.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/strsplit.h"
- #include "pbd/types_convert.h"
- #include "pbd/xml++.h"
-@@ -66,6 +65,8 @@
-
- #include "pbd/abstract_ui.cc" // instantiate template
-
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Glib;
---
-2.28.0
-
-
-From a7a20e03ffc61e444c188411da0d3afa1d14548a Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Wed, 19 Aug 2020 17:40:02 +0200
-Subject: [PATCH 2/2] Fix --no-nls, i18n include order in UI -- #8361
-
----
- gtk2_ardour/ardour_ui_access_web.cc | 3 ++-
- gtk2_ardour/ardour_ui_dependents.cc | 3 ++-
- gtk2_ardour/pt_import_selector.cc | 3 ++-
- gtk2_ardour/startup_fsm.cc | 3 ++-
- gtk2_ardour/template_dialog.cc | 4 ++--
- gtk2_ardour/transport_control.cc | 4 ++--
- session_utils/fix_bbtppq.cc | 3 ++-
- 7 files changed, 14 insertions(+), 9 deletions(-)
-
-diff --git a/gtk2_ardour/ardour_ui_access_web.cc b/gtk2_ardour/ardour_ui_access_web.cc
-index 7986e2ca3..781b65262 100644
---- a/gtk2_ardour/ardour_ui_access_web.cc
-+++ b/gtk2_ardour/ardour_ui_access_web.cc
-@@ -36,12 +36,13 @@
- #include "gtk2ardour-version.h"
- #endif
-
--#include "pbd/i18n.h"
- #include "pbd/openuri.h"
-
- #include "ardour_message.h"
- #include "ardour_ui.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace PBD;
- using namespace Gtk;
-diff --git a/gtk2_ardour/ardour_ui_dependents.cc b/gtk2_ardour/ardour_ui_dependents.cc
-index d28ae7c14..24810d3e7 100644
---- a/gtk2_ardour/ardour_ui_dependents.cc
-+++ b/gtk2_ardour/ardour_ui_dependents.cc
-@@ -33,7 +33,6 @@
- #include <cstdio>
-
- #include "pbd/error.h"
--#include "pbd/i18n.h"
-
- #include "ardour/session.h"
- #include "ardour/lv2_plugin.h"
-@@ -62,6 +61,8 @@
- #include <gdk/gdkx.h>
- #endif
-
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- using namespace PBD;
-
-diff --git a/gtk2_ardour/pt_import_selector.cc b/gtk2_ardour/pt_import_selector.cc
-index da65bcb72..318da1e35 100644
---- a/gtk2_ardour/pt_import_selector.cc
-+++ b/gtk2_ardour/pt_import_selector.cc
-@@ -22,7 +22,6 @@
- #include <iostream>
-
- #include "pbd/gstdio_compat.h"
--#include "pbd/i18n.h"
- #include "pbd/file_utils.h"
-
- #include "ptformat/ptformat.h"
-@@ -33,6 +32,8 @@
-
- #include "pt_import_selector.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
- using namespace ARDOUR;
- using namespace PBD;
-diff --git a/gtk2_ardour/startup_fsm.cc b/gtk2_ardour/startup_fsm.cc
-index c52b0ecea..dfdd01ce4 100644
---- a/gtk2_ardour/startup_fsm.cc
-+++ b/gtk2_ardour/startup_fsm.cc
-@@ -26,7 +26,6 @@
- #include "pbd/basename.h"
- #include "pbd/file_archive.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
-
- #include "ardour/audioengine.h"
- #include "ardour/filename_extensions.h"
-@@ -58,6 +57,8 @@
- #include "gtk2ardour-version.h"
- #endif
-
-+#include "pbd/i18n.h"
-+
- using namespace ARDOUR;
- using namespace Gtk;
- using namespace Gtkmm2ext;
-diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc
-index e0c5590ee..c9c37d00e 100644
---- a/gtk2_ardour/template_dialog.cc
-+++ b/gtk2_ardour/template_dialog.cc
-@@ -40,7 +40,6 @@
- #include "pbd/error.h"
- #include "pbd/file_archive.h"
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/xml++.h"
-
- #include "gtkmm2ext/gui_thread.h"
-@@ -52,9 +51,10 @@
- #include "ardour/template_utils.h"
-
- #include "progress_reporter.h"
--
- #include "template_dialog.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace Gtk;
- using namespace PBD;
-diff --git a/gtk2_ardour/transport_control.cc b/gtk2_ardour/transport_control.cc
-index a7be5903d..0828febb6 100644
---- a/gtk2_ardour/transport_control.cc
-+++ b/gtk2_ardour/transport_control.cc
-@@ -16,8 +16,6 @@
- * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
-
--#include "pbd/i18n.h"
--
- #include "ardour/location.h"
- #include "ardour/session.h"
-
-@@ -25,6 +23,8 @@
- #include "ardour_ui.h"
- #include "transport_control.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace Gtk;
-
- TransportControlProvider::TransportControlProvider ()
-diff --git a/session_utils/fix_bbtppq.cc b/session_utils/fix_bbtppq.cc
-index e3767c8cd..81b148bcc 100644
---- a/session_utils/fix_bbtppq.cc
-+++ b/session_utils/fix_bbtppq.cc
-@@ -25,7 +25,6 @@
- #include <glibmm.h>
-
- #include "pbd/file_utils.h"
--#include "pbd/i18n.h"
- #include "pbd/stateful.h"
-
- #include "ardour/region_factory.h"
-@@ -44,6 +43,8 @@
-
- #include "common.h"
-
-+#include "pbd/i18n.h"
-+
- using namespace std;
- using namespace ARDOUR;
- using namespace SessionUtils;
---
-2.28.0
-
diff --git a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch b/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
deleted file mode 100644
index 90454593b68..00000000000
--- a/media-sound/ardour/files/ardour-6.2-use-signed-int-for-atomic-operations.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 6d950d15ba5192a86c57d8045d1d26f9ad4be0db Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Thu, 16 Jul 2020 16:13:21 +0200
-Subject: [PATCH] Use signed int for atomic operations -- #8314
-
----
- libs/pbd/pbd/mpmc_queue.h | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/libs/pbd/pbd/mpmc_queue.h b/libs/pbd/pbd/mpmc_queue.h
-index a7909a901..2c08068e1 100644
---- a/libs/pbd/pbd/mpmc_queue.h
-+++ b/libs/pbd/pbd/mpmc_queue.h
-@@ -82,7 +82,7 @@ public:
- push_back (T const& data)
- {
- cell_t* cell;
-- guint pos = g_atomic_int_get (&_enqueue_pos);
-+ gint pos = g_atomic_int_get (&_enqueue_pos);
- for (;;) {
- cell = &_buffer[pos & _buffer_mask];
- guint seq = g_atomic_int_get (&cell->_sequence);
-@@ -108,7 +108,7 @@ public:
- pop_front (T& data)
- {
- cell_t* cell;
-- guint pos = g_atomic_int_get (&_dequeue_pos);
-+ gint pos = g_atomic_int_get (&_dequeue_pos);
- for (;;) {
- cell = &_buffer[pos & _buffer_mask];
- guint seq = g_atomic_int_get (&cell->_sequence);
-@@ -138,8 +138,8 @@ private:
- cell_t* _buffer;
- size_t _buffer_mask;
-
-- volatile guint _enqueue_pos;
-- volatile guint _dequeue_pos;
-+ volatile gint _enqueue_pos;
-+ volatile gint _dequeue_pos;
- };
-
- } /* end namespace */
---
-2.28.0
-
-From 9fcb51de2e34f9fee74838e57317ad44d21c40d0 Mon Sep 17 00:00:00 2001
-From: Robin Gareus <robin@gareus.org>
-Date: Thu, 16 Jul 2020 18:07:14 +0200
-Subject: [PATCH] Use signed int for atomic operations part II -- #8314
-
----
- libs/ardour/ardour/session.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
-index dcc8c88ed..f491f7f17 100644
---- a/libs/ardour/ardour/session.h
-+++ b/libs/ardour/ardour/session.h
-@@ -1762,7 +1762,7 @@ private:
- OnlyLoop,
- };
-
-- volatile guint _punch_or_loop; // enum PunchLoopLock
-+ volatile gint _punch_or_loop; // enum PunchLoopLock
- gint current_usecs_per_track;
-
- bool punch_active () const;
---
-2.28.0
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2021-08-06 14:10 Miroslav Šulc
0 siblings, 0 replies; 11+ messages in thread
From: Miroslav Šulc @ 2021-08-06 14:10 UTC (permalink / raw
To: gentoo-commits
commit: dd26c5689532219bffe52836c49bf1d5d231b53f
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Fri Aug 6 13:46:35 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Aug 6 14:10:44 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dd26c568
media-sound/ardour: fixes in 6.8 and 9999
fixed handling of AS
fixed location of appdata
Closes: https://bugs.gentoo.org/800070
Closes: https://bugs.gentoo.org/800067
Package-Manager: Portage-3.0.20, Repoman-3.0.3
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../ardour/{ardour-6.8.ebuild => ardour-6.8-r1.ebuild} | 11 +++++++----
media-sound/ardour/ardour-9999.ebuild | 11 +++++++----
media-sound/ardour/files/ardour-6.8-metadata.patch | 13 +++++++++++++
3 files changed, 27 insertions(+), 8 deletions(-)
diff --git a/media-sound/ardour/ardour-6.8.ebuild b/media-sound/ardour/ardour-6.8-r1.ebuild
similarity index 97%
rename from media-sound/ardour/ardour-6.8.ebuild
rename to media-sound/ardour/ardour-6.8-r1.ebuild
index bd4fb59624c..f3108601e72 100644
--- a/media-sound/ardour/ardour-6.8.ebuild
+++ b/media-sound/ardour/ardour-6.8-r1.ebuild
@@ -71,6 +71,10 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
jack? ( virtual/jack )"
+PATCHES=(
+ "${FILESDIR}/${P}-metadata.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"
@@ -84,7 +88,6 @@ pkg_setup() {
}
src_prepare() {
- default
xdg_src_prepare
sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
@@ -119,6 +122,9 @@ src_prepare() {
}
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"
@@ -166,9 +172,6 @@ src_install() {
insinto /usr/share/mime/packages
newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
- insinto /usr/share/metainfo
- doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
}
pkg_postinst() {
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index bd4fb59624c..41b264273ca 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -71,6 +71,10 @@ DEPEND="${RDEPEND}
doc? ( app-doc/doxygen[dot] )
jack? ( virtual/jack )"
+PATCHES=(
+ "${FILESDIR}/${PN}-6.8-metadata.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"
@@ -84,7 +88,6 @@ pkg_setup() {
}
src_prepare() {
- default
xdg_src_prepare
sed 's/'full-optimization\'\ :\ \\[.*'/'full-optimization\'\ :\ \'\','/' -i "${S}"/wscript || die
@@ -119,6 +122,9 @@ src_prepare() {
}
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"
@@ -166,9 +172,6 @@ src_install() {
insinto /usr/share/mime/packages
newins build/gtk2_ardour/ardour.xml ardour${SLOT}.xml
-
- insinto /usr/share/metainfo
- doins build/gtk2_ardour/ardour${SLOT}.appdata.xml
}
pkg_postinst() {
diff --git a/media-sound/ardour/files/ardour-6.8-metadata.patch b/media-sound/ardour/files/ardour-6.8-metadata.patch
new file mode 100644
index 00000000000..fa7b6e12119
--- /dev/null
+++ b/media-sound/ardour/files/ardour-6.8-metadata.patch
@@ -0,0 +1,13 @@
+diff --git a/gtk2_ardour/wscript b/gtk2_ardour/wscript
+index f5d0533..a68cb3f 100644
+--- a/gtk2_ardour/wscript
++++ b/gtk2_ardour/wscript
+@@ -943,7 +943,7 @@ def build(bld):
+ obj.chmod = Utils.O644
+ obj.dict = freedesktop_subst_dict
+ set_subst_dict(obj, freedesktop_subst_dict)
+- bld.install_files (os.path.join (bld.env['PREFIX'], 'share/appdata'), obj.target)
++ bld.install_files (os.path.join (bld.env['PREFIX'], 'share/metadata'), obj.target)
+
+ # install desktop icon files
+ bld.install_as('${PREFIX}/share/icons/hicolor/16x16/apps/ardour6.png', 'resources/Ardour-icon_16px.png')
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2023-09-22 15:44 Sam James
0 siblings, 0 replies; 11+ messages in thread
From: Sam James @ 2023-09-22 15:44 UTC (permalink / raw
To: gentoo-commits
commit: acf9acf595f777967f52efca811a3028d7af8431
Author: Violet Purcell <vimproved <AT> inventati <DOT> org>
AuthorDate: Fri Sep 22 01:17:20 2023 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Fri Sep 22 15:42:14 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=acf9acf5
media-sound/ardour: Improve libc++ fix
This commit makes the libc++ fix for ardour use the fix from Steinberg's
upstream vst3 sdk, which actually provides an implementation for
AtomicAdd, unlike the previous fix. Additionally, this fix does not
require an extra configure arg.
Upstream-PR: https://github.com/Ardour/ardour/pull/822
Signed-off-by: Violet Purcell <vimproved <AT> inventati.org>
Closes: https://github.com/gentoo/gentoo/pull/32981
Signed-off-by: Sam James <sam <AT> gentoo.org>
.../{ardour-7.4-r2.ebuild => ardour-7.4-r3.ebuild} | 2 -
.../{ardour-7.5.ebuild => ardour-7.5-r1.ebuild} | 2 -
media-sound/ardour/ardour-9999.ebuild | 2 -
media-sound/ardour/files/ardour-7.4-libc++.patch | 56 +++++++++++++---------
4 files changed, 33 insertions(+), 29 deletions(-)
diff --git a/media-sound/ardour/ardour-7.4-r2.ebuild b/media-sound/ardour/ardour-7.4-r3.ebuild
similarity index 98%
rename from media-sound/ardour/ardour-7.4-r2.ebuild
rename to media-sound/ardour/ardour-7.4-r3.ebuild
index 2bfcbebca1ea..0fee9b81252e 100644
--- a/media-sound/ardour/ardour-7.4-r2.ebuild
+++ b/media-sound/ardour/ardour-7.4-r3.ebuild
@@ -146,8 +146,6 @@ src_configure() {
# not possible right now --use-external-libs
)
- [[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ )
-
waf-utils_src_configure "${myconf[@]}"
}
diff --git a/media-sound/ardour/ardour-7.5.ebuild b/media-sound/ardour/ardour-7.5-r1.ebuild
similarity index 98%
rename from media-sound/ardour/ardour-7.5.ebuild
rename to media-sound/ardour/ardour-7.5-r1.ebuild
index 2bef74d90d7e..e012233b45d4 100644
--- a/media-sound/ardour/ardour-7.5.ebuild
+++ b/media-sound/ardour/ardour-7.5-r1.ebuild
@@ -146,8 +146,6 @@ src_configure() {
# not possible right now --use-external-libs
)
- [[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ )
-
waf-utils_src_configure "${myconf[@]}"
}
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index 607dfeed3930..029d71ed7696 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -146,8 +146,6 @@ src_configure() {
# not possible right now --use-external-libs
)
- [[ "$(tc-get-cxx-stdlib)" = "libc++" ]] && myconf+=( --use-libc++ )
-
waf-utils_src_configure "${myconf[@]}"
}
diff --git a/media-sound/ardour/files/ardour-7.4-libc++.patch b/media-sound/ardour/files/ardour-7.4-libc++.patch
index 85f13ba47dbc..a596fafba0f7 100644
--- a/media-sound/ardour/files/ardour-7.4-libc++.patch
+++ b/media-sound/ardour/files/ardour-7.4-libc++.patch
@@ -1,39 +1,49 @@
-From d8e42490b18bd0c8a827d96608e951bf5bc875e4 Mon Sep 17 00:00:00 2001
+From https://github.com/Ardour/ardour/pull/822/commits/c2ac82bfbacc583c49b306826dedec754633bbe7 Mon Sep 17 00:00:00 2001
From: Violet Purcell <vimproved@inventati.org>
-Date: Sun, 4 Jun 2023 04:56:58 -0400
-Subject: [PATCH] Fix build with libc++ on linux
+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 <vimproved@inventati.org>
--- a/libs/vst3/pluginterfaces/base/funknown.cpp
+++ b/libs/vst3/pluginterfaces/base/funknown.cpp
-@@ -44,7 +44,9 @@
+@@ -44,13 +44,23 @@
#endif
#if SMTG_OS_LINUX
-+#ifndef USE_LIBCXX
++#if !defined (SMTG_USE_STDATOMIC_H)
++#if defined (_LIBCPP_VERSION)
++#define SMTG_USE_STDATOMIC_H 1
++#else
#include <ext/atomicity.h>
++#endif
+#endif
/* UUID */
#include <string>
#include <boost/uuid/uuid.hpp>
-@@ -83,7 +85,7 @@ int32 PLUGIN_API atomicAdd (int32& var, int32 d)
+ #include <boost/uuid/uuid_generators.hpp>
+ #endif
+
++#if defined (SMTG_USE_STDATOMIC_H) && SMTG_USE_STDATOMIC_H
++#include <stdatomic.h>
++#endif
++
+ namespace Steinberg {
+
+ //------------------------------------------------------------------------
+@@ -79,7 +89,9 @@ namespace FUnknownPrivate {
+ //------------------------------------------------------------------------
+ int32 PLUGIN_API atomicAdd (int32& var, int32 d)
+ {
+-#if SMTG_OS_WINDOWS
++#if SMTG_USE_STDATOMIC_H
++ return atomic_fetch_add (reinterpret_cast<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);
--#elif SMTG_OS_LINUX
-+#elif SMTG_OS_LINUX && !defined USE_LIBCXX
- __gnu_cxx::__atomic_add (&var, d);
- return var;
- #else
---- a/wscript
-+++ b/wscript
-@@ -545,6 +545,8 @@ int main() { return 0; }''',
- if opt.use_libcpp or conf.env['build_host'] in [ 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' ]:
- cxx_flags.append('--stdlib=libc++')
- linker_flags.append('--stdlib=libc++')
-+ if platform == 'linux':
-+ cxx_flags.append('-DUSE_LIBCXX')
-
- if conf.options.cxx11 or conf.env['build_host'] in [ 'mavericks', 'yosemite', 'el_capitan', 'sierra', 'high_sierra', 'mojave', 'catalina' , 'bigsur', 'monterey', 'ventura' ]:
- conf.check_cxx(cxxflags=["-std=c++11"])
--
-2.40.1
+2.42.0
+
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2024-05-21 17:24 Miroslav Šulc
0 siblings, 0 replies; 11+ messages in thread
From: Miroslav Šulc @ 2024-05-21 17:24 UTC (permalink / raw
To: gentoo-commits
commit: 5e07ca5693cf685291678bb251dcb33c7312c3a2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Tue May 21 17:23:48 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue May 21 17:24:28 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e07ca56
media-sound/ardour: fixed compilation with boost 1.85
Closes: https://bugs.gentoo.org/932349
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/ardour/ardour-8.6.ebuild | 1 +
media-sound/ardour/ardour-9999.ebuild | 1 +
media-sound/ardour/files/ardour-6.8-boost-1.85.patch | 19 +++++++++++++++++++
3 files changed, 21 insertions(+)
diff --git a/media-sound/ardour/ardour-8.6.ebuild b/media-sound/ardour/ardour-8.6.ebuild
index 51d880ba1dae..365ac6ace241 100644
--- a/media-sound/ardour/ardour-8.6.ebuild
+++ b/media-sound/ardour/ardour-8.6.ebuild
@@ -71,6 +71,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-6.8-metadata.patch"
+ "${FILESDIR}/${PN}-6.8-boost-1.85.patch"
)
pkg_pretend() {
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild
index cee5f390d988..ffe4801efe13 100644
--- a/media-sound/ardour/ardour-9999.ebuild
+++ b/media-sound/ardour/ardour-9999.ebuild
@@ -71,6 +71,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-6.8-metadata.patch"
+ "${FILESDIR}/${PN}-6.8-boost-1.85.patch"
)
pkg_pretend() {
diff --git a/media-sound/ardour/files/ardour-6.8-boost-1.85.patch b/media-sound/ardour/files/ardour-6.8-boost-1.85.patch
new file mode 100644
index 000000000000..ffa8a6b092b6
--- /dev/null
+++ b/media-sound/ardour/files/ardour-6.8-boost-1.85.patch
@@ -0,0 +1,19 @@
+--- Ardour-8.6.0.orig/libs/surfaces/websockets/message.cc
++++ Ardour-8.6.0/libs/surfaces/websockets/message.cc
+@@ -58,14 +58,14 @@ NodeStateMessage::NodeStateMessage (void
+
+ _state = NodeState (root.get<std::string> ("node"));
+
+- pt::ptree addr = root.get_child ("addr", pt::ptree ());
++ pt::ptree addr = root.get_child ("addr");
+
+ for (pt::ptree::iterator it = addr.begin (); it != addr.end (); ++it) {
+ // throws if datatype not uint32_t
+ _state.add_addr (boost::lexical_cast<uint32_t> (it->second.data ()));
+ }
+
+- pt::ptree val = root.get_child ("val", pt::ptree ());
++ pt::ptree val = root.get_child ("val");
+
+ for (pt::ptree::iterator it = val.begin (); it != val.end (); ++it) {
+ std::string val = it->second.data ();
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2024-11-04 19:28 Miroslav Šulc
0 siblings, 0 replies; 11+ messages in thread
From: Miroslav Šulc @ 2024-11-04 19:28 UTC (permalink / raw
To: gentoo-commits
commit: 76367ed3e2d0c4915db59bfa604f67c60d740001
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 4 19:27:59 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 4 19:28:10 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=76367ed3
media-sound/ardour: applied patch to 8.10-r2 to prevent crash on startup when compiled with clang + dropped old c++11 flag
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
...ardour-8.10-r1.ebuild => ardour-8.10-r2.ebuild} | 8 +-
.../files/ardour-9.0.0-fix-clang-crash.patch | 123 +++++++++++++++++++++
2 files changed, 124 insertions(+), 7 deletions(-)
diff --git a/media-sound/ardour/ardour-8.10-r1.ebuild b/media-sound/ardour/ardour-8.10-r2.ebuild
similarity index 97%
rename from media-sound/ardour/ardour-8.10-r1.ebuild
rename to media-sound/ardour/ardour-8.10-r2.ebuild
index 0f3b1f15c091..bb6ece851b94 100644
--- a/media-sound/ardour/ardour-8.10-r1.ebuild
+++ b/media-sound/ardour/ardour-8.10-r2.ebuild
@@ -71,6 +71,7 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-6.8-metadata.patch"
+ "${FILESDIR}/${PN}-9.0.0-fix-clang-crash.patch"
)
pkg_pretend() {
@@ -78,13 +79,6 @@ pkg_pretend() {
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
diff --git a/media-sound/ardour/files/ardour-9.0.0-fix-clang-crash.patch b/media-sound/ardour/files/ardour-9.0.0-fix-clang-crash.patch
new file mode 100644
index 000000000000..6162782d91f5
--- /dev/null
+++ b/media-sound/ardour/files/ardour-9.0.0-fix-clang-crash.patch
@@ -0,0 +1,123 @@
+From f17a6562174ccf658eb35ba7a425d3ac340c1607 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Mon, 4 Nov 2024 18:46:21 +0100
+Subject: [PATCH] use modern C++ for snprintf (#9841)
+
+This replaces vector<char>::operator[] (which now
+a constexpr since C++20). We could use &vector::data(),
+but a unique_ptr seems more appropriate for the case at hand.
+--- a/libs/ardour/broadcast_info.cc
++++ b/libs/ardour/broadcast_info.cc
+@@ -39,15 +39,15 @@ namespace ARDOUR
+ static void
+ snprintf_bounded_null_filled (char* target, size_t target_size, char const * fmt, ...)
+ {
+- std::vector<char> buf(target_size+1);
++ std::unique_ptr<char[]> buf (new char [target_size + 1]);
+ va_list ap;
+
+ va_start (ap, fmt);
+- vsnprintf (&buf[0], target_size+1, fmt, ap);
++ vsnprintf (buf.get (), target_size+1, fmt, ap);
+ va_end (ap);
+
+ memset (target, 0, target_size);
+- memcpy (target, &buf[0], target_size);
++ memcpy (target, buf.get (), target_size);
+
+ }
+
+--- a/libs/ardour/export_graph_builder.cc
++++ b/libs/ardour/export_graph_builder.cc
+@@ -796,9 +796,9 @@ ExportGraphBuilder::Intermediate::Intermediate (ExportGraphBuilder & parent, Fil
+ int format = ExportFormatBase::F_RAW | ExportFormatBase::SF_Float;
+
+ if (parent._realtime) {
+- tmp_file.reset (new TmpFileRt<float> (&tmpfile_path_buf[0], format, channels, config.format->sample_rate()));
++ tmp_file.reset (new TmpFileRt<float> (tmpfile_path_buf.data (), format, channels, config.format->sample_rate()));
+ } else {
+- tmp_file.reset (new TmpFileSync<float> (&tmpfile_path_buf[0], format, channels, config.format->sample_rate()));
++ tmp_file.reset (new TmpFileSync<float> (tmpfile_path_buf.data (), format, channels, config.format->sample_rate()));
+ }
+
+ tmp_file->FileWritten.connect_same_thread (post_processing_connection,
+--- a/libs/ardour/io.cc
++++ b/libs/ardour/io.cc
+@@ -1338,7 +1338,6 @@ IO::bundle_changed (Bundle::Change /*c*/)
+ string
+ IO::build_legal_port_name (std::shared_ptr<PortSet const> ports, DataType type)
+ {
+- const int name_size = AudioEngine::instance()->port_name_size();
+ int limit;
+ string suffix;
+
+@@ -1372,21 +1371,24 @@ IO::build_legal_port_name (std::shared_ptr<PortSet const> ports, DataType type)
+
+ // allow up to 4 digits for the output port number, plus the slash, suffix and extra space
+
++ uint32_t name_size = AudioEngine::instance()->port_name_size();
+ limit = name_size - AudioEngine::instance()->my_name().length() - (suffix.length() + 5);
+
+- std::vector<char> buf1(name_size+1);
+- std::vector<char> buf2(name_size+1);
++ ++name_size; // allow for \0
++
++ std::unique_ptr<char[]> buf1 (new char[name_size]);
++ std::unique_ptr<char[]> buf2 (new char[name_size]);
+
+ /* colons are illegal in port names, so fix that */
+
+ string nom = legalize_io_name (_name.val());
+
+- snprintf (&buf1[0], name_size+1, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
++ std::snprintf (buf1.get(), name_size, ("%.*s/%s"), limit, nom.c_str(), suffix.c_str());
+
+- int port_number = find_port_hole (ports, &buf1[0]);
+- snprintf (&buf2[0], name_size+1, "%s %d", &buf1[0], port_number);
++ int port_number = find_port_hole (ports, buf1.get ());
++ std::snprintf (buf2.get(), name_size, "%s %d", buf1.get (), port_number);
+
+- return string (&buf2[0]);
++ return string (buf2.get ());
+ }
+
+ int32_t
+@@ -1400,17 +1402,17 @@ IO::find_port_hole (std::shared_ptr<PortSet const> ports, const char* base)
+ return 1;
+ }
+
+- /* we only allow up to 4 characters for the port number
+- */
++ uint32_t const name_size = AudioEngine::instance()->port_name_size() + 1;
+
++ /* we only allow up to 4 characters for the port number */
+ for (n = 1; n < 9999; ++n) {
+- std::vector<char> buf (AudioEngine::instance()->port_name_size());
+ PortSet::const_iterator i = ports->begin ();
+
+- snprintf (&buf[0], buf.size()+1, _("%s %u"), base, n);
++ std::unique_ptr<char[]> buf (new char[name_size]);
++ std::snprintf (buf.get (), name_size, "%s %u", base, n);
+
+ for ( ; i != ports->end (); ++i) {
+- if (string (i->name()) == string (&buf[0])) {
++ if (string (i->name()) == string (buf.get ())) {
+ break;
+ }
+ }
+@@ -1526,13 +1528,13 @@ IO::bundle_channel_name (uint32_t c, uint32_t n, DataType t) const
+ case 2:
+ return c == 0 ? _("L") : _("R");
+ default:
+- snprintf (buf, sizeof(buf), "%d", (c + 1));
++ std::snprintf (buf, sizeof(buf), "%d", (c + 1));
+ return buf;
+ }
+
+ } else {
+
+- snprintf (buf, sizeof(buf), "%d", (c + 1));
++ std::snprintf (buf, sizeof(buf), "%d", (c + 1));
+ return buf;
+
+ }
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2024-11-06 7:43 Miroslav Šulc
0 siblings, 0 replies; 11+ messages in thread
From: Miroslav Šulc @ 2024-11-06 7:43 UTC (permalink / raw
To: gentoo-commits
commit: aa6f52b9dbb8f1c5d387c26b0677b601420747b2
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Wed Nov 6 07:43:17 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Wed Nov 6 07:43:34 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa6f52b9
media-sound/ardour: fixed implicit function declaration in 8.10 + added an improvement from the master repo
Bug: https://bugs.gentoo.org/939584
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
.../{ardour-8.10-r2.ebuild => ardour-8.10-r3.ebuild} | 2 ++
.../ardour-9.0.0-fix-unlikely-buffer-overflow.patch | 19 +++++++++++++++++++
.../ardour-9.0.0-properly-check-for-syscall.patch | 16 ++++++++++++++++
3 files changed, 37 insertions(+)
diff --git a/media-sound/ardour/ardour-8.10-r2.ebuild b/media-sound/ardour/ardour-8.10-r3.ebuild
similarity index 97%
rename from media-sound/ardour/ardour-8.10-r2.ebuild
rename to media-sound/ardour/ardour-8.10-r3.ebuild
index bb6ece851b94..cba0bc79c8e1 100644
--- a/media-sound/ardour/ardour-8.10-r2.ebuild
+++ b/media-sound/ardour/ardour-8.10-r3.ebuild
@@ -72,6 +72,8 @@ DEPEND="${RDEPEND}
PATCHES=(
"${FILESDIR}/${PN}-6.8-metadata.patch"
"${FILESDIR}/${PN}-9.0.0-fix-clang-crash.patch"
+ "${FILESDIR}/${PN}-9.0.0-properly-check-for-syscall.patch"
+ "${FILESDIR}/${PN}-9.0.0-fix-unlikely-buffer-overflow.patch"
)
pkg_pretend() {
diff --git a/media-sound/ardour/files/ardour-9.0.0-fix-unlikely-buffer-overflow.patch b/media-sound/ardour/files/ardour-9.0.0-fix-unlikely-buffer-overflow.patch
new file mode 100644
index 000000000000..fd698f67bdd3
--- /dev/null
+++ b/media-sound/ardour/files/ardour-9.0.0-fix-unlikely-buffer-overflow.patch
@@ -0,0 +1,19 @@
+From 02fde5f1aa3997d880f185c2083707e8715cfa59 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Wed, 6 Nov 2024 04:07:01 +0100
+Subject: [PATCH] Fix unlikely buffer overflow #9845
+
+> warning: 'sscanf' may overflow; destination buffer in argument 6
+> has size 32, but the corresponding specifier may require size 33
+> [-Wfortify-source]
+--- a/gtk2_ardour/transcode_ffmpeg.cc
++++ b/gtk2_ardour/transcode_ffmpeg.cc
+@@ -192,7 +192,7 @@ TranscodeFfmpeg::probe ()
+ PARSE_FRACTIONAL_FPS (timebase)
+ } else if (key == X_("timecode") && m_duration == 0 && m_fps > 0) {
+ int h, m, s;
+- char f[32];
++ char f[33];
+ if (sscanf (i->at (16).c_str (), "%d:%d:%d:%32s", &h, &m, &s, f) == 4) {
+ m_duration = (ARDOUR::samplecnt_t)floor (m_fps * (h * 3600.0 + m * 60.0 + s * 1.0 + atoi (f) / pow ((double)10, (int)strlen (f))));
+ }
diff --git a/media-sound/ardour/files/ardour-9.0.0-properly-check-for-syscall.patch b/media-sound/ardour/files/ardour-9.0.0-properly-check-for-syscall.patch
new file mode 100644
index 000000000000..12f677c3828c
--- /dev/null
+++ b/media-sound/ardour/files/ardour-9.0.0-properly-check-for-syscall.patch
@@ -0,0 +1,16 @@
+From ba4d9709c6e442ee57329fd592d48fc98ea0b937 Mon Sep 17 00:00:00 2001
+From: Robin Gareus <robin@gareus.org>
+Date: Wed, 6 Nov 2024 04:07:25 +0100
+Subject: [PATCH] Properly check for syscall (#9845)
+
+--- a/libs/ardour/wscript
++++ b/libs/ardour/wscript
+@@ -355,7 +355,7 @@ def configure(conf):
+ features = 'c',
+ mandatory = False,
+ execute = False,
+- fragment = "#include <sys/syscall.h>\nint main () { syscall(SYS_ioprio_set, 1, 0, 8192); return 0; }")
++ fragment = "#include <unistd.h>\n#include <sys/syscall.h>\nint main () { syscall(SYS_ioprio_set, 1, 0, 8192); return 0; }")
+
+ if have_sys_ioprio:
+ conf.define('HAVE_IOPRIO', 1)
^ permalink raw reply related [flat|nested] 11+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/
@ 2024-11-25 8:23 Miroslav Šulc
0 siblings, 0 replies; 11+ messages in thread
From: Miroslav Šulc @ 2024-11-25 8:23 UTC (permalink / raw
To: gentoo-commits
commit: 1bbe1bf2c456641d81c05e79acaf900ab3139c91
Author: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
AuthorDate: Mon Nov 25 08:23:29 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Mon Nov 25 08:23:29 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1bbe1bf2
media-sound/ardour: dropped obsolete 8.7
Bug: https://bugs.gentoo.org/943918
Closes: https://bugs.gentoo.org/808381
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
media-sound/ardour/Manifest | 1 -
media-sound/ardour/ardour-8.7.ebuild | 200 ---------------------
.../ardour/files/ardour-6.8-boost-1.85.patch | 19 --
3 files changed, 220 deletions(-)
diff --git a/media-sound/ardour/Manifest b/media-sound/ardour/Manifest
index a1f7358358f9..d48fa646b0eb 100644
--- a/media-sound/ardour/Manifest
+++ b/media-sound/ardour/Manifest
@@ -1,2 +1 @@
DIST Ardour-8.10.0.tar.bz2 17811275 BLAKE2B 5a0edc68c707ae1659b080cf543a4a3dc3397c91366e5c5e3084fe0095d983ba1170acc1fde49dbd6abd1b05325e2117b79fcf96c1d5c84b24d5ecc76a39cd64 SHA512 744e4bc73e35a758fce46c0035a11b430b70aa77503446a0118aba62b86b62fb293be1418ec8cfc0e1495a3a005bb71445f48661d9302a3b5bacc1a7f6c2874b
-DIST Ardour-8.7.0.tar.bz2 17807972 BLAKE2B 9bbe4ed5c3ad62d643518881a45b71642f5ce41c8620eb4c82befcb9df1053b08b60d3683961d78825f99e3a74222404c511073491972f138edaaaea445c6961 SHA512 cd2cdc1360b01d23cd3df62ee949ecab9d5d8da5112636438c2ef8a88d188503bcd7f09f2a5d8e07460dacbc35cecd96e8edbc748adccc50b5a90375f2f742d0
diff --git a/media-sound/ardour/ardour-8.7.ebuild b/media-sound/ardour/ardour-8.7.ebuild
deleted file mode 100644
index fa3ba391ecf7..000000000000
--- a/media-sound/ardour/ardour-8.7.ebuild
+++ /dev/null
@@ -1,200 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..13} )
-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="8"
-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-text/doxygen[dot] )
- jack? ( virtual/jack )"
-
-PATCHES=(
- "${FILESDIR}/${PN}-6.8-metadata.patch"
- "${FILESDIR}/${PN}-6.8-boost-1.85.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"
-
- # -Werror=odr
- # https://tracker.ardour.org/view.php?id=9649
- # https://bugs.gentoo.org/917095
- filter-lto
-
- local backends="alsa,dummy"
- use jack && backends+=",jack"
- use pulseaudio && backends+=",pulseaudio"
-
- tc-export CC CXX
- local myconf=(
- --configdir=/etc
- --freedesktop
- --noconfirm
- --optimize
- --no-ytk
- --with-backends=${backends}
- $({ use cpu_flags_ppc_altivec || use cpu_flags_x86_sse; } && \
- echo '' || echo "--no-fpu-optimization")
- $(usex doc "--docs" '')
- $(usex nls '' "--no-nls")
- $(usex phonehome '' "--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-6.8-boost-1.85.patch b/media-sound/ardour/files/ardour-6.8-boost-1.85.patch
deleted file mode 100644
index ffa8a6b092b6..000000000000
--- a/media-sound/ardour/files/ardour-6.8-boost-1.85.patch
+++ /dev/null
@@ -1,19 +0,0 @@
---- Ardour-8.6.0.orig/libs/surfaces/websockets/message.cc
-+++ Ardour-8.6.0/libs/surfaces/websockets/message.cc
-@@ -58,14 +58,14 @@ NodeStateMessage::NodeStateMessage (void
-
- _state = NodeState (root.get<std::string> ("node"));
-
-- pt::ptree addr = root.get_child ("addr", pt::ptree ());
-+ pt::ptree addr = root.get_child ("addr");
-
- for (pt::ptree::iterator it = addr.begin (); it != addr.end (); ++it) {
- // throws if datatype not uint32_t
- _state.add_addr (boost::lexical_cast<uint32_t> (it->second.data ()));
- }
-
-- pt::ptree val = root.get_child ("val", pt::ptree ());
-+ pt::ptree val = root.get_child ("val");
-
- for (pt::ptree::iterator it = val.begin (); it != val.end (); ++it) {
- std::string val = it->second.data ();
^ permalink raw reply related [flat|nested] 11+ messages in thread
end of thread, other threads:[~2024-11-25 8:23 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-11-04 19:28 [gentoo-commits] repo/gentoo:master commit in: media-sound/ardour/files/, media-sound/ardour/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-11-25 8:23 Miroslav Šulc
2024-11-06 7:43 Miroslav Šulc
2024-05-21 17:24 Miroslav Šulc
2023-09-22 15:44 Sam James
2021-08-06 14:10 Miroslav Šulc
2020-11-13 8:34 Miroslav Šulc
2018-06-11 21:18 Lars Wendler
2016-12-06 9:48 Lars Wendler
2015-08-17 15:39 Ben de Groot
2015-08-17 15:12 Andreas Schuerch
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox