diff --git a/recipes/recipes_emscripten/libtiff/build.sh b/recipes/recipes_emscripten/libtiff/build.sh index 925938bda..8ed758cc2 100644 --- a/recipes/recipes_emscripten/libtiff/build.sh +++ b/recipes/recipes_emscripten/libtiff/build.sh @@ -4,6 +4,9 @@ mkdir bld cd bld emcmake cmake .. -GNinja \ + -Dtiff-tests=OFF \ + -Dtiff-tools=OFF \ + -Dtiff-docs=OFF \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_INSTALL_LIBDIR=lib \ diff --git a/recipes/recipes_emscripten/libtiff/recipe.yaml b/recipes/recipes_emscripten/libtiff/recipe.yaml index d751097cc..6852c6a57 100644 --- a/recipes/recipes_emscripten/libtiff/recipe.yaml +++ b/recipes/recipes_emscripten/libtiff/recipe.yaml @@ -1,5 +1,5 @@ context: - version: 4.5.0 + version: 4.5.1 package: name: libtiff @@ -7,49 +7,26 @@ package: source: url: https://download.osgeo.org/libtiff/tiff-${{ version }}.tar.gz - sha256: c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 + sha256: d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b build: - number: 1 - # Does a very good job of maintaining compatibility. - # https://abi-laboratory.pro/tracker/timeline/libtiff/ - # run_exports: - # - {{ pin_subpackage('libtiff', max_pin='x') }} - # missing_dso_whitelist: - # # Only used by libtiff,bin/tiffgt (a viewer), which is ok. - # - /opt/X11/lib/libGL.1.dylib - # - /opt/X11/lib/libglut.3.dylib + number: 0 requirements: build: - # - libtool # [unix] - ${{ compiler('c') }} - ${{ compiler('cxx') }} - cmake - ninja - # host: - # - zlib - # - jpeg - # - xz - # - zstd - # - lerc - # - libdeflate - # - libwebp-base # [linux or osx] -# test: -# downstreams: -# - pillow >=8 -# - py-opencv >=4 -# - tifffile -# commands: -# - test -f ${PREFIX}/lib/libtiff.a # [not win] -# - test -f ${PREFIX}/lib/libtiffxx.a # [not win] -# - test -f ${PREFIX}/lib/libtiff{{ SHLIB_EXT }} # [not win] -# - test -f ${PREFIX}/lib/libtiffxx{{ SHLIB_EXT }} # [not win] -# - if not exist %PREFIX%\\Library\\bin\\tiff.dll exit 1 # [win] -# - if not exist %PREFIX%\\Library\\bin\\tiffxx.dll exit 1 # [win] -# - if not exist %PREFIX%\\Library\\bin\\libtiff.dll exit 1 # [win] -# - if not exist %PREFIX%\\Library\\bin\\libtiffxx.dll exit 1 # [win] +tests: +- package_contents: + lib: + - libtiff.a + - libtiffxx.a + include: + - tiff.h + - tiffio.h about: license: HPND @@ -61,9 +38,4 @@ about: homepage: http://www.libtiff.org/ extra: recipe-maintainers: - - jakirkham - - mingwandroid - - msarahan - - ocefpaf - - stuarteberg - - hmaarrfk + - DerThorsten diff --git a/recipes/recipes_emscripten/libtiff/recipe_legacy.yaml b/recipes/recipes_emscripten/libtiff/recipe_legacy.yaml deleted file mode 100644 index 7cb3975ba..000000000 --- a/recipes/recipes_emscripten/libtiff/recipe_legacy.yaml +++ /dev/null @@ -1,71 +0,0 @@ -context: - version: "4.4.0" - -package: - name: libtiff - version: "{{ version }}" - -source: - url: https://download.osgeo.org/libtiff/tiff-{{ version }}.tar.gz - sha256: 917223b37538959aca3b790d2d73aa6e626b688e02dcda272aec24c2f498abed - -build: - number: 0 - # Does a very good job of maintaining compatibility. - # https://abi-laboratory.pro/tracker/timeline/libtiff/ - # run_exports: - # - {{ pin_subpackage('libtiff', max_pin='x') }} - # missing_dso_whitelist: - # # Only used by libtiff,bin/tiffgt (a viewer), which is ok. - # - /opt/X11/lib/libGL.1.dylib - # - /opt/X11/lib/libglut.3.dylib - -requirements: - build: - # - libtool # [unix] - - "{{ compiler('c') }}" - - "{{ compiler('cxx') }}" - - cmake - - ninja - # host: - # - zlib - # - jpeg - # - xz - # - zstd - # - lerc - # - libdeflate - # - libwebp-base # [linux or osx] - -# test: -# downstreams: -# - pillow >=8 -# - py-opencv >=4 -# - tifffile -# commands: -# - test -f ${PREFIX}/lib/libtiff.a # [not win] -# - test -f ${PREFIX}/lib/libtiffxx.a # [not win] -# - test -f ${PREFIX}/lib/libtiff{{ SHLIB_EXT }} # [not win] -# - test -f ${PREFIX}/lib/libtiffxx{{ SHLIB_EXT }} # [not win] -# - if not exist %PREFIX%\\Library\\bin\\tiff.dll exit 1 # [win] -# - if not exist %PREFIX%\\Library\\bin\\tiffxx.dll exit 1 # [win] -# - if not exist %PREFIX%\\Library\\bin\\libtiff.dll exit 1 # [win] -# - if not exist %PREFIX%\\Library\\bin\\libtiffxx.dll exit 1 # [win] - -about: - home: http://www.libtiff.org/ - license: HPND - license_file: COPYRIGHT - summary: Support for the Tag Image File Format (TIFF). - description: | - This software provides support for the Tag Image File Format (TIFF), a - widely used format for storing image data. - doc_url: http://www.libtiff.org/document.html - -extra: - recipe-maintainers: - - jakirkham - - mingwandroid - - msarahan - - ocefpaf - - stuarteberg - - hmaarrfk