diff --git a/.docker/qgis-linux/Dockerfile b/.docker/qgis-linux/Dockerfile index cb3fa01..64fe59c 100644 --- a/.docker/qgis-linux/Dockerfile +++ b/.docker/qgis-linux/Dockerfile @@ -28,6 +28,7 @@ RUN dnf -y install \ libspatialite-devel \ protobuf-lite-devel \ libpq-devel \ + libzstd-devel \ qt5-qtwebview-devel diff --git a/.docker/qt-ndk/Dockerfile b/.docker/qt-ndk/Dockerfile index 2281c22..9f92f88 100644 --- a/.docker/qt-ndk/Dockerfile +++ b/.docker/qt-ndk/Dockerfile @@ -83,6 +83,7 @@ RUN /tmp/qt/install-qt.sh --version ${QT_VERSION} --target android --directory " qttools \ qtsvg \ qtwebview \ + qtconnectivity \ qtcharts # Download & unpack android SDK diff --git a/qt_version.txt b/qt_version.txt index 222951c..f486c6c 100644 --- a/qt_version.txt +++ b/qt_version.txt @@ -1 +1 @@ -5.14.2 +5.15.2 diff --git a/recipes/libzstd/recipe.sh b/recipes/libzstd/recipe.sh new file mode 100644 index 0000000..8ce4831 --- /dev/null +++ b/recipes/libzstd/recipe.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +# version of your package +VERSION_libzstd=v1.4.5 + +# dependencies of this recipe +DEPS_libzstd=() + +# url of the package +URL_libzstd=https://github.com/facebook/zstd/archive/${VERSION_libzstd}.zip + +# md5 of the package +MD5_libzstd=beb47f4f92ef69d28400be661cf95c20 + +# default build path +BUILD_libzstd=$BUILD_PATH/libzstd/$(get_directory $URL_libzstd) + +# default recipe path +RECIPE_libzstd=$RECIPES_PATH/libzstd + +# function called for preparing source code if needed +# (you can apply patch etc here.) +function prebuild_libzstd() { + cd $BUILD_libzstd + + # check marker + if [ -f .patched ]; then + return + fi +} + +function shouldbuild_libzstd() { + # If lib is newer than the sourcecode skip build + if [ $BUILD_PATH/libzstd/build-$ARCH/lib/libzstd.so -nt $BUILD_libzstd/.patched ]; then + DO_BUILD=0 + fi +} + +# function called to build the source code +function build_libzstd() { + try mkdir -p $BUILD_PATH/libzstd/build-$ARCH + try cd $BUILD_PATH/libzstd/build-$ARCH + push_arm + + # configure + try $CMAKECMD \ + -DCMAKE_INSTALL_PREFIX:PATH=$STAGE_PATH \ + $BUILD_libzstd/build/cmake/ + + # try $MAKESMP + try $MAKESMP install + + pop_arm +} + +# function called after all the compile have been done +function postbuild_libzstd() { + true +} diff --git a/recipes/qgis/recipe.sh b/recipes/qgis/recipe.sh index f691c3e..ae6acac 100755 --- a/recipes/qgis/recipe.sh +++ b/recipes/qgis/recipe.sh @@ -4,14 +4,14 @@ VERSION_qgis=3.13 # dependencies of this recipe -DEPS_qgis=(zlib gdal qca libspatialite libspatialindex expat gsl postgresql libzip qtkeychain exiv2 protobuf) +DEPS_qgis=(zlib gdal qca libspatialite libspatialindex expat gsl postgresql libzip qtkeychain exiv2 protobuf libzstd) # DEPS_qgis=() # url of the package -URL_qgis=https://github.com/qgis/QGIS/archive/43b64b13f38cd032778591f28d426dd5261fe078.tar.gz +URL_qgis=https://github.com/qgis/QGIS/archive/df28e637cdddc0c6e93355a9f98ad2d12d9e6acc.tar.gz # md5 of the package -MD5_qgis=4917f14aeda73aed420e51221da84bf2 +MD5_qgis=21f1d8d6e5ccae77ba1baa323155e1d4 # default build path BUILD_qgis=$BUILD_PATH/qgis/$(get_directory $URL_qgis)