Version bump (bug #346019). Update to EAPI 4, use scons-utils eclass, fix compile with gcc-4.6, use system libraries (bug #255759), respect CFLAGS and LDFLAGS (bug #277983), and force the __STDC_FORMAT_MACROS flag on by default (fixes bug #355993).

(Portage version: 2.2.0_alpha30/cvs/Linux x86_64)

4 files changed, 178 insertions, 0 deletions

diff --git a/media-sound/ardour/files/ardour-2.8.11-flags.patch b/media-sound/ardour/files/ardour-2.8.11-flags.patch
new file mode 100644
index 000000000000..607b072cffa2
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.11-flags.patch
@@ -0,0 +1,28 @@
+--- ardour-2.8.11/SConstruct.orig
++++ ardour-2.8.11/SConstruct
+@@ -414,6 +414,15 @@
+     if os.environ.has_key('CXX'):
+ 	context['CXX'] = os.environ['CXX']
+ 
++	if os.environ.has_key('CFLAGS'):
++		env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS'])
++
++	if os.environ.has_key('CXXFLAGS'):
++		env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS'])
++
++	if os.environ.has_key('LDFLAGS'):
++		env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS'])
++
+     if os.environ.has_key('DISTCC_HOSTS'):
+ 	context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS']
+ 	context['ENV']['HOME'] = os.environ['HOME']
+@@ -807,9 +816,6 @@
+ if env['DEBUG'] == 1:
+     env.Append(CCFLAGS=" ".join (debug_flags))
+     env.Append(LINKFLAGS=" ".join (debug_flags))
+-else:
+-    env.Append(CCFLAGS=" ".join (opt_flags))
+-    env.Append(LINKFLAGS=" ".join (opt_flags))
+ 
+ if env['STL_DEBUG'] == 1:
+     env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG")
diff --git a/media-sound/ardour/files/ardour-2.8.11-gcc46.patch b/media-sound/ardour/files/ardour-2.8.11-gcc46.patch
new file mode 100644
index 000000000000..4944fd8a8e27
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.11-gcc46.patch
@@ -0,0 +1,29 @@
+--- ardour-2.8.11.old/libs/ardour/enums.cc
++++ ardour-2.8.11/libs/ardour/enums.cc
+@@ -31,7 +31,8 @@
+ 
+ using namespace std;
+ using namespace PBD;
+-using namespace ARDOUR;
++namespace ARDOUR
++{
+ 
+ void
+ setup_enum_writer ()
+@@ -362,3 +363,5 @@ setup_enum_writer ()
+ 	REGISTER (_Track_FreezeState);
+ 	
+ }
++
++}
+--- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc
++++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc
+@@ -177,7 +177,7 @@ wiimote_discovery:
+ 	std::cerr << "Wiimote: discovering, press 1+2" << std::endl;
+ 
+  	while (!wiimote_handle && !main_thread_quit) {
+-		bdaddr = *BDADDR_ANY;
++		bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}};
+ 		callback_thread_registered_for_ardour = false;
+ 		wiimote_handle = cwiid_open(&bdaddr, 0);
+ 
diff --git a/media-sound/ardour/files/ardour-2.8.11-syslibs.patch b/media-sound/ardour/files/ardour-2.8.11-syslibs.patch
new file mode 100644
index 000000000000..932bdade31f0
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.11-syslibs.patch
@@ -0,0 +1,110 @@
+--- ardour-2.8.11/SConstruct.orig
++++ ardour-2.8.11/SConstruct
+@@ -863,40 +863,6 @@
+ 	    
+ prep_libcheck(env, env)
+ 
+-
+-#
+-# these are part of the Ardour source tree because they are C++
+-# 
+-
+-libraries['vamp'] = LibraryInfo (LIBS='vampsdk',
+-                                 LIBPATH='#libs/vamp-sdk',
+-                                 CPPPATH='#libs/vamp-sdk')
+-libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk',
+-                                 LIBPATH='#libs/vamp-sdk',
+-                                 CPPPATH='#libs/vamp-sdk')
+-
+-env['RUBBERBAND'] = False
+-
+-conf = Configure (env)
+-
+-if conf.CheckHeader ('fftw3.h'):
+-    env['RUBBERBAND'] = True
+-    libraries['rubberband'] = LibraryInfo (LIBS='rubberband',
+-                                           LIBPATH='#libs/rubberband',
+-                                           CPPPATH='#libs/rubberband',
+-                                           CCFLAGS='-DUSE_RUBBERBAND')
+-else:
+-    print ""
+-    print "-------------------------------------------------------------------------"
+-    print "You do not have the FFTW single-precision development package installed."
+-    print "This prevents Ardour from using the Rubberband library for timestretching"
+-    print "and pitchshifting. It will fall back on SoundTouch for timestretch, and "
+-    print "pitchshifting will not be available."
+-    print "-------------------------------------------------------------------------"
+-    print ""
+-
+-conf.Finish()
+-
+ #
+ # Check for libusb
+ 
+@@ -1080,10 +1046,22 @@
+     # Comment the previous line and uncomment this for old versions of Debian:
+     #libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch')
+ 
+-    libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
+-                                            LIBPATH='#libs/appleutility',
+-                                            CPPPATH='#libs/appleutility')
+-    
++    #libraries['appleutility'] = LibraryInfo(LIBS='libappleutility',
++    #                                        LIBPATH='#libs/appleutility',
++    #                                        CPPPATH='#libs/appleutility')
++
++    env['RUBBERBAND'] = True
++    env.Append (CXXFLAGS="-DUSE_RUBBERBAND")
++    libraries['rubberband'] = LibraryInfo()
++    libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband')
++
++    libraries['vamp-sdk'] = LibraryInfo()
++    libraries['vamp-sdk'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
++    libraries['vamp'] = LibraryInfo()
++    libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk')
++    libraries['vamphost'] = LibraryInfo()
++    libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk')
++
+     coredirs = [
+         'templates',
+         'manual'
+@@ -1093,7 +1071,6 @@
+         'libs/pbd',
+         'libs/midi++2',
+         'libs/ardour',
+-        'libs/vamp-sdk',
+         'libs/vamp-plugins/',
+     # these are unconditionally included but have
+     # tests internally to avoid compilation etc
+@@ -1109,8 +1086,7 @@
+     gtk_subdirs = [
+ #        'libs/flowcanvas',
+         'libs/gtkmm2ext',
+-        'gtk2_ardour',
+-        clearlooks_version
++        'gtk2_ardour'
+         ]
+ 
+ else:
+@@ -1222,9 +1198,9 @@
+ # timestretch libraries
+ #
+ 
+-timefx_subdirs = ['libs/soundtouch']
+-if env['RUBBERBAND']:
+-    timefx_subdirs += ['libs/rubberband']
++#timefx_subdirs = ['libs/soundtouch']
++#if env['RUBBERBAND']:
++#    timefx_subdirs += ['libs/rubberband']
+ 
+ opts.Save('scache.conf', env)
+ Help(opts.GenerateHelpText(env))
+@@ -1403,7 +1379,7 @@
+ for subdir in coredirs:
+     SConscript (subdir + '/SConscript')
+ 
+-for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]:
++for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]:
+     for subdir in sublistdir:
+         SConscript (subdir + '/SConscript')
+ 
diff --git a/media-sound/ardour/files/ardour-2.8.11-type.patch b/media-sound/ardour/files/ardour-2.8.11-type.patch
new file mode 100644
index 000000000000..6de9129a8e17
--- /dev/null
+++ b/media-sound/ardour/files/ardour-2.8.11-type.patch
@@ -0,0 +1,11 @@
+--- ardour-2.8.11/gtk2_ardour/sfdb_freesound_mootcher.cc.orig
++++ ardour-2.8.11/gtk2_ardour/sfdb_freesound_mootcher.cc
+@@ -342,7 +342,7 @@
+ {

+ 	struct MemoryStruct xml_page;

+ 	xml_page.memory = NULL;

+-	xml_page.size = NULL;

++	xml_page.size = 0;

+ 

+ 	std::string xmlFileName;

+ 	std::string audioFileName;