Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
diff --git a/nix/store/ipz4izl82p822flysklls9bnm686ay14-source/src/CMakeLists.txt b/pkgs/applications/graphics/alice-vision/CMakeLists.txt
index 118281d65cb..85b15586452 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -178,7 +178,6 @@ endif()
set(CMAKE_MODULE_PATH
${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake)
include(OptimizeForArchitecture)
-OptimizeForArchitecture()
set(ALICEVISION_HAVE_SSE 0)
if(SSE2_FOUND OR TARGET_ARCHITECTURE STREQUAL "native")
if(MSVC AND NOT ${CMAKE_CL_64})
10 changes: 10 additions & 0 deletions pkgs/by-name/al/alice-vision/cmake-fix-disabled-cuda-build.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- a/src/software/utils/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
+++ b/src/software/utils/CMakeLists.txt 2026-03-04 13:51:53.928332074 +0100
@@ -564,7 +564,6 @@
aliceVision_cmdline
aliceVision_mvsData
aliceVision_mvsUtils
- aliceVision_depthMap
aliceVision_sfmData
aliceVision_sfmDataIO
Boost::program_options
115 changes: 115 additions & 0 deletions pkgs/by-name/al/alice-vision/find-coin-modules.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,115 @@
--- a/src/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
+++ b/src/CMakeLists.txt 2023-04-03 16:32:16.994922955 +0200
@@ -433,6 +435,7 @@
find_package(CoinUtils REQUIRED)
find_package(Clp REQUIRED)
find_package(Osi REQUIRED)
+ find_package(OsiClp REQUIRED)
endif()

# ==============================================================================
--- a/src/aliceVision/linearProgramming/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
+++ b/src/aliceVision/linearProgramming/CMakeLists.txt 2023-04-03 16:33:09.883053876 +0200
@@ -13,6 +13,7 @@
Coin::Clp # clp + solver wrapper
Coin::CoinUtils # container tools
Coin::Osi # generic LP
+ Coin::OsiClp
)

