haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-03-19 01:46:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

opentimelineio, revbump, fixes install paths for 32bit (#12217)

Browse Source
This commit is contained in:
Schrijvers Luc
2025-04-20 16:34:31 +02:00
committed by GitHub
parent cd92f03b94
commit 95dff93396
2 changed files with 19 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
media-libs/opentimelineio/opentimelineio-0.17.0.recipe
View File

@@ -15,7 +15,7 @@ read and write legacy formats into the OTIO data model."
HOMEPAGE="https://github.com/AcademySoftwareFoundation/OpenTimelineIO"
COPYRIGHT="2016-2024 Contributors to the OpenTimelineIO project."
LICENSE="Apache v2"
REVISION="1"
REVISION="2"
SOURCE_URI="https://github.com/AcademySoftwareFoundation/OpenTimelineIO/archive/refs/tags/v$portVersion.tar.gz"
CHECKSUM_SHA256="cdf8281c6091a18a4147295b660e13b610a6d58919a79608bf03e5359c1c2d24"
SOURCE_FILENAME="OpenTimelineIO-v$portVersion.tar.gz"

27
media-libs/opentimelineio/patches/opentimelineio-0.17.0.patchset
View File

@@ -1,11 +1,11 @@
From 2cff834f77f6ceacf0055ebd2372a8ea52817681 Mon Sep 17 00:00:00 2001
From 5df1788b195a10c04e59da4ac32d02165cc727bc Mon Sep 17 00:00:00 2001
From: Luc Schrijvers <begasus@gmail.com>
Date: Sun, 20 Apr 2025 09:40:21 +0200
Subject: Use common install paths
diff --git a/src/opentime/CMakeLists.txt b/src/opentime/CMakeLists.txt
index b7cc47c..04a88a1 100644
index b7cc47c..c0f188c 100644
--- a/src/opentime/CMakeLists.txt
+++ b/src/opentime/CMakeLists.txt
@@ -39,17 +39,17 @@ target_compile_options(opentime PRIVATE
@@ -18,10 +18,13 @@ index b7cc47c..04a88a1 100644
install(TARGETS opentime
EXPORT OpenTimeTargets
- INCLUDES DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/include"
- ARCHIVE DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
- LIBRARY DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
- RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
+ INCLUDES DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}"
ARCHIVE DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
LIBRARY DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(EXPORT OpenTimeTargets
- DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentime"
@@ -48,10 +51,10 @@ index b7cc47c..04a88a1 100644
endif()
diff --git a/src/opentimelineio/CMakeLists.txt b/src/opentimelineio/CMakeLists.txt
index 4b08e6d..1cd5068 100644
index 4b08e6d..a7ac842 100644
--- a/src/opentimelineio/CMakeLists.txt
+++ b/src/opentimelineio/CMakeLists.txt
@@ -109,11 +109,11 @@ target_compile_options(opentimelineio PRIVATE
@@ -109,22 +109,22 @@ target_compile_options(opentimelineio PRIVATE
if(OTIO_CXX_INSTALL)
install(FILES ${OPENTIMELINEIO_HEADER_FILES}
@@ -66,8 +69,14 @@ index 4b08e6d..1cd5068 100644
endif()
install(TARGETS opentimelineio
@@ -124,7 +124,7 @@ if(OTIO_CXX_INSTALL)
RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
EXPORT OpenTimelineIOTargets
INCLUDES DESTINATION "${OPENTIMELINEIO_INCLUDES}"
- ARCHIVE DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
- LIBRARY DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}"
- RUNTIME DESTINATION "${OTIO_RESOLVED_CXX_DYLIB_INSTALL_DIR}")
+ ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
+ RUNTIME DESTINATION "${CMAKE_INSTALL_LIBDIR}")
install(EXPORT OpenTimelineIOTargets
- DESTINATION "${OTIO_RESOLVED_CXX_INSTALL_DIR}/share/opentimelineio"