[arch-commits] Commit in opentimelineio/repos/community-x86_64 (4 files)
Antonio Rojas
arojas at gemini.archlinux.org
Wed Oct 27 19:52:43 UTC 2021
Date: Wednesday, October 27, 2021 @ 19:52:42
Author: arojas
Revision: 1034777
archrelease: copy trunk to community-x86_64
Added:
opentimelineio/repos/community-x86_64/PKGBUILD
(from rev 1034776, opentimelineio/trunk/PKGBUILD)
opentimelineio/repos/community-x86_64/opentimelineio-c++17.patch
(from rev 1034776, opentimelineio/trunk/opentimelineio-c++17.patch)
Deleted:
opentimelineio/repos/community-x86_64/PKGBUILD
opentimelineio/repos/community-x86_64/opentimelineio-c++17.patch
----------------------------+
PKGBUILD | 88 +++++++++++-------------
opentimelineio-c++17.patch | 156 +++++++++++++++++++------------------------
2 files changed, 115 insertions(+), 129 deletions(-)
Deleted: PKGBUILD
===================================================================
--- PKGBUILD 2021-10-27 19:52:30 UTC (rev 1034776)
+++ PKGBUILD 2021-10-27 19:52:42 UTC (rev 1034777)
@@ -1,45 +0,0 @@
-# Maintainer: Antonio Rojas <arojas at archlinux.org>
-
-pkgname=opentimelineio
-pkgver=0.13
-pkgrel=4
-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=('33a63891b4656804242512e122b33ed12e35d4038fd78610ccb82b441b9506dd'
- 'SKIP'
- '927675021a15d0fde97697e1b7a7312e0ee64f628cb5a09716edf972870d0cbc')
-
-prepare() {
- mv rapidjson OpenTimelineIO-$pkgver/src/deps
- sed -e '/deps/d' -i OpenTimelineIO-$pkgver/src/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
-}
-
-build() {
- cmake -B build -S OpenTimelineIO-$pkgver \
- -DCMAKE_INSTALL_PREFIX=/usr
- cmake --build build
-
- cd OpenTimelineIO-$pkgver
- python setup.py build
-}
-
-package() {
- DESTDIR="$pkgdir" cmake --install build
-
- 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
-}
Copied: opentimelineio/repos/community-x86_64/PKGBUILD (from rev 1034776, opentimelineio/trunk/PKGBUILD)
===================================================================
--- PKGBUILD (rev 0)
+++ PKGBUILD 2021-10-27 19:52:42 UTC (rev 1034777)
@@ -0,0 +1,43 @@
+# Maintainer: Antonio Rojas <arojas at archlinux.org>
+
+pkgname=opentimelineio
+pkgver=0.14
+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=('6365c6365b6c3d34abd3f653391f67588f324a46ccb3da4c31ec78c56de84d85'
+ 'SKIP'
+ '36650ae9ab93af5ea9006e3e074a5f33106378dc353ec18345615c1c5f5c0fdc')
+
+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
+}
+
+build() {
+ cmake -B build -S OpenTimelineIO-$pkgver \
+ -DCMAKE_INSTALL_PREFIX=/usr
+ cmake --build build
+
+ cd OpenTimelineIO-$pkgver
+ python setup.py build
+}
+
+package() {
+ DESTDIR="$pkgdir" cmake --install build
+
+ cd OpenTimelineIO-$pkgver
+ DESTDIR="$pkgdir" python setup.py install --root="$pkgdir" --optimize=1
+ rm -fr "$pkgdir"/build
+}
Deleted: opentimelineio-c++17.patch
===================================================================
--- opentimelineio-c++17.patch 2021-10-27 19:52:30 UTC (rev 1034776)
+++ opentimelineio-c++17.patch 2021-10-27 19:52:42 UTC (rev 1034777)
@@ -1,84 +0,0 @@
-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)
-
--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")
- endif()
-
- # make sure that git submodules are up to date when building
-diff --git a/src/opentimelineio/any.h b/src/opentimelineio/any.h
-index 2250eb1..b8c2634 100644
---- a/src/opentimelineio/any.h
-+++ b/src/opentimelineio/any.h
-@@ -1,12 +1,12 @@
- #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;
-
- } }
-
-diff --git a/src/opentimelineio/optional.h b/src/opentimelineio/optional.h
-index 7b6f110..288aea0 100644
---- a/src/opentimelineio/optional.h
-+++ b/src/opentimelineio/optional.h
-@@ -1,13 +1,13 @@
- #pragma once
-
--#include "nonstd/optional.hpp"
-+#include <optional>
- #include "opentimelineio/version.h"
-
- namespace opentimelineio { namespace OPENTIMELINEIO_VERSION {
-
--using nonstd::optional;
--using nonstd::nullopt;
--using nonstd::nullopt_t;
-+using std::optional;
-+using std::nullopt;
-+using std::nullopt_t;
-
- } }
-
-diff --git a/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h b/src/py-opentimelineio/opentimelineio-bindings/otio_utils.h
-index d647160..12bf3bc 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)
Copied: opentimelineio/repos/community-x86_64/opentimelineio-c++17.patch (from rev 1034776, opentimelineio/trunk/opentimelineio-c++17.patch)
===================================================================
--- opentimelineio-c++17.patch (rev 0)
+++ opentimelineio-c++17.patch 2021-10-27 19:52:42 UTC (rev 1034777)
@@ -0,0 +1,72 @@
+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)
More information about the arch-commits
mailing list