public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in media-sound/ardour: ChangeLog ardour-9999.ebuild ardour-3.5.14.ebuild
@ 2013-10-28 18:50 Andreas Schuerch (nativemad)
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Schuerch (nativemad) @ 2013-10-28 18:50 UTC (permalink / raw
  To: gentoo-commits

nativemad    13/10/28 18:50:03

  Modified:             ChangeLog ardour-9999.ebuild
  Added:                ardour-3.5.14.ebuild
  Log:
  Bump to 3.5.14. Thanks Alexey McSakoff for the ebuilds and the updated patch. See Bug 488934.
  
  (Portage version: 2.1.12.2/cvs/Linux i686, signed Manifest commit with key C1DE54B2)

Revision  Changes    Path
1.121                media-sound/ardour/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.121&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.121&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?r1=1.120&r2=1.121

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v
retrieving revision 1.120
retrieving revision 1.121
diff -u -r1.120 -r1.121
--- ChangeLog	10 Sep 2013 20:14:00 -0000	1.120
+++ ChangeLog	28 Oct 2013 18:50:02 -0000	1.121
@@ -1,6 +1,13 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.120 2013/09/10 20:14:00 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.121 2013/10/28 18:50:02 nativemad Exp $
+
+*ardour-3.5.14 (28 Oct 2013)
+
+  28 Oct 2013; Andreas Schuerch <nativemad@gentoo.org> +ardour-3.5.14.ebuild,
+  +files/ardour-3.5-syslibs.patch, ardour-9999.ebuild:
+  bump to 3.5.14. Thanks Alexey McSakoff for the ebuilds and the updated patch.
+  See Bug 488934
 
 *ardour-9999 (10 Sep 2013)
 *ardour-3.4 (10 Sep 2013)



1.2                  media-sound/ardour/ardour-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?r1=1.1&r2=1.2

Index: ardour-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ardour-9999.ebuild	10 Sep 2013 20:14:00 -0000	1.1
+++ ardour-9999.ebuild	28 Oct 2013 18:50:02 -0000	1.2
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.1 2013/09/10 20:14:00 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.2 2013/10/28 18:50:02 nativemad Exp $
 
 EAPI=4
 inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
@@ -69,7 +69,7 @@
 }
 
 src_prepare(){
-	epatch "${FILESDIR}"/${PN}-3.2-syslibs.patch
+	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
 	sed 's/python/python2/' -i waf
 }
 



1.1                  media-sound/ardour/ardour-3.5.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild?rev=1.1&content-type=text/plain

Index: ardour-3.5.14.ebuild
===================================================================
# Copyright 1999-2013 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v 1.1 2013/10/28 18:50:02 nativemad Exp $

EAPI=4
inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils

DESCRIPTION="Digital Audio Workstation"
HOMEPAGE="http://ardour.org/"
EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"

if [ ${PV} = 9999 ]; then
	KEYWORDS=""
else
	EGIT_COMMIT="${PV}"
	KEYWORDS="~amd64 ~x86"
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
	>=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

	)"

DEPEND="${RDEPEND}
	virtual/pkgconfig
	nls? ( sys-devel/gettext )
	doc? ( app-doc/doxygen[dot] )"

src_unpack() {
	git-2_src_unpack
}

