Skip to content

Commit

Permalink
Attempt to build AppImage with Carla support
Browse files Browse the repository at this point in the history
  • Loading branch information
tresf committed Nov 30, 2017
1 parent 03e9889 commit ffdd5f8
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 1 deletion.
8 changes: 8 additions & 0 deletions .travis/linux..install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -21,3 +21,11 @@ fi

# shellcheck disable=SC2086
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
sudo apt-get install -y carla-git
10 changes: 10 additions & 0 deletions cmake/linux/package_linux.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -178,6 +178,16 @@ if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
ln -sr "${APPDIR}usr/lib/lmms/optional/libweakjack.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"
Expand Down
2 changes: 1 addition & 1 deletion plugins/carlabase/carla.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ CarlaInstrument::CarlaInstrument(InstrumentTrack* const instrumentTrack, const D
QString dllName(carla_get_library_filename());

#if defined(CARLA_OS_LINUX)
fHost.resourceDir = strdup(QString(dllName.split("/lib/carla")[0] + "/share/carla/resources/").toUtf8().constData());
fHost.resourceDir = strdup(QString(dllName.split("/lib")[0] + "/share/carla/resources/").toUtf8().constData());
#else
fHost.resourceDir = NULL;
#endif
Expand Down

0 comments on commit ffdd5f8

Please sign in to comment.