nativemad 15/04/22 13:42:22 Added: ardour-4.0-revision-naming.patch ardour-4.0-lv2.patch Log: version bump, introduce jack useflag (Portage version: 2.2.18/cvs/Linux i686, signed Manifest commit with key 60373227)
Revision Changes Path 1.1 media-sound/ardour/files/ardour-4.0-revision-naming.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-4.0-revision-naming.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-4.0-revision-naming.patch?rev=1.1&content-type=text/plain Index: ardour-4.0-revision-naming.patch =================================================================== diff -rupN ardour-4.0-vanilla/wscript ardour-4.0/wscript --- ardour-4.0-vanilla/wscript 2015-04-18 00:23:10.000000000 +0200 +++ ardour-4.0/wscript 2015-04-20 18:26:50.849812000 +0200 @@ -137,29 +137,29 @@ def fetch_tarball_revision (): if not os.path.exists ('libs/ardour/revision.cc'): print ('This tarball was not created correctly - it is missing libs/ardour/revision.cc') sys.exit (1) - with open('libs/ardour/revision.cc') as f: - content = f.readlines() - remove_punctuation_map = dict((ord(char), None) for char in '";') - return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map) - -if os.path.isdir (os.path.join(os.getcwd(), '.git')): - rev = fetch_git_revision () -else: - rev = fetch_tarball_revision () +# with open('libs/ardour/revision.cc') as f: +# content = f.readlines() +# remove_punctuation_map = dict((ord(char), None) for char in '";') +# return content[1].decode('utf-8').strip().split(' ')[7].translate (remove_punctuation_map) + +#if os.path.isdir (os.path.join(os.getcwd(), '.git')): +# rev = fetch_git_revision () +#else: +# rev = fetch_tarball_revision () # # rev is now of the form MAJOR.MINOR[-rcX]-rev-commit # or, if right at the same rev as a release, MAJOR.MINOR[-rcX] # -parts = rev.split ('.', 1) -MAJOR = parts[0] -other = parts[1].split('-', 1) -MINOR = other[0] -if len(other) > 1: - MICRO = other[1].rsplit('-',1)[0].replace('-','.') -else: - MICRO = '0' +#parts = rev.split ('.', 1) +MAJOR = '4' +#other = parts[1].split('-', 1) +MINOR = '0' +#if len(other) > 1: +# MICRO = other[1].rsplit('-',1)[0].replace('-','.') +#else: +MICRO = 'gentoo' V = MAJOR + '.' + MINOR + '.' + MICRO VERSION = V @@ -216,16 +216,16 @@ def fetch_gcc_version (CC): 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 = "4.0-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: # 1.1 media-sound/ardour/files/ardour-4.0-lv2.patch file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-4.0-lv2.patch?rev=1.1&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-4.0-lv2.patch?rev=1.1&content-type=text/plain Index: ardour-4.0-lv2.patch =================================================================== diff -rupN ardour-4.0-vanilla/libs/ardour/automatable.cc ardour-4.0/libs/ardour/automatable.cc --- ardour-4.0-vanilla/libs/ardour/automatable.cc 2015-04-18 00:23:10.000000000 +0200 +++ ardour-4.0/libs/ardour/automatable.cc 2015-04-21 16:32:14.943812000 +0200 @@ -34,7 +34,11 @@ #include "ardour/plugin.h" #include "ardour/plugin_insert.h" #include "ardour/session.h" + +#ifdef LV2_SUPPORT #include "ardour/uri_map.h" +#endif + #include "ardour/value_as_string.h" #include "i18n.h" diff -rupN ardour-4.0-vanilla/libs/ardour/buffer_set.cc ardour-4.0/libs/ardour/buffer_set.cc --- ardour-4.0-vanilla/libs/ardour/buffer_set.cc 2015-04-18 00:23:10.000000000 +0200 +++ ardour-4.0/libs/ardour/buffer_set.cc 2015-04-21 16:40:44.216812000 +0200 @@ -34,8 +34,8 @@ #include "ardour/midi_buffer.h" #include "ardour/port.h" #include "ardour/port_set.h" -#include "ardour/uri_map.h" #ifdef LV2_SUPPORT +#include "ardour/uri_map.h" #include "ardour/lv2_plugin.h" #include "lv2_evbuf.h" #endif diff -rupN ardour-4.0-vanilla/libs/ardour/event_type_map.cc ardour-4.0/libs/ardour/event_type_map.cc --- ardour-4.0-vanilla/libs/ardour/event_type_map.cc 2015-04-18 00:23:10.000000000 +0200 +++ ardour-4.0/libs/ardour/event_type_map.cc 2015-04-21 16:47:28.489812000 +0200 @@ -24,7 +24,9 @@ #include "ardour/event_type_map.h" #include "ardour/parameter_descriptor.h" #include "ardour/parameter_types.h" +#ifdef LV2_SUPPORT #include "ardour/uri_map.h" +#endif #include "evoral/Parameter.hpp" #include "evoral/ParameterDescriptor.hpp" #include "evoral/midi_events.h" diff -rupN ardour-4.0-vanilla/libs/ardour/globals.cc ardour-4.0/libs/ardour/globals.cc --- ardour-4.0-vanilla/libs/ardour/globals.cc 2015-04-18 00:23:10.000000000 +0200 +++ ardour-4.0/libs/ardour/globals.cc 2015-04-21 16:54:33.404812000 +0200 @@ -106,8 +106,9 @@ #include "ardour/runtime_functions.h" #include "ardour/session_event.h" #include "ardour/source_factory.h" +#ifdef LV2_SUPPORT #include "ardour/uri_map.h" - +#endif #include "audiographer/routines.h" #if defined (__APPLE__)