if (NOT MOSEK_FOUND)
--- /dev/null 2023-03-27 18:27:39.858686170 +0200
+++ b/src/cmake/FindCoinUtils.cmake 2023-04-03 16:12:16.146494958 +0200
@@ -0,0 +1,21 @@
+find_package(PkgConfig REQUIRED)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_COINUTILS REQUIRED IMPORTED_TARGET coinutils)
+
+ add_library(Coin::CoinUtils ALIAS PkgConfig::PC_COINUTILS)
+endif()
+
+find_path(COINUTILS_INCLUDE_DIRS
+ NAMES CoinUtilsConfig.h
+ HINTS ${PC_COINUTILS_INCLUDE_DIRS})
+
+if (EXISTS "${COINUTILS_INCLUDE_DIRS}/CoinUtilsConfig.h")
+ file(STRINGS "${COINUTILS_INCLUDE_DIRS}/CoinUtilsConfig.h" coinutils_version_str REGEX "^#define[\t ]+COINUTILS_VERSION[\t ]+\".*\"")
+ string(REGEX REPLACE "^#define[\t ]+COINUTILS_VERSION[\t ]+\"([^\"]*)\".*" "\\1" CoinUtils_VERSION "${coinutils_version_str}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(CoinUtils
+ REQUIRED_VARS COINUTILS_INCLUDE_DIRS
+ VERSION_VAR CoinUtils_VERSION
+ )
--- /dev/null 2023-03-27 18:27:39.858686170 +0200
+++ b/src/cmake/FindClp.cmake 2023-04-03 16:12:16.146494958 +0200
@@ -0,0 +1,21 @@
+find_package(PkgConfig REQUIRED)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_CLP REQUIRED IMPORTED_TARGET clp)
+
+ add_library(Coin::Clp ALIAS PkgConfig::PC_CLP)
+endif()
+
+find_path(CLP_INCLUDE_DIRS
+ NAMES ClpConfig.h
+ HINTS ${PC_CLP_INCLUDE_DIRS})
+
+if (EXISTS "${CLP_INCLUDE_DIRS}/ClpConfig.h")
+ file(STRINGS "${CLP_INCLUDE_DIRS}/ClpConfig.h" clp_version_str REGEX "^#define[\t ]+CLP_VERSION[\t ]+\".*\"")
+ string(REGEX REPLACE "^#define[\t ]+CLP_VERSION[\t ]+\"([^\"]*)\".*" "\\1" Clp_VERSION "${clp_version_str}")
+endif()
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Clp
+ REQUIRED_VARS CLP_INCLUDE_DIRS
+ VERSION_VAR Clp_VERSION
+ )
--- /dev/null 2023-03-27 18:27:39.858686170 +0200
+++ b/src/cmake/FindOsi.cmake 2023-04-03 16:12:16.147494961 +0200
@@ -0,0 +1,22 @@
+find_package(PkgConfig REQUIRED)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_OSI REQUIRED IMPORTED_TARGET osi)
+
+ add_library(Coin::Osi ALIAS PkgConfig::PC_OSI)
+endif()
+
+find_path(OSI_INCLUDE_DIRS
+ NAMES OsiConfig.h
+ HINTS ${PC_OSI_INCLUDE_DIRS})
+
+if (EXISTS "${OSI_INCLUDE_DIRS}/OsiConfig.h")
+ file(STRINGS "${OSI_INCLUDE_DIRS}/OsiConfig.h" osi_version_str REGEX "^#define[\t ]+OSI_VERSION[\t ]+\".*\"")
+ string(REGEX REPLACE "^#define[\t ]+OSI_VERSION[\t ]+\"([^\"]*)\".*" "\\1" Osi_VERSION "${osi_version_str}")
+endif()
+
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Osi
+ REQUIRED_VARS OSI_INCLUDE_DIRS
+ VERSION_VAR Osi_VERSION
+ )
--- /dev/null 2023-03-27 18:27:39.858686170 +0200
+++ b/src/cmake/FindOsiClp.cmake 2023-04-03 16:31:08.255752799 +0200
@@ -0,0 +1,18 @@
+find_package(PkgConfig REQUIRED)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_OSI_CLP REQUIRED IMPORTED_TARGET osi-clp)
+
+ add_library(Coin::OsiClp ALIAS PkgConfig::PC_OSI_CLP)
+
+ set(OsiClp_VERSION ${PC_OSI_CLP_VERSION})
+endif()
+
+find_path(OSI_CLP_INCLUDE_DIRS
+ NAMES OsiSolverInterface.hpp
+ HINTS ${PC_OSI_CLP_INCLUDE_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(OsiClp
+ REQUIRED_VARS OSI_CLP_INCLUDE_DIRS
+ VERSION_VAR OsiClp_VERSION
+ )

23 changes: 23 additions & 0 deletions pkgs/by-name/al/alice-vision/find-flann.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--- /dev/null 2023-04-03 16:53:39.918168848 +0200
+++ b/src/cmake/Findflann.cmake 2023-04-03 21:33:25.433754406 +0200
@@ -0,0 +1,20 @@
+find_package(PkgConfig REQUIRED)
+if(PKG_CONFIG_FOUND)
+ pkg_check_modules(PC_FLANN REQUIRED IMPORTED_TARGET flann)
+ pkg_check_modules(PC_LZ4 REQUIRED IMPORTED_TARGET liblz4)
+
+ add_library(flann::flann_cpp ALIAS PkgConfig::PC_FLANN)
+ set(FLANN_LIBRARY flann::flann_cpp)
+
+ set(FLANN_VERSION ${PC_FLANN_VERSION})
+endif()
+
+find_path(FLANN_INCLUDE_DIRS
+ NAMES flann/flann.hpp
+ HINTS ${PC_FLANN_INCLUDE_DIRS})
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(flann
+ REQUIRED_VARS FLANN_INCLUDE_DIRS
+ VERSION_VAR FLANN_VERSION
+ )
44 changes: 44 additions & 0 deletions pkgs/by-name/al/alice-vision/openimageio-3-compat.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
--- a/src/CMakeLists.txt 1970-01-01 01:00:01.000000000 +0100
+++ b/src/CMakeLists.txt 2026-03-04 13:28:12.598278820 +0100
@@ -333,7 +333,7 @@
# ==============================================================================
# OpenImageIO
# ==============================================================================
-find_package(OpenImageIO 2.0.9 REQUIRED)
+find_package(OpenImageIO 3.1.10.0 REQUIRED)
if (OPENIMAGEIO_FOUND OR OpenImageIO_FOUND)
message(STATUS "OpenImageIO found.")
else()
--- a/src/cmake/AliceVisionConfig.cmake.in 1970-01-01 01:00:01.000000000 +0100
+++ b/src/cmake/AliceVisionConfig.cmake.in 2026-03-05 14:24:41.082290112 +0100
@@ -48,7 +48,7 @@
set(Ceres_DIR @Ceres_DIR@)
find_dependency(Ceres)

-find_dependency(OpenImageIO 2.1)
+find_dependency(OpenImageIO 3.1)

# whether it is built with CCTags
set(ALICEVISION_HAVE_CCTAG @ALICEVISION_HAVE_CCTAG@)
--- a/src/aliceVision/image/io.cpp 1970-01-01 01:00:01.000000000 +0100
+++ b/src/aliceVision/image/io.cpp 2026-03-04 13:27:08.447975800 +0100
@@ -1284,7 +1284,7 @@

void logOIIOImageCacheInfo()
{
- oiio::ImageCache* cache = oiio::ImageCache::create(true);
+ auto cache = oiio::ImageCache::create(true);

int maxOpenFiles = -1;
cache->getattribute("max_open_files", maxOpenFiles);
--- a/src/software/pipeline/main_panoramaInit.cpp 1970-01-01 01:00:01.000000000 +0100
+++ b/src/software/pipeline/main_panoramaInit.cpp 2026-03-04 14:29:24.118244363 +0100
@@ -91,7 +91,7 @@
oiio::ImageBuf buf_src(spec_src, const_cast<float*>(_levels[level - 1].data()));
oiio::ImageBuf buf_dst(spec_dst, const_cast<float*>(_levels[level].data()));

- oiio::ImageBufAlgo::resize(buf_dst, buf_src, "gaussian");
+ oiio::ImageBufAlgo::resize(buf_dst, buf_src, { { "filtername", "gaussian" } });
}

return true;
Loading
Loading