From df73921b54c85f258f672dacf0891d4d7526e1ea Mon Sep 17 00:00:00 2001
From: sfn <redacted>
Date: Fri, 6 Feb 2026 12:13:15 +0100
Subject: [PATCH] Use system lemon (which is now patched with C++20
 compatibility)

---
 .SRCINFO |  5 ++---
 PKGBUILD | 15 ++-------------
 2 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/.SRCINFO b/.SRCINFO
index 182e9de09ac6..176f43bec8d5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = alice-vision
 	pkgdesc = Photogrammetric Computer Vision Framework which provides 3D Reconstruction and Camera Tracking algorithms
 	pkgver = 3.3.1
-	pkgrel = 2
+	pkgrel = 3
 	url = https://alicevision.org/
 	arch = x86_64
 	license = MPL-2.0
@@ -25,6 +25,7 @@ pkgbase = alice-vision
 	depends = geogram
 	depends = coin-or-clp
 	depends = coin-or-coinutils
+	depends = coin-or-lemon
 	depends = ceres-solver
 	depends = openmesh
 	depends = jemalloc
@@ -41,12 +42,10 @@ pkgbase = alice-vision
 	options = !debug
 	source = git+https://github.com/alicevision/AliceVision.git#tag=v3.3.1
 	source = MeshSDFilter::git+https://github.com/alicevision/MeshSDFilter.git#branch=av_develop
-	source = git+https://github.com/alicevision/lemon#commit=8885b9a
 	source = fix-default-ocio-path.patch
 	source = alicevision.sh
 	sha256sums = 395661cda7ac46e9f694a568a8e7caf42989da64d2e0b206a667881d10ddae71
 	sha256sums = SKIP
-	sha256sums = 30be1cb0a282f389fe8137b695813d4b53a5a13746fd91245ce8e83e773478cf
 	sha256sums = 3f02c715f27498ac8982edee3e3af151b0cd2a9cb83da37fef3b7fec1e34b169
 	sha256sums = b474a12823b1fb0e1613bba0d7bd455f63124aa8c29b3d00df94f0a3c00ab900
 
diff --git a/PKGBUILD b/PKGBUILD
index 34b44bdc95bc..18f45c0698c6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,13 +4,13 @@
 
 pkgname='alice-vision'
 pkgver=3.3.1
-pkgrel=2
+pkgrel=3
 options=('!debug') # debug package is kinda big -- needs investigation!
 pkgdesc="Photogrammetric Computer Vision Framework which provides 3D Reconstruction and Camera Tracking algorithms"
 arch=('x86_64')
 url="https://alicevision.org/"
 license=('MPL-2.0' 'MIT')
-depends=('boost-libs' 'geogram' 'coin-or-clp' 'coin-or-coinutils' 'ceres-solver' 'openmesh' 'jemalloc' 'zlib'
+depends=('boost-libs' 'geogram' 'coin-or-clp' 'coin-or-coinutils' 'coin-or-lemon' 'ceres-solver' 'openmesh' 'jemalloc' 'zlib'
          'alembic' 'popsift' 'assimp' 'onnxruntime' 'cuda' 'openimageio' 'usd')
 makedepends=('boost' 'eigen' 'freetype2' 'flann' 'cctag' 'onnx' 'swig' 'expat'
              'git' 'cmake' 'doxygen' 'python-sphinx' 'nanoflann' 'metis' 'libe57format')
@@ -18,21 +18,15 @@ optdepends=('apriltag: Recognition of Apriltags'
 			'libe57format: e57 3d imaging format I/O')
 source=("git+https://github.com/alicevision/AliceVision.git#tag=v${pkgver}"
         "MeshSDFilter::git+https://github.com/alicevision/MeshSDFilter.git#branch=av_develop"
-        "git+https://github.com/alicevision/lemon#commit=8885b9a"
         "fix-default-ocio-path.patch"
         "alicevision.sh")
 
 sha256sums=('395661cda7ac46e9f694a568a8e7caf42989da64d2e0b206a667881d10ddae71'
             'SKIP'
-            '30be1cb0a282f389fe8137b695813d4b53a5a13746fd91245ce8e83e773478cf'
             '3f02c715f27498ac8982edee3e3af151b0cd2a9cb83da37fef3b7fec1e34b169'
             'b474a12823b1fb0e1613bba0d7bd455f63124aa8c29b3d00df94f0a3c00ab900')
 
 prepare() {
-  # Lemon build
-  sed 's|VERSION 2.8|VERSION 3.5|g' -i lemon/CMakeLists.txt
-  sed 's|\(CMP0048\) OLD|\1 NEW|g' -i lemon/CMakeLists.txt
-
   cd AliceVision
 
   git submodule init
@@ -88,10 +82,6 @@ prepare() {
 }
 
 build() {
-  cd ${srcdir}/lemon
-  cmake -Bbuild -DCMAKE_CXX_STANDARD=20 -DCMAKE_INSTALL_PREFIX=${srcdir}/lemon/install
-  make -C build && make -C build install
-
   local python_version=$(python -c 'import sys; print(".".join(map(str, sys.version_info[:2])))')
   cd ${srcdir}/AliceVision
 
@@ -101,7 +91,6 @@ build() {
     -DALICEVISION_INSTALL_MESHROOM_PLUGIN=ON \
     -DALICEVISION_BUILD_SWIG_BINDINGS=ON \
     -DALICEVISION_BUILD_DOC=OFF \
-    -DLEMON_DIR=${srcdir}/lemon/install/share/lemon/cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_SYSTEM_INCLUDE_PATH='/usr/include/python"${python_version}/' \
     -DCMAKE_SKIP_INSTALL_RPATH=ON