From fda0a7b0320923e65c21c85b4103ee8529818afb Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Aug 05 2017 12:29:37 +0000 Subject: add libmypaint dependency into opentoonz-master --- diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh index aa3c017..964cb94 100644 --- a/docker-builder-data/build/script/packet/opentoonz-master.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.sh @@ -1,9 +1,9 @@ -DEPS="jpeg-9b png-1.6.26 lz4-master lzo-2.10 lzma-5.2.3 glew-2.0.0 freeglut-3.0.0 superlu-5.2.1 openblas-master boost-1.61.0 qt-5.7" +DEPS="jpeg-9b png-1.6.26 lz4-master lzo-2.10 lzma-5.2.3 glew-2.0.0 freeglut-3.0.0 superlu-5.2.1 openblas-master boost-1.61.0 qt-5.7 mypaintlib-master" DEPS_NATIVE="cmake-3.6.2" PK_DIRNAME="opentoonz" PK_URL="https://github.com/opentoonz/$PK_DIRNAME.git" -PK_LICENSE_FILES="README.md LICENSE.txt thirdparty/tiff-4.0.3/COPYRIGHT" +PK_LICENSE_FILES="README.md LICENSE.txt thirdparty/tiff-4.0.3/COPYRIGHT stuff/library/mypaint?brushes/Licenses.txt" PK_CONFIGURE_OPTIONS= diff --git a/docker-builder-data/build/script/packet/opentoonz-testing.sh b/docker-builder-data/build/script/packet/opentoonz-testing.sh index 8f860da..4c226b3 100644 --- a/docker-builder-data/build/script/packet/opentoonz-testing.sh +++ b/docker-builder-data/build/script/packet/opentoonz-testing.sh @@ -1,8 +1,5 @@ source "$PACKET_SCRIPT_DIR/opentoonz-master.sh" -DEPS="$DEPS mypaintlib-master" PK_DIRNAME="opentoonz" PK_URL="https://github.com/blackwarthog/$PK_DIRNAME.git" PK_GIT_CHECKOUT="origin/testing" - -PK_LICENSE_FILES="$PK_LICENSE_FILES stuff/library/mypaint?brushes/Licenses.txt"