From bf8c76cd53f549d0f71618380c04f865184ab226 Mon Sep 17 00:00:00 2001 From: emscripten-forge-bot Date: Thu, 16 May 2024 07:48:31 +0000 Subject: [PATCH 1/5] Update libtiff from 4.5.0 to 4.5.1 --- recipes/recipes_emscripten/libtiff/recipe.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/recipes/recipes_emscripten/libtiff/recipe.yaml b/recipes/recipes_emscripten/libtiff/recipe.yaml index d751097cc..e25237e59 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,7 +7,7 @@ package: source: url: https://download.osgeo.org/libtiff/tiff-${{ version }}.tar.gz - sha256: c7a1d9296649233979fa3eacffef3fa024d73d05d589cb622727b5b08c423464 + sha256: d7f38b6788e4a8f5da7940c5ac9424f494d8a79eba53d555f4a507167dca5e2b build: number: 1 From 62763474ae3bed313c978da25cea0eeddd571522 Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Fri, 28 Jun 2024 08:49:34 +0200 Subject: [PATCH 2/5] disable targets --- recipes/recipes_emscripten/libtiff/build.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/recipes/recipes_emscripten/libtiff/build.sh b/recipes/recipes_emscripten/libtiff/build.sh index 925938bda..f49560048 100644 --- a/recipes/recipes_emscripten/libtiff/build.sh +++ b/recipes/recipes_emscripten/libtiff/build.sh @@ -3,7 +3,10 @@ mkdir bld cd bld -emcmake cmake .. -GNinja \ +emcmake cmake .. -GNinja \\ + -Dtiff-tests=OFF \ + -Dtiff-tools=OFF \ + -Dtiff-docs=OFF \ -DCMAKE_INSTALL_PREFIX=$PREFIX \ -DCMAKE_PREFIX_PATH=$PREFIX \ -DCMAKE_INSTALL_LIBDIR=lib \ From df2dc9d9ee52c3dd5d90f737b3cc51475ef3595c Mon Sep 17 00:00:00 2001 From: Thorsten Beier Date: Mon, 9 Sep 2024 14:03:33 +0200 Subject: [PATCH 3/5] Update recipe.yaml --- recipes/recipes_emscripten/libtiff/recipe.yaml | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/recipes/recipes_emscripten/libtiff/recipe.yaml b/recipes/recipes_emscripten/libtiff/recipe.yaml index e25237e59..33d2dcb6a 100644 --- a/recipes/recipes_emscripten/libtiff/recipe.yaml +++ b/recipes/recipes_emscripten/libtiff/recipe.yaml @@ -61,9 +61,4 @@ about: homepage: http://www.libtiff.org/ extra: recipe-maintainers: - - jakirkham - - mingwandroid - - msarahan - - ocefpaf - - stuarteberg - - hmaarrfk + - DerThorsten From a133018d30dc1eab45de804fcfa5ff60904f9fde Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Mon, 9 Sep 2024 18:48:26 +0200 Subject: [PATCH 4/5] Clean up --- recipes/recipes_emscripten/libtiff/build.sh | 2 +- .../recipes_emscripten/libtiff/recipe.yaml | 34 +-------- .../libtiff/recipe_legacy.yaml | 71 ------------------- 3 files changed, 2 insertions(+), 105 deletions(-) delete mode 100644 recipes/recipes_emscripten/libtiff/recipe_legacy.yaml diff --git a/recipes/recipes_emscripten/libtiff/build.sh b/recipes/recipes_emscripten/libtiff/build.sh index f49560048..8ed758cc2 100644 --- a/recipes/recipes_emscripten/libtiff/build.sh +++ b/recipes/recipes_emscripten/libtiff/build.sh @@ -3,7 +3,7 @@ mkdir bld cd bld -emcmake cmake .. -GNinja \\ +emcmake cmake .. -GNinja \ -Dtiff-tests=OFF \ -Dtiff-tools=OFF \ -Dtiff-docs=OFF \ diff --git a/recipes/recipes_emscripten/libtiff/recipe.yaml b/recipes/recipes_emscripten/libtiff/recipe.yaml index 33d2dcb6a..413d01835 100644 --- a/recipes/recipes_emscripten/libtiff/recipe.yaml +++ b/recipes/recipes_emscripten/libtiff/recipe.yaml @@ -10,46 +10,14 @@ source: 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] about: license: HPND 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 From bb144e673ae14067e396a8de8c0108f32bb32f14 Mon Sep 17 00:00:00 2001 From: Isabel Paredes Date: Mon, 9 Sep 2024 18:49:04 +0200 Subject: [PATCH 5/5] Add tests --- recipes/recipes_emscripten/libtiff/recipe.yaml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/recipes/recipes_emscripten/libtiff/recipe.yaml b/recipes/recipes_emscripten/libtiff/recipe.yaml index 413d01835..6852c6a57 100644 --- a/recipes/recipes_emscripten/libtiff/recipe.yaml +++ b/recipes/recipes_emscripten/libtiff/recipe.yaml @@ -19,6 +19,15 @@ requirements: - cmake - ninja +tests: +- package_contents: + lib: + - libtiff.a + - libtiffxx.a + include: + - tiff.h + - tiffio.h + about: license: HPND license_file: LICENSE.md