nativemad 15/04/23 07:15:26 Modified: ChangeLog ardour-9999.ebuild Added: ardour-4.0-r1.ebuild Log: use dependant alsa and jack backend and build without jack-metadata even for use=jack. See Bug 547428. (Portage version: 2.2.18/cvs/Linux i686, signed Manifest commit with key 60373227)
Revision Changes Path 1.141 media-sound/ardour/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.141&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.141&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?r1=1.140&r2=1.141 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v retrieving revision 1.140 retrieving revision 1.141 diff -u -r1.140 -r1.141 --- ChangeLog 22 Apr 2015 13:42:22 -0000 1.140 +++ ChangeLog 23 Apr 2015 07:15:26 -0000 1.141 @@ -1,6 +1,13 @@ # ChangeLog for media-sound/ardour # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.140 2015/04/22 13:42:22 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.141 2015/04/23 07:15:26 nativemad Exp $ + +*ardour-4.0-r1 (23 Apr 2015) + + 23 Apr 2015; Andreas Schuerch <native...@gentoo.org> +ardour-4.0-r1.ebuild, + ardour-9999.ebuild: + use dependant alsa and jack backend and build without jack-metadata even for + use=jack. See Bug 547428 *ardour-4.0 (22 Apr 2015) 1.16 media-sound/ardour/ardour-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.16&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.16&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?r1=1.15&r2=1.16 Index: ardour-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v retrieving revision 1.15 retrieving revision 1.16 diff -u -r1.15 -r1.16 --- ardour-9999.ebuild 22 Apr 2015 13:42:22 -0000 1.15 +++ ardour-9999.ebuild 23 Apr 2015 07:15:26 -0000 1.16 @@ -1,6 +1,6 @@ # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.15 2015/04/22 13:42:22 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.16 2015/04/23 07:15:26 nativemad Exp $ EAPI=5 @@ -110,21 +110,13 @@ fi tc-export CC CXX mkdir -p "${D}" - echo waf-utils_src_configure \ - --destdir="${D}" \ - --prefix=/usr \ - --configdir=/etc \ - --optimize \ - $(use lv2 && echo "--lv2" || echo "--no-lv2") \ - $(use nls && echo "--nls" || echo "--no-nls") \ - $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ - $(use doc && echo "--docs") waf-utils_src_configure \ --destdir="${D}" \ --prefix=/usr \ --configdir=/etc \ --optimize \ - $(use jack || echo "--no-jack --libjack=weak --no-jack-metadata") \ + --no-jack-metadata \ + $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \ $(use lv2 && echo "--lv2" || echo "--no-lv2") \ $(use nls && echo "--nls" || echo "--no-nls") \ $({ use altivec || use cpu_flags_x86_sse; } && echo "--fpu-optimization" || echo "--no-fpu-optimization") \ 1.1 media-sound/ardour/ardour-4.0-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-4.0-r1.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-4.0-r1.ebuild?rev=1.1&content-type=text/plain Index: ardour-4.0-r1.ebuild =================================================================== # Copyright 1999-2015 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-4.0-r1.ebuild,v 1.1 2015/04/23 07:15:26 nativemad Exp $ 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 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.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 nls? ( 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 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 \ $(use jack && echo "--with-backends=alsa,jack" || echo "--with-backends=alsa --no-jack --libjack=weak") \ $(use lv2 && echo "--lv2" || echo "--no-lv2") \ $(use nls && echo "--nls" || echo "--no-nls") \ $({ 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 ardour3 ardour3 ardour3 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!" }