src_prepare(){
	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
	sed 's/python/python2/' -i waf
}

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") \
		$((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
}





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-sound/ardour: ChangeLog ardour-9999.ebuild ardour-3.5.14.ebuild
@ 2013-11-05  9:12 Andreas Schuerch (nativemad)
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Schuerch (nativemad) @ 2013-11-05  9:12 UTC (permalink / raw
  To: gentoo-commits

nativemad    13/11/05 09:12:20

  Modified:             ChangeLog ardour-9999.ebuild ardour-3.5.14.ebuild
  Log:
  Moved the versioned build to the github zip instead of using git directly. See bug 484674.
  
  (Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key C1DE54B2)

Revision  Changes    Path
1.122                media-sound/ardour/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.122&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.122&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?r1=1.121&r2=1.122

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -r1.121 -r1.122
--- ChangeLog	28 Oct 2013 18:50:02 -0000	1.121
+++ ChangeLog	5 Nov 2013 09:12:19 -0000	1.122
@@ -1,6 +1,11 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.121 2013/10/28 18:50:02 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.122 2013/11/05 09:12:19 nativemad Exp $
+
+  05 Nov 2013; Andreas Schuerch <nativemad@gentoo.org> ardour-3.5.14.ebuild,
+  ardour-9999.ebuild:
+  Moved the versioned build to the github zip instead of using git directly.
+  See bug 484674
 
 *ardour-3.5.14 (28 Oct 2013)
 



1.3                  media-sound/ardour/ardour-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?r1=1.2&r2=1.3

Index: ardour-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ardour-9999.ebuild	28 Oct 2013 18:50:02 -0000	1.2
+++ ardour-9999.ebuild	5 Nov 2013 09:12:19 -0000	1.3
@@ -1,19 +1,20 @@
 # Copyright 1999-2013 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.2 2013/10/28 18:50:02 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.3 2013/11/05 09:12:19 nativemad Exp $
 
 EAPI=4
 inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
-EGIT_REPO_URI="git://git.ardour.org/ardour/ardour.git"
 
 if [ ${PV} = 9999 ]; then
 	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+
 else
-	EGIT_COMMIT="${PV}"
 	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.zip -> ${P}.zip"
 fi
 
 LICENSE="GPL-2"
@@ -65,10 +66,18 @@
 	doc? ( app-doc/doxygen[dot] )"
 
 src_unpack() {
-	git-2_src_unpack
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
 }
 
 src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		sed -e '/cmd = "git describe --tags/,/utf-8/{s:cmd = \"git describe --tags HEAD\":rev = \"'${PV}'\":p;d}' -i "${S}"/wscript
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+	fi
 	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
 	sed 's/python/python2/' -i waf
 }



1.2                  media-sound/ardour/ardour-3.5.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild?rev=1.2&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild?rev=1.2&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild?r1=1.1&r2=1.2

Index: ardour-3.5.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ardour-3.5.14.ebuild	28 Oct 2013 18:50:02 -0000	1.1
+++ ardour-3.5.14.ebuild	5 Nov 2013 09:12:19 -0000	1.2
@@ -1,19 +1,20 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v 1.1 2013/10/28 18:50:02 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v 1.2 2013/11/05 09:12:19 nativemad Exp $
 
 EAPI=4
 inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
 
 DESCRIPTION="Digital Audio Workstation"
 HOMEPAGE="http://ardour.org/"
-EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
 
 if [ ${PV} = 9999 ]; then
 	KEYWORDS=""
+	EGIT_REPO_URI="http://git.ardour.org/ardour/ardour.git"
+
 else
-	EGIT_COMMIT="${PV}"
 	KEYWORDS="~amd64 ~x86"
+	SRC_URI="https://github.com/Ardour/ardour/archive/${PV}.zip -> ${P}.zip"
 fi
 
 LICENSE="GPL-2"
