From 3af8db77fb3ec59ea9a0e1fb49cb7244d1e80050 Mon Sep 17 00:00:00 2001 From: Ivan Mahonin Date: Nov 06 2016 05:46:56 +0000 Subject: fix png version and backdeps --- diff --git a/docker-builder-data/build/script/packet/appimagekit-master.sh b/docker-builder-data/build/script/packet/appimagekit-master.sh index 386e5ea..6629118 100644 --- a/docker-builder-data/build/script/packet/appimagekit-master.sh +++ b/docker-builder-data/build/script/packet/appimagekit-master.sh @@ -1,4 +1,4 @@ -DEPS="png-1.6.25 cmake-3.6.2" +DEPS="png-1.6.26 cmake-3.6.2" PK_DIRNAME="AppImageKit" PK_URL="https://github.com/probonopd/$PK_DIRNAME.git" diff --git a/docker-builder-data/build/script/packet/cairo-1.14.6.sh b/docker-builder-data/build/script/packet/cairo-1.14.6.sh index 7400575..75ff836 100644 --- a/docker-builder-data/build/script/packet/cairo-1.14.6.sh +++ b/docker-builder-data/build/script/packet/cairo-1.14.6.sh @@ -1,4 +1,4 @@ -DEPS="png-1.6.25 pixman-0.34.0 xcbfull-1.12" +DEPS="png-1.6.26 pixman-0.34.0 xcbfull-1.12" PK_DIRNAME="cairo-1.14.6" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/gdkpixbuf-2.36.0.sh b/docker-builder-data/build/script/packet/gdkpixbuf-2.36.0.sh index 39db45e..7fb9a85 100644 --- a/docker-builder-data/build/script/packet/gdkpixbuf-2.36.0.sh +++ b/docker-builder-data/build/script/packet/gdkpixbuf-2.36.0.sh @@ -1,4 +1,4 @@ -DEPS="jpeg-9b png-1.6.25 tiff-4.0.6 gobjectintrospection-1.50.0" +DEPS="jpeg-9b png-1.6.26 tiff-4.0.6 gobjectintrospection-1.50.0" PK_DIRNAME="gdk-pixbuf-2.36.0" PK_ARCHIVE="$PK_DIRNAME.tar.xz" diff --git a/docker-builder-data/build/script/packet/imagemagick-6.9.6.sh b/docker-builder-data/build/script/packet/imagemagick-6.9.6.sh index e778f60..a4da9de 100644 --- a/docker-builder-data/build/script/packet/imagemagick-6.9.6.sh +++ b/docker-builder-data/build/script/packet/imagemagick-6.9.6.sh @@ -1,4 +1,4 @@ -DEPS="jpeg-9b png-1.6.25 tiff-4.0.6 xml-2.9.4 fftw-3.3.5" +DEPS="jpeg-9b png-1.6.26 tiff-4.0.6 xml-2.9.4 fftw-3.3.5" PK_DIRNAME="ImageMagick-6.9.6-3" PK_ARCHIVE="$PK_DIRNAME.tar.gz" diff --git a/docker-builder-data/build/script/packet/imagemagick-7.0.3.sh b/docker-builder-data/build/script/packet/imagemagick-7.0.3.sh index 62b499e..895d90c 100644 --- a/docker-builder-data/build/script/packet/imagemagick-7.0.3.sh +++ b/docker-builder-data/build/script/packet/imagemagick-7.0.3.sh @@ -1,4 +1,4 @@ -DEPS="jpeg-9b png-1.6.25 tiff-4.0.6 xml-2.9.4 fftw-3.3.5" +DEPS="jpeg-9b png-1.6.26 tiff-4.0.6 xml-2.9.4 fftw-3.3.5" PK_DIRNAME="ImageMagick-7.0.3-4" PK_ARCHIVE="$PK_DIRNAME.tar.gz" diff --git a/docker-builder-data/build/script/packet/opentoonz-debug.sh b/docker-builder-data/build/script/packet/opentoonz-debug.sh index 893c5d4..e234158 100644 --- a/docker-builder-data/build/script/packet/opentoonz-debug.sh +++ b/docker-builder-data/build/script/packet/opentoonz-debug.sh @@ -1,4 +1,4 @@ -DEPS="jpeg-9b png-1.6.25 lz4-master glew-2.0.0 usb-1.0.20 sdl-2.0.5 superlu-4.3 cmake-3.6.2 freeglut-3.0.0 openblas-master boost-1.61.0 qt-5.7" +DEPS="jpeg-9b png-1.6.26 lz4-master glew-2.0.0 usb-1.0.20 sdl-2.0.5 superlu-4.3 cmake-3.6.2 freeglut-3.0.0 openblas-master boost-1.61.0 qt-5.7" PK_VERSION="1.1.1" PK_DIRNAME="opentoonz" diff --git a/docker-builder-data/build/script/packet/opentoonz-master.sh b/docker-builder-data/build/script/packet/opentoonz-master.sh index d962835..73a07a0 100644 --- a/docker-builder-data/build/script/packet/opentoonz-master.sh +++ b/docker-builder-data/build/script/packet/opentoonz-master.sh @@ -1,4 +1,4 @@ -DEPS="jpeg-9b png-1.6.25 lz4-master glew-2.0.0 usb-1.0.20 sdl-2.0.5 superlu-4.3 cmake-3.6.2 freeglut-3.0.0 openblas-master boost-1.61.0 qt-5.7" +DEPS="jpeg-9b png-1.6.26 lz4-master glew-2.0.0 usb-1.0.20 sdl-2.0.5 superlu-4.3 cmake-3.6.2 freeglut-3.0.0 openblas-master boost-1.61.0 qt-5.7" PK_VERSION="1.1.1" PK_DIRNAME="opentoonz" diff --git a/docker-builder-data/build/script/packet/png-1.6.25.sh b/docker-builder-data/build/script/packet/png-1.6.25.sh deleted file mode 100644 index 78c3550..0000000 --- a/docker-builder-data/build/script/packet/png-1.6.25.sh +++ /dev/null @@ -1,7 +0,0 @@ -DEPS="" - -PK_DIRNAME="libpng-1.6.26" -PK_ARCHIVE="$PK_DIRNAME.tar.gz" -PK_URL="http://download.sourceforge.net/libpng/$PK_ARCHIVE" - -source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh 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 new file mode 100644 index 0000000..78c3550 --- /dev/null +++ b/docker-builder-data/build/script/packet/png-1.6.26.sh @@ -0,0 +1,7 @@ +DEPS="" + +PK_DIRNAME="libpng-1.6.26" +PK_ARCHIVE="$PK_DIRNAME.tar.gz" +PK_URL="http://download.sourceforge.net/libpng/$PK_ARCHIVE" + +source $INCLUDE_SCRIPT_DIR/inc-pkall-default.sh diff --git a/docker-builder-data/build/script/packet/qt-5.7.sh b/docker-builder-data/build/script/packet/qt-5.7.sh index b9950c6..6efa1e9 100644 --- a/docker-builder-data/build/script/packet/qt-5.7.sh +++ b/docker-builder-data/build/script/packet/qt-5.7.sh @@ -1,4 +1,4 @@ -DEPS="xcbfull-1.12 glib-2.50.0" +DEPS="png-1.6.26 xcbfull-1.12 glib-2.50.0" PK_DIRNAME="qt-everywhere-opensource-src-5.7.0" PK_ARCHIVE="$PK_DIRNAME.tar.gz" diff --git a/docker-builder-data/build/script/packet/sox-14.4.2.sh b/docker-builder-data/build/script/packet/sox-14.4.2.sh index 3532a3b..9c247a9 100644 --- a/docker-builder-data/build/script/packet/sox-14.4.2.sh +++ b/docker-builder-data/build/script/packet/sox-14.4.2.sh @@ -1,4 +1,4 @@ -DEPS="png-1.6.25" +DEPS="png-1.6.26" PK_DIRNAME="sox-14.4.2" PK_ARCHIVE="$PK_DIRNAME.tar.gz" diff --git a/util/scan-for-dep.sh b/util/scan-for-dep.sh new file mode 100755 index 0000000..a196e81 --- /dev/null +++ b/util/scan-for-dep.sh @@ -0,0 +1,25 @@ +#!/bin/bash + +SCAN_PATH=$1 +DEP=$2 + +SCAN_PATH=$(cd "$SCAN_PATH"; pwd) + +run() { + local SCAN_PATH=$1 + cd "$SCAN_PATH" + for FILE in $SCAN_PATH/*; do + if [ -f "$FILE" ]; then + if [[ $FILE == *.so* ]] || [[ $FILE == */bin/* ]]; then + FILE_DEPS=`ldd "$FILE" | grep "$DEP"` + if [ ! -z "$FILE_DEPS" ]; then + echo $FILE + fi + fi + elif [ -d "$FILE" ]; then + run $FILE + fi + done +} + +run "$SCAN_PATH"