Update for 8.12.2

libvips · Jan 25, 2022 · ece8474 · ece8474
1 parent aa02547
commit ece8474
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 13 deletions.
diff --git a/README.md b/README.md
@@ -37,7 +37,7 @@ Run the top-level [build script](build.sh) with the `--help` parameter for help.
 | [librsvg]       | 2.53.0    | LGPLv3                                                       |
 | [libspng]       | 0.7.1     | BSD 2-Clause                                                 |
 | [libtiff]       | 4.3.0     | [libtiff License] (BSD-like)                                 |
-| [libvips]       | 8.12.1    | LGPLv3                                                       |
+| [libvips]       | 8.12.2    | LGPLv3                                                       |
 | [libwebp]       | 1.2.2     | New BSD License                                              |
 | [libxml2]       | 2.9.12    | MIT Licence                                                  |
 | [mozjpeg]       | 4.0.3     | [zlib License, IJG License, BSD-3-Clause]                    |

diff --git a/build/build.sh b/build/build.sh
@@ -132,8 +132,8 @@ make pe-util \
 if [ "$NIGHTLY" = "true" ]; then
   nightly_version=$(wget -q -O- 'https://api.github.com/repos/libvips/libvips/git/refs/heads/master' | sed -n 's#.*"sha": "\([^"]\{7\}\).*#\1#p' | head -1)
 
-  # Invalidate build cache
-  rm $mxe_dir/usr/$target.$deps/installed/vips-$deps
+  # Invalidate build cache, if exits
+  rm -f $mxe_dir/usr/$target.$deps/installed/vips-$deps
 fi
 
 # Build MXE's meson-wrapper (needed by pango, GDK-PixBuf, GLib and Orc),

diff --git a/build/package-vipsdev.sh b/build/package-vipsdev.sh
@@ -92,7 +92,14 @@ strip=$target.$deps-strip
 # Directories
 install_dir=$mxe_prefix/$target.$deps
 bin_dir=$install_dir/bin
-module_dir=$(printf '%s\n' $install_dir/lib/vips-modules-* | sort -n | tail -1)
+
+# Ensure module_dir is set correctly when building nightly versions
+if [ "$NIGHTLY" = "true" ]; then
+  module_dir=$(printf '%s\n' $install_dir/lib/vips-modules-* | sort -n | tail -1)
+else
+  module_dir=$install_dir/lib/vips-modules-$vips_version
+fi
+module_dir_base=${module_dir##*/}
 
 echo "Copying libvips and dependencies"
 
@@ -120,8 +127,8 @@ if [ -d "$module_dir" ]; then
       cp -n $dll $repackage_dir/bin
     done
   done
-  mkdir -p $repackage_dir/bin/${module_dir##*/}
-  cp $module_dir/*.dll $repackage_dir/bin/${module_dir##*/}
+  mkdir -p $repackage_dir/bin/$module_dir_base
+  cp $module_dir/*.dll $repackage_dir/bin/$module_dir_base
 fi
 
 echo "Copying install area $install_dir/"
@@ -161,7 +168,7 @@ echo "Strip unneeded symbols"
 # Remove all symbols that are not needed
 if [ "$DEBUG" = "false" ]; then
   $strip --strip-unneeded $repackage_dir/bin/*.{exe,dll}
-  [ -d "$module_dir" ] && $strip --strip-unneeded $repackage_dir/bin/${module_dir##*/}/*.dll
+  [ -d "$module_dir" ] && $strip --strip-unneeded $repackage_dir/bin/$module_dir_base/*.dll
 fi
 
 echo "Copying packaging files"

diff --git a/build/patches/vips-8-dlldir-as-libdir.patch b/build/patches/vips-8-dlldir-as-libdir.patch
@@ -46,7 +46,7 @@ diff --git a/libvips/iofuncs/util.c b/libvips/iofuncs/util.c
 index 1111111..2222222 100644
 --- a/libvips/iofuncs/util.c
 +++ b/libvips/iofuncs/util.c
-@@ -1975,6 +1975,54 @@ DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
+@@ -1983,6 +1983,54 @@ DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
  	return( TRUE );
  }
  #endif

diff --git a/build/variables.sh b/build/variables.sh
@@ -2,7 +2,7 @@
 
 vips_package=vips
 vips_version=8.12
-vips_patch_version=1
+vips_patch_version=2
 #vips_pre_version=rc1
 
 if [ "$NIGHTLY" = "true" ]; then

diff --git a/build/vips-all.mk b/build/vips-all.mk
@@ -2,8 +2,8 @@ PKG             := vips-all
 $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.12.1
-$(PKG)_CHECKSUM := 474d8439244cd26c504812fd623259f806c32553b38d2a54798c9766135f5a5c
+$(PKG)_VERSION  := 8.12.2
+$(PKG)_CHECKSUM := 565252992aff2c7cd10c866c7a58cd57bc536e03924bde29ae0f0cb9e074010b
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libvips/libvips/releases,v
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)

diff --git a/build/vips-web.mk b/build/vips-web.mk
@@ -2,8 +2,8 @@ PKG             := vips-web
 $(PKG)_WEBSITE  := https://libvips.github.io/libvips/
 $(PKG)_DESCR    := A fast image processing library with low memory needs.
 $(PKG)_IGNORE   :=
-$(PKG)_VERSION  := 8.12.1
-$(PKG)_CHECKSUM := 474d8439244cd26c504812fd623259f806c32553b38d2a54798c9766135f5a5c
+$(PKG)_VERSION  := 8.12.2
+$(PKG)_CHECKSUM := 565252992aff2c7cd10c866c7a58cd57bc536e03924bde29ae0f0cb9e074010b
 $(PKG)_PATCHES  := $(realpath $(sort $(wildcard $(dir $(lastword $(MAKEFILE_LIST)))/patches/vips-[0-9]*.patch)))
 $(PKG)_GH_CONF  := libvips/libvips/releases,v
 $(PKG)_SUBDIR   := vips-$($(PKG)_VERSION)