Merge pull request #40 from regro-cf-autotick-bot/rebuild-libtiff45-0…

…-1_hd4fdd8

Rebuild for libtiff45

.ci_support/linux_64_.yaml

@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_name:
 - cos6
 channel_sources:
@@ -17,7 +17,7 @@ jpeg:
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 libwebp:
 - '1'
 openjpeg:

.ci_support/linux_aarch64_.yaml

@@ -3,7 +3,7 @@ BUILD:
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_arch:
 - aarch64
 cdt_name:
@@ -21,7 +21,7 @@ jpeg:
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 libwebp:
 - '1'
 openjpeg:

.ci_support/linux_ppc64le_.yaml

@@ -1,7 +1,7 @@
 c_compiler:
 - gcc
 c_compiler_version:
-- '10'
+- '12'
 cdt_name:
 - cos7
 channel_sources:
@@ -17,7 +17,7 @@ jpeg:
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 libwebp:
 - '1'
 openjpeg:

.ci_support/migrations/libtiff45.yaml

@@ -0,0 +1,7 @@
+__migrator:
+  build_number: 1
+  kind: version
+  migration_number: 1
+libtiff:
+- '4.5'
+migrator_ts: 1671403615.5901675

.ci_support/osx_64_.yaml

@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,7 +15,7 @@ jpeg:
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 libwebp:
 - '1'
 macos_machine:

.ci_support/osx_arm64_.yaml

@@ -3,7 +3,7 @@ MACOSX_DEPLOYMENT_TARGET:
 c_compiler:
 - clang
 c_compiler_version:
-- '14'
+- '15'
 channel_sources:
 - conda-forge
 channel_targets:
@@ -15,7 +15,7 @@ jpeg:
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 libwebp:
 - '1'
 macos_machine:

.ci_support/win_64_.yaml

@@ -1,5 +1,5 @@
 c_compiler:
-- vs2019
+- vs2022
 channel_sources:
 - conda-forge
 channel_targets:
@@ -9,7 +9,7 @@ jpeg:
 libpng:
 - '1.6'
 libtiff:
-- '4'
+- '4.5'
 libwebp:
 - '1'
 openjpeg:

conda-forge.yml

@@ -1,11 +1,9 @@
-azure:
-  settings_win:
-    pool:
-      vmImage: windows-2019
 build_platform:
   linux_aarch64: linux_64
   linux_ppc64le: linux_64
   osx_arm64: osx_64
+conda_build:
+  pkg_format: '2'
 conda_forge_output_validation: true
 github:
   branch_name: main
@@ -18,5 +16,3 @@ test_on_native_only: true
 travis:
   secure:
     BINSTAR_TOKEN: gO5RQpmA+IZ45PCC7R2wtetuf5Mb4cCbj8g/3TM334bid4IRytMi7XlYUE55wlqDewKmh5OrqCrswaS2uiBu31UeNgxlPOEk8uYZ2AML+lWliTZHxapQmpTCM9CNjc+iFK58kEYb03K4vhuOiEpvVHWLRhe55QE53kwDOdI70n2fFHYnoxXXjNA3Tg49bvZbqHinsGkseUrnqYYx+xuUpf/eJpktwqlx4AU8epm8OQLdorwTsk6cmuDpo138+U+xA3fm98Gii0/xCvMpLL5gCbh1lCAqXOK85f6ySHSI8KSYlpAR0HWWVkATNAqt5hjEYWs5ebyqh/7dL66pjEpw4SjFCF1zEbXx3oU+GB4viAdldBfiZg3FG6eGJwfK0FIOkZTkhCxMt+jqB6bYYaj/lv9igsYl5+UicEP17RmQSVYCiLzVWj0trdLVUYavJi0vwziICh6OVY3UIJ+CGUN0uTpYEMol9nhvf3vrAm8JIEi9YRPlAZO4ZDMOmiHcit8FaEo2TI5sNTLqf7+HtyCeg3NsTZdOEYTGssfGoMxN3nnwP/yIWe/GrVLJqhxdq00UP1Zq+o5+Fni5Ow1cgSvmzxI1xFj/OxfTIdxFzoLTIUyv5OxPDPreWY3Iv6xDMGteozTA4HFYBrqyXWR9GxMNDYQ+SPXjXt9JVrgvmg6nLs4=
