| 1 |
commit: e795b3db7ee3e3fe3e735b5a1728aaf81855aef0 |
| 2 |
Author: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Sep 20 11:17:32 2019 +0000 |
| 4 |
Commit: Andreas Schuerch <nativemad <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Sep 20 11:17:32 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e795b3db |
| 7 |
|
| 8 |
media-sound/ardour: few fixes #685516, #688106, #688116 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.69, Repoman-2.3.16 |
| 11 |
Signed-off-by: Andreas Schuerch <nativemad <AT> gentoo.org> |
| 12 |
|
| 13 |
media-sound/ardour/ardour-5.12.ebuild | 28 +++++++++++++--------------- |
| 14 |
media-sound/ardour/ardour-9999.ebuild | 22 ++++++++++------------ |
| 15 |
2 files changed, 23 insertions(+), 27 deletions(-) |
| 16 |
|
| 17 |
diff --git a/media-sound/ardour/ardour-5.12.ebuild b/media-sound/ardour/ardour-5.12.ebuild |
| 18 |
index 8998723b507..de386a8cd32 100644 |
| 19 |
--- a/media-sound/ardour/ardour-5.12.ebuild |
| 20 |
+++ b/media-sound/ardour/ardour-5.12.ebuild |
| 21 |
@@ -1,4 +1,4 @@ |
| 22 |
-# Copyright 1999-2017 Gentoo Foundation |
| 23 |
+# Copyright 1999-2019 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
@@ -11,7 +11,7 @@ DESCRIPTION="Digital Audio Workstation" |
| 28 |
HOMEPAGE="http://ardour.org/" |
| 29 |
|
| 30 |
if [[ ${PV} == *9999* ]]; then |
| 31 |
- EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git" |
| 32 |
+ EGIT_REPO_URI="https://git.ardour.org/ardour/ardour.git" |
| 33 |
inherit git-r3 |
| 34 |
else |
| 35 |
KEYWORDS="~amd64 ~x86" |
| 36 |
@@ -20,7 +20,7 @@ else |
| 37 |
fi |
| 38 |
|
| 39 |
LICENSE="GPL-2" |
| 40 |
-SLOT="5" |
| 41 |
+SLOT="6" |
| 42 |
IUSE="altivec doc jack cpu_flags_x86_sse cpu_flags_x86_mmx cpu_flags_x86_3dnow" |
| 43 |
|
| 44 |
RDEPEND=" |
| 45 |
@@ -50,12 +50,11 @@ RDEPEND=" |
| 46 |
net-misc/curl |
| 47 |
sys-libs/readline:0= |
| 48 |
sci-libs/fftw:3.0[threads] |
| 49 |
- virtual/libusb:0 |
| 50 |
+ virtual/libusb:1 |
| 51 |
x11-libs/cairo |
| 52 |
>=x11-libs/gtk+-2.8.1:2 |
| 53 |
x11-libs/pango |
| 54 |
jack? ( virtual/jack ) |
| 55 |
- >=media-libs/slv2-0.6.1 |
| 56 |
media-libs/lilv |
| 57 |
media-libs/sratom |
| 58 |
dev-libs/sord |
| 59 |
@@ -113,15 +112,14 @@ src_configure() { |
| 60 |
tc-export CC CXX |
| 61 |
mkdir -p "${D}" |
| 62 |
waf-utils_src_configure \ |
| 63 |
- --destdir="${D}" \ |
| 64 |
- --prefix=/usr \ |
| 65 |
- --configdir=/etc \ |
| 66 |
- --nls \ |
| 67 |
- --optimize \ |
| 68 |
- --lv2 \ |
| 69 |
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ |
| 70 |
- $(usex doc "--docs" '') \ |
| 71 |
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") |
| 72 |
+ $(usex doc "--docs" '') \ |
| 73 |
+ $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ |
| 74 |
+ $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ |
| 75 |
+ --destdir="${D}" \ |
| 76 |
+ --prefix=/usr \ |
| 77 |
+ --configdir=/etc \ |
| 78 |
+ --nls \ |
| 79 |
+ --optimize |
| 80 |
} |
| 81 |
|
| 82 |
src_install() { |
| 83 |
@@ -129,7 +127,7 @@ src_install() { |
| 84 |
mv ${PN}.1 ${PN}${SLOT}.1 |
| 85 |
doman ${PN}${SLOT}.1 |
| 86 |
newicon "${S}/gtk2_ardour/resources/Ardour-icon_48px.png" ${PN}${SLOT}.png |
| 87 |
- make_desktop_entry ardour5 ardour5 ardour5 AudioVideo |
| 88 |
+ make_desktop_entry ardour6 ardour6 ardour6 AudioVideo |
| 89 |
} |
| 90 |
|
| 91 |
pkg_postinst() { |
| 92 |
|
| 93 |
diff --git a/media-sound/ardour/ardour-9999.ebuild b/media-sound/ardour/ardour-9999.ebuild |
| 94 |
index eb88ef6ef38..de386a8cd32 100644 |
| 95 |
--- a/media-sound/ardour/ardour-9999.ebuild |
| 96 |
+++ b/media-sound/ardour/ardour-9999.ebuild |
| 97 |
@@ -1,4 +1,4 @@ |
| 98 |
-# Copyright 1999-2018 Gentoo Foundation |
| 99 |
+# Copyright 1999-2019 Gentoo Authors |
| 100 |
# Distributed under the terms of the GNU General Public License v2 |
| 101 |
|
| 102 |
EAPI=6 |
| 103 |
@@ -50,12 +50,11 @@ RDEPEND=" |
| 104 |
net-misc/curl |
| 105 |
sys-libs/readline:0= |
| 106 |
sci-libs/fftw:3.0[threads] |
| 107 |
- virtual/libusb:0 |
| 108 |
+ virtual/libusb:1 |
| 109 |
x11-libs/cairo |
| 110 |
>=x11-libs/gtk+-2.8.1:2 |
| 111 |
x11-libs/pango |
| 112 |
jack? ( virtual/jack ) |
| 113 |
- >=media-libs/slv2-0.6.1 |
| 114 |
media-libs/lilv |
| 115 |
media-libs/sratom |
| 116 |
dev-libs/sord |
| 117 |
@@ -113,15 +112,14 @@ src_configure() { |
| 118 |
tc-export CC CXX |
| 119 |
mkdir -p "${D}" |
| 120 |
waf-utils_src_configure \ |
| 121 |
- --destdir="${D}" \ |
| 122 |
- --prefix=/usr \ |
| 123 |
- --configdir=/etc \ |
| 124 |
- --nls \ |
| 125 |
- --optimize \ |
| 126 |
- --lv2 \ |
| 127 |
- $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ |
| 128 |
- $(usex doc "--docs" '') \ |
| 129 |
- $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") |
| 130 |
+ $(usex doc "--docs" '') \ |
| 131 |
+ $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ |
| 132 |
+ $(usex jack "--with-backends=alsa,jack" "--with-backends=alsa --libjack=weak") \ |
| 133 |
+ --destdir="${D}" \ |
| 134 |
+ --prefix=/usr \ |
| 135 |
+ --configdir=/etc \ |
| 136 |
+ --nls \ |
| 137 |
+ --optimize |
| 138 |
} |
| 139 |
|
| 140 |
src_install() { |
Archives