From 922983639442bce3c87efab0fee79b81c5a1e36e Mon Sep 17 00:00:00 2001
From: Joe Rivera <joe.rivera@cyberpcangel.com>
Date: Sun, 26 Jul 2026 04:44:06 -0500
Subject: [PATCH] recipes(pycvc-gl): ship the package layout, republish +cvc.6
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

#155 turned pycvc_gl from a flat module into a package (SWIG proxy ->
__init__.py, _pycvc_gl*.so moved inside pycvc_gl/, and camera/vehicle/lab/
scenes ship as submodules). The recipe still packaged the old flat globs
(_pycvc_gl* / pycvc_gl.py at the site-packages top level), which now match
nothing — the packed bundle would be empty.

Ship the whole pycvc_gl/ package dir instead, and bump the CPU recipe floor
5 -> 6 (the published +cvc.5 is the old flat module; this republish carries
the package layout). compute-revisions still mints the actual revision as
max(floor, published+1). Same fix on the pycvc-gl-cuda peer (shared slot).
---
 cvcpkg/recipes/pycvc-gl-cuda/recipe.yaml | 11 ++++++-----
 cvcpkg/recipes/pycvc-gl/recipe.yaml      | 22 +++++++++++++++++-----
 2 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/cvcpkg/recipes/pycvc-gl-cuda/recipe.yaml b/cvcpkg/recipes/pycvc-gl-cuda/recipe.yaml
index e81ca096..a9249891 100644
--- a/cvcpkg/recipes/pycvc-gl-cuda/recipe.yaml
+++ b/cvcpkg/recipes/pycvc-gl-cuda/recipe.yaml
@@ -65,11 +65,12 @@ build:
 
 package:
   files:
-    # ONLY the scene module — the core _pycvc/pycvc.py come from pycvc-cuda, so
-    # the two install side by side with no file overlap. Same paths as the CPU
-    # `pycvc-gl` package (they share the `pycvc-gl` slot).
-    - lib/python*/site-packages/_pycvc_gl*
-    - lib/python*/site-packages/pycvc_gl.py
+    # pycvc_gl is now a PACKAGE (#155): __init__.py (SWIG proxy) + _pycvc_gl*.so
+    # inside it + the camera/vehicle/lab/scenes submodules. Ship the whole package
+    # dir. The core _pycvc/pycvc.py come from pycvc-cuda, so the two install side
+    # by side with no file overlap. Same path as the CPU `pycvc-gl` package (they
+    # share the `pycvc-gl` slot).
+    - lib/python*/site-packages/pycvc_gl/
 
 abi:
   cxx_std: 17
diff --git a/cvcpkg/recipes/pycvc-gl/recipe.yaml b/cvcpkg/recipes/pycvc-gl/recipe.yaml
index fc709e86..c9f5bcba 100644
--- a/cvcpkg/recipes/pycvc-gl/recipe.yaml
+++ b/cvcpkg/recipes/pycvc-gl/recipe.yaml
@@ -20,7 +20,16 @@ recipe:
   # in-place transform/color updates) instead of the old add-only facade, and
   # adopts a host's live scene (scene_from_capsule) for volrover3. Rebuilt against
   # the new cvcgl +cvc.4 + pycvc +cvc.5 + libcvc +cvc.3.
-  cvc_revision: 5
+  # Bumped 5 -> 6: post-#155 republish. pycvc_gl is now a PACKAGE, not a flat
+  # module: the SWIG proxy became __init__.py, _pycvc_gl*.so moved inside it, and
+  # the reusable pure-Python scene helpers ship as submodules (pycvc_gl.camera,
+  # .vehicle, .lab, .scenes) — so grl_snam_lab (and any consumer) gets them from
+  # the bindings with no external package. The published +cvc.5 was the old flat
+  # `pycvc_gl.py`; this republish ships the package layout (see package.files).
+  # Same SWIG runtime / same linked +cvc peers — install-layout change only.
+  # (compute-revisions in publish-cvcpkg.yml still mints max(floor, published+1);
+  # this floor makes the intended +cvc.6 explicit and robust to a degraded query.)
+  cvc_revision: 6
   maintainer: "cvcpkg group"
   maintainer_email: "info@cvcpkg.org"
   maintainer_url: "https://cvcpkg.org"
@@ -89,10 +98,13 @@ build:
 
 package:
   files:
-    # ONLY the scene module — the core _pycvc/pycvc.py come from the pycvc
-    # package, so the two install side by side with no file overlap.
-    - lib/python*/site-packages/_pycvc_gl*
-    - lib/python*/site-packages/pycvc_gl.py
+    # pycvc_gl is now a PACKAGE (#155): the SWIG proxy is __init__.py, the
+    # extension module _pycvc_gl*.so lives INSIDE it, and the pure-Python scene
+    # helpers ship as submodules (camera/vehicle/lab/scenes). Ship the whole
+    # package dir — the old flat globs (_pycvc_gl* / pycvc_gl.py at site-packages
+    # top level) now match nothing. The core _pycvc/pycvc.py still come from the
+    # pycvc package, so the two install side by side with no file overlap.
+    - lib/python*/site-packages/pycvc_gl/
 
 abi:
   cxx_std: 17