1 diff -dur -x '*~' Carla-1.9.6.orig/Makefile Carla-1.9.6/Makefile
2 --- Carla-1.9.6.orig/Makefile 2015-03-12 14:09:14.000000000 +0100
3 +++ Carla-1.9.6/Makefile 2016-11-19 13:47:16.395089673 +0100
7 install -d $(DESTDIR)$(PREFIX)/bin/
8 - install -d $(DESTDIR)$(PREFIX)/lib/carla/
9 - install -d $(DESTDIR)$(PREFIX)/lib/carla/styles/
10 - install -d $(DESTDIR)$(PREFIX)/lib/pkgconfig/
11 + install -d $(DESTDIR)$(LIBDIR)/carla/
12 + install -d $(DESTDIR)$(LIBDIR)/carla/styles/
13 + install -d $(DESTDIR)$(LIBDIR)/pkgconfig/
14 install -d $(DESTDIR)$(PREFIX)/include/carla/
15 install -d $(DESTDIR)$(PREFIX)/include/carla/includes/
16 install -d $(DESTDIR)$(PREFIX)/share/applications/
18 install -m 644 data/carla.xml $(DESTDIR)$(PREFIX)/share/mime/packages/
20 # Install pkg-config file
21 - install -m 644 data/carla-standalone.pc $(DESTDIR)$(PREFIX)/lib/pkgconfig/
22 + install -m 644 data/carla-standalone.pc $(DESTDIR)$(LIBDIR)/pkgconfig/
24 # Install backend libs
27 - $(DESTDIR)$(PREFIX)/lib/carla/
28 + $(DESTDIR)$(LIBDIR)/carla/
30 # Install other binaries
33 bin/carla-discovery-* \
34 - $(DESTDIR)$(PREFIX)/lib/carla/
35 + $(DESTDIR)$(LIBDIR)/carla/
37 # Install the real modgui bridge
39 data/carla-bridge-lv2-modgui \
40 - $(DESTDIR)$(PREFIX)/lib/carla/
41 + $(DESTDIR)$(LIBDIR)/carla/
46 - $(DESTDIR)$(PREFIX)/lib/carla/styles/
47 + $(DESTDIR)$(LIBDIR)/carla/styles/
52 $(LINK) $(PREFIX)/share/carla/ui_inputdialog_value.py $(DESTDIR)$(PREFIX)/share/carla/resources/
54 # Adjust PREFIX value in script files
55 - sed -i "s?X-PREFIX-X?$(PREFIX)?" \
56 + sed -i "s?X-PREFIX-X?$(PREFIX)?;s?X-LIBDIR-X?$(LIBDIR)?" \
57 + $(DESTDIR)$(PREFIX)/share/carla/carla_shared.py \
58 + $(DESTDIR)$(PREFIX)/share/carla/carla_widgets.py \
59 $(DESTDIR)$(PREFIX)/bin/carla \
60 $(DESTDIR)$(PREFIX)/bin/carla-database \
61 $(DESTDIR)$(PREFIX)/bin/carla-patchbay \
62 $(DESTDIR)$(PREFIX)/bin/carla-rack \
63 $(DESTDIR)$(PREFIX)/bin/carla-single \
64 $(DESTDIR)$(PREFIX)/bin/carla-settings \
65 - $(DESTDIR)$(PREFIX)/lib/carla/carla-bridge-lv2-modgui \
66 - $(DESTDIR)$(PREFIX)/lib/pkgconfig/carla-standalone.pc
67 + $(DESTDIR)$(LIBDIR)/carla/carla-bridge-lv2-modgui \
68 + $(DESTDIR)$(LIBDIR)/pkgconfig/carla-standalone.pc
69 # $(DESTDIR)$(PREFIX)/bin/carla-control \
71 # --------------------------------------------------------------------------------------------------------------------
74 - install -d $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
75 + install -d $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/
78 bin/carla.lv2/carla.* \
80 - $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
81 + $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/
83 # Link binaries for lv2 plugin
84 - @for i in $(shell find $(DESTDIR)$(PREFIX)/lib/carla/ -maxdepth 1 -type f -exec basename {} ';'); do \
85 - $(LINK) $(PREFIX)/lib/carla/$$i $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/; \
86 - $(LINK) $(PREFIX)/lib/carla/$$i $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/; \
87 + @for i in $(shell find $(DESTDIR)$(LIBDIR)/carla/ -maxdepth 1 -type f -exec basename {} ';'); do \
88 + $(LINK) $(LIBDIR)/carla/$$i $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/; \
89 + $(LINK) $(LIBDIR)/carla/$$i $(DESTDIR)$(LIBDIR)/vst/carla.vst/; \
91 - rm -f $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/libcarla_standalone2.*
92 - rm -f $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/libcarla_standalone2.*
93 + rm -f $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/libcarla_standalone2.*
94 + rm -f $(DESTDIR)$(LIBDIR)/vst/carla.vst/libcarla_standalone2.*
96 # Link styles for lv2 plugin
97 - $(LINK) $(PREFIX)/lib/carla/styles $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
98 + $(LINK) $(LIBDIR)/carla/styles $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/
100 # Link resources for lv2 plugin
101 - rm -rf $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/resources
102 - $(LINK) $(PREFIX)/share/carla/resources/ $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
103 + rm -rf $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/resources
104 + $(LINK) $(PREFIX)/share/carla/resources/ $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/
106 # --------------------------------------------------------------------------------------------------------------------
108 @@ -620,25 +622,25 @@
109 ifeq ($(HAVE_X11),true)
110 ifeq ($(DEFAULT_QT),4)
112 - install -d $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
113 + install -d $(DESTDIR)$(LIBDIR)/vst/carla.vst/
117 bin/CarlaPatchbay*.* \
118 - $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
119 + $(DESTDIR)$(LIBDIR)/vst/carla.vst/
121 # Link binaries for vst plugin
122 - @for i in $(shell find $(DESTDIR)$(PREFIX)/lib/carla/ -maxdepth 1 -type f -exec basename {} ';'); do \
123 - $(LINK) $(PREFIX)/lib/carla/$$i $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/; \
124 + @for i in $(shell find $(DESTDIR)$(LIBDIR)/carla/ -maxdepth 1 -type f -exec basename {} ';'); do \
125 + $(LINK) $(LIBDIR)/carla/$$i $(DESTDIR)$(LIBDIR)/vst/carla.vst/; \
127 - rm -f $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/libcarla_standalone2.*
128 + rm -f $(DESTDIR)$(LIBDIR)/vst/carla.vst/libcarla_standalone2.*
130 # Link styles for vst plugin
131 - $(LINK) $(PREFIX)/lib/carla/styles $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
132 + $(LINK) $(LIBDIR)/carla/styles $(DESTDIR)$(LIBDIR)/vst/carla.vst/
134 # Link resources for vst plugin
135 - rm -rf $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/resources
136 - $(LINK) $(PREFIX)/share/carla/resources/ $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
137 + rm -rf $(DESTDIR)$(LIBDIR)/vst/carla.vst/resources
138 + $(LINK) $(PREFIX)/share/carla/resources/ $(DESTDIR)$(LIBDIR)/vst/carla.vst/
145 rm -f $(DESTDIR)$(PREFIX)/bin/carla*
146 - rm -f $(DESTDIR)$(PREFIX)/lib/pkgconfig/carla-standalone.pc
147 + rm -f $(DESTDIR)$(LIBDIR)/pkgconfig/carla-standalone.pc
148 rm -f $(DESTDIR)$(PREFIX)/share/applications/carla.desktop
149 rm -f $(DESTDIR)$(PREFIX)/share/applications/carla-control.desktop
150 rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/*/apps/carla.png
152 rm -f $(DESTDIR)$(PREFIX)/share/icons/hicolor/scalable/apps/carla-control.svg
153 rm -f $(DESTDIR)$(PREFIX)/share/mime/packages/carla.xml
154 rm -rf $(DESTDIR)$(PREFIX)/include/carla/
155 - rm -rf $(DESTDIR)$(PREFIX)/lib/carla/
156 - rm -rf $(DESTDIR)$(PREFIX)/lib/lv2/carla.lv2/
157 - rm -rf $(DESTDIR)$(PREFIX)/lib/vst/carla.vst/
158 + rm -rf $(DESTDIR)$(LIBDIR)/carla/
159 + rm -rf $(DESTDIR)$(LIBDIR)/lv2/carla.lv2/
160 + rm -rf $(DESTDIR)$(LIBDIR)/vst/carla.vst/
161 rm -rf $(DESTDIR)$(PREFIX)/share/carla/
163 # ----------------------------------------------------------------------------------------------------------------------------
164 diff -dur -x '*~' Carla-1.9.6.orig/data/carla Carla-1.9.6/data/carla
165 --- Carla-1.9.6.orig/data/carla 2015-03-12 14:09:14.000000000 +0100
166 +++ Carla-1.9.6/data/carla 2016-11-19 13:45:49.448810610 +0100
170 INSTALL_PREFIX="X-PREFIX-X"
171 -export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
172 +export PATH="X-LIBDIR-X/carla:$PATH"
173 exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@"
174 diff -dur -x '*~' Carla-1.9.6.orig/data/carla-database Carla-1.9.6/data/carla-database
175 --- Carla-1.9.6.orig/data/carla-database 2015-03-12 14:09:14.000000000 +0100
176 +++ Carla-1.9.6/data/carla-database 2016-11-19 13:45:49.448810610 +0100
180 INSTALL_PREFIX="X-PREFIX-X"
181 -export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
182 +export PATH="X-LIBDIR-X/carla:$PATH"
183 exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_database.py --with-libprefix="$INSTALL_PREFIX" "$@"
184 diff -dur -x '*~' Carla-1.9.6.orig/data/carla-patchbay Carla-1.9.6/data/carla-patchbay
185 --- Carla-1.9.6.orig/data/carla-patchbay 2015-03-12 14:09:14.000000000 +0100
186 +++ Carla-1.9.6/data/carla-patchbay 2016-11-19 13:45:49.448810610 +0100
190 INSTALL_PREFIX="X-PREFIX-X"
191 -export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
192 +export PATH="X-LIBDIR-X/carla:$PATH"
193 exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla-patchbay --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@"
194 diff -dur -x '*~' Carla-1.9.6.orig/data/carla-rack Carla-1.9.6/data/carla-rack
195 --- Carla-1.9.6.orig/data/carla-rack 2015-03-12 14:09:14.000000000 +0100
196 +++ Carla-1.9.6/data/carla-rack 2016-11-19 13:45:49.448810610 +0100
200 INSTALL_PREFIX="X-PREFIX-X"
201 -export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
202 +export PATH="X-LIBDIR-X/carla:$PATH"
203 exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla-rack --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@"
204 diff -dur -x '*~' Carla-1.9.6.orig/data/carla-settings Carla-1.9.6/data/carla-settings
205 --- Carla-1.9.6.orig/data/carla-settings 2015-03-12 14:09:14.000000000 +0100
206 +++ Carla-1.9.6/data/carla-settings 2016-11-19 13:45:49.448810610 +0100
210 INSTALL_PREFIX="X-PREFIX-X"
211 -export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
212 +export PATH="X-LIBDIR-X/carla:$PATH"
213 exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_settings.py --with-libprefix="$INSTALL_PREFIX" "$@"
214 diff -dur -x '*~' Carla-1.9.6.orig/data/carla-single Carla-1.9.6/data/carla-single
215 --- Carla-1.9.6.orig/data/carla-single 2015-03-12 14:09:14.000000000 +0100
216 +++ Carla-1.9.6/data/carla-single 2016-11-19 13:45:49.448810610 +0100
219 INSTALL_PREFIX = "X-PREFIX-X"
221 -CARLA_LIBDIR = os.path.join(INSTALL_PREFIX, "lib", "carla")
222 +CARLA_LIBDIR = os.path.join("X-LIBDIR-X", "carla")
223 CARLA_RESDIR = os.path.join(INSTALL_PREFIX, "share", "carla", "resources")
225 # --------------------------------------------------------------------------------------------------------
226 diff -dur -x '*~' Carla-1.9.6.orig/data/carla-standalone.pc Carla-1.9.6/data/carla-standalone.pc
227 --- Carla-1.9.6.orig/data/carla-standalone.pc 2015-03-12 14:09:14.000000000 +0100
228 +++ Carla-1.9.6/data/carla-standalone.pc 2016-11-19 13:45:49.448810610 +0100
231 exec_prefix=${prefix}
232 -libdir=${exec_prefix}/lib/carla
233 +libdir=X-LIBDIR-X/carla
234 includedir=${prefix}/include/carla
236 Name: carla-standalone
237 diff -dur -x '*~' Carla-1.9.6.orig/data/todo/carla-control Carla-1.9.6/data/todo/carla-control
238 --- Carla-1.9.6.orig/data/todo/carla-control 2015-03-12 14:09:14.000000000 +0100
239 +++ Carla-1.9.6/data/todo/carla-control 2016-11-19 13:45:49.448810610 +0100
243 INSTALL_PREFIX="X-PREFIX-X"
244 -export PATH="$INSTALL_PREFIX"/lib/carla:$PATH
245 +export PATH="X-LIBDIR-X/carla:$PATH"
246 exec $PYTHON "$INSTALL_PREFIX"/share/carla/carla_control.py --with-appname="$0" --with-libprefix="$INSTALL_PREFIX" "$@"
247 diff -dur -x '*~' Carla-1.9.6.orig/source/carla_shared.py Carla-1.9.6/source/carla_shared.py
248 --- Carla-1.9.6.orig/source/carla_shared.py 2015-03-12 14:09:14.000000000 +0100
249 +++ Carla-1.9.6/source/carla_shared.py 2016-11-19 13:46:47.227483196 +0100
250 @@ -375,23 +375,33 @@
253 DEFAULT_LADSPA_PATH = HOME + "/.ladspa"
254 + DEFAULT_LADSPA_PATH += ":/usr/lib64/ladspa"
255 DEFAULT_LADSPA_PATH += ":/usr/lib/ladspa"
256 + DEFAULT_LADSPA_PATH += ":/usr/libx32/ladspa"
257 DEFAULT_LADSPA_PATH += ":/usr/local/lib/ladspa"
259 DEFAULT_DSSI_PATH = HOME + "/.dssi"
260 + DEFAULT_DSSI_PATH += ":/usr/lib64/dssi"
261 DEFAULT_DSSI_PATH += ":/usr/lib/dssi"
262 + DEFAULT_DSSI_PATH += ":/usr/libx32/dssi"
263 DEFAULT_DSSI_PATH += ":/usr/local/lib/dssi"
265 DEFAULT_LV2_PATH = HOME + "/.lv2"
266 + DEFAULT_LV2_PATH += ":/usr/lib64/lv2"
267 DEFAULT_LV2_PATH += ":/usr/lib/lv2"
268 + DEFAULT_LV2_PATH += ":/usr/libx32/lv2"
269 DEFAULT_LV2_PATH += ":/usr/local/lib/lv2"
271 DEFAULT_VST2_PATH = HOME + "/.vst"
272 + DEFAULT_VST2_PATH += ":/usr/lib64/vst"
273 DEFAULT_VST2_PATH += ":/usr/lib/vst"
274 + DEFAULT_VST2_PATH += ":/usr/libx32/vst"
275 DEFAULT_VST2_PATH += ":/usr/local/lib/vst"
277 DEFAULT_VST3_PATH = HOME + "/.vst3"
278 + DEFAULT_VST3_PATH += ":/usr/lib64/vst3"
279 DEFAULT_VST3_PATH += ":/usr/lib/vst3"
280 + DEFAULT_VST3_PATH += ":/usr/libx32/vst3"
281 DEFAULT_VST3_PATH += ":/usr/local/lib/vst3"
283 DEFAULT_GIG_PATH = HOME + "/.sounds/gig"
285 def getPaths(libPrefix = None):
288 + pathBinaries = os.path.join("X-LIBDIR-X", "carla")
290 # standalone, installed system-wide linux
291 if libPrefix is not None:
292 - pathBinaries = os.path.join(libPrefix, "lib", "carla")
293 pathResources = os.path.join(libPrefix, "share", "carla", "resources")
295 # standalone, local source
296 diff -dur -x '*~' Carla-1.9.6.orig/source/carla_widgets.py Carla-1.9.6/source/carla_widgets.py
297 --- Carla-1.9.6.orig/source/carla_widgets.py 2015-03-12 14:09:14.000000000 +0100
298 +++ Carla-1.9.6/source/carla_widgets.py 2016-11-19 13:45:49.448810610 +0100
299 @@ -1577,7 +1577,7 @@
300 loadHostSettings(host)
302 host.engine_init("JACK", "Carla-Widgets")
303 - host.add_plugin(BINARY_NATIVE, PLUGIN_DSSI, "/usr/lib/dssi/karplong.so", "karplong", "karplong", 0, None, 0x0)
304 + host.add_plugin(BINARY_NATIVE, PLUGIN_DSSI, "X-LIBDIR-X/dssi/karplong.so", "karplong", "karplong", 0, None, 0x0)
305 host.set_active(0, True)
307 gui1 = CarlaAboutW(None, host)
308 diff -dur -x '*~' Carla-1.9.6.orig/source/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp Carla-1.9.6/source/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp
309 --- Carla-1.9.6.orig/source/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp 2015-03-12 14:09:14.000000000 +0100
310 +++ Carla-1.9.6/source/modules/juce_audio_processors/format_types/juce_LADSPAPluginFormat.cpp 2016-11-19 13:45:49.448810610 +0100
312 FileSearchPath LADSPAPluginFormat::getDefaultLocationsToSearch()
\r
314 return FileSearchPath (SystemStats::getEnvironmentVariable ("LADSPA_PATH",
\r
315 - "/usr/lib/ladspa;/usr/local/lib/ladspa;~/.ladspa")
\r
316 + "/usr/lib64/ladspa;/usr/lib/ladspa;/usr/libx32/ladspa;/usr/local/lib/ladspa;~/.ladspa")
\r
317 .replace (":", ";"));
\r
320 diff -dur -x '*~' Carla-1.9.6.orig/source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp Carla-1.9.6/source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp
321 --- Carla-1.9.6.orig/source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp 2015-03-12 14:09:14.000000000 +0100
322 +++ Carla-1.9.6/source/modules/juce_audio_processors/format_types/juce_VSTPluginFormat.cpp 2016-11-19 13:45:49.448810610 +0100
323 @@ -2818,7 +2818,7 @@
324 return FileSearchPath ("~/Library/Audio/Plug-Ins/VST;/Library/Audio/Plug-Ins/VST");
\r
326 return FileSearchPath (SystemStats::getEnvironmentVariable ("VST_PATH",
\r
327 - "/usr/lib/vst;/usr/local/lib/vst;~/.vst")
\r
328 + "/usr/lib64/vst;/usr/lib/vst;/usr/libx32/vst;/usr/local/lib/vst;~/.vst")
\r
329 .replace (":", ";"));
\r
331 const String programFiles (File::getSpecialLocation (File::globalApplicationsDirectory).getFullPathName());
\r
332 diff -dur -x '*~' Carla-1.9.6.orig/source/modules/lilv/config/lilv_config.h Carla-1.9.6/source/modules/lilv/config/lilv_config.h
333 --- Carla-1.9.6.orig/source/modules/lilv/config/lilv_config.h 2015-03-12 14:09:14.000000000 +0100
334 +++ Carla-1.9.6/source/modules/lilv/config/lilv_config.h 2016-11-19 13:45:49.448810610 +0100
336 #elif defined(__WIN32__)
337 #define LILV_DEFAULT_LV2_PATH "%APPDATA%\\LV2;%COMMONPROGRAMFILES%\\LV2"
339 - #define LILV_DEFAULT_LV2_PATH "~/.lv2:/usr/lib/lv2:/usr/local/lib/lv2"
340 + #define LILV_DEFAULT_LV2_PATH "~/.lv2:/usr/lib64/lv2:/usr/lib/lv2:/usr/libx32/lv2:/usr/local/lib/lv2"
343 #endif /* _LILV_CONFIG_H_ */