diff --git a/docker-builder-data/build/script/packet/boost-1.61.0.sh b/docker-builder-data/build/script/packet/boost-1.61.0.sh index bf48907..6973790 100644 --- a/docker-builder-data/build/script/packet/boost-1.61.0.sh +++ b/docker-builder-data/build/script/packet/boost-1.61.0.sh @@ -1,4 +1,4 @@ -DEPS="" +DEPS="zlib-1.2.11 bzip2-1.0.6" PK_DIRNAME="boost_1_61_0" PK_ARCHIVE="$PK_DIRNAME.tar.bz2" @@ -18,7 +18,7 @@ pkbuild() { local LOCAL_OPTIONS= if [ "$PLATFORM" = "win" ]; then LOCAL_OPTIONS="variant=release runtime-link=shared toolset=gcc-win binary-format=pe abi=ms target-os=windows --user-config=$BUILD_PACKET_DIR/$PK_DIRNAME/user-config.jam" - echo "using gcc : win : $CXX : cflags=$CFLAGS cxxflags=$CXXFLAGS linkflags=$LDFLAGS ;" > user-config.jam + echo "using gcc : win : $CXX : $CFLAGS $CXXFLAGS $LDFLAGS ;" > user-config.jam fi ./b2 -j${THREADS} $LOCAL_OPTIONS || return 1 } diff --git a/docker-builder-data/build/script/packet/bzip2-1.0.6.files/Makefile.patch b/docker-builder-data/build/script/packet/bzip2-1.0.6.files/Makefile.patch new file mode 100644 index 0000000..ee75350 --- /dev/null +++ b/docker-builder-data/build/script/packet/bzip2-1.0.6.files/Makefile.patch @@ -0,0 +1,22 @@ +15c15 +< SHELL=/bin/sh +--- +> SHELL?=/bin/sh +18,21c18,21 +< CC=gcc +< AR=ar +< RANLIB=ranlib +< LDFLAGS= +--- +> CC?=gcc +> AR?=ar +> RANLIB?=ranlib +> LDFLAGS?= +24c24 +< CFLAGS=-Wall -Winline -O2 -g $(BIGFILES) +--- +> CFLAGS+=-Wall -Winline -O2 -g -fPIC $(BIGFILES) +27c27 +< PREFIX=/usr/local +--- +> PREFIX?=/usr/local diff --git a/docker-builder-data/build/script/packet/bzip2-1.0.6.files/bzip2.c.patch b/docker-builder-data/build/script/packet/bzip2-1.0.6.files/bzip2.c.patch new file mode 100644 index 0000000..7af0f7b --- /dev/null +++ b/docker-builder-data/build/script/packet/bzip2-1.0.6.files/bzip2.c.patch @@ -0,0 +1,4 @@ +131c131 +< # include +--- +> # include diff --git a/docker-builder-data/build/script/packet/bzip2-1.0.6.sh b/docker-builder-data/build/script/packet/bzip2-1.0.6.sh new file mode 100644 index 0000000..23c281b --- /dev/null +++ b/docker-builder-data/build/script/packet/bzip2-1.0.6.sh @@ -0,0 +1,28 @@ + +PK_DIRNAME="bzip2-1.0.6" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="http://bzip.org/1.0.6/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + +pkbuild() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 + + cp --remove-destination "$UNPACK_PACKET_DIR/$PK_DIRNAME/Makefile" ./ || return 1 + patch "Makefile" "$FILES_PACKET_DIR/Makefile.patch" || return 1 + + cp --remove-destination "$UNPACK_PACKET_DIR/$PK_DIRNAME/bzip2.c" ./ || return 1 + patch "bzip2.c" "$FILES_PACKET_DIR/bzip2.c.patch" || return 1 + + PREFIX="$INSTALL_PACKET_DIR" make -j${THREADS} libbz2.a || return 1 +} + +pkinstall() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 + + mkdir -p "$INSTALL_PACKET_DIR/include" + cp -f bzlib.h "$INSTALL_PACKET_DIR/include/" || return 1 + + mkdir -p "$INSTALL_PACKET_DIR/lib" + cp -f libbz2.a "$INSTALL_PACKET_DIR/lib/"|| return 1 +} diff --git a/docker-builder-data/build/script/packet/dlfcnwin32-1.1.1.sh b/docker-builder-data/build/script/packet/dlfcnwin32-1.1.1.sh new file mode 100644 index 0000000..00109c3 --- /dev/null +++ b/docker-builder-data/build/script/packet/dlfcnwin32-1.1.1.sh @@ -0,0 +1,23 @@ + +PK_DIRNAME="dlfcn-win32-1.1.1" +PK_ARCHIVE="v1.1.1.tar.gz" +PK_URL="https://github.com/dlfcn-win32/dlfcn-win32/archive/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + + +pkbuild() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 + + if ! check_packet_function $NAME build.configure; then + cc="$CC" ./configure \ + --prefix="$INSTALL_PACKET_DIR" \ + --disable-static \ + --enable-shared \ + || return 1 + set_done $NAME build.configure + fi + + make -j${THREADS} || return 1 +} + \ No newline at end of file diff --git a/docker-builder-data/build/script/packet/expat-2.2.5.sh b/docker-builder-data/build/script/packet/expat-2.2.5.sh new file mode 100644 index 0000000..ec561a9 --- /dev/null +++ b/docker-builder-data/build/script/packet/expat-2.2.5.sh @@ -0,0 +1,6 @@ + +PK_DIRNAME="expat-2.2.5" +PK_ARCHIVE="$PK_DIRNAME.tar.bz2" +PK_URL="https://github.com/libexpat/libexpat/releases/download/R_2_2_5/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/fontconfig-2.11.0.sh b/docker-builder-data/build/script/packet/fontconfig-2.11.0.sh index 65f5be9..a10fc26 100644 --- a/docker-builder-data/build/script/packet/fontconfig-2.11.0.sh +++ b/docker-builder-data/build/script/packet/fontconfig-2.11.0.sh @@ -1,4 +1,4 @@ -DEPS="" +DEPS="freetype-2.8.1 expat-2.2.5" PK_DIRNAME="fontconfig-2.11.0" PK_ARCHIVE="$PK_DIRNAME.tar.gz" diff --git a/docker-builder-data/build/script/packet/freetype-2.8.1.sh b/docker-builder-data/build/script/packet/freetype-2.8.1.sh new file mode 100644 index 0000000..ba7b3a4 --- /dev/null +++ b/docker-builder-data/build/script/packet/freetype-2.8.1.sh @@ -0,0 +1,9 @@ +DEPS="png-1.6.26" + +PK_DIRNAME="freetype-2.8.1" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="https://sourceforge.net/projects/freetype/files/freetype2/2.8.1/$PK_ARCHIVE" + +PK_LICENSE_FILES="docs/FTL.TXT" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/glib-2.50.0.files/gstrfuncs.c.patch b/docker-builder-data/build/script/packet/glib-2.50.0.files/gstrfuncs.c.patch new file mode 100644 index 0000000..3858ce6 --- /dev/null +++ b/docker-builder-data/build/script/packet/glib-2.50.0.files/gstrfuncs.c.patch @@ -0,0 +1,4 @@ +1275c1275 +< #if defined(G_OS_WIN32) +--- +> #if defined(G_OS_WIN32) && 0 diff --git a/docker-builder-data/build/script/packet/glib-2.50.0.sh b/docker-builder-data/build/script/packet/glib-2.50.0.sh index 744ce4c..8530cb5 100644 --- a/docker-builder-data/build/script/packet/glib-2.50.0.sh +++ b/docker-builder-data/build/script/packet/glib-2.50.0.sh @@ -1,10 +1,18 @@ -DEPS="ffi-3.2.1" +DEPS="zlib-1.2.11 ffi-3.2.1" DEPS_NATIVE="glib-2.50.0" PK_DIRNAME="glib-2.50.0" PK_ARCHIVE="$PK_DIRNAME.tar.xz" PK_URL="https://download.gnome.org/sources/glib/2.50/$PK_ARCHIVE" -PK_CONFIGURE_OPTIONS="--with-pcre=internal" +PK_CONFIGURE_OPTIONS="--with-pcre=internal --disable-compile-warnings" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + + +pkhook_prebuild() { + if [ "$PLATFORM" = "win" ]; then + cp --remove-destination "$UNPACK_PACKET_DIR/$PK_DIRNAME/glib/gstrfuncs.c" "glib" || return 1 + patch "glib/gstrfuncs.c" "$FILES_PACKET_DIR/gstrfuncs.c.patch" || return 1 + fi +} diff --git a/docker-builder-data/build/script/packet/harfbuzz-1.3.2.sh b/docker-builder-data/build/script/packet/harfbuzz-1.3.2.sh index d5d5847..7ea5786 100644 --- a/docker-builder-data/build/script/packet/harfbuzz-1.3.2.sh +++ b/docker-builder-data/build/script/packet/harfbuzz-1.3.2.sh @@ -1,4 +1,4 @@ -DEPS="glib-2.50.0" +DEPS="fontconfig-2.11.0 glib-2.50.0" PK_DIRNAME="harfbuzz-1.3.2" PK_ARCHIVE="$PK_DIRNAME.tar.bz2" diff --git a/docker-builder-data/build/script/packet/mlt-6.2.0.sh b/docker-builder-data/build/script/packet/mlt-6.2.0.sh index 88ebdc5..16822ca 100644 --- a/docker-builder-data/build/script/packet/mlt-6.2.0.sh +++ b/docker-builder-data/build/script/packet/mlt-6.2.0.sh @@ -27,6 +27,8 @@ if [ "$PLATFORM" = "linux" ]; then fi if [ "$PLATFORM" = "win" ]; then + DEPS="$DEPS dlfcnwin32-1.1.1" + PK_CONFIGURE_OPTIONS="$PK_CONFIGURE_OPTIONS --target-os=MinGW" if [ "$ARCH" = "32" ]; then PK_CONFIGURE_OPTIONS="$PK_CONFIGURE_OPTIONS --target-arch=i686" diff --git a/docker-builder-data/build/script/packet/nsis-3.02.1.sh b/docker-builder-data/build/script/packet/nsis-3.02.1.sh new file mode 100644 index 0000000..a74e308 --- /dev/null +++ b/docker-builder-data/build/script/packet/nsis-3.02.1.sh @@ -0,0 +1,29 @@ +DEPS="zlib-1.2.11" +DEPS_NATIVE="scons-3.0.1" + +PK_DIRNAME="nsis-3.02.1-src" +PK_ARCHIVE="$PK_DIRNAME.tar.bz2" +PK_URL="http://prdownloads.sourceforge.net/nsis/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + +pkbuild() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 + native_at_place with_envvar PATH "$PATH" scons \ + PREFIX="$INSTALL_PACKET_DIR" \ + ZLIB_W32="$ENVDEPS_PACKET_DIR" \ + SKIPUTILS="NSIS Menu" \ + NSIS_MAX_STRLEN=131072 \ + || return 1 +} + +pkinstall() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" + native_at_place with_envvar PATH "$PATH" scons \ + PREFIX="$INSTALL_PACKET_DIR" \ + ZLIB_W32="$ENVDEPS_PACKET_DIR" \ + SKIPUTILS="NSIS Menu" \ + NSIS_MAX_STRLEN=8192 \ + install \ + || return 1 +} diff --git a/docker-builder-data/build/script/packet/ogg-1.3.2.sh b/docker-builder-data/build/script/packet/ogg-1.3.2.sh index 0579b41..75b199f 100644 --- a/docker-builder-data/build/script/packet/ogg-1.3.2.sh +++ b/docker-builder-data/build/script/packet/ogg-1.3.2.sh @@ -2,6 +2,6 @@ DEPS="" PK_DIRNAME="libogg-1.3.2" PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="http://downloads.xiph.org/releases/ogg/$PK_ARCHIVE" +PK_URL="https://downloads.xiph.org/releases/ogg/$PK_ARCHIVE" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh index f7f3ed0..ce442d0 100644 --- a/docker-builder-data/build/script/packet/opentoonz-master.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.sh @@ -24,15 +24,15 @@ pkhook_version() { pkbuild() { local LOCAL_OPTIONS= local LOCAL_CMAKE_OPTIONS= - local LOCAL_LIB_SUFFIX="so" - local LOCAL_GLUT_LIB="libglut" + local LOCAL_PNG_LIB="libpng16.so" + local LOCAL_GLUT_LIB="libglut.so" if [ ! -z "$HOST" ]; then LOCAL_OPTIONS="--host=$HOST" fi if [ "$PLATFORM" = "win" ]; then LOCAL_CMAKE_OPTIONS="$LOCAL_CMAKE_OPTIONS -DCMAKE_SYSTEM_NAME=Windows" - LOCAL_LIB_SUFFIX="dll.a" - LOCAL_GLUT_LIB="libfreeglut" + LOCAL_PNG_LIB="libpng16.a" + LOCAL_GLUT_LIB="libfreeglut.dll.a" fi if ! check_packet_function $NAME build.libtiff; then @@ -55,8 +55,8 @@ pkbuild() { -DCMAKE_MODULE_PATH="$ENVDEPS_NATIVE_PACKET_DIR/share/cmake-3.6.2/Modules" \ -DCMAKE_INSTALL_PREFIX="$INSTALL_PACKET_DIR" \ -DPNG_PNG_INCLUDE_DIR="$ENVDEPS_PACKET_DIR/include" \ - -DPNG_LIBRARY="$ENVDEPS_PACKET_DIR/lib/libpng16.$LOCAL_LIB_SUFFIX" \ - -DGLUT_LIB="$ENVDEPS_PACKET_DIR/lib/$LOCAL_GLUT_LIB.$LOCAL_LIB_SUFFIX" \ + -DPNG_LIBRARY="$ENVDEPS_PACKET_DIR/lib/$LOCAL_PNG_LIB" \ + -DGLUT_LIB="$ENVDEPS_PACKET_DIR/lib/$LOCAL_GLUT_LIB" \ $LOCAL_CMAKE_OPTIONS \ $PK_CONFIGURE_OPTIONS \ ../sources; \ @@ -73,8 +73,9 @@ pkinstall() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME/toonz/build" make install || return 1 if [ "$PLATFORM" = "win" ]; then - cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff-5.dll" "$INSTALL_PACKET_DIR/bin/" || return 1 - cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiffxx-5.dll" "$INSTALL_PACKET_DIR/bin/" || return 1 + true + #cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff-5.dll" "$INSTALL_PACKET_DIR/bin/" || return 1 + #cp --remove-destination "$BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiffxx-5.dll" "$INSTALL_PACKET_DIR/bin/" || return 1 else cp --remove-destination "$FILES_PACKET_DIR/launch-opentoonz.sh" "$INSTALL_PACKET_DIR/bin" || return 1 cp --remove-destination $BUILD_PACKET_DIR/$PK_DIRNAME/thirdparty/tiff-4.0.3/libtiff/.libs/libtiff.so* "$INSTALL_PACKET_DIR/lib" || return 1 @@ -83,21 +84,18 @@ pkinstall() { if [ "$PLATFORM" = "win" ]; then local TARGET="$INSTALL_PACKET_DIR/bin/" - local LOCAL_DIR="/usr/$HOST/sys-root/mingw/bin/" + + local LOCAL_DIR="/usr/local/$HOST/sys-root/$HOST/lib/" cp "$LOCAL_DIR"/libgcc*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/libgfortran*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/libquadmath*.dll "$TARGET" || return 1 cp "$LOCAL_DIR"/libstdc*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libquadmath*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libgfortran*.dll "$TARGET" || return 1 + + local LOCAL_DIR="/usr/local/$HOST/sys-root/bin/" cp "$LOCAL_DIR"/libwinpthread*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/zlib*.dll "$TARGET" || return 1 cp "$LOCAL_DIR"/libgettextlib*.dll "$TARGET" || return 1 cp "$LOCAL_DIR"/libintl*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/iconv*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/libtermcap*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/libpcre*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/libharfbuzz*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/libjasper*.dll "$TARGET" || return 1 - cp "$LOCAL_DIR"/libjpeg*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libiconv*.dll "$TARGET" || return 1 # add icon cp "$BUILD_PACKET_DIR/$PK_DIRNAME/toonz/sources/toonz/toonz.ico" "$TARGET" || return 1 @@ -112,11 +110,10 @@ pkhook_postlicense() { local TARGET="$LICENSE_PACKET_DIR" if [ "$PLATFORM" = "win" ]; then local LOCAL_DIR="/usr/$HOST/sys-root/mingw/bin/" - copy_system_license "mingw$ARCH-gcc gcc" "$TARGET" || return 1 - copy_system_license mingw$ARCH-winpthreads "$TARGET" || return 1 - copy_system_license mingw$ARCH-gettext "$TARGET" || return 1 - copy_system_license mingw$ARCH-win-iconv "$TARGET" || return 1 - copy_system_license mingw$ARCH-termcap "$TARGET" || return 1 + copy_system_license gcc "$TARGET" || return 1 + copy_system_license mingw-w64 "$TARGET" || return 1 + copy_system_license gettext "$TARGET" || return 1 + copy_system_license iconv "$TARGET" || return 1 else copy_system_license gcc "$TARGET" || return 1 copy_system_license libudev "$TARGET" || return 1 diff --git a/docker-builder-data/build/script/packet/opentoonz-nsis.sh b/docker-builder-data/build/script/packet/opentoonz-nsis.sh index dd39745..36a9cfa 100644 --- a/docker-builder-data/build/script/packet/opentoonz-nsis.sh +++ b/docker-builder-data/build/script/packet/opentoonz-nsis.sh @@ -1,4 +1,4 @@ -DEPS="opentoonz-master" +DEPS="opentoonz-master nsis-3.02.1" pkfunc_register_file() { local FILE=$1 @@ -65,7 +65,7 @@ pkinstall_release() { EOF # let's go - makensis opentoonz.nsi || return 1 + makensis -INPUTCHARSET UTF8 opentoonz.nsi || return 1 # remove temporary dir cd "$INSTALL_RELEASE_PACKET_DIR" || return 1 diff --git a/docker-builder-data/build/script/packet/opentoonz-testingnsis.sh b/docker-builder-data/build/script/packet/opentoonz-testingnsis.sh index 867a57e..c77cd22 100644 --- a/docker-builder-data/build/script/packet/opentoonz-testingnsis.sh +++ b/docker-builder-data/build/script/packet/opentoonz-testingnsis.sh @@ -1,3 +1,3 @@ source "$PACKET_SCRIPT_DIR/opentoonz-nsis.sh" -DEPS="opentoonz-testing" +DEPS=`echo "$DEPS" | sed "s|opentoonz-master|opentoonz-testing|g"` diff --git a/docker-builder-data/build/script/packet/png-1.6.26.sh b/docker-builder-data/build/script/packet/png-1.6.26.sh index 38ad7aa..e31de86 100644 --- a/docker-builder-data/build/script/packet/png-1.6.26.sh +++ b/docker-builder-data/build/script/packet/png-1.6.26.sh @@ -1,6 +1,4 @@ -if [ "$PLATFORM" = "win" ]; then - DEPS="zlib-1.2.11" -fi +DEPS="zlib-1.2.11" PK_DIRNAME="libpng-1.6.26" PK_ARCHIVE="$PK_DIRNAME.tar.gz" diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/gl.hpp.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/gl.hpp.patch new file mode 100644 index 0000000..6caaaf3 --- /dev/null +++ b/docker-builder-data/build/script/packet/qt-5.9.2.files/gl.hpp.patch @@ -0,0 +1,5 @@ +25,26c25 +< #elif __QT__ && QT_VERSION >= 0x050000 +< #define GL_GLEXT_PROTOTYPES +--- +> #elif defined(__QT__) diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dintegration.cpp.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dintegration.cpp.patch deleted file mode 100644 index 5a4b27f..0000000 --- a/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dintegration.cpp.patch +++ /dev/null @@ -1,4 +0,0 @@ -111c111 -< if (VerQueryValue(info.constData(), __TEXT("\\"), ---- -> if (VerQueryValue(const_cast(info.constData()), __TEXT("\\"), diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dpaintengine.cpp.patch b/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dpaintengine.cpp.patch deleted file mode 100644 index 48bd7b6..0000000 --- a/docker-builder-data/build/script/packet/qt-5.9.2.files/qwindowsdirect2dpaintengine.cpp.patch +++ /dev/null @@ -1,27 +0,0 @@ -65a66,83 -> namespace D2D1 { -> D2D1_BITMAP_BRUSH_PROPERTIES1 -> BitmapBrushProperties1( -> D2D1_EXTEND_MODE extendModeX = D2D1_EXTEND_MODE_CLAMP, -> D2D1_EXTEND_MODE extendModeY = D2D1_EXTEND_MODE_CLAMP, -> D2D1_INTERPOLATION_MODE interpolationMode = D2D1_INTERPOLATION_MODE_LINEAR -> ) -> { -> D2D1_BITMAP_BRUSH_PROPERTIES1 bitmapBrush1Properties; -> -> bitmapBrush1Properties.extendModeX = extendModeX; -> bitmapBrush1Properties.extendModeY = extendModeY; -> bitmapBrush1Properties.interpolationMode = interpolationMode; -> -> return bitmapBrush1Properties; -> } -> } -> -947c965 -< ComPtr geometry = vectorPathToID2D1PathGeometry(path); ---- -> ComPtr geometry = vectorPathToID2D1PathGeometry(path).Get(); -1206c1224 -< ComPtr geometry = d->vectorPathToID2D1PathGeometry(path); ---- -> ComPtr geometry = d->vectorPathToID2D1PathGeometry(path).Get(); diff --git a/docker-builder-data/build/script/packet/qt-5.9.2.sh b/docker-builder-data/build/script/packet/qt-5.9.2.sh index 5a569db..690dab6 100644 --- a/docker-builder-data/build/script/packet/qt-5.9.2.sh +++ b/docker-builder-data/build/script/packet/qt-5.9.2.sh @@ -18,42 +18,39 @@ pkbuild() { if ! check_packet_function $NAME build.configure; then local LOCAL_OPTIONS= if [ "$PLATFORM" = "win" ]; then - rm -f "qtbase/mkspecs/win32-g++/qmake.conf" + rm -f "qtbase/mkspecs/win32-g++/qmake.conf" || return 1 patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/mkspecs/win32-g++/qmake.conf" \ -i "$FILES_PACKET_DIR/qmake.conf.patch" -o - \ > "qtbase/mkspecs/win32-g++/qmake.conf" - rm -f "qtactiveqt/src/tools/idc/idc.pro" + rm -f "qtactiveqt/src/tools/idc/idc.pro" || return 1 patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtactiveqt/src/tools/idc/idc.pro" \ -i "$FILES_PACKET_DIR/idc.pro.patch" -o - \ > "qtactiveqt/src/tools/idc/idc.pro" - rm -f "qtbase/src/plugins/platforms/direct2d/direct2d.pro" + rm -f "qtbase/src/plugins/platforms/direct2d/direct2d.pro" || return 1 patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/src/plugins/platforms/direct2d/direct2d.pro" \ -i "$FILES_PACKET_DIR/direct2d.pro.patch" -o - \ > "qtbase/src/plugins/platforms/direct2d/direct2d.pro" - # mingw bugs workarounds (https://sourceforge.net/p/mingw-w64/mailman/message/35627786/): + #rm -f "qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/gl.hpp" || return 1 + #patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/gl.hpp" \ + # -i "$FILES_PACKET_DIR/gl.hpp.patch" -o - \ + # > "qtlocation/src/3rdparty/mapbox-gl-native/src/mbgl/gl/gl.hpp" - rm -f "qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp" - patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp" \ - -i "$FILES_PACKET_DIR/qwindowsdirect2dpaintengine.cpp.patch" -o - \ - > "qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.cpp" - - rm -f "qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp" - patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp" \ - -i "$FILES_PACKET_DIR/qwindowsdirect2dintegration.cpp.patch" -o - \ - > "qtbase/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.cpp" - - LOCAL_OPTIONS="-xplatform win32-g++ -device-option CROSS_COMPILE=$HOST- -opengl desktop" + LOCAL_OPTIONS=" \ + -xplatform win32-g++ \ + -device-option CROSS_COMPILE=$HOST- \ + -opengl desktop \ + -no-feature-geoservices_mapboxgl " fi - rm -f "qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp" + rm -f "qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp" || return 1 patch "$UNPACK_PACKET_DIR/$PK_DIRNAME/qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp" \ -i "$FILES_PACKET_DIR/socketcanbackend.cpp.patch" -o - \ > "qtserialbus/src/plugins/canbus/socketcan/socketcanbackend.cpp" - native_at_place \ + native_at_place with_envvar PATH "$PATH" \ ./configure \ -prefix "$INSTALL_PACKET_DIR" \ $LOCAL_OPTIONS \ @@ -66,12 +63,13 @@ pkbuild() { set_done $NAME build.configure fi - native_at_place make -j${THREADS} || native_at_place make ||return 1 + native_at_place with_envvar PATH "$PATH" make -j${THREADS} || \ + native_at_place with_envvar PATH "$PATH" make || return 1 } pkinstall() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" - make install || return 1 + native_at_place with_envvar PATH "$PATH" make install || return 1 cat << EOF > "$INSTALL_PACKET_DIR/bin/qt.conf" [Paths] diff --git a/docker-builder-data/build/script/packet/rsvg-2.40.16.sh b/docker-builder-data/build/script/packet/rsvg-2.40.16.sh index c0e2051..855e755 100644 --- a/docker-builder-data/build/script/packet/rsvg-2.40.16.sh +++ b/docker-builder-data/build/script/packet/rsvg-2.40.16.sh @@ -1,4 +1,5 @@ DEPS="croco-0.6.11 gdkpixbuf-2.36.0 cairo-1.15.4 pango-1.40.3" +DEPS_NATIVE="gdkpixbuf-2.36.0" PK_DIRNAME="librsvg-2.40.16" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/scons-3.0.1.sh b/docker-builder-data/build/script/packet/scons-3.0.1.sh new file mode 100644 index 0000000..22a5625 --- /dev/null +++ b/docker-builder-data/build/script/packet/scons-3.0.1.sh @@ -0,0 +1,14 @@ +PK_DIRNAME="scons-3.0.1" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="http://prdownloads.sourceforge.net/scons/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + +pkbuild() { + return 0 +} + +pkinstall() { + cd "$BUILD_PACKET_DIR/$PK_DIRNAME" + python setup.py install --prefix="$INSTALL_PACKET_DIR" || return 1 +} diff --git a/docker-builder-data/build/script/packet/sdl-1.2.15.sh b/docker-builder-data/build/script/packet/sdl-1.2.15.sh index 7bd46a5..6f99e25 100644 --- a/docker-builder-data/build/script/packet/sdl-1.2.15.sh +++ b/docker-builder-data/build/script/packet/sdl-1.2.15.sh @@ -12,7 +12,7 @@ pkbuild() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 if ! check_packet_function $NAME build.cunfigure; then if [ "$PLATFORM" = "fedora" ]; then - cp --remove-destination "$UNPACK_PACKET_DIR/$PK_DIRNAME/src/video/x11/SDL_x11sym.h" "src/video/x11" + cp --remove-destination "$UNPACK_PACKET_DIR/$PK_DIRNAME/src/video/x11/SDL_x11sym.h" "src/video/x11" || return 1 patch "src/video/x11/SDL_x11sym.h" "$FILES_PACKET_DIR/SDL_x11sym.h.patch" || return 1 fi CFLAGS="$PK_CFLAGS $CFLAGS" CPPFLAGS="$PK_CPPFLAGS $CPPFLAGS" \ diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index b737dc3..3f6b1f1 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -80,32 +80,28 @@ pkinstall() { # copy system libraries if [ "$PLATFORM" = "win" ]; then local TARGET="$INSTALL_PACKET_DIR/bin/" - local LOCAL_DIR="/usr/$HOST/sys-root/mingw/bin/" - cp $LOCAL_DIR/libgcc*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libstdc*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libwinpthread*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libquadmath*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libgfortran*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/iconv*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libintl*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libdl*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libltdl*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libexpat*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/zlib*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libbz2*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libfreetype*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libjasper*.dll "$TARGET" || return 1 - cp $LOCAL_DIR/libjpeg*.dll "$TARGET" || return 1 + + local LOCAL_DIR="/usr/local/$HOST/sys-root/$HOST/lib/" + cp "$LOCAL_DIR"/libgcc*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libstdc*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libquadmath*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libgfortran*.dll "$TARGET" || return 1 + + local LOCAL_DIR="/usr/local/$HOST/sys-root/bin/" + cp "$LOCAL_DIR"/libwinpthread*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libgettextlib*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libintl*.dll "$TARGET" || return 1 + cp "$LOCAL_DIR"/libiconv*.dll "$TARGET" || return 1 else local TARGET="$INSTALL_PACKET_DIR/lib/" - copy_system_gcc_libs "$TARGET" || return 1 - copy_system_lib libudev "$TARGET" || return 1 - copy_system_lib libdb "$TARGET" || return 1 - copy_system_lib libpcre "$TARGET" || return 1 - copy_system_lib libdirect "$TARGET" || return 1 - copy_system_lib libfusion "$TARGET" || return 1 - copy_system_lib libbz2 "$TARGET" || return 1 - copy_system_lib libselinux "$TARGET" || return 1 + copy_system_gcc_libs "$TARGET" || return 1 + copy_system_lib libudev "$TARGET" || return 1 + copy_system_lib libdb "$TARGET" || return 1 + copy_system_lib libpcre "$TARGET" || return 1 + copy_system_lib libdirect "$TARGET" || return 1 + copy_system_lib libfusion "$TARGET" || return 1 + copy_system_lib libbz2 "$TARGET" || return 1 + copy_system_lib libselinux "$TARGET" || return 1 fi } @@ -113,15 +109,10 @@ pkhook_postlicense() { local TARGET="$LICENSE_PACKET_DIR" if [ "$PLATFORM" = "win" ]; then local LOCAL_DIR="/usr/$HOST/sys-root/mingw/bin/" - copy_system_license "mingw$ARCH-gcc gcc" "$TARGET" || return 1 - copy_system_license mingw$ARCH-winpthreads "$TARGET" || return 1 - copy_system_license mingw$ARCH-gettext "$TARGET" || return 1 - copy_system_license mingw$ARCH-win-iconv "$TARGET" || return 1 - copy_system_license mingw$ARCH-dlfcn "$TARGET" || return 1 - copy_system_license mingw$ARCH-libltdl "$TARGET" || return 1 - copy_system_license mingw$ARCH-expat "$TARGET" || return 1 - copy_system_license mingw$ARCH-bzip2 "$TARGET" || return 1 - copy_system_license mingw$ARCH-freetype "$TARGET" || return 1 + copy_system_license gcc "$TARGET" || return 1 + copy_system_license mingw-w64 "$TARGET" || return 1 + copy_system_license gettext "$TARGET" || return 1 + copy_system_license iconv "$TARGET" || return 1 else copy_system_license gcc "$TARGET" || return 1 copy_system_license libudev "$TARGET" || return 1 diff --git a/docker-builder-data/build/script/packet/synfigstudio-nsis.sh b/docker-builder-data/build/script/packet/synfigstudio-nsis.sh index 1365a63..c3bb16c 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-nsis.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-nsis.sh @@ -1,4 +1,4 @@ -DEPS="synfigstudio-master" +DEPS="synfigstudio-master nsis-3.02.1" PK_PYTHON_DIRNAME="python" PK_PYTHON_ARCHIVE="portable-python-3.2.5.1.zip" diff --git a/docker-builder-data/build/script/packet/theora-1.1.1.sh b/docker-builder-data/build/script/packet/theora-1.1.1.sh index 869c1ce..bbf280c 100644 --- a/docker-builder-data/build/script/packet/theora-1.1.1.sh +++ b/docker-builder-data/build/script/packet/theora-1.1.1.sh @@ -2,7 +2,7 @@ DEPS="ogg-1.3.2" PK_DIRNAME="libtheora-1.1.1" PK_ARCHIVE="$PK_DIRNAME.tar.bz2" -PK_URL="http://downloads.xiph.org/releases/theora/$PK_ARCHIVE" +PK_URL="https://downloads.xiph.org/releases/theora/$PK_ARCHIVE" PK_CONFIGURE_OPTIONS="--disable-examples" diff --git a/docker-builder-data/build/script/packet/vorbis-1.3.5.sh b/docker-builder-data/build/script/packet/vorbis-1.3.5.sh index 9aa0e64..287f93b 100644 --- a/docker-builder-data/build/script/packet/vorbis-1.3.5.sh +++ b/docker-builder-data/build/script/packet/vorbis-1.3.5.sh @@ -2,6 +2,6 @@ DEPS="ogg-1.3.2" PK_DIRNAME="libvorbis-1.3.5" PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="http://downloads.xiph.org/releases/vorbis/$PK_ARCHIVE" +PK_URL="https://downloads.xiph.org/releases/vorbis/$PK_ARCHIVE" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/zlib-1.2.11.files/Makefile.mingw b/docker-builder-data/build/script/packet/zlib-1.2.11.files/Makefile.mingw index 0dfdeaa..455b08e 100644 --- a/docker-builder-data/build/script/packet/zlib-1.2.11.files/Makefile.mingw +++ b/docker-builder-data/build/script/packet/zlib-1.2.11.files/Makefile.mingw @@ -94,7 +94,7 @@ zlibrc.o: win32/zlib1.rc .PHONY: install uninstall clean -install: zlib.h zconf.h $(STATICLIB) $(IMPLIB) +install: zlib.h zconf.h $(SHAREDLIB) $(IMPLIB) @if test -z "$(DESTDIR)$(INCLUDE_PATH)" -o -z "$(DESTDIR)$(LIBRARY_PATH)" -o -z "$(DESTDIR)$(BINARY_PATH)"; then \ echo INCLUDE_PATH, LIBRARY_PATH, and BINARY_PATH must be specified; \ exit 1; \ diff --git a/docker-builder-data/build/script/packet/zlib-1.2.11.sh b/docker-builder-data/build/script/packet/zlib-1.2.11.sh index fb69146..ed689f4 100644 --- a/docker-builder-data/build/script/packet/zlib-1.2.11.sh +++ b/docker-builder-data/build/script/packet/zlib-1.2.11.sh @@ -13,13 +13,13 @@ if [ "$PLATFORM" = "win" ]; then pkbuild() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 cp "$FILES_PACKET_DIR/Makefile.mingw" . - make -fMakefile.mingw -j${THREADS} || return 1 + make -fMakefile.mingw SHARED_MODE=1 -j${THREADS} || return 1 } pkinstall() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" - BINARY_PATH="$INTALL_PACKET_DIR/bin" \ - INCLUDE_PATH="$INTALL_PACKET_DIR/include" \ - LIBRARY_PATH="$INTALL_PACKET_DIR/lib" \ - make -fMakefile.mingw install || return 1 + BINARY_PATH="$INSTALL_PACKET_DIR/bin" \ + INCLUDE_PATH="$INSTALL_PACKET_DIR/include" \ + LIBRARY_PATH="$INSTALL_PACKET_DIR/lib" \ + make -fMakefile.mingw SHARED_MODE=1 install || return 1 } fi