diff --git a/docker-builder-data/build/script/common/manager.sh b/docker-builder-data/build/script/common/manager.sh index 77afea8..327f7e5 100755 --- a/docker-builder-data/build/script/common/manager.sh +++ b/docker-builder-data/build/script/common/manager.sh @@ -310,8 +310,8 @@ $TC_LD_LIBRARY_PATH" export CFLAGS="-I$ENVDEPS_PACKET_DIR/include $TC_CFLAGS" export CPPFLAGS="-I$ENVDEPS_PACKET_DIR/include $TC_CPPFLAGS" export CXXFLAGS="-I$ENVDEPS_PACKET_DIR/include $TC_CXXFLAGS" - export PKG_CONFIG_PATH="$ENVDEPS_PACKET_DIR/lib/pkgconfig:$ENVDEPS_PACKET_DIR/share/pkgconfig:$TC_PKG_CONFIG_PATH" - export PKG_CONFIG_LIBDIR="$ENVDEPS_PACKET_DIR/lib:$TC_PKG_CONFIG_LIBDIR" + export PKG_CONFIG_PATH="$ENVDEPS_PACKET_DIR/lib/pkgconfig:$ENVDEPS_PACKET_DIR/lib64/pkgconfig:$ENVDEPS_PACKET_DIR/share/pkgconfig:$TC_PKG_CONFIG_PATH" + export PKG_CONFIG_LIBDIR="$ENVDEPS_PACKET_DIR/lib:$ENVDEPS_PACKET_DIR/lib64:$TC_PKG_CONFIG_LIBDIR" export PKG_CONFIG_SYSROOT_DIR="/" export XDG_DATA_DIRS="$ENVDEPS_PACKET_DIR/share:$TC_XDG_DATA_DIRS" export ACLOCAL_PATH="$ENVDEPS_PACKET_DIR/share/aclocal:$TC_ACLOCAL_PATH" diff --git a/docker-builder-data/build/script/packet/jack-0.125.0.sh b/docker-builder-data/build/script/packet/jack-0.125.0.sh index ae8c090..ccf5263 100644 --- a/docker-builder-data/build/script/packet/jack-0.125.0.sh +++ b/docker-builder-data/build/script/packet/jack-0.125.0.sh @@ -6,7 +6,3 @@ PK_URL="http://jackaudio.org/downloads/$PK_ARCHIVE" PK_LICENSE_FILES="AUTHORS COPYING COPYING.GPL COPYING.LGPL" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh - -pkinstall_release() { - return 0 -} \ No newline at end of file diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh index 411d716..dab5764 100644 --- a/docker-builder-data/build/script/packet/synfigcore-master.sh +++ b/docker-builder-data/build/script/packet/synfigcore-master.sh @@ -71,10 +71,6 @@ else DEPS="$DEPS glibmm-2.41.4 xmlpp-2.22.0" fi -if [ "$PLATFORM" = "linux" ]; then - DEPS="$DEPS jack-0.125.0" -fi - PK_DIRNAME="synfig" PK_URL="https://github.com/synfig/$PK_DIRNAME.git" PK_GIT_CHECKOUT="origin/testing" diff --git a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh index ed5b5cd..9be2f2a 100755 --- a/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-appimage.files/launch.sh @@ -4,7 +4,7 @@ SCRIPT_DIR=$(cd `dirname "$0"`; pwd) BASE_DIR=`dirname "$SCRIPT_DIR"` # Check if this system have JACK installed -if ( ! ldconfig -p | grep libjack.so >/dev/null ) || ( ! which jackd >/dev/null ) ; then +if ! which jackd >/dev/null; then # No JACK, so disable this functionality. # (The bundled libjack won't work correctly anyway). export SYNFIG_DISABLE_JACK=1 diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index 2e435ce..64f2dc5 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -26,6 +26,10 @@ else DEPS="$DEPS gtkmm-3.14.0" fi +if [ "$PLATFORM" = "linux" ]; then + DEPS="$DEPS jack-0.125.0" +fi + PK_DIRNAME="synfig" PK_URL="https://github.com/synfig/$PK_DIRNAME.git" PK_GIT_CHECKOUT="origin/testing"