From 337357a8cadaf241ea7deed88e4cfb225b25d41f Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Dec 15 2019 05:51:27 +0000 Subject: fix builds --- diff --git a/build-opentoonz.sh b/build-opentoonz.sh index e260a6d..0793d0f 100755 --- a/build-opentoonz.sh +++ b/build-opentoonz.sh @@ -56,7 +56,7 @@ run_nsis() { "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-nsis/install_release" \ "*.exe" \ "$PACKET_BUILD_DIR/$PLATFORM-$ARCH/opentoonz-nsis/envdeps_release/version-opentoonz-master" - + local TEMPLATE=`gen_name_template "OpenToonz" "" "$PLATFORM" "$ARCH" ".zip"` "$PUBLISH_DIR/publish.sh" \ "opentoonz" \ diff --git a/build-papagayong.sh b/build-papagayong.sh index 873c0d8..7eb633c 100755 --- a/build-papagayong.sh +++ b/build-papagayong.sh @@ -47,7 +47,8 @@ run_nsis() { # QUICK HACK: PLATFORM=win ARCH=32 $SCRIPT clean_before_do env zlib-1.2.11 # for NSIS $SCRIPT chain update papagayong-testing \ - chain clean_before_do build papagayong-testing \ + chain clean_before_do unpack papagayong-testing \ + chain clean_before_do envdeps_native papagayong-testing \ chain shell papagayong-testing "/build/script/packet/papagayong-testing.files/build-win.sh" local TEMPLATE=`gen_name_template "PapagayoNG" "" "$PLATFORM" "$ARCH" ".exe"` diff --git a/build-synfigstudio.sh b/build-synfigstudio.sh index 9c27b70..4db6c47 100755 --- a/build-synfigstudio.sh +++ b/build-synfigstudio.sh @@ -49,7 +49,7 @@ run_nsis() { echo "" echo "Update and build synfigstudio for $PLATFORM-$ARCH" echo "" - #PLATFORM=win ARCH=32 $SCRIPT clean_before_do env zlib-1.2.11 # for NSIS + PLATFORM=win ARCH=32 $SCRIPT clean_before_do env zlib-1.2.11 # for NSIS $SCRIPT chain native update synfigetl-master \ chain native update synfigcore-master \ chain update synfigetl-master \ @@ -58,6 +58,7 @@ run_nsis() { chain clean_before_do install_release synfigstudio-nsis \ chain clean_before_do install_release synfigstudio-portable + local TEMPLATE=`gen_name_template "SynfigStudio" "$SYNFIGSTUDIO_TESTING_TAG" "$PLATFORM" "$ARCH" ".exe"` "$PUBLISH_DIR/publish.sh" \ "synfigstudio" \ diff --git a/env-builder-data/build/script/packet/bzip2-1.0.6.sh b/env-builder-data/build/script/packet/bzip2-1.0.6.sh index 383d19b..1b807eb 100644 --- a/env-builder-data/build/script/packet/bzip2-1.0.6.sh +++ b/env-builder-data/build/script/packet/bzip2-1.0.6.sh @@ -1,7 +1,7 @@ PK_DIRNAME="bzip2-1.0.6" PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="https://fossies.org/linux/misc/$PK_ARCHIVE" +PK_URL="https://sourceware.org/pub/bzip2/$PK_ARCHIVE" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/env-builder-data/build/script/packet/doxygen-1.8.8.sh b/env-builder-data/build/script/packet/doxygen-1.8.8.sh index 1500c69..d29f584 100644 --- a/env-builder-data/build/script/packet/doxygen-1.8.8.sh +++ b/env-builder-data/build/script/packet/doxygen-1.8.8.sh @@ -2,7 +2,7 @@ DEPS="graphviz-2.40.1" PK_DIRNAME="doxygen-1.8.8" PK_ARCHIVE="$PK_DIRNAME.src.tar.gz" -PK_URL="http://ftp.stack.nl/pub/users/dimitri/$PK_ARCHIVE" +PK_URL="https://sourceforge.net/projects/doxygen/files/rel-1.8.8/$PK_ARCHIVE/download" PK_CONFIGURE_OPTIONS_DEFAULT="--prefix $INSTALL_PACKET_DIR" diff --git a/env-builder-data/build/script/packet/graphviz-2.40.1.sh b/env-builder-data/build/script/packet/graphviz-2.40.1.sh index 446ebbd..5cd42a3 100644 --- a/env-builder-data/build/script/packet/graphviz-2.40.1.sh +++ b/env-builder-data/build/script/packet/graphviz-2.40.1.sh @@ -3,6 +3,6 @@ DEPS="epoxy-master rsvg-2.40.16 atk-2.22.0 atspi2atk-2.22.0 gdkpixbuf-2.36.0 cai PK_DIRNAME="graphviz-2.40.1" PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="http://www.graphviz.org/pub/graphviz/stable/SOURCES/$PK_ARCHIVE" +PK_URL="https://graphviz.gitlab.io/pub/graphviz/stable/SOURCES/graphviz.tar.gz" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/env-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.files/resample.c.patch b/env-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.files/resample.c.patch new file mode 100644 index 0000000..8d67fdd --- /dev/null +++ b/env-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.files/resample.c.patch @@ -0,0 +1,8 @@ +80c80 +< #ifndef HAVE_XMMINTRIN_H +--- +> #if !defined(__SSE__) || !defined(HAVE_XMMINTRIN_H) +86c86 +< #ifndef HAVE_EMMINTRIN_H +--- +> #if !defined(__SSE2__) || !defined(HAVE_EMMINTRIN_H) diff --git a/env-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.sh b/env-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.sh index afb9ec8..bd3fd09 100644 --- a/env-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.sh +++ b/env-builder-data/build/script/packet/gstreamerpluginsbase-0.10.36.sh @@ -6,3 +6,8 @@ PK_URL="https://gstreamer.freedesktop.org/src/gst-plugins-base/$PK_ARCHIVE" PK_LICENSE_FILES="AUTHORS COPYING COPYING.LIB" source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh + + +pkhook_prebuild() { + pkhelper_patch gst/audioresample resample.c +} diff --git a/env-builder-data/build/script/packet/jack-0.125.0.sh b/env-builder-data/build/script/packet/jack-0.125.0.sh index ccf5263..f7c349a 100644 --- a/env-builder-data/build/script/packet/jack-0.125.0.sh +++ b/env-builder-data/build/script/packet/jack-0.125.0.sh @@ -1,8 +1,12 @@ DEPS="" -PK_DIRNAME="jack-audio-connection-kit-0.125.0" -PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="http://jackaudio.org/downloads/$PK_ARCHIVE" +PK_DIRNAME="jack1" +PK_URL="https://github.com/jackaudio/$PK_DIRNAME.git" +PK_GIT_CHECKOUT="tags/0.125.0" PK_LICENSE_FILES="AUTHORS COPYING COPYING.GPL COPYING.LGPL" -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh +source $INCLUDE_SCRIPT_DIR/inc-pkall-git.sh + +pkhook_prebuild() { + ./autogen.sh +} diff --git a/env-builder-data/build/script/packet/openblas-master.files/KERNEL.generic.patch b/env-builder-data/build/script/packet/openblas-master.files/KERNEL.generic.patch new file mode 100644 index 0000000..97f9ee8 --- /dev/null +++ b/env-builder-data/build/script/packet/openblas-master.files/KERNEL.generic.patch @@ -0,0 +1,24 @@ +14,15c14,15 +< SGEMMONCOPYOBJ = sgemm_oncopy.o +< SGEMMOTCOPYOBJ = sgemm_otcopy.o +--- +> SGEMMONCOPYOBJ = sgemm_oncopy.$(SUFFIX) +> SGEMMOTCOPYOBJ = sgemm_otcopy.$(SUFFIX) +20,21c20,21 +< DGEMMONCOPYOBJ = dgemm_oncopy.o +< DGEMMOTCOPYOBJ = dgemm_otcopy.o +--- +> DGEMMONCOPYOBJ = dgemm_oncopy.$(SUFFIX) +> DGEMMOTCOPYOBJ = dgemm_otcopy.$(SUFFIX) +26,27c26,27 +< CGEMMONCOPYOBJ = cgemm_oncopy.o +< CGEMMOTCOPYOBJ = cgemm_otcopy.o +--- +> CGEMMONCOPYOBJ = cgemm_oncopy.$(SUFFIX) +> CGEMMOTCOPYOBJ = cgemm_otcopy.$(SUFFIX) +32,33c32,33 +< ZGEMMONCOPYOBJ = zgemm_oncopy.o +< ZGEMMOTCOPYOBJ = zgemm_otcopy.o +--- +> ZGEMMONCOPYOBJ = zgemm_oncopy.$(SUFFIX) +> ZGEMMOTCOPYOBJ = zgemm_otcopy.$(SUFFIX) diff --git a/env-builder-data/build/script/packet/openblas-master.sh b/env-builder-data/build/script/packet/openblas-master.sh index af771e2..be28871 100644 --- a/env-builder-data/build/script/packet/openblas-master.sh +++ b/env-builder-data/build/script/packet/openblas-master.sh @@ -11,6 +11,10 @@ pkbuild() { cd "$BUILD_PACKET_DIR/$PK_DIRNAME" pkhelper_patch . getarch.c + if [ "$PLATFORM" = "win" ]; then + pkhelper_patch kernel/x86 KERNEL.generic + pkhelper_patch kernel/x86_64 KERNEL.generic + fi local LOCAL_BINARY_OPTION= if [ "$ARCH" = "32" ]; then diff --git a/env-builder-data/build/script/packet/papagayong-appimage.sh b/env-builder-data/build/script/packet/papagayong-appimage.sh index d97a02e..2b26817 100644 --- a/env-builder-data/build/script/packet/papagayong-appimage.sh +++ b/env-builder-data/build/script/packet/papagayong-appimage.sh @@ -12,8 +12,8 @@ pkinstall() { mkdir -p "$APPDIR/usr/bin" mkdir -p "$APPDIR/usr/lib" - cp --remove-destination "$ENVDEPS_PACKET_DIR/bin/AppRun" "$APPDIR/" || return 1 - cp --remove-destination "$ENVDEPS_PACKET_DIR/bin/desktopintegration" "$APPDIR/usr/bin/papagayong.wrapper"|| return 1 + cp --remove-destination "$ENVDEPS_NATIVE_PACKET_DIR/bin/AppRun" "$APPDIR/" || return 1 + cp --remove-destination "$ENVDEPS_NATIVE_PACKET_DIR/bin/desktopintegration" "$APPDIR/usr/bin/papagayong.wrapper"|| return 1 cp --remove-destination "$FILES_PACKET_DIR/papagayong.desktop" "$APPDIR/" || return 1 cp --remove-destination "$FILES_PACKET_DIR/launch.sh" "$APPDIR/usr/bin/" || return 1 diff --git a/env-builder-data/build/script/packet/papagayong-master.sh b/env-builder-data/build/script/packet/papagayong-master.sh index 7a49a0d..f0856fe 100644 --- a/env-builder-data/build/script/packet/papagayong-master.sh +++ b/env-builder-data/build/script/packet/papagayong-master.sh @@ -1,7 +1,8 @@ -DEPS="wxphoenix-master python3pyaudio-master" - if [ "$PLATFORM" = "win" ]; then + DEPS= DEPS_NATIVE="nsis-2.50" +else + DEPS="wxphoenix-master python3pyaudio-master" fi PK_DIRNAME="papagayo-ng" diff --git a/env-builder-data/build/script/packet/synfigstudio-appimage.sh b/env-builder-data/build/script/packet/synfigstudio-appimage.sh index 9d92fae..9558077 100644 --- a/env-builder-data/build/script/packet/synfigstudio-appimage.sh +++ b/env-builder-data/build/script/packet/synfigstudio-appimage.sh @@ -12,8 +12,8 @@ pkinstall() { mkdir -p "$APPDIR/usr/bin" mkdir -p "$APPDIR/usr/lib" - cp --remove-destination "$ENVDEPS_PACKET_DIR/bin/AppRun" "$APPDIR/" || return 1 - cp --remove-destination "$ENVDEPS_PACKET_DIR/bin/desktopintegration" "$APPDIR/usr/bin/synfigstudio.wrapper"|| return 1 + cp --remove-destination "$ENVDEPS_NATIVE_PACKET_DIR/bin/AppRun" "$APPDIR/" || return 1 + cp --remove-destination "$ENVDEPS_NATIVE_PACKET_DIR/bin/desktopintegration" "$APPDIR/usr/bin/synfigstudio.wrapper"|| return 1 cp --remove-destination "$FILES_PACKET_DIR/synfigstudio.desktop" "$APPDIR/" || return 1 cp --remove-destination "$FILES_PACKET_DIR/synfigstudio.png" "$APPDIR/" || return 1