diff --git a/CMakeLists.txt b/CMakeLists.txt index 87d55b696..7cf21088b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,7 +12,7 @@ endif() # First declare project with C and CXX to initialize CMake properly project(libcvc - VERSION 3.7.0 + VERSION 3.7.1 DESCRIPTION "Computational Visualization Center library from VolumeRover package" LANGUAGES C CXX ) diff --git a/cvcpkg/recipes/ari/recipe.yaml b/cvcpkg/recipes/ari/recipe.yaml index ec223c22a..14e5e7a03 100644 --- a/cvcpkg/recipes/ari/recipe.yaml +++ b/cvcpkg/recipes/ari/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 recipe: name: ari - upstream_version: "3.7.0" + upstream_version: "3.7.1" cvc_revision: 1 maintainer: "cvcpkg group" maintainer_email: "info@cvcpkg.org" diff --git a/cvcpkg/recipes/cvc-cli-cuda/recipe.yaml b/cvcpkg/recipes/cvc-cli-cuda/recipe.yaml index cdec6283e..50331fc4a 100644 --- a/cvcpkg/recipes/cvc-cli-cuda/recipe.yaml +++ b/cvcpkg/recipes/cvc-cli-cuda/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 recipe: name: cvc-cli-cuda - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. cvc_revision: 1 diff --git a/cvcpkg/recipes/cvc-cli/recipe.yaml b/cvcpkg/recipes/cvc-cli/recipe.yaml index 02fa065e5..1746ec80c 100644 --- a/cvcpkg/recipes/cvc-cli/recipe.yaml +++ b/cvcpkg/recipes/cvc-cli/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 recipe: name: cvc-cli - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. cvc_revision: 1 diff --git a/cvcpkg/recipes/cvcgl-cuda/recipe.yaml b/cvcpkg/recipes/cvcgl-cuda/recipe.yaml index b87a5a8e5..19b071126 100644 --- a/cvcpkg/recipes/cvcgl-cuda/recipe.yaml +++ b/cvcpkg/recipes/cvcgl-cuda/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 recipe: name: cvcgl-cuda - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. # Bumped 1 -> 3 (2 is #522's): ships share/cvcGL/ (the wasm state shim), as cvcgl 3.4.0+cvc.18. diff --git a/cvcpkg/recipes/cvcgl/recipe.yaml b/cvcpkg/recipes/cvcgl/recipe.yaml index d185dda1f..e38338046 100644 --- a/cvcpkg/recipes/cvcgl/recipe.yaml +++ b/cvcpkg/recipes/cvcgl/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 recipe: name: cvcgl - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Bumped 1 -> 2: republish from post-#136 master. cvcGL gained the injected-app # SceneGraph(cvc::app&, statePrefix) ctor (no cvc:: singleton), and it links the # +cvc.2 libcvc (ABI change, #134). The published +cvc.1 predates all of this, @@ -81,7 +81,8 @@ recipe: # the ImageMagick HDRI define (cvc::cvc's public MAGICKCORE_HDRI_ENABLE was 0 against the # Q16HDRI library). cvcGL source unchanged; it rebuilds against and re-pins that libcvc. # 3, not 2: native cvcgl is already at +cvc.2 on the catalog. - cvc_revision: 3 + # Reset to 1 for the 3.7.1 upstream version: a version bump restarts cvc_revision. + cvc_revision: 1 maintainer: "cvcpkg group" maintainer_email: "info@cvcpkg.org" maintainer_url: "https://cvcpkg.org" diff --git a/cvcpkg/recipes/libcvc-cuda/recipe.yaml b/cvcpkg/recipes/libcvc-cuda/recipe.yaml index 9e49874db..fc1a836e9 100644 --- a/cvcpkg/recipes/libcvc-cuda/recipe.yaml +++ b/cvcpkg/recipes/libcvc-cuda/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 recipe: name: libcvc-cuda - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Bumped 1 -> 2: this bundle no longer ships the `cvc` CLI (it moved to its own # cvc-cli / cvc-cli-cuda packages so it lands deliberately in a user's PATH). # Dropping the binary changes bundle contents, and +cvc.1 was already published diff --git a/cvcpkg/recipes/libcvc-examples-web/recipe.yaml b/cvcpkg/recipes/libcvc-examples-web/recipe.yaml index 436933209..b95cf4a42 100644 --- a/cvcpkg/recipes/libcvc-examples-web/recipe.yaml +++ b/cvcpkg/recipes/libcvc-examples-web/recipe.yaml @@ -1,12 +1,13 @@ schema_version: 1 recipe: name: libcvc-examples-web - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Replaces cvcgl-examples' wasm-mt column (last published 3.7.0+cvc.1), which carried # only the four nav/terrain demos; this carries the whole gallery. # Bumped 1 -> 2: the gallery now links ImageMagick (CVC_ENABLE_IMAGEMAGICK=ON, was OFF # because the demo link could not resolve MagickCore's static codec libraries). - cvc_revision: 2 + # Reset to 1 for the 3.7.1 upstream version: a version bump restarts cvc_revision. + cvc_revision: 1 maintainer: "cvcpkg group" maintainer_email: "info@cvcpkg.org" maintainer_url: "https://cvcpkg.org" diff --git a/cvcpkg/recipes/libcvc-examples/recipe.yaml b/cvcpkg/recipes/libcvc-examples/recipe.yaml index 3d7e8d7e4..b3107a054 100644 --- a/cvcpkg/recipes/libcvc-examples/recipe.yaml +++ b/cvcpkg/recipes/libcvc-examples/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 recipe: name: libcvc-examples - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Replaces cvcgl-examples (last published 3.7.0+cvc.2), with the examples moved to the repo's # top-level examples/. The browser gallery is its own package now, libcvc-examples-web. cvc_revision: 1 diff --git a/cvcpkg/recipes/libcvc/recipe.yaml b/cvcpkg/recipes/libcvc/recipe.yaml index 737984c06..0c1424c6a 100644 --- a/cvcpkg/recipes/libcvc/recipe.yaml +++ b/cvcpkg/recipes/libcvc/recipe.yaml @@ -1,7 +1,7 @@ schema_version: 1 recipe: name: libcvc - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Bumped 1 -> 2: the host-only libcvc ABI changed (voxels::_cuda_unified_ptr is # now always std::shared_ptr, +8 bytes, to match the CUDA build and make # cvc::volume's layout variant-invariant). The new CPU bundle is not ABI- @@ -147,7 +147,8 @@ recipe: # FindImageMagick tier ran. Native bundles are unchanged. 3, not 2: native is already at # +cvc.2 on the catalog and the wasm-mt publish packs verbatim at this revision. cvcgl bumps # in lockstep (1 -> 3) and re-pins this build. - cvc_revision: 3 + # Reset to 1 for the 3.7.1 upstream version: a version bump restarts cvc_revision. + cvc_revision: 1 maintainer: "cvcpkg group" maintainer_email: "info@cvcpkg.org" maintainer_url: "https://cvcpkg.org" diff --git a/cvcpkg/recipes/pycvc-cp311-cuda/recipe.yaml b/cvcpkg/recipes/pycvc-cp311-cuda/recipe.yaml index de60218aa..4e609929d 100644 --- a/cvcpkg/recipes/pycvc-cp311-cuda/recipe.yaml +++ b/cvcpkg/recipes/pycvc-cp311-cuda/recipe.yaml @@ -5,7 +5,7 @@ recipe: # convention (-cp311-cuda). CUDA stays cp311-only for now — no # cp312/cp313 CUDA columns. name: pycvc-cp311-cuda - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. cvc_revision: 1 diff --git a/cvcpkg/recipes/pycvc-cp311/recipe.yaml b/cvcpkg/recipes/pycvc-cp311/recipe.yaml index 2aa59a10d..891b22ccc 100644 --- a/cvcpkg/recipes/pycvc-cp311/recipe.yaml +++ b/cvcpkg/recipes/pycvc-cp311/recipe.yaml @@ -6,7 +6,7 @@ recipe: # pycvc-cp311 SUPERSEDES the published bare `pycvc`; it is a NEW catalog # name, so its revision restarts at 1. name: pycvc-cp311 - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. # Bumped 2 -> 3: republish rebuilt against the v2 libcvc (.cvcnav format v2 / two-head diff --git a/cvcpkg/recipes/pycvc-cp312/recipe.yaml b/cvcpkg/recipes/pycvc-cp312/recipe.yaml index 395680eab..bbeb3a034 100644 --- a/cvcpkg/recipes/pycvc-cp312/recipe.yaml +++ b/cvcpkg/recipes/pycvc-cp312/recipe.yaml @@ -5,7 +5,7 @@ recipe: # (-cp311/-cp312/-cp313). Same sources as pycvc-cp311, built against # python312 + numpy-cp312. New catalog name — revision starts at 1. name: pycvc-cp312 - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts revisions OF # an upstream version, so a version bump restarts it. Supersedes the 3.2.4 # +cvc.2 rebuild that shipped the new cvc::nav material bindings in diff --git a/cvcpkg/recipes/pycvc-cp313/recipe.yaml b/cvcpkg/recipes/pycvc-cp313/recipe.yaml index 8e0891523..7bb8eaf2b 100644 --- a/cvcpkg/recipes/pycvc-cp313/recipe.yaml +++ b/cvcpkg/recipes/pycvc-cp313/recipe.yaml @@ -6,7 +6,7 @@ recipe: # python313 + numpy-cp313. New catalog name — revision starts at 1. # NO cp313t column: SWIG-generated modules are not free-threaded-safe. name: pycvc-cp313 - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. # Bumped 2 -> 3: republish rebuilt against the v2 libcvc (.cvcnav format v2 / two-head diff --git a/cvcpkg/recipes/pycvc-gl-cp311-cuda/recipe.yaml b/cvcpkg/recipes/pycvc-gl-cp311-cuda/recipe.yaml index 9d35c6d3b..e2235e2b5 100644 --- a/cvcpkg/recipes/pycvc-gl-cp311-cuda/recipe.yaml +++ b/cvcpkg/recipes/pycvc-gl-cp311-cuda/recipe.yaml @@ -5,7 +5,7 @@ recipe: # convention (-cp311-cuda). CUDA stays cp311-only for now — no # cp312/cp313 CUDA columns. name: pycvc-gl-cp311-cuda - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. cvc_revision: 1 diff --git a/cvcpkg/recipes/pycvc-gl-cp311/recipe.yaml b/cvcpkg/recipes/pycvc-gl-cp311/recipe.yaml index 7f2811a61..e95dff2ac 100644 --- a/cvcpkg/recipes/pycvc-gl-cp311/recipe.yaml +++ b/cvcpkg/recipes/pycvc-gl-cp311/recipe.yaml @@ -6,7 +6,7 @@ recipe: # pycvc-gl-cp311 SUPERSEDES the published bare `pycvc-gl`; it is a NEW # catalog name, so its revision restarts at 1. name: pycvc-gl-cp311 - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. cvc_revision: 1 diff --git a/cvcpkg/recipes/pycvc-gl-cp312/recipe.yaml b/cvcpkg/recipes/pycvc-gl-cp312/recipe.yaml index d11ae9ccf..c70886fba 100644 --- a/cvcpkg/recipes/pycvc-gl-cp312/recipe.yaml +++ b/cvcpkg/recipes/pycvc-gl-cp312/recipe.yaml @@ -5,7 +5,7 @@ recipe: # column recipe. Same sources as pycvc-gl-cp311, built against python312 + # numpy-cp312 + vtk-python-cp312. New catalog name — revision starts at 1. name: pycvc-gl-cp312 - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts revisions OF # an upstream version, so a version bump restarts it. Supersedes the 3.2.4 # +cvc.2 family republish (material-aware nav). The scene module source is @@ -15,7 +15,8 @@ recipe: # the static link could not resolve MagickCore's codec libraries). 3, not 2: linux was # already auto-bumped to +cvc.2 on the catalog, and the wasm publish packs verbatim at # this revision, so 3 keeps every platform monotonic. Native builds are unchanged. - cvc_revision: 3 + # Reset to 1 for the 3.7.1 upstream version: a version bump restarts cvc_revision. + cvc_revision: 1 maintainer: "cvcpkg group" maintainer_email: "info@cvcpkg.org" maintainer_url: "https://cvcpkg.org" diff --git a/cvcpkg/recipes/pycvc-gl-cp313/recipe.yaml b/cvcpkg/recipes/pycvc-gl-cp313/recipe.yaml index a4ce53ee8..3cd4ea679 100644 --- a/cvcpkg/recipes/pycvc-gl-cp313/recipe.yaml +++ b/cvcpkg/recipes/pycvc-gl-cp313/recipe.yaml @@ -6,7 +6,7 @@ recipe: # numpy-cp313 + vtk-python-cp313. New catalog name — revision starts at 1. # NO cp313t column: SWIG-generated modules are not free-threaded-safe. name: pycvc-gl-cp313 - upstream_version: "3.7.0" + upstream_version: "3.7.1" # Reset to 1 for the 3.3.0 upstream version: cvc_revision counts # revisions OF an upstream version, so a version bump restarts it. cvc_revision: 1