1 |
radhermit 11/04/30 10:06:58 |
2 |
|
3 |
Added: ardour-2.8.11-flags.patch |
4 |
ardour-2.8.11-syslibs.patch |
5 |
ardour-2.8.11-type.patch ardour-2.8.11-gcc46.patch |
6 |
Log: |
7 |
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). |
8 |
|
9 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.1 media-sound/ardour/files/ardour-2.8.11-flags.patch |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-flags.patch?rev=1.1&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-flags.patch?rev=1.1&content-type=text/plain |
16 |
|
17 |
Index: ardour-2.8.11-flags.patch |
18 |
=================================================================== |
19 |
--- ardour-2.8.11/SConstruct.orig |
20 |
+++ ardour-2.8.11/SConstruct |
21 |
@@ -414,6 +414,15 @@ |
22 |
if os.environ.has_key('CXX'): |
23 |
context['CXX'] = os.environ['CXX'] |
24 |
|
25 |
+ if os.environ.has_key('CFLAGS'): |
26 |
+ env['CCFLAGS'] += SCons.Util.CLVar(os.environ['CFLAGS']) |
27 |
+ |
28 |
+ if os.environ.has_key('CXXFLAGS'): |
29 |
+ env['CXXFLAGS'] += SCons.Util.CLVar(os.environ['CXXFLAGS']) |
30 |
+ |
31 |
+ if os.environ.has_key('LDFLAGS'): |
32 |
+ env['LINKFLAGS'] += SCons.Util.CLVar(os.environ['LDFLAGS']) |
33 |
+ |
34 |
if os.environ.has_key('DISTCC_HOSTS'): |
35 |
context['ENV']['DISTCC_HOSTS'] = os.environ['DISTCC_HOSTS'] |
36 |
context['ENV']['HOME'] = os.environ['HOME'] |
37 |
@@ -807,9 +816,6 @@ |
38 |
if env['DEBUG'] == 1: |
39 |
env.Append(CCFLAGS=" ".join (debug_flags)) |
40 |
env.Append(LINKFLAGS=" ".join (debug_flags)) |
41 |
-else: |
42 |
- env.Append(CCFLAGS=" ".join (opt_flags)) |
43 |
- env.Append(LINKFLAGS=" ".join (opt_flags)) |
44 |
|
45 |
if env['STL_DEBUG'] == 1: |
46 |
env.Append(CXXFLAGS="-D_GLIBCXX_DEBUG") |
47 |
|
48 |
|
49 |
|
50 |
1.1 media-sound/ardour/files/ardour-2.8.11-syslibs.patch |
51 |
|
52 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-syslibs.patch?rev=1.1&view=markup |
53 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-syslibs.patch?rev=1.1&content-type=text/plain |
54 |
|
55 |
Index: ardour-2.8.11-syslibs.patch |
56 |
=================================================================== |
57 |
--- ardour-2.8.11/SConstruct.orig |
58 |
+++ ardour-2.8.11/SConstruct |
59 |
@@ -863,40 +863,6 @@ |
60 |
|
61 |
prep_libcheck(env, env) |
62 |
|
63 |
- |
64 |
-# |
65 |
-# these are part of the Ardour source tree because they are C++ |
66 |
-# |
67 |
- |
68 |
-libraries['vamp'] = LibraryInfo (LIBS='vampsdk', |
69 |
- LIBPATH='#libs/vamp-sdk', |
70 |
- CPPPATH='#libs/vamp-sdk') |
71 |
-libraries['vamphost'] = LibraryInfo (LIBS='vamphostsdk', |
72 |
- LIBPATH='#libs/vamp-sdk', |
73 |
- CPPPATH='#libs/vamp-sdk') |
74 |
- |
75 |
-env['RUBBERBAND'] = False |
76 |
- |
77 |
-conf = Configure (env) |
78 |
- |
79 |
-if conf.CheckHeader ('fftw3.h'): |
80 |
- env['RUBBERBAND'] = True |
81 |
- libraries['rubberband'] = LibraryInfo (LIBS='rubberband', |
82 |
- LIBPATH='#libs/rubberband', |
83 |
- CPPPATH='#libs/rubberband', |
84 |
- CCFLAGS='-DUSE_RUBBERBAND') |
85 |
-else: |
86 |
- print "" |
87 |
- print "-------------------------------------------------------------------------" |
88 |
- print "You do not have the FFTW single-precision development package installed." |
89 |
- print "This prevents Ardour from using the Rubberband library for timestretching" |
90 |
- print "and pitchshifting. It will fall back on SoundTouch for timestretch, and " |
91 |
- print "pitchshifting will not be available." |
92 |
- print "-------------------------------------------------------------------------" |
93 |
- print "" |
94 |
- |
95 |
-conf.Finish() |
96 |
- |
97 |
# |
98 |
# Check for libusb |
99 |
|
100 |
@@ -1080,10 +1046,22 @@ |
101 |
# Comment the previous line and uncomment this for old versions of Debian: |
102 |
#libraries['soundtouch'].ParseConfig ('pkg-config --cflags --libs libSoundTouch') |
103 |
|
104 |
- libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', |
105 |
- LIBPATH='#libs/appleutility', |
106 |
- CPPPATH='#libs/appleutility') |
107 |
- |
108 |
+ #libraries['appleutility'] = LibraryInfo(LIBS='libappleutility', |
109 |
+ # LIBPATH='#libs/appleutility', |
110 |
+ # CPPPATH='#libs/appleutility') |
111 |
+ |
112 |
+ env['RUBBERBAND'] = True |
113 |
+ env.Append (CXXFLAGS="-DUSE_RUBBERBAND") |
114 |
+ libraries['rubberband'] = LibraryInfo() |
115 |
+ libraries['rubberband'].ParseConfig ('pkg-config --cflags --libs rubberband') |
116 |
+ |
117 |
+ libraries['vamp-sdk'] = LibraryInfo() |
118 |
+ libraries['vamp-sdk'].ParseConfig ('pkg-config --cflags --libs vamp-sdk') |
119 |
+ libraries['vamp'] = LibraryInfo() |
120 |
+ libraries['vamp'].ParseConfig ('pkg-config --cflags --libs vamp-sdk') |
121 |
+ libraries['vamphost'] = LibraryInfo() |
122 |
+ libraries['vamphost'].ParseConfig ('pkg-config --cflags --libs vamp-hostsdk') |
123 |
+ |
124 |
coredirs = [ |
125 |
'templates', |
126 |
'manual' |
127 |
@@ -1093,7 +1071,6 @@ |
128 |
'libs/pbd', |
129 |
'libs/midi++2', |
130 |
'libs/ardour', |
131 |
- 'libs/vamp-sdk', |
132 |
'libs/vamp-plugins/', |
133 |
# these are unconditionally included but have |
134 |
# tests internally to avoid compilation etc |
135 |
@@ -1109,8 +1086,7 @@ |
136 |
gtk_subdirs = [ |
137 |
# 'libs/flowcanvas', |
138 |
'libs/gtkmm2ext', |
139 |
- 'gtk2_ardour', |
140 |
- clearlooks_version |
141 |
+ 'gtk2_ardour' |
142 |
] |
143 |
|
144 |
else: |
145 |
@@ -1222,9 +1198,9 @@ |
146 |
# timestretch libraries |
147 |
# |
148 |
|
149 |
-timefx_subdirs = ['libs/soundtouch'] |
150 |
-if env['RUBBERBAND']: |
151 |
- timefx_subdirs += ['libs/rubberband'] |
152 |
+#timefx_subdirs = ['libs/soundtouch'] |
153 |
+#if env['RUBBERBAND']: |
154 |
+# timefx_subdirs += ['libs/rubberband'] |
155 |
|
156 |
opts.Save('scache.conf', env) |
157 |
Help(opts.GenerateHelpText(env)) |
158 |
@@ -1403,7 +1379,7 @@ |
159 |
for subdir in coredirs: |
160 |
SConscript (subdir + '/SConscript') |
161 |
|
162 |
-for sublistdir in [ subdirs, timefx_subdirs, gtk_subdirs, surface_subdirs ]: |
163 |
+for sublistdir in [ subdirs, gtk_subdirs, surface_subdirs ]: |
164 |
for subdir in sublistdir: |
165 |
SConscript (subdir + '/SConscript') |
166 |
|
167 |
|
168 |
|
169 |
|
170 |
1.1 media-sound/ardour/files/ardour-2.8.11-type.patch |
171 |
|
172 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-type.patch?rev=1.1&view=markup |
173 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-type.patch?rev=1.1&content-type=text/plain |
174 |
|
175 |
Index: ardour-2.8.11-type.patch |
176 |
=================================================================== |
177 |
--- ardour-2.8.11/gtk2_ardour/sfdb_freesound_mootcher.cc.orig |
178 |
+++ ardour-2.8.11/gtk2_ardour/sfdb_freesound_mootcher.cc |
179 |
@@ -342,7 +342,7 @@ |
180 |
{ |
181 |
struct MemoryStruct xml_page; |
182 |
xml_page.memory = NULL; |
183 |
- xml_page.size = NULL; |
184 |
+ xml_page.size = 0; |
185 |
|
186 |
std::string xmlFileName; |
187 |
std::string audioFileName; |
188 |
|
189 |
|
190 |
|
191 |
1.1 media-sound/ardour/files/ardour-2.8.11-gcc46.patch |
192 |
|
193 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-gcc46.patch?rev=1.1&view=markup |
194 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/media-sound/ardour/files/ardour-2.8.11-gcc46.patch?rev=1.1&content-type=text/plain |
195 |
|
196 |
Index: ardour-2.8.11-gcc46.patch |
197 |
=================================================================== |
198 |
--- ardour-2.8.11.old/libs/ardour/enums.cc |
199 |
+++ ardour-2.8.11/libs/ardour/enums.cc |
200 |
@@ -31,7 +31,8 @@ |
201 |
|
202 |
using namespace std; |
203 |
using namespace PBD; |
204 |
-using namespace ARDOUR; |
205 |
+namespace ARDOUR |
206 |
+{ |
207 |
|
208 |
void |
209 |
setup_enum_writer () |
210 |
@@ -362,3 +363,5 @@ setup_enum_writer () |
211 |
REGISTER (_Track_FreezeState); |
212 |
|
213 |
} |
214 |
+ |
215 |
+} |
216 |
--- ardour-2.8.11.old/libs/surfaces/wiimote/wiimote.cc |
217 |
+++ ardour-2.8.11/libs/surfaces/wiimote/wiimote.cc |
218 |
@@ -177,7 +177,7 @@ wiimote_discovery: |
219 |
std::cerr << "Wiimote: discovering, press 1+2" << std::endl; |
220 |
|
221 |
while (!wiimote_handle && !main_thread_quit) { |
222 |
- bdaddr = *BDADDR_ANY; |
223 |
+ bdaddr = (bdaddr_t) {{0, 0, 0, 0, 0, 0}}; |
224 |
callback_thread_registered_for_ardour = false; |
225 |
wiimote_handle = cwiid_open(&bdaddr, 0); |