Date: Wednesday, October 27, 2021 @ 19:52:30 Author: arojas Revision: 1034776
Update to 0.14.0 Modified: opentimelineio/trunk/PKGBUILD opentimelineio/trunk/opentimelineio-c++17.patch ----------------------------+ PKGBUILD | 12 +++------ opentimelineio-c++17.patch | 56 ++++++++++++++++--------------------------- 2 files changed, 27 insertions(+), 41 deletions(-) Modified: PKGBUILD =================================================================== --- PKGBUILD 2021-10-27 19:51:29 UTC (rev 1034775) +++ PKGBUILD 2021-10-27 19:52:30 UTC (rev 1034776) @@ -1,8 +1,8 @@ # Maintainer: Antonio Rojas <aro...@archlinux.org> pkgname=opentimelineio -pkgver=0.13 -pkgrel=4 +pkgver=0.14 +pkgrel=1 pkgdesc='Open Source API and interchange format for editorial timeline information' url='http://opentimeline.io/' license=(Apache) @@ -12,13 +12,13 @@ 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=('33a63891b4656804242512e122b33ed12e35d4038fd78610ccb82b441b9506dd' +sha256sums=('6365c6365b6c3d34abd3f653391f67588f324a46ccb3da4c31ec78c56de84d85' 'SKIP' - '927675021a15d0fde97697e1b7a7312e0ee64f628cb5a09716edf972870d0cbc') + '36650ae9ab93af5ea9006e3e074a5f33106378dc353ec18345615c1c5f5c0fdc') prepare() { mv rapidjson OpenTimelineIO-$pkgver/src/deps - sed -e '/deps/d' -i OpenTimelineIO-$pkgver/src/CMakeLists.txt # Unbundle pybind11 + 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 @@ -39,7 +39,5 @@ cd OpenTimelineIO-$pkgver DESTDIR="$pkgdir" python setup.py install --root="$pkgdir" --optimize=1 - - mv "$pkgdir"/build/opentimelineio/src/*/*/*/opentimelineio/* "$pkgdir"/usr/lib/python*/site-packages/opentimelineio rm -fr "$pkgdir"/build } Modified: opentimelineio-c++17.patch =================================================================== --- opentimelineio-c++17.patch 2021-10-27 19:51:29 UTC (rev 1034775) +++ opentimelineio-c++17.patch 2021-10-27 19:52:30 UTC (rev 1034776) @@ -1,31 +1,21 @@ -diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt -index 3325465..5a7f495 100644 ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -1,6 +1,6 @@ - cmake_minimum_required(VERSION 3.9.4) +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 --set(CMAKE_CXX_STANDARD 11) -+set(CMAKE_CXX_STANDARD 17) - set(CMAKE_CXX_STANDARD_REQUIRED ON) - set(CMAKE_CXX_EXTENSIONS OFF) - -@@ -8,8 +8,8 @@ if(MSVC) - set(PYBIND11_CPP_STANDARD /std:c++14) - set(CMAKE_CXX_FLAGS "/W4 /EHsc") - else() -- set(PYBIND11_CPP_STANDARD -std=c++11) -- set(CMAKE_CXX_FLAGS "-std=c++11 -Wall -Wno-deprecated-register") -+ set(PYBIND11_CPP_STANDARD -std=c++17) -+ set(CMAKE_CXX_FLAGS "-std=c++17 -Wall -Wno-deprecated-register") + if (NOT CMAKE_CXX_STANDARD) +- set(CMAKE_CXX_STANDARD 14) ++ set(CMAKE_CXX_STANDARD 17) endif() - # make sure that git submodules are up to date when building + set(CMAKE_CXX_STANDARD_REQUIRED ON) diff --git a/src/opentimelineio/any.h b/src/opentimelineio/any.h -index 2250eb1..b8c2634 100644 +index 2939bae..b104f78 100644 --- a/src/opentimelineio/any.h +++ b/src/opentimelineio/any.h -@@ -1,12 +1,12 @@ +@@ -1,11 +1,11 @@ #pragma once -#include "any/any.hpp" @@ -32,20 +22,19 @@ +#include <any> #include "opentimelineio/version.h" - namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { + 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 7b6f110..288aea0 100644 +index ee74693..b3e3b24 100644 --- a/src/opentimelineio/optional.h +++ b/src/opentimelineio/optional.h -@@ -1,13 +1,13 @@ +@@ -1,12 +1,12 @@ #pragma once -#include "nonstd/optional.hpp" @@ -52,19 +41,18 @@ +#include <optional> #include "opentimelineio/version.h" - namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { - --using nonstd::optional; + namespace opentimelineio { namespace OPENTIMELINEIO_VERSION { + -using nonstd::nullopt; -using nonstd::nullopt_t; -+using std::optional; +-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 d647160..12bf3bc 100644 +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;