-conda_build:
-  pkg_format: '2'

recipe/bld.bat

@@ -1,26 +1,35 @@
 mkdir build
 cd build
 
-curl -fsSOL https://software-network.org/client/sw-master-windows-client.zip
+curl -fsSOL https://software-network.org/client/sw-master-windows_x86_64-client.zip
 if errorlevel 1 exit 1
 
-unzip sw-master-windows-client.zip -d .
+unzip sw-master-windows_x86_64-client.zip -d .
 if errorlevel 1 exit 1
 
 set PATH=%PATH%;%CD%
 
 sw setup
 if errorlevel 1 exit 1
 
-cmake -G "NMake Makefiles" ^
-      -D CMAKE_BUILD_TYPE=Release ^
+:: As of July 2023, the build system for this package can run into issues if the
+:: version of `cl` found via %PATH% is not exactly the same as the version used
+:: by MSBuild. The only way I can figure out to avoid the problem is to avoid
+:: MSBuild altogether, which can be done by using the NMake Makefiles generator,
+:: as well as explicitly specifying the full path to the desired compilers.
+set "clpathunix=%VCToolsInstallDir%bin\Hostx64\x64\cl.exe"
+set "clpathunix=%clpathunix:\=/%"
+
+cmake %CMAKE_ARGS% ^
       -D BUILD_PROG=1 ^
       -D CMAKE_PREFIX_PATH=%LIBRARY_PREFIX% ^
       -D CMAKE_INCLUDE_PATH=%LIBRARY_INC% ^
       -D CMAKE_LIBRARY_PATH=%LIBRARY_LIB% ^
-      -D CMAKE_INSTALL_PREFIX=%LIBRARY_PREFIX% ^
       -D BUILD_SHARED_LIBS=ON ^
       -D CMAKE_MODULE_LINKER_FLAGS=-whole-archive ^
+      -D "CMAKE_C_COMPILER=%clpathunix%" ^
+      -D "CMAKE_CXX_COMPILER=%clpathunix%" ^
+      -G "NMake Makefiles" ^
       ..
 if errorlevel 1 exit 1
 
@@ -31,5 +40,5 @@ cmake --build . --config Release --target install
 if errorlevel 1 exit 1
 
 :: Make copies of the .lib file without the embedded version number
-copy %LIBRARY_LIB%\leptonica-1.82.0.lib %LIBRARY_LIB%\leptonica.lib
-copy %LIBRARY_LIB%\leptonica-1.82.0.lib %LIBRARY_LIB%\lept.lib
+copy %LIBRARY_LIB%\leptonica-%PKG_VERSION%.lib %LIBRARY_LIB%\leptonica.lib
+copy %LIBRARY_LIB%\leptonica-%PKG_VERSION%.lib %LIBRARY_LIB%\lept.lib

recipe/conda_build_config.yaml

@@ -1,4 +1,4 @@
 c_compiler:                    # [win]
-- vs2019                       # [win]
+- vs2022                       # [win]
 cxx_compiler:                  # [win]
-- vs2019                       # [win]
+- vs2022                       # [win]

recipe/meta.yaml

@@ -1,6 +1,6 @@
 {% set name = "leptonica" %}
-{% set version = "1.82.0" %}
-{% set sha256 = "155302ee914668c27b6fe3ca9ff2da63b245f6d62f3061c8f27563774b8ae2d6" %}
+{% set version = "1.83.1" %}
+{% set sha256 = "8f18615e0743af7df7f50985c730dfcf0c93548073d1f56621e4156a8b54d3dd" %}
 
 package:
   name: {{ name|lower }}
@@ -14,7 +14,7 @@ source:
     - cmake.patch  # [win]
 
 build:
-  number: 2
+  number: 0
   skip: true  # [win and vc<14]
   run_exports:
     - {{ pin_subpackage(name, max_pin='x.x') }}