Date: Monday, September 26, 2022 @ 21:07:50 Author: arojas Revision: 1311543
upgpkg: opentimelineio 0.15-1: Update to 0.15 Modified: opentimelineio/trunk/PKGBUILD Deleted: opentimelineio/trunk/opentimelineio-c++17.patch ----------------------------+ PKGBUILD | 36 ++++++++++----------- opentimelineio-c++17.patch | 72 ------------------------------------------- 2 files changed, 17 insertions(+), 91 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2022-09-26 20:52:19 UTC (rev 1311542) +++ PKGBUILD 2022-09-26 21:07:50 UTC (rev 1311543) @@ -1,36 +1,34 @@ # Maintainer: Antonio Rojas <[email protected]> pkgname=opentimelineio -pkgver=0.14.1 -pkgrel=2 +pkgver=0.15 +pkgrel=1 pkgdesc='Open Source API and interchange format for editorial timeline information' url='http://opentimeline.io/' license=(Apache) arch=(x86_64) depends=(python-aaf2) -makedepends=(cmake python-pip pybind11 git) -source=(https://github.com/PixarAnimationStudios/OpenTimelineIO/archive/v$pkgver/$pkgname-$pkgver.tar.gz - git+https://github.com/Tencent/rapidjson#commit=66eb606 - opentimelineio-c++17.patch) -sha256sums=('04c0a5c2f0639a0a1e9745d40cdb9e86f966c85f19880e8ca614699175a93554' - 'SKIP' - '36650ae9ab93af5ea9006e3e074a5f33106378dc353ec18345615c1c5f5c0fdc') +makedepends=(cmake python-setuptools pybind11 git imath) +source=(git+https://github.com/PixarAnimationStudios/OpenTimelineIO#tag=v$pkgver) +sha256sums=('SKIP') prepare() { - mv rapidjson OpenTimelineIO-$pkgver/src/deps - sed -e '/deps/d' -i OpenTimelineIO-$pkgver/CMakeLists.txt # Unbundle pybind11 - sed -e '1 i\find_package(pybind11)' -i OpenTimelineIO-$pkgver/src/py-opentimelineio/opentime-bindings/CMakeLists.txt \ - -i OpenTimelineIO-$pkgver/src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt - - patch -d OpenTimelineIO-$pkgver -p1 < opentimelineio-c++17.patch # Use native C++17 types + cd OpenTimelineIO + git submodule update --init + sed -e '/deps/d' -i CMakeLists.txt # Unbundle pybind11 + sed -e '1 i\find_package(pybind11)' -i src/py-opentimelineio/opentime-bindings/CMakeLists.txt \ + -i src/py-opentimelineio/opentimelineio-bindings/CMakeLists.txt } build() { - cmake -B build -S OpenTimelineIO-$pkgver \ - -DCMAKE_INSTALL_PREFIX=/usr + cmake -B build -S OpenTimelineIO \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DOTIO_FIND_IMATH=ON cmake --build build - cd OpenTimelineIO-$pkgver +# Workaround messy build system + export CXXFLAGS+=" -I/usr/include/Imath" + cd OpenTimelineIO python setup.py build } @@ -37,7 +35,7 @@ package() { DESTDIR="$pkgdir" cmake --install build - cd OpenTimelineIO-$pkgver + cd OpenTimelineIO DESTDIR="$pkgdir" python setup.py install --root="$pkgdir" --optimize=1 rm -fr "$pkgdir"/build } Deleted: opentimelineio-c++17.patch =================================================================== --- opentimelineio-c++17.patch 2022-09-26 20:52:19 UTC (rev 1311542) +++ opentimelineio-c++17.patch 2022-09-26 21:07:50 UTC (rev 1311543) @@ -1,72 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 2d95957..0ab6986 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -148,7 +148,7 @@ endif() - # Global language settings - - if (NOT CMAKE_CXX_STANDARD) -- set(CMAKE_CXX_STANDARD 14) -+ set(CMAKE_CXX_STANDARD 17) - endif() - - set(CMAKE_CXX_STANDARD_REQUIRED ON) -diff --git a/src/opentimelineio/any.h b/src/opentimelineio/any.h -index 2939bae..b104f78 100644 ---- a/src/opentimelineio/any.h -+++ b/src/opentimelineio/any.h -@@ -1,11 +1,11 @@ - #pragma once - --#include "any/any.hpp" -+#include <any> - #include "opentimelineio/version.h" - - namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { - --using linb::any; --using linb::any_cast; -+using std::any; -+using std::any_cast; - - }} // namespace opentimelineio::OPENTIMELINEIO_VERSION -diff --git a/src/opentimelineio/optional.h b/src/opentimelineio/optional.h -index ee74693..b3e3b24 100644 ---- a/src/opentimelineio/optional.h -+++ b/src/opentimelineio/optional.h -@@ -1,12 +1,12 @@ - #pragma once - --#include "nonstd/optional.hpp" -+#include <optional> - #include "opentimelineio/version.h" - - namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { - --using nonstd::nullopt; --using nonstd::nullopt_t; --using nonstd::optional; -+using std::nullopt; -+using std::nullopt_t; -+using std::optional; - - }} // namespace opentimelineio::OPENTIMELINEIO_VERSION -diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h -index f4bbdf3..1d55983 100644 ---- a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h -+++ b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h -@@ -14,14 +14,6 @@ using namespace opentimelineio::OPENTIMELINEIO_VERSION; - - void install_external_keepalive_monitor(SerializableObject* so, bool apply_now); - --namespace pybind11 { namespace detail { -- template<typename T> struct type_caster<optional<T>> -- : public optional_caster<optional<T>> {}; -- -- template<> struct type_caster<nullopt_t> -- : public void_caster<nullopt_t> {}; --}} -- - template <typename T> - struct managing_ptr { - managing_ptr(T* ptr)
