nativemad 14/10/23 18:13:02 Modified: ardour-9999.ebuild ChangeLog Added: ardour-3.5.403.ebuild Log: version bump and die if sse is not set through march. See bug 526172. (Portage version: 2.2.8-r2/cvs/Linux i686, unsigned Manifest commit)
Revision Changes Path 1.10 media-sound/ardour/ardour-9999.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.10&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.10&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?r1=1.9&r2=1.10 Index: ardour-9999.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v retrieving revision 1.9 retrieving revision 1.10 diff -u -r1.9 -r1.10 --- ardour-9999.ebuild 11 Oct 2014 13:02:51 -0000 1.9 +++ ardour-9999.ebuild 23 Oct 2014 18:13:02 -0000 1.10 @@ -1,6 +1,6 @@ # Copyright 1999-2014 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.9 2014/10/11 13:02:51 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.10 2014/10/23 18:13:02 nativemad Exp $ EAPI=4 inherit eutils toolchain-funcs flag-o-matic waf-utils @@ -68,6 +68,13 @@ DEPEND="${DEPEND}" fi +pkg_pretend() { + MARCH=$(get-flag march) + if ! gcc -march=${MARCH} -Q --help=target | grep "msse" | grep "enabled" >/dev/null; then + die "Ardour fails to build with an march that is not sse capable!" + fi +} + src_unpack() { if [ ${PV} = 9999 ]; then git-2_src_unpack @@ -78,7 +85,7 @@ src_prepare(){ if ! [ ${PV} = 9999 ]; then - PVTEMP=`echo "${PV}" | sed "s/\./-/2"` + PVTEMP=$(echo "${PV}" | sed "s/\./-/2") sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript 1.132 media-sound/ardour/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.132&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.132&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?r1=1.131&r2=1.132 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v retrieving revision 1.131 retrieving revision 1.132 diff -u -r1.131 -r1.132 --- ChangeLog 11 Oct 2014 13:02:51 -0000 1.131 +++ ChangeLog 23 Oct 2014 18:13:02 -0000 1.132 @@ -1,6 +1,12 @@ # ChangeLog for media-sound/ardour # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.131 2014/10/11 13:02:51 nativemad Exp $ +# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.132 2014/10/23 18:13:02 nativemad Exp $ + +*ardour-3.5.403 (23 Oct 2014) + + 23 Oct 2014; Andreas Schuerch <native...@gentoo.org> +ardour-3.5.403.ebuild, + ardour-9999.ebuild: + Version bump for Bug #526172 and fail if sse isn't set through gcc via march. 11 Oct 2014; Andreas Schuerch <native...@gentoo.org> ardour-3.5.380.ebuild, ardour-9999.ebuild: 1.1 media-sound/ardour/ardour-3.5.403.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild?rev=1.1&content-type=text/plain Index: ardour-3.5.403.ebuild =================================================================== # Copyright 1999-2014 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.403.ebuild,v 1.1 2014/10/23 18:13:02 nativemad Exp $ EAPI=4 inherit eutils toolchain-funcs flag-o-matic 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="3" IUSE="altivec debug doc nls lv2 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 >=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 >=media-libs/taglib-1.7 net-misc/curl 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} virtual/pkgconfig nls? ( sys-devel/gettext ) doc? ( app-doc/doxygen[dot] )" if ! [ ${PV} = 9999 ]; then DEPEND="${DEPEND}" fi pkg_pretend() { MARCH=$(get-flag march) if ! gcc -march=${MARCH} -Q --help=target | grep "msse" | grep "enabled" >/dev/null; then die "Ardour fails to build with an march that is not sse capable!" fi } src_unpack() { if [ ${PV} = 9999 ]; then git-2_src_unpack else unpack ${A} fi } src_prepare(){ if ! [ ${PV} = 9999 ]; then PVTEMP=$(echo "${PV}" | sed "s/\./-/2") sed -e '/cmd = "git describe HEAD/,/utf-8/{s:cmd = \"git describe HEAD\":rev = \"'${PVTEMP}-gentoo'\":p;d}' -i "${S}"/wscript sed -e 's/'os.getcwd\(\),\ \'.git'/'os.getcwd\(\),\ \'libs/'' -i "${S}"/wscript sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript fi epatch "${FILESDIR}"/${PN}-3.5.7-syslibs.patch sed 's/python/python2/' -i waf # sed 's/'FLAGS\'\,\ optimization_flags'/'FLAGS\'\,\ \'\''/g' -i "${S}"/wscript sed 's/'FLAGS\'\,\ compiler_flags'/'FLAGS\'\,\ \'\''/g' -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 \ $(use lv2 && echo "--lv2" || echo "--no-lv2") \ $(use nls && echo "--nls" || echo "--no-nls") \ $(use debug && echo "--stl-debug" || echo "--optimize") \ $((use altivec || use 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!" }
