Compare commits
1 Commits
| Author | SHA256 | Date | |
|---|---|---|---|
| e4b44dcd94 |
201
0001-Drop-Imath2-support-and-modernize-Imath-includes.patch
Normal file
201
0001-Drop-Imath2-support-and-modernize-Imath-includes.patch
Normal file
@@ -0,0 +1,201 @@
|
||||
From b20b49b78f250414a8a2be9d49f8c444759561fb Mon Sep 17 00:00:00 2001
|
||||
From: =?UTF-8?q?Julius=20K=C3=BCnzel?=
|
||||
<78424983+jlskuz@users.noreply.github.com>
|
||||
Date: Thu, 27 Mar 2025 18:10:53 +0100
|
||||
Subject: [PATCH] Drop Imath2 support and modernize Imath includes (#1852)
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
* Drop support for Imath 2
|
||||
* Port Imath includes to Imath/*.h
|
||||
As suggested by Imath devs, see https://github.com/AcademySoftwareFoundation/Imath/issues/136#issuecomment-812671628
|
||||
This is possible now that Imath 2 support was dropped
|
||||
|
||||
* Add find_dependency call for Imath to *Config.cmake
|
||||
This will make it easier for downstream users
|
||||
* Use global include_directories for internal Imath
|
||||
|
||||
---------
|
||||
|
||||
Signed-off-by: Julius Künzel <julius.kuenzel@kde.org>
|
||||
---
|
||||
CMakeLists.txt | 28 ++++---------------
|
||||
src/opentimelineio/CMakeLists.txt | 6 ++--
|
||||
.../OpenTimelineIOConfig.cmake.in | 1 +
|
||||
src/opentimelineio/composable.h | 2 +-
|
||||
src/opentimelineio/mediaReference.h | 2 +-
|
||||
src/opentimelineio/serializableObject.h | 2 +-
|
||||
.../opentimelineio-bindings/otio_imath.cpp | 4 +--
|
||||
.../otio_serializableObjects.cpp | 2 +-
|
||||
tests/CMakeLists.txt | 3 --
|
||||
9 files changed, 15 insertions(+), 35 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 36f6e27..a1a074f 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -183,37 +183,22 @@ elseif(OTIO_FIND_IMATH)
|
||||
message(STATUS "Found Imath 3 at ${Imath_CONFIG}")
|
||||
set(USE_DEPS_IMATH OFF)
|
||||
else()
|
||||
- find_package(IlmBase QUIET)
|
||||
- if (IlmBase_FOUND)
|
||||
- message(STATUS "Imath 3 not found, found Imath 2 at ${IlmBase_CONFIG}")
|
||||
- message(STATUS "You may need to point to the Imath headers by setting IMATH_INCLUDES")
|
||||
- set(USE_DEPS_IMATH_OFF)
|
||||
- set(OTIO_RESOLVED_IMATH_LIBRARIES "${IlmBase_LIBRARIES")
|
||||
- else()
|
||||
- message(STATUS "Imath 3 and 2 were not found, using src/deps/Imath")
|
||||
- set(USE_DEPS_IMATH ON)
|
||||
- endif()
|
||||
+ message(STATUS "Imath 3 was not found, using src/deps/Imath")
|
||||
+ set(USE_DEPS_IMATH ON)
|
||||
endif()
|
||||
else()
|
||||
message(STATUS "Using src/deps/Imath by default")
|
||||
set(USE_DEPS_IMATH ON)
|
||||
endif()
|
||||
|
||||
+if(USE_DEPS_IMATH)
|
||||
+ include_directories("${PROJECT_SOURCE_DIR}/src/deps/Imath/src")
|
||||
+endif()
|
||||
+
|
||||
# set up the internally hosted dependencies
|
||||
# add_subdirectory(src/deps)
|
||||
find_package(RapidJSON CONFIG REQUIRED)
|
||||
|
||||
-set (OTIO_IMATH_TARGETS
|
||||
- # For OpenEXR/Imath 3.x:
|
||||
- $<TARGET_NAME_IF_EXISTS:Imath::Imath>
|
||||
- $<TARGET_NAME_IF_EXISTS:Imath::Half>
|
||||
- # For OpenEXR >= 2.4/2.5 with reliable exported targets
|
||||
- $<TARGET_NAME_IF_EXISTS:IlmBase::Imath>
|
||||
- $<TARGET_NAME_IF_EXISTS:IlmBase::Half>
|
||||
- $<TARGET_NAME_IF_EXISTS:IlmBase::Iex>
|
||||
- # For OpenEXR <= 2.3:
|
||||
- ${ILMBASE_LIBRARIES})
|
||||
-
|
||||
add_subdirectory(src/opentime)
|
||||
add_subdirectory(src/opentimelineio)
|
||||
|
||||
@@ -228,4 +213,3 @@ endif()
|
||||
if(OTIO_CXX_EXAMPLES)
|
||||
add_subdirectory(examples)
|
||||
endif()
|
||||
-
|
||||
diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt
|
||||
index 22828a6..ad1890b 100644
|
||||
--- a/src/opentimelineio/CMakeLists.txt
|
||||
+++ b/src/opentimelineio/CMakeLists.txt
|
||||
@@ -78,13 +78,11 @@ add_library(opentimelineio ${OTIO_SHARED_OR_STATIC_LIB}
|
||||
add_library(OTIO::opentimelineio ALIAS opentimelineio)
|
||||
|
||||
target_include_directories(opentimelineio
|
||||
- PRIVATE "${IMATH_INCLUDES}"
|
||||
- "${PROJECT_SOURCE_DIR}/src"
|
||||
- "${IMATH_INCLUDES}"
|
||||
+ PRIVATE "${PROJECT_SOURCE_DIR}/src"
|
||||
${RapidJSON_INCLUDE_DIRS})
|
||||
|
||||
target_link_libraries(opentimelineio
|
||||
- PUBLIC opentime ${OTIO_IMATH_TARGETS})
|
||||
+ PUBLIC opentime Imath::Imath)
|
||||
|
||||
set_target_properties(opentimelineio PROPERTIES
|
||||
VERSION ${OTIO_VERSION}
|
||||
diff --git a/src/opentimelineio/OpenTimelineIOConfig.cmake.in b/src/opentimelineio/OpenTimelineIOConfig.cmake.in
|
||||
index f735b36..355f8ea 100644
|
||||
--- a/src/opentimelineio/OpenTimelineIOConfig.cmake.in
|
||||
+++ b/src/opentimelineio/OpenTimelineIOConfig.cmake.in
|
||||
@@ -2,5 +2,6 @@
|
||||
|
||||
include(CMakeFindDependencyMacro)
|
||||
find_dependency(OpenTime)
|
||||
+find_dependency(Imath)
|
||||
|
||||
include("${CMAKE_CURRENT_LIST_DIR}/OpenTimelineIOTargets.cmake")
|
||||
diff --git a/src/opentimelineio/composable.h b/src/opentimelineio/composable.h
|
||||
index d2691ff..4f63856 100644
|
||||
--- a/src/opentimelineio/composable.h
|
||||
+++ b/src/opentimelineio/composable.h
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "opentimelineio/serializableObjectWithMetadata.h"
|
||||
#include "opentimelineio/version.h"
|
||||
|
||||
-#include <ImathBox.h>
|
||||
+#include <Imath/ImathBox.h>
|
||||
|
||||
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
|
||||
|
||||
diff --git a/src/opentimelineio/mediaReference.h b/src/opentimelineio/mediaReference.h
|
||||
index f7fde5a..63fa70c 100644
|
||||
--- a/src/opentimelineio/mediaReference.h
|
||||
+++ b/src/opentimelineio/mediaReference.h
|
||||
@@ -6,7 +6,7 @@
|
||||
#include "opentimelineio/serializableObjectWithMetadata.h"
|
||||
#include "opentimelineio/version.h"
|
||||
|
||||
-#include <ImathBox.h>
|
||||
+#include <Imath/ImathBox.h>
|
||||
|
||||
namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
|
||||
|
||||
diff --git a/src/opentimelineio/serializableObject.h b/src/opentimelineio/serializableObject.h
|
||||
index 63ccc04..280706e 100644
|
||||
--- a/src/opentimelineio/serializableObject.h
|
||||
+++ b/src/opentimelineio/serializableObject.h
|
||||
@@ -12,7 +12,7 @@
|
||||
#include "opentimelineio/typeRegistry.h"
|
||||
#include "opentimelineio/version.h"
|
||||
|
||||
-#include "ImathBox.h"
|
||||
+#include "Imath/ImathBox.h"
|
||||
#include "serialization.h"
|
||||
|
||||
#include <list>
|
||||
diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp
|
||||
index 540025a..4cd5df2 100644
|
||||
--- a/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp
|
||||
+++ b/src/py-opentimelineio/opentimelineio-bindings/otio_imath.cpp
|
||||
@@ -6,8 +6,8 @@
|
||||
|
||||
#include "otio_utils.h"
|
||||
|
||||
-#include "ImathBox.h"
|
||||
-#include "ImathVec.h"
|
||||
+#include "Imath/ImathBox.h"
|
||||
+#include "Imath/ImathVec.h"
|
||||
|
||||
namespace py = pybind11;
|
||||
|
||||
diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp b/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp
|
||||
index 290a70d..1bdd8c8 100644
|
||||
--- a/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp
|
||||
+++ b/src/py-opentimelineio/opentimelineio-bindings/otio_serializableObjects.cpp
|
||||
@@ -32,7 +32,7 @@
|
||||
#include "otio_utils.h"
|
||||
#include "otio_anyDictionary.h"
|
||||
|
||||
-#include "ImathBox.h"
|
||||
+#include "Imath/ImathBox.h"
|
||||
|
||||
namespace py = pybind11;
|
||||
using namespace pybind11::literals;
|
||||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
|
||||
index 85cb216..a17de5c 100644
|
||||
--- a/tests/CMakeLists.txt
|
||||
+++ b/tests/CMakeLists.txt
|
||||
@@ -20,9 +20,6 @@ foreach(test ${tests_opentimelineio})
|
||||
add_executable(${test} utils.h utils.cpp ${test}.cpp)
|
||||
|
||||
target_link_libraries(${test} opentimelineio)
|
||||
- if (NOT "${IMATH_INCLUDES}" STREQUAL "")
|
||||
- target_include_directories(${test} "${IMATH_INCLUDES}")
|
||||
- endif()
|
||||
set_target_properties(${test} PROPERTIES FOLDER tests)
|
||||
add_test(NAME ${test}
|
||||
COMMAND ${test}
|
||||
--
|
||||
2.49.0
|
||||
|
||||
118
0001-Use-system-rapidjson.patch
Normal file
118
0001-Use-system-rapidjson.patch
Normal file
@@ -0,0 +1,118 @@
|
||||
From 2bd90edfb4730780b71fcacae9e492ff15a16268 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Marin <christophe@krop.fr>
|
||||
Date: Fri, 7 Mar 2025 10:42:48 +0100
|
||||
Subject: [PATCH 1/2] Use system rapidjson
|
||||
|
||||
---
|
||||
CMakeLists.txt | 56 +++----------------------------
|
||||
src/opentimelineio/CMakeLists.txt | 5 ++-
|
||||
2 files changed, 7 insertions(+), 54 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 825ad9d..0a4d0ce 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -28,7 +28,7 @@ project(OpenTimelineIO VERSION ${OTIO_VERSION} LANGUAGES C CXX)
|
||||
# Installation options
|
||||
option(OTIO_CXX_INSTALL "Install the C++ bindings" ON)
|
||||
option(OTIO_PYTHON_INSTALL "Install the Python bindings" OFF)
|
||||
-option(OTIO_DEPENDENCIES_INSTALL "Install OTIO's C++ header dependencies (any and nonstd)" ON)
|
||||
+option(OTIO_DEPENDENCIES_INSTALL "Install OTIO's C++ header dependencies (any and nonstd)" OFF)
|
||||
option(OTIO_INSTALL_PYTHON_MODULES "Install OTIO pure Python modules/files" ON)
|
||||
option(OTIO_INSTALL_COMMANDLINE_TOOLS "Install the OTIO command line tools" ON)
|
||||
option(OTIO_INSTALL_CONTRIB "Install the opentimelineio_contrib Python package" ON)
|
||||
@@ -149,63 +149,16 @@ endif()
|
||||
set(CMAKE_CXX_STANDARD_REQUIRED ON)
|
||||
set(CMAKE_CXX_EXTENSIONS OFF)
|
||||
|
||||
-if(OTIO_CXX_COVERAGE AND NOT MSVC)
|
||||
- set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --coverage")
|
||||
- # this causes cmake to produce file.gcno instead of file.cpp.gcno
|
||||
- set(CMAKE_CXX_OUTPUT_EXTENSION_REPLACE 1)
|
||||
- message(STATUS "Building C++ with Coverage: ON")
|
||||
-else()
|
||||
- message(STATUS "Building C++ with Coverage: OFF")
|
||||
-endif()
|
||||
|
||||
-if(WIN32)
|
||||
- # Windows debug builds for Python require a d in order for the module to
|
||||
- # load. This also helps ensure that debug builds in general are matched
|
||||
- # to the Microsoft debug CRT.
|
||||
- set(OTIO_DEBUG_POSTFIX "d")
|
||||
-endif()
|
||||
+
|
||||
+
|
||||
|
||||
set_property(GLOBAL PROPERTY USE_FOLDERS ON)
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Fetch or refresh submodules if requested
|
||||
#
|
||||
-if (OTIO_AUTOMATIC_SUBMODULES)
|
||||
- # make sure that git submodules are up to date when building
|
||||
- find_package(Git QUIET)
|
||||
- if (GIT_FOUND)
|
||||
- message(STATUS "Checking git repo is available:")
|
||||
- execute_process(
|
||||
- # the following command returns true if cwd is in the repo
|
||||
- COMMAND ${GIT_EXECUTABLE} rev-parse --is-inside-work-tree
|
||||
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
|
||||
- RESULT_VARIABLE IN_A_GIT_REPO_RETCODE
|
||||
- )
|
||||
- endif()
|
||||
|
||||
- if (GIT_FOUND AND IN_A_GIT_REPO_RETCODE EQUAL 0)
|
||||
- # you might want to turn this off if you're working in one of the submodules
|
||||
- # or trying it out with a different version of the submodule
|
||||
- option(GIT_UPDATE_SUBMODULES "Update submodules each build" ON)
|
||||
- if (GIT_UPDATE_SUBMODULES)
|
||||
- message(
|
||||
- STATUS "root: Updating git submodules to make sure they are up to date"
|
||||
- )
|
||||
- execute_process(
|
||||
- COMMAND ${GIT_EXECUTABLE} submodule update --init --recursive
|
||||
- WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}
|
||||
- RESULT_VARIABLE GIT_UPDATE_SUBMODULES_RESULT
|
||||
- )
|
||||
- if (NOT GIT_UPDATE_SUBMODULES_RESULT EQUAL "0")
|
||||
- message(
|
||||
- FATAL_ERROR
|
||||
- "git submodule update --init --recursive failed with \
|
||||
- ${GIT_UPDATE_SUBMODULES_RESULT}"
|
||||
- )
|
||||
- endif()
|
||||
- endif()
|
||||
- endif()
|
||||
-endif()
|
||||
|
||||
#------------------------------------------------------------------------------
|
||||
# Setup tests
|
||||
@@ -245,7 +198,8 @@ else()
|
||||
endif()
|
||||
|
||||
# set up the internally hosted dependencies
|
||||
-add_subdirectory(src/deps)
|
||||
+# add_subdirectory(src/deps)
|
||||
+find_package(RapidJSON CONFIG REQUIRED)
|
||||
|
||||
set (OTIO_IMATH_TARGETS
|
||||
# For OpenEXR/Imath 3.x:
|
||||
diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt
|
||||
index 4b08e6d..e98828b 100644
|
||||
--- a/src/opentimelineio/CMakeLists.txt
|
||||
+++ b/src/opentimelineio/CMakeLists.txt
|
||||
@@ -80,9 +80,8 @@ add_library(OTIO::opentimelineio ALIAS opentimelineio)
|
||||
target_include_directories(opentimelineio
|
||||
PRIVATE "${IMATH_INCLUDES}"
|
||||
"${PROJECT_SOURCE_DIR}/src"
|
||||
- "${PROJECT_SOURCE_DIR}/src/deps"
|
||||
- "${PROJECT_SOURCE_DIR}/src/deps/rapidjson/include"
|
||||
- "${IMATH_INCLUDES}")
|
||||
+ "${IMATH_INCLUDES}"
|
||||
+ ${RapidJSON_INCLUDE_DIRS})
|
||||
|
||||
target_link_libraries(opentimelineio
|
||||
PUBLIC opentime ${OTIO_IMATH_TARGETS})
|
||||
--
|
||||
2.48.1
|
||||
|
||||
@@ -1,19 +1,19 @@
|
||||
From c03dae99da5e4256561f014d6b4be32c8258efd8 Mon Sep 17 00:00:00 2001
|
||||
From 6b4edf8f770982c0fb147fd79322d8967f0795b0 Mon Sep 17 00:00:00 2001
|
||||
From: Christophe Marin <christophe@krop.fr>
|
||||
Date: Fri, 7 Mar 2025 10:58:24 +0100
|
||||
Subject: [PATCH] CMake fixes
|
||||
Subject: [PATCH 2/2] CMake fixes
|
||||
|
||||
---
|
||||
CMakeLists.txt | 7 +++----
|
||||
src/opentime/CMakeLists.txt | 6 +++---
|
||||
src/opentimelineio/CMakeLists.txt | 6 +++---
|
||||
3 files changed, 9 insertions(+), 10 deletions(-)
|
||||
CMakeLists.txt | 4 +++-
|
||||
src/opentime/CMakeLists.txt | 8 +++++---
|
||||
src/opentimelineio/CMakeLists.txt | 8 +++++---
|
||||
3 files changed, 13 insertions(+), 7 deletions(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 69a7b4d..babc6c5 100644
|
||||
index 0a4d0ce..36f6e27 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -20,6 +20,8 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.15" CACHE STRING "Minimum OS X deployment ve
|
||||
@@ -20,6 +20,8 @@ set(CMAKE_OSX_DEPLOYMENT_TARGET "10.14" CACHE STRING "Minimum OS X deployment ve
|
||||
|
||||
project(OpenTimelineIO VERSION ${OTIO_VERSION} LANGUAGES C CXX)
|
||||
|
||||
@@ -22,7 +22,7 @@ index 69a7b4d..babc6c5 100644
|
||||
#------------------------------------------------------------------------------
|
||||
# Options
|
||||
# Add all options and settings here for all subprojects to aid in project
|
||||
@@ -106,7 +108,7 @@ if(OTIO_PYTHON_INSTALL)
|
||||
@@ -100,7 +102,7 @@ if(OTIO_PYTHON_INSTALL)
|
||||
endif()
|
||||
|
||||
else()
|
||||
@@ -31,21 +31,20 @@ index 69a7b4d..babc6c5 100644
|
||||
message(STATUS "OTIO C++ installing to ${CMAKE_INSTALL_PREFIX}")
|
||||
endif()
|
||||
|
||||
@@ -263,9 +265,6 @@ else()
|
||||
message(STATUS "Using src/deps/rapidjson by default")
|
||||
endif()
|
||||
|
||||
-# set up the internally hosted dependencies
|
||||
-add_subdirectory(src/deps)
|
||||
-
|
||||
add_subdirectory(src/opentime)
|
||||
add_subdirectory(src/opentimelineio)
|
||||
|
||||
diff --git a/src/opentime/CMakeLists.txt b/src/opentime/CMakeLists.txt
|
||||
index 9133e4e..341bead 100644
|
||||
index b7cc47c..6ad040f 100644
|
||||
--- a/src/opentime/CMakeLists.txt
|
||||
+++ b/src/opentime/CMakeLists.txt
|
||||
@@ -73,7 +73,7 @@ if(OTIO_CXX_INSTALL)
|
||||
@@ -19,6 +19,8 @@ add_library(OTIO::opentime ALIAS opentime)
|
||||
target_include_directories(opentime PRIVATE "${PROJECT_SOURCE_DIR}/src")
|
||||
|
||||
set_target_properties(opentime PROPERTIES
|
||||
+ VERSION ${OTIO_VERSION}
|
||||
+ SOVERSION 0
|
||||
DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"
|
||||
LIBRARY_OUTPUT_NAME "opentime"
|
||||
POSITION_INDEPENDENT_CODE TRUE
|
||||
@@ -49,7 +51,7 @@ if(OTIO_CXX_INSTALL)
|
||||
RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
|
||||
|
||||
install(EXPORT OpenTimeTargets
|
||||
@@ -54,7 +53,7 @@ index 9133e4e..341bead 100644
|
||||
NAMESPACE OTIO:: )
|
||||
|
||||
include(CMakePackageConfigHelpers)
|
||||
@@ -81,7 +81,7 @@ if(OTIO_CXX_INSTALL)
|
||||
@@ -57,7 +59,7 @@ if(OTIO_CXX_INSTALL)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/OpenTimeConfig.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/OpenTimeConfig.cmake
|
||||
INSTALL_DESTINATION
|
||||
@@ -63,20 +62,29 @@ index 9133e4e..341bead 100644
|
||||
NO_SET_AND_CHECK_MACRO
|
||||
NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
||||
)
|
||||
@@ -90,7 +90,7 @@ if(OTIO_CXX_INSTALL)
|
||||
@@ -66,7 +68,7 @@ if(OTIO_CXX_INSTALL)
|
||||
FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/OpenTimeConfig.cmake
|
||||
DESTINATION
|
||||
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime
|
||||
+ ${CMAKE_INSTALL_LIBDIR}/cmake/opentime
|
||||
)
|
||||
endif()
|
||||
|
||||
install(
|
||||
diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt
|
||||
index 2ca319b..3644cc4 100644
|
||||
index e98828b..22828a6 100644
|
||||
--- a/src/opentimelineio/CMakeLists.txt
|
||||
+++ b/src/opentimelineio/CMakeLists.txt
|
||||
@@ -151,7 +151,7 @@ if(OTIO_CXX_INSTALL)
|
||||
@@ -87,6 +87,8 @@ target_link_libraries(opentimelineio
|
||||
PUBLIC opentime ${OTIO_IMATH_TARGETS})
|
||||
|
||||
set_target_properties(opentimelineio PROPERTIES
|
||||
+ VERSION ${OTIO_VERSION}
|
||||
+ SOVERSION 0
|
||||
DEBUG_POSTFIX "${OTIO_DEBUG_POSTFIX}"
|
||||
LIBRARY_OUTPUT_NAME "opentimelineio"
|
||||
POSITION_INDEPENDENT_CODE TRUE
|
||||
@@ -123,7 +125,7 @@ if(OTIO_CXX_INSTALL)
|
||||
RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
|
||||
|
||||
install(EXPORT OpenTimelineIOTargets
|
||||
@@ -85,7 +93,7 @@ index 2ca319b..3644cc4 100644
|
||||
NAMESPACE OTIO:: )
|
||||
|
||||
include(CMakePackageConfigHelpers)
|
||||
@@ -159,7 +159,7 @@ if(OTIO_CXX_INSTALL)
|
||||
@@ -131,7 +133,7 @@ if(OTIO_CXX_INSTALL)
|
||||
${CMAKE_CURRENT_SOURCE_DIR}/OpenTimelineIOConfig.cmake.in
|
||||
${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIOConfig.cmake
|
||||
INSTALL_DESTINATION
|
||||
@@ -94,15 +102,14 @@ index 2ca319b..3644cc4 100644
|
||||
NO_SET_AND_CHECK_MACRO
|
||||
NO_CHECK_REQUIRED_COMPONENTS_MACRO
|
||||
)
|
||||
@@ -168,7 +168,7 @@ if(OTIO_CXX_INSTALL)
|
||||
@@ -140,6 +142,6 @@ if(OTIO_CXX_INSTALL)
|
||||
FILES
|
||||
${CMAKE_CURRENT_BINARY_DIR}/OpenTimelineIOConfig.cmake
|
||||
DESTINATION
|
||||
- ${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio
|
||||
+ ${CMAKE_INSTALL_LIBDIR}/cmake/opentimelineio
|
||||
)
|
||||
|
||||
install(
|
||||
endif()
|
||||
--
|
||||
2.51.1
|
||||
2.48.1
|
||||
|
||||
|
||||
3
opentimelineio-0.17.0.tar.gz
Normal file
3
opentimelineio-0.17.0.tar.gz
Normal file
@@ -0,0 +1,3 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:cdf8281c6091a18a4147295b660e13b610a6d58919a79608bf03e5359c1c2d24
|
||||
size 2340862
|
||||
@@ -1,3 +0,0 @@
|
||||
version https://git-lfs.github.com/spec/v1
|
||||
oid sha256:746854490ee1d6bfb3071027afac8cdb5c477140011be2473d26e9b724cc6283
|
||||
size 1622822
|
||||
@@ -1,23 +1,3 @@
|
||||
-------------------------------------------------------------------
|
||||
Thu Nov 6 23:52:10 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Update to 0.18.0
|
||||
* Add enabled flag to Effect schema
|
||||
* Drop Imath 2 support
|
||||
* Added a Color primitive structure for assigning colors to
|
||||
elements (this is not meant to represent pixel colors)
|
||||
* Per-Track and Per-Clip Color
|
||||
* Added --remove-effects feature to otiotool
|
||||
* Remove OTIOView from the core library
|
||||
- Drop patches:
|
||||
* 0001-Use-system-rapidjson.patch
|
||||
* 0001-Drop-Imath2-support-and-modernize-Imath-includes.patch
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Fri Oct 10 22:07:53 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
- Make sure OTIO is rebuilt after an imath update
|
||||
|
||||
-------------------------------------------------------------------
|
||||
Sat Mar 29 10:15:22 UTC 2025 - Christophe Marin <christophe@krop.fr>
|
||||
|
||||
|
||||
@@ -17,14 +17,17 @@
|
||||
|
||||
|
||||
Name: opentimelineio
|
||||
Version: 0.18.0
|
||||
Version: 0.17.0
|
||||
Release: 0
|
||||
Summary: API and interchange format for editorial timeline information
|
||||
License: Apache-2.0
|
||||
URL: https://github.com/AcademySoftwareFoundation/OpenTimelineIO
|
||||
Source: https://github.com/AcademySoftwareFoundation/OpenTimelineIO/archive/refs/tags/v%{version}.tar.gz#/%{name}-%{version}.tar.gz
|
||||
Source: https://github.com/AcademySoftwareFoundation/OpenTimelineIO/archive/refs/tags/v0.17.0.tar.gz#/%{name}-%{version}.tar.gz
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch0: 0002-CMake-fixes.patch
|
||||
Patch0: 0001-Use-system-rapidjson.patch
|
||||
Patch1: 0002-CMake-fixes.patch
|
||||
# PATCH-FIX-UPSTREAM
|
||||
Patch2: 0001-Drop-Imath2-support-and-modernize-Imath-includes.patch
|
||||
BuildRequires: cmake
|
||||
%if 0%{?suse_version} == 1500
|
||||
BuildRequires: gcc13-PIE
|
||||
@@ -41,19 +44,18 @@ OpenTimelineIO is an interchange format and API for editorial cut information.
|
||||
OTIO contains information about the order and length of cuts and references to
|
||||
external media. It is not however, a container format for media.
|
||||
|
||||
%package -n libopentimelineio18
|
||||
%package -n libopentimelineio0
|
||||
Summary: API and interchange format for editorial timeline information
|
||||
|
||||
%description -n libopentimelineio18
|
||||
%description -n libopentimelineio0
|
||||
OpenTimelineIO is an interchange format and API for editorial cut information.
|
||||
OTIO contains information about the order and length of cuts and references to
|
||||
external media. It is not however, a container format for media.
|
||||
|
||||
%package devel
|
||||
Summary: Development files for opentimelineio
|
||||
Requires: libopentimelineio18 = %{version}
|
||||
# opentimelineio doesn't link to imath and will break if the soname changes
|
||||
%requires_eq Imath-devel
|
||||
Requires: libopentimelineio0 = %{version}
|
||||
Requires: pkgconfig(Imath)
|
||||
|
||||
%description devel
|
||||
Development files for opentimelineio.
|
||||
@@ -67,10 +69,7 @@ rm -r src/deps
|
||||
export CXX=g++-13
|
||||
%endif
|
||||
|
||||
%cmake \
|
||||
-DOTIO_FIND_IMATH:BOOL=TRUE \
|
||||
-DOTIO_FIND_RAPIDJSON:BOOL=TRUE \
|
||||
-DOTIO_DEPENDENCIES_INSTALL:BOOL=FALSE
|
||||
%cmake -DOTIO_FIND_IMATH:BOOL=TRUE
|
||||
|
||||
%cmake_build
|
||||
|
||||
@@ -80,9 +79,9 @@ export CXX=g++-13
|
||||
%check
|
||||
%ctest
|
||||
|
||||
%ldconfig_scriptlets -n libopentimelineio18
|
||||
%ldconfig_scriptlets -n libopentimelineio0
|
||||
|
||||
%files -n libopentimelineio18
|
||||
%files -n libopentimelineio0
|
||||
%license LICENSE.txt
|
||||
%doc README.md
|
||||
%{_libdir}/libopentime.so.*
|
||||
|
||||
Reference in New Issue
Block a user