diff --git a/docker-builder-data/build/script/include/inc-pkall-none.sh b/docker-builder-data/build/script/include/inc-pkall-none.sh index 70cc357..8889c46 100644 --- a/docker-builder-data/build/script/include/inc-pkall-none.sh +++ b/docker-builder-data/build/script/include/inc-pkall-none.sh @@ -59,6 +59,10 @@ pkhook_postlicense() { return 0 } +pkhook_postinstall() { + return 0 +} + pkhook_postinstall_release() { return 0 } diff --git a/docker-builder-data/build/script/include/inc-pkinstall-default.sh b/docker-builder-data/build/script/include/inc-pkinstall-default.sh index 5c16f7f..567ab46 100644 --- a/docker-builder-data/build/script/include/inc-pkinstall-default.sh +++ b/docker-builder-data/build/script/include/inc-pkinstall-default.sh @@ -6,4 +6,9 @@ pkinstall() { if ! make install; then return 1 fi + + cd "$INSTALL_PACKET_DIR" + if ! pkhook_postinstall; then + return 1 + fi } diff --git a/docker-builder-data/build/script/packet/libtool-2.4.6.files/libtool.m4.patch b/docker-builder-data/build/script/packet/libtool-2.4.6.files/libtool.m4.patch new file mode 100644 index 0000000..a67dfd1 --- /dev/null +++ b/docker-builder-data/build/script/packet/libtool-2.4.6.files/libtool.m4.patch @@ -0,0 +1,4 @@ +3476c3476 +< lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' +--- +> lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64|pei-x86-64)' diff --git a/docker-builder-data/build/script/packet/libtool-2.4.6.sh b/docker-builder-data/build/script/packet/libtool-2.4.6.sh new file mode 100644 index 0000000..c911aeb --- /dev/null +++ b/docker-builder-data/build/script/packet/libtool-2.4.6.sh @@ -0,0 +1,11 @@ +DEPS="" + +PK_DIRNAME="libtool-2.4.6" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="http://ftpmirror.gnu.org/libtool/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + +pkhook_postinstall() { + patch "share/aclocal/libtool.m4" "$FILES_PACKET_DIR/libtool.m4.patch" || return 1 +} 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 741d007..c4d08ef 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 @@ -37,3 +37,11 @@ fi source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh +pkhook_postinstall() { + if [ "$PLATFORM" = "win" ]; then + mkdir -p "bin" + mv "libmlt++-3.dll" "bin" + mv "libmlt-6.dll" "bin" + mv "melt" "bin" + fi +} diff --git a/docker-builder-data/build/script/packet/synfigcore-master.sh b/docker-builder-data/build/script/packet/synfigcore-master.sh index 49ef0df..14e937c 100644 --- a/docker-builder-data/build/script/packet/synfigcore-master.sh +++ b/docker-builder-data/build/script/packet/synfigcore-master.sh @@ -63,6 +63,7 @@ DEPS=" \ jpeg-9b tiff-4.0.6 fftw-3.3.5 imagemagick-6.8.7 \ ffmpeg-3.1.5 mlt-6.2.0 \ boost-1.61.0 cairo-1.15.4 pango-1.40.3 glibmm-2.41.4 xmlpp-2.22.0" +DEPS_NATIVE="libtool-2.4.6" if [ "$PLATFORM" = "linux" ]; then DEPS="$DEPS jack-0.125.0" diff --git a/docker-builder-data/build/script/packet/synfigetl-master.sh b/docker-builder-data/build/script/packet/synfigetl-master.sh index 18a0680..6969728 100644 --- a/docker-builder-data/build/script/packet/synfigetl-master.sh +++ b/docker-builder-data/build/script/packet/synfigetl-master.sh @@ -1,4 +1,5 @@ DEPS="" +DEPS_NATIVE="libtool-2.4.6" PK_DIRNAME="synfig" PK_URL="https://github.com/synfig/$PK_DIRNAME.git" diff --git a/docker-builder-data/build/script/packet/synfigstudio-master.sh b/docker-builder-data/build/script/packet/synfigstudio-master.sh index d175b90..f57301b 100644 --- a/docker-builder-data/build/script/packet/synfigstudio-master.sh +++ b/docker-builder-data/build/script/packet/synfigstudio-master.sh @@ -18,7 +18,7 @@ # gnomethemes | gtk, rsvg DEPS="synfigcore-master gtkmm-3.22.0 adwaitaicontheme-3.22.0 gnomethemesstandard-3.22.2" -DEPS_NATIVE="synfigcore-master" +DEPS_NATIVE="libtool-2.4.6 synfigcore-master" PK_DIRNAME="synfig" PK_URL="https://github.com/synfig/$PK_DIRNAME.git" diff --git a/docker-builder-data/build/script/packet/xmlpp-2.22.0.files/configure.patch b/docker-builder-data/build/script/packet/xmlpp-2.22.0.files/configure.patch new file mode 100644 index 0000000..f4fe79e --- /dev/null +++ b/docker-builder-data/build/script/packet/xmlpp-2.22.0.files/configure.patch @@ -0,0 +1,4 @@ +4974c4974 +< lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?' +--- +> lt_cv_deplibs_check_method='file_magic file format pei*-*(.*architecture: i386)?' diff --git a/docker-builder-data/build/script/packet/xmlpp-2.22.0.sh b/docker-builder-data/build/script/packet/xmlpp-2.22.0.sh index b0d0a8a..67b411e 100644 --- a/docker-builder-data/build/script/packet/xmlpp-2.22.0.sh +++ b/docker-builder-data/build/script/packet/xmlpp-2.22.0.sh @@ -9,6 +9,8 @@ source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh pkbuild() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" || return 1 if ! check_packet_function $NAME build.cunfigure; then + cp --remove-destination "$UNPACK_PACKET_DIR/$PK_DIRNAME/configure" . + patch configure "$FILES_PACKET_DIR/configure.patch" CFLAGS="$PK_CFLAGS $CFLAGS" CPPFLAGS="$PK_CPPFLAGS $CPPFLAGS" \ ./configure \ $PK_CONFIGURE_OPTIONS_DEFAULT \