[SCM] ardour3/master: Merge tag 'upstream/3.1_dfsg'
adiknoth-guest at users.alioth.debian.org
adiknoth-guest at users.alioth.debian.org
Tue Apr 9 16:44:53 UTC 2013
Imported Upstream version 3.1~dfsg
Imported Upstream version 3.0~dfsg
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 5ee8de4f102a77142f6a8eed9a4bbc7873c2c056
X-Git-Newrev: 066dc990ed458e261b96e338ccbd457b8c908721
The following commit has been merged in the master branch:
commit 9e67af3e3329fcbacb6a94f41a86b49b705c839c
Merge: 5ee8de4f102a77142f6a8eed9a4bbc7873c2c056 ec42bc2ab5c551eecd7cdd2aa06ec5144fff24d3
Author: Adrian Knoth <adi at drcomp.erfurt.thur.de>
Date: Tue Apr 9 15:12:28 2013 +0200
Merge tag 'upstream/3.1_dfsg'
Upstream version 3.1~dfsg
Conflicts:
.gitignore
diff --combined .gitignore
index e6d62cb,48a95b8..9d78e81
--- a/.gitignore
+++ b/.gitignore
@@@ -1,129 -1,82 +1,83 @@@
+/.pc
- # git-ls-files --others --exclude-from=.git/info/exclude
- # Lines that start with '#' are comments.
- # For a project mostly in C, the following would be a good set of
- # exclude patterns (uncomment them if you want to use them):
*.[oa]
- *~
*.o
*.os
- Makefile
*.template
*.binding
- .scache
- .deps
*.so
+ *.dylib
*.pyc
- .sconf_temp/
- .sconsign.dblite
- ardour_system.rc
+ # autotools
+ aclocal.m4
config.log
- gtk2_ardour/SAE-de.bindings
- gtk2_ardour/SAE-us.bindings
- gtk2_ardour/ardev_common.sh
- gtk2_ardour/ardour-3.0
- gtk2_ardour/ardour.sh
- gtk2_ardour/ardour3_ui_dark.rc
- gtk2_ardour/ardour3_ui_light.rc
- gtk2_ardour/ergonomic-us.bindings
- gtk2_ardour/mnemonic-us.bindings
- gtk2_ardour/version.cc
- gtk2_ardour/version.h
- gtk2_ardour/test/*.cpp
- gtk2_ardour/test/test_ui_config
- libs/ardour/ardour/version.h
- libs/ardour/config_text.cc
- libs/ardour/svn_revision.cc
- libs/ardour/version.cc
- libs/glibmm2/Makefile.in
- libs/glibmm2/aclocal.m4
- libs/glibmm2/autom4te.cache/
- libs/glibmm2/config.log
- libs/glibmm2/configure
- libs/glibmm2/glib/Makefile.in
- libs/gtkmm2ext/gtkmm2ext/version.h
- libs/gtkmm2ext/version.cc
- libs/midi++2/midi++/version.h
- libs/midi++2/version.cc
- libs/pbd/pbd/version.h
- libs/pbd/version.cc
- libs/sigc++2/Makefile.in
- libs/sigc++2/aclocal.m4
- libs/sigc++2/autom4te.cache/
- libs/sigc++2/config.guess
- libs/sigc++2/config.log
- libs/sigc++2/config.status
- libs/sigc++2/config.sub
- libs/sigc++2/configure
- libs/sigc++2/depcomp
- libs/sigc++2/install-sh
- libs/sigc++2/libsigc++-2.0.spec
- libs/sigc++2/libtool
- libs/sigc++2/ltmain.sh
- libs/sigc++2/scripts/Makefile.in
- libs/sigc++2/sigc++-2.0.pc
- libs/sigc++2/sigc++/Makefile.in
- libs/sigc++2/sigc++config.h
- libs/sigc++2/stamp-h1
- libs/taglib/bindings/c/taglib_c.pc
- libs/taglib/config.h
- libs/taglib/config.log
- libs/taglib/config.status
- libs/taglib/headers/
- libs/taglib/libtool
- libs/taglib/stamp-h1
- libs/taglib/taglib-config
- libs/taglib/taglib.pc
- manual/xml/entities.ent
- scache.conf
- tools/osx_packaging/Resources/
- gtk2_ardour/SAE-de-keypad.bindings
- gtk2_ardour/SAE-de-nokeypad.bindings
- gtk2_ardour/SAE-us-keypad.bindings
- gtk2_ardour/SAE-us-nokeypad.bindings
- gtk2_ardour/ardour.menus
- gtk2_ardour/ardour3_ui_dark_sae.rc
- gtk2_ardour/ardour3_ui_light_sae.rc
- libs/glibmm2/config.h
- libs/glibmm2/config.status
- libs/glibmm2/glib/stamp-h2
- libs/glibmm2/libtool
- libs/glibmm2/scripts/config.guess
- libs/glibmm2/scripts/config.sub
- libs/glibmm2/scripts/install-sh
- libs/glibmm2/scripts/libtool.m4
- libs/glibmm2/scripts/ltmain.sh
- libs/glibmm2/scripts/ltoptions.m4
- libs/glibmm2/scripts/ltsugar.m4
- libs/glibmm2/scripts/ltversion.m4
- libs/glibmm2/scripts/lt~obsolete.m4
- libs/glibmm2/scripts/missing
- libs/glibmm2/stamp-h1
- libs/glibmm2/glibmm-2.4.pc
- libs/glibmm2/glibmm/
- libs/glibmm2/glibmmconfig.h
- libs/sigc++2/scripts/libtool.m4
- libs/sigc++2/scripts/ltoptions.m4
- libs/sigc++2/scripts/ltsugar.m4
- libs/sigc++2/scripts/ltversion.m4
- libs/sigc++2/scripts/lt~obsolete.m4
- libs/evoral/build
- libs/evoral/.waf*
- libs/evoral/.lock-wscript
- libs/glibmm2/autom4te.cache
- libs/sigc++2/autom4te.cache
- .sconf_temp
- libs/taglib/headers/taglib
- .lock-wscript
- .waf-*
- build
+ config.status
+ config.guess
+ config.sub
+ Makefile
+ Makefile.in
+ autom4te.cache
+ stamp-h1
+ libtool
+ ltmain.sh
+ install-sh
+ depcomp
+ .deps
+
+ # OSX
+ .DS_STORE
+
+ # misc editor/tools
+ *~
*.swp
- tags
- BROWSE
+ *.kdev4
+ .gdb_history
core
- gtk2_ardour/po/*.mo
- libs/ardour/po/*.mo
- gtk2_ardour/*.pot
- libs/ardour/libardour.pot
+ cscope.files
+ cscope.out
+ tags
+
+ # generated folders doc, build, packaging
+ .waf-*
+ .waf3-*
+ .lock-waf*
+ /build/
+ /doc/html/
+ /doc/latex/
+ /tools/osx_packaging/Resources/
+
+
+ # translations
+ /gtk2_ardour/po/*.mo
+ /gtk2_ardour/*.pot
+ /libs/ardour/po/*.mo
+ /libs/ardour/libardour.pot
+
+ # /gtk2_ardour/
+ /gtk2_ardour/ardour.sh
+ /gtk2_ardour/ardev_common.sh
+ /gtk2_ardour/*.bindings
+ /gtk2_ardour/*.rc
+ /gtk2_ardour/version.cc
+ /gtk2_ardour/version.h
+
+ # /libs/ardour/
+ /libs/ardour/version.cc
+ /libs/ardour/ardour/version.h
+ /libs/ardour/revision.cc
+ /libs/ardour/config_text.cc
+
+ # /libs/gtkmm2ext/
+ /libs/gtkmm2ext/*.pot
+ /libs/gtkmm2ext/*.mo
+ /libs/gtkmm2ext/*.po
+ /libs/gtkmm2ext/version.cc
+ /libs/gtkmm2ext/gtkmm2ext/version.h
+
+ # /libs/midi++2/
+ /libs/midi++2/version.cc
+ /libs/midi++2/midi++/version.h
+ # /libs/pbd/
+ /libs/pbd/version.cc
+ /libs/pbd/pbd/version.h
diff --combined wscript
index c489e52,433f1a6..1f86646
--- a/wscript
+++ b/wscript
@@@ -15,8 -15,8 +15,8 @@@ if sys.platform == 'darwin'
OSX_VERSION = '3.0beta6'
VERSION = '3.0beta6'
else:
- LINUX_VERSION = '3.0'
- VERSION = '3.0'
+ LINUX_VERSION = '3.1'
+ VERSION = '3.1'
APPNAME = 'Ardour3'
@@@ -42,11 -42,9 +42,9 @@@ children =
'libs/clearlooks-newer',
'libs/audiographer',
'gtk2_ardour',
'export',
'midi_maps',
'mcp',
- 'manual',
'patchfiles'
]
@@@ -67,11 -65,6 +65,6 @@@ else
# Version stuff
- def fetch_svn_revision (path):
- cmd = "svnversion | cut -d: -f1"
- output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].decode (sys.getdefaultencoding())
- return output.rstrip(os.linesep)
-
def fetch_gcc_version (CC):
cmd = "LANG= %s --version" % CC
output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
@@@ -79,56 -72,33 +72,33 @@@
version = o.split(' ')[2].split('.')
return version
- def fetch_git_revision (path):
- cmd = "LANG= git log --abbrev HEAD^..HEAD"
- output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
- o = output[0].decode('utf-8')
- rev = o.replace ("commit", "git")[0:10]
- cmd = "LANG= git log --abbrev -n1 --grep 'git-svn-id'"
+ def fetch_git_revision ():
+ cmd = "LANG= git describe --tags HEAD"
output = subprocess.Popen(cmd, shell=True, stderr=subprocess.STDOUT, stdout=subprocess.PIPE).communicate()[0].splitlines()
- for line in output:
- try:
- if "git-svn-id" in line:
- line = line.split('@')[1].split(' ')
- rev = line[0]
- break
- except:
- pass
+ rev = output[0].decode('utf-8')
return rev
- def fetch_bzr_revision (path):
- cmd = subprocess.Popen("LANG= bzr log -l 1 " + path, stdout=subprocess.PIPE, shell=True)
- out = cmd.communicate()[0]
- svn = re.search('^svn revno: [0-9]*', out, re.MULTILINE)
- str = svn.group(0)
- chars = 'svnreio: '
- return string.lstrip(str, chars)
-
def create_stored_revision():
rev = ""
- if os.path.exists('.svn'):
- rev = fetch_svn_revision('.');
- elif os.path.exists('.git'):
- rev = fetch_git_revision('.');
- elif os.path.exists('.bzr'):
- rev = fetch_bzr_revision('.');
- print("Revision: %s", rev)
- elif os.path.exists('libs/ardour/svn_revision.cc'):
- print("Using packaged svn revision")
+ if os.path.exists('.git'):
+ rev = fetch_git_revision();
+ print("ardour.git version: " + rev + "\n")
+ elif os.path.exists('libs/ardour/revision.cc'):
+ print("Using packaged revision")
return
else:
- print("Missing libs/ardour/svn_revision.cc. Blame the packager.")
+ print("Missing libs/ardour/revision.cc. Blame the packager.")
sys.exit(-1)
try:
- text = '#include "ardour/svn_revision.h"\n'
- text += 'namespace ARDOUR { const char* svn_revision = \"%s\"; }\n' % rev
- print('Writing svn revision info to libs/ardour/svn_revision.cc using ' + rev)
- o = open('libs/ardour/svn_revision.cc', 'w')
+ text = '#include "ardour/revision.h"\n'
+ text += 'namespace ARDOUR { const char* revision = \"%s\"; }\n' % rev
+ print('Writing revision info to libs/ardour/revision.cc using ' + rev)
+ o = open('libs/ardour/revision.cc', 'w')
o.write(text)
o.close()
except IOError:
- print('Could not open libs/ardour/svn_revision.cc for writing\n')
+ print('Could not open libs/ardour/revision.cc for writing\n')
sys.exit(-1)
def set_compiler_flags (conf,opt):
@@@ -435,6 -405,12 +405,12 @@@ def options(opt)
help='Do not build with Freesound database support')
opt.add_option('--gprofile', action='store_true', default=False, dest='gprofile',
help='Compile for use with gprofile')
+ opt.add_option('--internal-shared-libs', action='store_true', default=True, dest='internal_shared_libs',
+ help='Build internal libs as shared libraries')
+ opt.add_option('--internal-static-libs', action='store_false', dest='internal_shared_libs',
+ help='Build internal libs as static libraries')
+ opt.add_option('--videotimeline', action='store_true', default=False, dest='videotimeline',
+ help='Compile with support for video-timeline')
opt.add_option('--lv2', action='store_true', default=True, dest='lv2',
help='Compile with support for LV2 (if Lilv+Suil is available)')
opt.add_option('--no-lv2', action='store_false', dest='lv2',
@@@ -598,6 -574,10 +574,10 @@@ def configure(conf)
else:
print ('No Carbon support available for this build\n')
+
+ if Options.options.internal_shared_libs:
+ conf.define('INTERNAL_SHARED_LIBS', 1)
+
if Options.options.boost_include != '':
conf.env.append_value('CXXFLAGS', '-I' + Options.options.boost_include)
@@@ -626,6 -606,7 +606,7 @@@
autowaf.check_pkg(conf, 'sndfile', uselib_store='SNDFILE', atleast_version='1.0.18')
autowaf.check_pkg(conf, 'giomm-2.4', uselib_store='GIOMM', atleast_version='2.2')
autowaf.check_pkg(conf, 'libcurl', uselib_store='CURL', atleast_version='7.0.0')
+ autowaf.check_pkg(conf, 'liblo', uselib_store='LO', atleast_version='0.26')
conf.check_cc(function_name='dlopen', header_name='dlfcn.h', lib='dl', uselib_store='DL')
@@@ -636,8 -617,6 +617,6 @@@
# Set up waf environment and C defines
opts = Options.options
- print "PH = "
- print opts.phone_home
if opts.phone_home:
conf.define('PHONE_HOME', 1)
conf.env['PHONE_HOME'] = True
@@@ -653,6 -632,9 +632,9 @@@
conf.env['BUILD_TESTS'] = opts.build_tests
#if opts.tranzport:
# conf.env['TRANZPORT'] = 1
+ if opts.videotimeline:
+ conf.define('WITH_VIDEOTIMELINE',1)
+ conf.env['VIDEOTIMELINE'] = 1
if opts.windows_vst:
conf.define('WINDOWS_VST_SUPPORT', 1)
conf.env['WINDOWS_VST_SUPPORT'] = True
@@@ -702,6 -684,7 +684,7 @@@ const char* const ardour_config_info =
write_config_text('Debuggable build', conf.env['DEBUG'])
write_config_text('Install prefix', conf.env['PREFIX'])
write_config_text('Strict compiler flags', conf.env['STRICT'])
+ write_config_text('Internal Shared Libraries', conf.is_defined('INTERNAL_SHARED_LIBS'))
write_config_text('Architecture flags', opts.arch)
write_config_text('Aubio', conf.is_defined('HAVE_AUBIO'))
@@@ -730,6 -713,7 +713,7 @@@
# write_config_text('Tranzport', opts.tranzport)
write_config_text('Unit tests', conf.env['BUILD_TESTS'])
write_config_text('Universal binary', opts.universal)
+ write_config_text('Videotimeline', opts.videotimeline)
write_config_text('Generic x86 CPU', opts.generic)
write_config_text('Windows VST support', opts.windows_vst)
write_config_text('Wiimote support', conf.is_defined('BUILD_WIIMOTE'))
@@@ -778,3 -762,5 +762,3 @@@ def i18n_po(bld)
def i18n_mo(bld):
bld.recurse (i18n_children)
-def tarball(bld):
- create_stored_revision()
--
ardour3 packaging
More information about the pkg-multimedia-commits
mailing list