Skip to content

Merge main into adobe-public (zlib fix) - #111

Merged
skywolf829 merged 5 commits into
adobe-publicfrom
swurster/merge-main-zlib
Nov 9, 2026
Merged

skywolf829 merged 5 commits into
adobe-publicfrom
swurster/merge-main-zlib

Conversation

@skywolf829

@skywolf829 skywolf829 commented Nov 9, 2026 •

Copy link
Copy Markdown
Collaborator

Brings #110 (zlib fetched from zlib.net/fossils) into adobe-public. Without it, v3.0.0+adobe.34 fails to build on machines without a system zlib, because the old zlib.net/zlib-1.3.2.tar.gz URL returns 404.

Heads-up on how to land this: this repo only allows squash merges, and a squash would drop the part that matters most here. #109 was squashed, so git doesn't know adobe-public already contains main's commits. A plain merge of main conflicts in 15 files, even though the contents are identical.

This branch's merge commit (0764e8c) has main (8551739) as a second parent, which fixes that for every later sync. Every conflict resolves to adobe-public's existing content, and the only content change is #110's one line. To keep it, fast-forward adobe-public to 0764e8c once CI passes (the old "Merge branch 'main' into adobe-public" commits were pushed this way), and close this PR. Squashing works for the zlib fix but leaves the next sync conflicting again.

Checked: after this merge, main is an ancestor of adobe-public, and adobe-public differs from main only by the environment map (#106, 25 files).

Next: tag v3.0.0+adobe.35 on the result.

diegomazala and others added 5 commits November 2, 2026 13:40
  Add SPZ_NIANTIC_georeference extension (vendor ID 0x4E53)

  Stores a similarity transform (origin, unit quaternion, scale) from the
  asset's RUB frame into a geocentric CRS, given as AUTHORITY:CODE (e.g.
  EPSG:4978) or inline PROJJSON for non-Earth bodies, with an optional
  coordinate epoch. The library validates the record but never applies it.

  Adds SpzExtensionBase::isValid() (default true); saveSpz now fails if any
  extension is invalid. Includes Python/WASM bindings, docs and tests.

  Co-authored-by: Diego <diego@nianticspatial.com>
…107)

* first pass

* fix wasm custom attribute conversion

* decode filter

* fix test number

* update quantized bits to 16

* add test
zlib.net only serves the latest release at the top level and moves older
ones to /fossils/, so https://zlib.net/zlib-1.3.2.tar.gz now 404s and any
build without a system zlib fails at configure time. Same tarball, so
the URL_HASH is unchanged.
Brings in the zlib fossils URL fix (#110). #109 was squash-merged, so this merge also records main's history as an ancestor of adobe-public; every conflict resolves to adobe-public's existing content, which already matches main apart from the Adobe environment map.
@skywolf829
skywolf829 merged commit 0764e8c into adobe-public Nov 9, 2026
36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants