diff options
| author |   Ben de Groot <yngwin@gentoo.org> | 2015-08-17 23:39:07 +0800 |
|---|---|---|
| committer | Ben de Groot <yngwin@gentoo.org> | 2015-08-17 23:39:07 +0800 |
| commit | 167b3815ced228284d1697cb85e386756a14a326 (patch) | |
| tree | 0ccb7c8360ea1e4a76bd9a134b4f37b8894fc21c /media-sound/ardour | |
| parent | media-sound/ardour: ebuild improvements (diff) | |
| parent | dev-python/pillow: Require tiff support for tests, bug #557996 (diff) | |
| download | gentoo-167b3815ced228284d1697cb85e386756a14a326.tar.gz gentoo-167b3815ced228284d1697cb85e386756a14a326.tar.bz2 gentoo-167b3815ced228284d1697cb85e386756a14a326.zip | |
Merge remote-tracking branch 'remotes/origin/master'
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-r1.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-r1.ebuild b/media-sound/ardour/ardour-4.2-r1.ebuild index c8aad5cdb632..8774ca016a58 100644 --- a/media-sound/ardour/ardour-4.2-r1.ebuild +++ b/media-sound/ardour/ardour-4.2-r1.ebuild @@ -70,7 +70,7 @@ DEPEND="${RDEPEND} src_prepare(){ if ! [[ ${PV} == *9999* ]]; then - epatch "${FILESDIR}"/${PN}-4.2-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: + # |