@@ -65,10 +66,18 @@
 	doc? ( app-doc/doxygen[dot] )"
 
 src_unpack() {
-	git-2_src_unpack
+	if [ ${PV} = 9999 ]; then
+		git-2_src_unpack
+	else
+		unpack ${A}
+	fi
 }
 
 src_prepare(){
+	if ! [ ${PV} = 9999 ]; then
+		sed -e '/cmd = "git describe --tags/,/utf-8/{s:cmd = \"git describe --tags HEAD\":rev = \"'${PV}'\":p;d}' -i "${S}"/wscript
+		sed -e 's/'os.path.exists\(\'.git'/'os.path.exists\(\'wscript/'' -i "${S}"/wscript
+	fi
 	epatch "${FILESDIR}"/${PN}-3.5-syslibs.patch
 	sed 's/python/python2/' -i waf
 }





^ permalink raw reply	[flat|nested] 3+ messages in thread

* [gentoo-commits] gentoo-x86 commit in media-sound/ardour: ChangeLog ardour-9999.ebuild ardour-3.5.14.ebuild
@ 2013-11-05 13:32 Andreas Schuerch (nativemad)
  0 siblings, 0 replies; 3+ messages in thread
From: Andreas Schuerch (nativemad) @ 2013-11-05 13:32 UTC (permalink / raw
  To: gentoo-commits

nativemad    13/11/05 13:32:59

  Modified:             ChangeLog ardour-9999.ebuild ardour-3.5.14.ebuild
  Log:
  Added app-arch/unzip do the deps. see bug 484674. Thanks Samuli.
  
  (Portage version: 2.2.1/cvs/Linux i686, signed Manifest commit with key C1DE54B2)

Revision  Changes    Path
1.123                media-sound/ardour/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.123&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?rev=1.123&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ChangeLog?r1=1.122&r2=1.123

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v
retrieving revision 1.122
retrieving revision 1.123
diff -u -r1.122 -r1.123
--- ChangeLog	5 Nov 2013 09:12:19 -0000	1.122
+++ ChangeLog	5 Nov 2013 13:32:59 -0000	1.123
@@ -1,6 +1,10 @@
 # ChangeLog for media-sound/ardour
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.122 2013/11/05 09:12:19 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ChangeLog,v 1.123 2013/11/05 13:32:59 nativemad Exp $
+
+  05 Nov 2013; Andreas Schuerch <nativemad@gentoo.org> ardour-3.5.14.ebuild,
+  ardour-9999.ebuild:
+  Added app-arch/unzip do the deps. see bug 484674. Thanks Samuli.
 
   05 Nov 2013; Andreas Schuerch <nativemad@gentoo.org> ardour-3.5.14.ebuild,
   ardour-9999.ebuild:



1.4                  media-sound/ardour/ardour-9999.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.4&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?rev=1.4&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-9999.ebuild?r1=1.3&r2=1.4

Index: ardour-9999.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ardour-9999.ebuild	5 Nov 2013 09:12:19 -0000	1.3
+++ ardour-9999.ebuild	5 Nov 2013 13:32:59 -0000	1.4
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.3 2013/11/05 09:12:19 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-9999.ebuild,v 1.4 2013/11/05 13:32:59 nativemad Exp $
 
 EAPI=4
 inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
@@ -64,6 +64,10 @@
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}
+		app-arch/unzip"
+	fi
 
 src_unpack() {
 	if [ ${PV} = 9999 ]; then



1.3                  media-sound/ardour/ardour-3.5.14.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild?r1=1.2&r2=1.3

Index: ardour-3.5.14.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ardour-3.5.14.ebuild	5 Nov 2013 09:12:19 -0000	1.2
+++ ardour-3.5.14.ebuild	5 Nov 2013 13:32:59 -0000	1.3
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v 1.2 2013/11/05 09:12:19 nativemad Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-sound/ardour/ardour-3.5.14.ebuild,v 1.3 2013/11/05 13:32:59 nativemad Exp $
 
 EAPI=4
 inherit eutils git-2 toolchain-funcs flag-o-matic waf-utils
@@ -64,6 +64,10 @@
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	doc? ( app-doc/doxygen[dot] )"
+	if ! [ ${PV} = 9999 ]; then
+		DEPEND="${DEPEND}
+		app-arch/unzip"
+	fi
 
 src_unpack() {
 	if [ ${PV} = 9999 ]; then





^ permalink raw reply	[flat|nested] 3+ messages in thread

end of thread, other threads:[~2013-11-05 13:33 UTC | newest]

Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-10-28 18:50 [gentoo-commits] gentoo-x86 commit in media-sound/ardour: ChangeLog ardour-9999.ebuild ardour-3.5.14.ebuild Andreas Schuerch (nativemad)
  -- strict thread matches above, loose matches on Subject: below --
2013-11-05  9:12 Andreas Schuerch (nativemad)
2013-11-05 13:32 Andreas Schuerch (nativemad)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox