Skip to content
Merged
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
114 changes: 114 additions & 0 deletions ports/opencolorio/dependencies.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,114 @@
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3feba7e..b4c2d47 100755
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -518,7 +518,7 @@ install(
FILE ${OCIO_TARGETS_EXPORT_NAME}
)

-if (NOT BUILD_SHARED_LIBS)
+if (0)
# Install custom macros used in the find modules.
install(FILES
${CMAKE_CURRENT_LIST_DIR}/share/cmake/macros/VersionUtils.cmake
diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
index aa2550a..3c968f7 100644
--- a/share/cmake/modules/FindExtPackages.cmake
+++ b/share/cmake/modules/FindExtPackages.cmake
@@ -55,6 +55,7 @@ message(STATUS "Checking for mandatory dependencies...")
# expat
# https://github.com/libexpat/libexpat
ocio_handle_dependency( expat REQUIRED ALLOW_INSTALL
+ CONFIG
MIN_VERSION 2.4.1
RECOMMENDED_VERSION 2.5.0
RECOMMENDED_VERSION_REASON "CVE fixes and fix issue with symbol leakage when built as a static library")
@@ -62,6 +63,7 @@ ocio_handle_dependency( expat REQUIRED ALLOW_INSTALL
# yaml-cpp
# https://github.com/jbeder/yaml-cpp
ocio_handle_dependency( yaml-cpp REQUIRED ALLOW_INSTALL
+ CONFIG
MIN_VERSION 0.6.3
RECOMMENDED_VERSION 0.7.0
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO")
@@ -69,13 +71,13 @@ ocio_handle_dependency( yaml-cpp REQUIRED ALLOW_INSTALL
# pystring
# https://github.com/imageworks/pystring
ocio_handle_dependency( pystring REQUIRED ALLOW_INSTALL
- MIN_VERSION 1.1.3
- RECOMMENDED_VERSION 1.1.3
+ CONFIG
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO")

# Imath (>=3.1)
# https://github.com/AcademySoftwareFoundation/Imath
ocio_handle_dependency( Imath REQUIRED ALLOW_INSTALL
+ CONFIG
MIN_VERSION 3.1.1
RECOMMENDED_VERSION 3.1.12
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO")
@@ -111,7 +113,8 @@ ocio_handle_dependency( ZLIB REQUIRED ALLOW_INSTALL
# minizip-ng
# https://github.com/zlib-ng/minizip-ng
ocio_handle_dependency( minizip-ng REQUIRED ALLOW_INSTALL
- MIN_VERSION 3.0.6
+ CONFIG
+ MIN_VERSION 4
RECOMMENDED_VERSION 3.0.7
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO")

@@ -132,8 +135,7 @@ if(OCIO_BUILD_APPS)
# lcms2
# https://github.com/mm2/Little-CMS
ocio_handle_dependency( lcms2 REQUIRED ALLOW_INSTALL
- MIN_VERSION 2.2
- RECOMMENDED_VERSION 2.2
+ CONFIG
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO")
endif()

@@ -259,6 +261,7 @@ if(OCIO_BUILD_APPS)
###############################################################################
# Calling find_package in CONFIG mode using PREFER_CONFIG option.
ocio_handle_dependency( OpenEXR PREFER_CONFIG ALLOW_INSTALL
+ CONFIG
MIN_VERSION ${OpenEXR_MININUM_VERSION}
RECOMMENDED_VERSION 3.1.5
RECOMMENDED_VERSION_REASON "Latest version tested with OCIO"
diff --git a/src/cmake/Config.cmake.in b/src/cmake/Config.cmake.in
index 4e2367b..fc0e483 100644
--- a/src/cmake/Config.cmake.in
+++ b/src/cmake/Config.cmake.in
@@ -23,19 +23,19 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@
########################

if (NOT TARGET expat::expat)
- find_dependency(expat @expat_VERSION@)
+ find_dependency(expat @expat_VERSION@ CONFIG)
endif()

if (NOT TARGET Imath::Imath)
- find_dependency(Imath @Imath_VERSION@)
+ find_dependency(Imath @Imath_VERSION@ CONFIG)
endif()

if (NOT TARGET pystring::pystring)
- find_dependency(pystring @pystring_VERSION@)
+ find_dependency(pystring @pystring_VERSION@ CONFIG)
endif()

if (NOT TARGET yaml-cpp::yaml-cpp)
- find_dependency(yaml-cpp @yaml-cpp_VERSION@)
+ find_dependency(yaml-cpp @yaml-cpp_VERSION@ CONFIG)
if (TARGET yaml-cpp AND NOT TARGET yaml-cpp::yaml-cpp)
add_library(yaml-cpp::yaml-cpp ALIAS yaml-cpp)
endif()
@@ -54,7 +54,7 @@ if (NOT @BUILD_SHARED_LIBS@) # NOT @BUILD_SHARED_LIBS@
endif()

if (NOT TARGET MINIZIP::minizip-ng)
- find_dependency(minizip-ng @minizip-ng_VERSION@)
+ find_dependency(minizip-ng @minizip-ng_VERSION@ CONFIG)
endif()

# Remove OCIO custom find module path.
16 changes: 0 additions & 16 deletions ports/opencolorio/fix-del-install-file.patch

This file was deleted.

73 changes: 0 additions & 73 deletions ports/opencolorio/fix-dependency.patch

This file was deleted.

93 changes: 0 additions & 93 deletions ports/opencolorio/fix-func-param.patch

This file was deleted.

10 changes: 0 additions & 10 deletions ports/opencolorio/fix-pkgconfig.patch

This file was deleted.

13 changes: 13 additions & 0 deletions ports/opencolorio/glew-no-glu.diff
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/src/libutils/oglapphelpers/glsl.cpp b/src/libutils/oglapphelpers/glsl.cpp
index 0154eff..6ad4356 100644
--- a/src/libutils/oglapphelpers/glsl.cpp
+++ b/src/libutils/oglapphelpers/glsl.cpp
@@ -41,7 +41,7 @@ bool GetGLError(std::string & error)
// Unfortunately no gluErrorString equivalent on Mac.
error = "OpenGL Error";
#else
- error = (const char*)gluErrorString(glErr);
+ error = "OpenGL Error";
Comment on lines +9 to +10
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Function removed from GLEW, cf. #43695

#endif
return true;
}
Loading