diff options
| author |   Andreas Schuerch <nativemad@gentoo.org> | 2015-08-17 17:06:47 +0200 |
|---|---|---|
| committer | Andreas Schuerch <nativemad@gentoo.org> | 2015-08-17 17:06:47 +0200 |
| commit | e54afaad3f3a5a669be1c81df85984d0ebb58f90 (patch) | |
| tree | 72f0e6fcc28f6eca58b289905d7cba4a693eadcc /media-sound/ardour | |
| parent | sys-libs/ncurses: rework handling of build-time tic #557834 (diff) | |
| download | gentoo-e54afaad3f3a5a669be1c81df85984d0ebb58f90.tar.gz gentoo-e54afaad3f3a5a669be1c81df85984d0ebb58f90.tar.bz2 gentoo-e54afaad3f3a5a669be1c81df85984d0ebb58f90.zip | |
corrected rev-numbering patch wrt 557990. Thanks Lars Wendler for the patch and Daniel Bautista for reporting
Package-Manager: portage-2.2.20.1
Diffstat (limited to 'media-sound/ardour')
| -rw-r--r-- | media-sound/ardour/ardour-4.1.ebuild | 2 | ||||
| -rw-r--r-- | media-sound/ardour/ardour-4.2.ebuild | 2 | ||||
| -rw-r--r-- | media-sound/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 4830a49f33ea..29167b33e061 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 4830a49f33ea..29167b33e061 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 000000000000..d558f4792a84 --- /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: + # |