mirror of
https://github.com/archlinux/aur.git
synced 2026-02-07 04:41:00 +01:00
upgpkg: 3.2.0-5: Fix default OCIO config path
This commit is contained in:
parent
08c333d010
commit
fab875f27b
3 changed files with 20 additions and 23 deletions
8
PKGBUILD
8
PKGBUILD
|
|
@ -4,7 +4,7 @@
|
|||
pkgbase=alice-vision
|
||||
pkgname=('alice-vision') # 'alice-vision-cuda'
|
||||
pkgver=3.2.0
|
||||
pkgrel=4
|
||||
pkgrel=5
|
||||
pkgdesc="Photogrammetric Computer Vision Framework which provides a 3D Reconstruction and Camera Tracking algorithms"
|
||||
arch=('x86_64')
|
||||
url="https://alicevision.github.io/"
|
||||
|
|
@ -21,6 +21,7 @@ source=("git+https://github.com/alicevision/AliceVision#tag=v${pkgver}"
|
|||
"FindClp.cmake"
|
||||
"FindOsi.cmake"
|
||||
"fix-computeUncertainty-build.patch"
|
||||
"fix-default-ocio-path.patch"
|
||||
)
|
||||
sha256sums=('SKIP'
|
||||
'SKIP'
|
||||
|
|
@ -28,7 +29,8 @@ sha256sums=('SKIP'
|
|||
'd21691bfd9c2561cea52b5f48caf885ec6f8c2a0603ce594914bff610e77a0c5'
|
||||
'6523435334eec6e39a244371287504cd0a0e88aa0cbe5dcac38b819ea881074e'
|
||||
'fbb87c86bc0b2ee2c98abfbecb0d555f75f01ccf5d4c59c22bb598e7f2897bf9'
|
||||
'9d704d7f584c016d0eedb8fdb93d4fde600bcc984a722b9daadfde14e66e50c6')
|
||||
'17546a6c362782f90d1d85eb7a4b42b96f5f51879c68efbcbcf07635e0f60cbc'
|
||||
'3f02c715f27498ac8982edee3e3af151b0cd2a9cb83da37fef3b7fec1e34b169')
|
||||
|
||||
prepare() {
|
||||
cd AliceVision
|
||||
|
|
@ -48,6 +50,8 @@ prepare() {
|
|||
# fix build
|
||||
patch -p1 -i ../fix-computeUncertainty-build.patch
|
||||
|
||||
# fix default OCIO config path
|
||||
patch -p1 -i ../fix-default-ocio-path.patch
|
||||
# fix doc build
|
||||
sed -i '/^ *install.*doc/s/doc/htmlDoc/' src/CMakeLists.txt
|
||||
ln -rs docs/sphinx{,/rst}
|
||||
|
|
|
|||
|
|
@ -1,24 +1,3 @@
|
|||
diff --git a/src/cmake/FindUncertaintyTE.cmake b/src/cmake/FindUncertaintyTE.cmake
|
||||
index bcd4d6bfe..9047b264e 100644
|
||||
--- a/src/cmake/FindUncertaintyTE.cmake
|
||||
+++ b/src/cmake/FindUncertaintyTE.cmake
|
||||
@@ -30,7 +30,7 @@ FIND_LIBRARY(UNCERTAINTYTE_LIBRARY NAMES uncertaintyTE
|
||||
PATH_SUFFIXES
|
||||
lib
|
||||
)
|
||||
-
|
||||
+message("lalalalala " ${UNCERTAINTYTE_LIBRARY})
|
||||
IF(UNCERTAINTYTE_INCLUDE_DIR)
|
||||
MESSAGE(STATUS "UncertaintyTE headers found in ${UNCERTAINTYTE_INCLUDE_DIR}")
|
||||
IF(NOT MAGMA_FOUND)
|
||||
@@ -39,6 +39,7 @@ IF(UNCERTAINTYTE_INCLUDE_DIR)
|
||||
IF(MAGMA_FOUND)
|
||||
set(UNCERTAINTYTE_INCLUDE_DIR ${UNCERTAINTYTE_INCLUDE_DIR} ${MAGMA_INCLUDE_DIRS})
|
||||
set(UNCERTAINTYTE_LIBRARY ${UNCERTAINTYTE_LIBRARY} ${MAGMA_LIBRARIES})
|
||||
+ message("lelelelelele " ${UNCERTAINTYTE_LIBRARY})
|
||||
ELSE()
|
||||
MESSAGE(WARNING "Couldn't find Magma, this is needed for compiling with UncertaintyTE")
|
||||
# this is to make the find_package_handle_standard_args fail
|
||||
diff --git a/src/software/utils/main_computeUncertainty.cpp b/src/software/utils/main_computeUncertainty.cpp
|
||||
index 23d2ab9ee..5bba4d7b2 100644
|
||||
--- a/src/software/utils/main_computeUncertainty.cpp
|
||||
|
|
|
|||
14
fix-default-ocio-path.patch
Normal file
14
fix-default-ocio-path.patch
Normal file
|
|
@ -0,0 +1,14 @@
|
|||
diff --git a/src/aliceVision/image/colorspace.cpp b/src/aliceVision/image/colorspace.cpp
|
||||
index 134017e27..85d5c351f 100644
|
||||
--- a/src/aliceVision/image/colorspace.cpp
|
||||
+++ b/src/aliceVision/image/colorspace.cpp
|
||||
@@ -26,8 +26,7 @@ oiio::ColorConfig& getGlobalColorConfigOCIO() { return colorConfigOCIO; }
|
||||
|
||||
std::string getColorConfigFilePathFromSourceCode()
|
||||
{
|
||||
- const fs::path moduleFolder = fs::path(__FILE__).parent_path();
|
||||
- return (moduleFolder / "share/aliceVision/config.ocio").string();
|
||||
+ return std::string("/usr/share/aliceVision/config.ocio");
|
||||
}
|
||||
|
||||
std::string getDefaultColorConfigFilePath()
|
||||
Loading…
Add table
Reference in a new issue