From 15301cc5e6cacf9975982bb95bef0e4cc6f31b49 Mon Sep 17 00:00:00 2001
From: Aditya Pratyay <pratyadi@amazon.com>
Date: Mon, 15 Dec 2025 14:27:49 +0530
Subject: [PATCH] Fix duplicate symbol error when statically linking Skia and
 Rive

---
 renderer/include/rive/renderer/render_context.hpp        | 2 +-
 renderer/include/rive/renderer/sk_rectanizer_skyline.hpp | 4 ++--
 renderer/src/render_context.cpp                          | 2 +-
 renderer/src/sk_rectanizer_skyline.cpp                   | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/renderer/include/rive/renderer/render_context.hpp b/renderer/include/rive/renderer/render_context.hpp
index 0194ea007..32f35cd8a 100644
--- a/renderer/include/rive/renderer/render_context.hpp
+++ b/renderer/include/rive/renderer/render_context.hpp
@@ -806,7 +806,7 @@ class RenderContext : public RiveRenderFactory
         uint32_t m_currentContourID;
 
         // Atlas for offscreen feathering.
-        std::unique_ptr<skgpu::RectanizerSkyline> m_atlasRectanizer;
+        std::unique_ptr<rive::RectanizerSkyline> m_atlasRectanizer;
         uint32_t m_atlasMaxX = 0;
         uint32_t m_atlasMaxY = 0;
         std::vector<PathDraw*> m_pendingAtlasDraws;
diff --git a/renderer/include/rive/renderer/sk_rectanizer_skyline.hpp b/renderer/include/rive/renderer/sk_rectanizer_skyline.hpp
index 1b78d058d..3ad4bc417 100644
--- a/renderer/include/rive/renderer/sk_rectanizer_skyline.hpp
+++ b/renderer/include/rive/renderer/sk_rectanizer_skyline.hpp
@@ -15,7 +15,7 @@
 #include <cstdint>
 #include <vector>
 
-namespace skgpu
+namespace rive
 {
 // Pack rectangles and track the current silhouette
 // Based, in part, on Jukka Jylanki's work at http://clb.demon.fi
@@ -82,4 +82,4 @@ class RectanizerSkyline
     // at x,y.
     void addSkylineLevel(int skylineIndex, int x, int y, int width, int height);
 };
-} // End of namespace skgpu
+} // End of namespace rive
diff --git a/renderer/src/render_context.cpp b/renderer/src/render_context.cpp
index 0838cedd8..fc08dbc02 100644
--- a/renderer/src/render_context.cpp
+++ b/renderer/src/render_context.cpp
@@ -592,7 +592,7 @@ bool RenderContext::LogicalFlush::allocateAtlasDraw(
         uint16_t atlasMaxSize = m_ctx->atlasMaxSize();
         // Use an atlas larger than atlasMaxSize if it's too small for the
         // request (meaning the render target is larger than atlasMaxSize).
-        m_atlasRectanizer = std::make_unique<skgpu::RectanizerSkyline>(
+        m_atlasRectanizer = std::make_unique<rive::RectanizerSkyline>(
             std::max(atlasMaxSize, drawWidth),
             std::max(atlasMaxSize, drawHeight));
     }
diff --git a/renderer/src/sk_rectanizer_skyline.cpp b/renderer/src/sk_rectanizer_skyline.cpp
index 36c325249..78507ce85 100644
--- a/renderer/src/sk_rectanizer_skyline.cpp
+++ b/renderer/src/sk_rectanizer_skyline.cpp
@@ -15,7 +15,7 @@
 #include <algorithm>
 #include <cassert>
 
-namespace skgpu
+namespace rive
 {
 
 bool RectanizerSkyline::addRect(int width, int height, int16_t* x, int16_t* y)
@@ -152,4 +152,4 @@ void RectanizerSkyline::addSkylineLevel(int skylineIndex,
     }
 }
 
-} // End of namespace skgpu
+} // End of namespace rive