Add Carla Support to AppImage

.travis/linux..install.sh

@@ -16,10 +16,9 @@ fi
 
 sudo apt-get install -y $PACKAGES
 
-# Carla depends on kxstudio which creates some package conflicts (wine, etc)
-# If run too early in the dependency process.  Once provided by PPA, "carla-git"
-# can simply be added to $PACKAGES
-sudo apt-get install -y apt-transport-https software-properties-common wget
-wget https://launchpad.net/~kxstudio-debian/+archive/kxstudio/+files/kxstudio-repos_9.4.6~kxstudio1_all.deb
-sudo dpkg -i kxstudio-repos_9.4.6~kxstudio1_all.deb
+# Carla depends on kxstudio which creates some package conflicts (wine, etc) if
+# run too early in the dependency process.
+sudo add-apt-repository -y ppa:kxstudio-debian/libs
+sudo add-apt-repository -y ppa:kxstudio-debian/apps
+sudo apt-get update
 sudo apt-get install -y carla-git

cmake/linux/package_linux.sh.in

@@ -103,7 +103,7 @@ mv "${APPDIR}usr/bin/lmms" "${APPDIR}usr/bin/lmms.real"
 cat >"${APPDIR}usr/bin/lmms" <<EOL
 #!/usr/bin/env bash
 DIR="\$( cd "\$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
-export LD_LIBRARY_PATH=\$DIR/usr/lib/:\$DIR/usr/lib/lmms:\$LD_LIBRARY_PATH
+export LD_LIBRARY_PATH=\$DIR/usr/lib/:\$DIR/usr/lib/lmms:/usr/lib/carla/:/usr/lib64/carla/:\$LD_LIBRARY_PATH
 # Prevent segfault on VirualBox
 if lsmod |grep vboxguest > /dev/null 2>&1; then
    echo "VirtualBox detected.  Forcing libgl software rendering."
@@ -170,6 +170,9 @@ ln -sr  "$VSTBIN" "$VSTLIB"
 # Remove wine library conflict
 rm -f "${APPDIR}/usr/lib/libwine.so.1"
 
+# Use system-provided carla
+rm -f "${APPDIR}usr/lib/"libcarla*.so
+
 # Remove problematic jack library, replace with weakjack
 if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
    rm -f "${APPDIR}/usr/lib/libjack.so.0"
@@ -178,16 +181,6 @@ if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
    ln -sr "${APPDIR}usr/lib/lmms/optional/weakjack.so" "${APPDIR}usr/lib/lmms/optional/libjack.so.0"
 fi
 
-# Use system-provided Carla files
-CARLABIN="/usr/share/carla/resources"
-if [ -d "${CARLABIN}" ]; then
-   rm -f "${APPDIR}/usr/lib/libcarla*.so"
-   mkdir -p "${APPDIR}${CARLABIN}"
-   ln -sf "${CARLABIN}/carla-plugin" "${APPDIR}${CARLABIN}/carla-plugin"
-   ln -sf "${CARLABIN}/carla-plugin-patchbay" "${APPDIR}${CARLABIN}/carla-plugin-patchbay"
-fi
-
-
 # Create AppImage
 echo -e "\nFinishing the AppImage..."
 echo -e "\n\n>>>>> appimagetool" >> "$LOGFILE"

plugins/carlabase/carla.cpp

@@ -36,6 +36,7 @@
 
 #include <QApplication>
 #include <QFileDialog>
+#include <QFileInfo>
 #include <QPushButton>
 #include <QTimerEvent>
 #include <QVBoxLayout>
@@ -150,15 +151,22 @@ CarlaInstrument::CarlaInstrument(InstrumentTrack* const instrumentTrack, const D
     fHost.uiName      = NULL;
     fHost.uiParentId  = 0;
 
-    // figure out prefix from dll filename
+    // carla/resources contains PyQt scripts required for launch
     QString dllName(carla_get_library_filename());
-
+    QString resourcesPath = QString();
 #if defined(CARLA_OS_LINUX)
-    fHost.resourceDir = strdup(QString(dllName.split("/lib")[0] + "/share/carla/resources/").toUtf8().constData());
-#else
-    fHost.resourceDir = NULL;
+    // parse prefix from dll filename
+    QDir path = QFileInfo(dllName).dir();
+    path.cdUp();
+    path.cdUp();
+    resourcesPath = path.absolutePath() + "/share/carla/resources";
+#elif defined(CARLA_OS_MAC)
+    // assume standard install location
+    resourcesPath = "/Applications/Carla.app/Contents/MacOS/resources";
+#elif defined(CARLA_OS_WIN32) || defined(CARLA_OS_WIN64)
+    // not yet supported
 #endif
-
+    fHost.resourceDir            = strdup(resourcesPath.toUtf8().constData());
     fHost.get_buffer_size        = host_get_buffer_size;
     fHost.get_sample_rate        = host_get_sample_rate;
     fHost.is_offline             = host_is_offline;