Switch weakjack to submodule

.gitmodules

@@ -22,3 +22,6 @@
 [submodule "plugins/LadspaEffect/tap/tap-plugins"]
 	path = plugins/LadspaEffect/tap/tap-plugins
 	url = https://github.com/tomszilagyi/tap-plugins
+[submodule "src/3rdparty/weakjack/weakjack"]
+	path = src/3rdparty/weakjack/weakjack
+	url = https://github.com/x42/weakjack.git

CMakeLists.txt

@@ -394,6 +394,7 @@ IF(WANT_JACK)
 	IF(JACK_FOUND)
 		IF(WANT_WEAKJACK)
 			SET(LMMS_HAVE_WEAKJACK TRUE)
+			SET(WEAKJACK_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/src/3rdparty/weakjack/weakjack)
 			SET(STATUS_JACK "OK (weak linking enabled)")
 			SET(JACK_INCLUDE_DIRS "")
 			# use dlsym instead

cmake/linux/package_linux.sh.in

@@ -108,6 +108,12 @@ if lsmod |grep vboxguest > /dev/null 2>&1; then
    echo "VirtualBox detected.  Forcing libgl software rendering."
    export LIBGL_ALWAYS_SOFTWARE=1;
 fi
+if ldconfig -p | grep libjack.so.0 > /dev/null 2>&1; then
+   echo "Jack appears to be installed on this system, so we'll use it."
+else
+   echo "Jack does not appear to be installed.  That's OK, we'll use a dummy version instead."
+   export LD_LIBRARY_PATH=\$DIR/usr/lib/lmms/optional:\$LD_LIBRARY_PATH
+fi
 QT_X11_NO_NATIVE_MENUBAR=1 QT_AUTO_SCREEN_SCALE_FACTOR=1 \$DIR/usr/bin/lmms.real "\$@"
 EOL
 
@@ -163,6 +169,12 @@ ln -sr  "$VSTBIN" "$VSTLIB"
 # Remove wine library conflict
 rm -f "${APPDIR}/usr/lib/libwine.so.1"
 
+# Remove problematic jack library, replace with weakjack
+if [ -e "${APPDIR}/usr/lib/libjack.so.0" ]; then
+   rm -f "${APPDIR}/usr/lib/libjack.so.0"
+   ln -sr "${APPDIR}usr/lib/lmms/optional/libweakjack.so" "${APPDIR}usr/lib/lmms/optional/libjack.so.0"
+fi
+
 # Create AppImage
 echo -e "\nFinishing the AppImage..."
 echo -e "\n\n>>>>> appimagetool" >> "$LOGFILE"

cmake/modules/CheckSubmodules.cmake

@@ -83,7 +83,7 @@ MACRO(GIT_SUBMODULE SUBMODULE_PATH FORCE_DEINIT)
 		)
 
 		SET(GIT_MESSAGE "${GIT_STDOUT}${GIT_STDERR}")
-		MESSAGE(${GIT_MESSAGE})
+		MESSAGE("${GIT_MESSAGE}")
 	ENDIF()
 ENDMACRO()
 

include/AudioJack.h

@@ -31,7 +31,7 @@
 #ifndef LMMS_HAVE_WEAKJACK
 #include <jack/jack.h>
 #else
-#include "AudioWeakJack.h"
+#include "weak_libjack.h"
 #endif
 
 #include <QtCore/QVector>