[arch-commits] Commit in opencolorio/repos/community-x86_64 (4 files)

Sven-Hendrik Haase svenstaro at archlinux.org
Sat May 15 14:52:07 UTC 2021


    Date: Saturday, May 15, 2021 @ 14:52:07
  Author: svenstaro
Revision: 934676

archrelease: copy trunk to community-x86_64

Added:
  opencolorio/repos/community-x86_64/PKGBUILD
    (from rev 934675, opencolorio/trunk/PKGBUILD)
  opencolorio/repos/community-x86_64/opencolorio-openexr3.patch
    (from rev 934675, opencolorio/trunk/opencolorio-openexr3.patch)
Deleted:
  opencolorio/repos/community-x86_64/PKGBUILD
  opencolorio/repos/community-x86_64/opencolorio-openexr3.patch

----------------------------+
 PKGBUILD                   |   82 ++++-----
 opencolorio-openexr3.patch |  364 +++++++++++++++++++++----------------------
 2 files changed, 223 insertions(+), 223 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2021-05-15 14:52:00 UTC (rev 934675)
+++ PKGBUILD	2021-05-15 14:52:07 UTC (rev 934676)
@@ -1,41 +0,0 @@
-# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
-# Contributor: Dumitru Ursu <dima at ceata.org>
-
-pkgname=opencolorio
-pkgver=2.0.0
-pkgrel=3
-pkgdesc="A color management framework for visual effects and animation"
-arch=('x86_64')
-url="https://opencolorio.org"
-license=('BSD')
-depends=('freeglut' 'glew' 'lcms2' 'tinyxml' 'yaml-cpp' 'imath' 'pystring')
-makedepends=('boost' 'cmake' 'python' 'pybind11' 'ninja')
-optdepends=('python: python bindings')
-source=($pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$pkgver.tar.gz
-        opencolorio-openexr3.patch)
-sha512sums=('7110a1a30a5fa64b81d7fc5e33234673aaddbad5e19ce7f21436c590edd7d2ce767650c9a934011a96e53132c030bd0b654fcf93ad79c1bfc8c050762c57f6d0'
-            '269a86e4020d272b64af631ba01f9b1e644bde119e9bfb1d5ec3fd62579d5d3f7ab31295fb6cffc51d7349c469e2ca6e12f69310317266eda602541e9fcff94f')
-
-prepare() {
-  patch -d OpenColorIO-$pkgver -p1 < opencolorio-openexr3.patch
-}
-
-build() {
-  cd OpenColorIO-$pkgver
-
-  cmake \
-    -GNinja \
-    -Bbuild \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib
-  ninja -C build
-}
-
-package() {
-  cd OpenColorIO-$pkgver
-
-  DESTDIR="$pkgdir" ninja -C build install
-  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-}
-
-# vim:set ts=2 sw=2 et:

Copied: opencolorio/repos/community-x86_64/PKGBUILD (from rev 934675, opencolorio/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2021-05-15 14:52:07 UTC (rev 934676)
@@ -0,0 +1,41 @@
+# Maintainer: Sven-Hendrik Haase <svenstaro at gmail.com>
+# Contributor: Dumitru Ursu <dima at ceata.org>
+
+pkgname=opencolorio
+pkgver=2.0.1
+pkgrel=1
+pkgdesc="A color management framework for visual effects and animation"
+arch=('x86_64')
+url="https://opencolorio.org"
+license=('BSD')
+depends=('freeglut' 'glew' 'lcms2' 'tinyxml' 'yaml-cpp' 'imath' 'pystring')
+makedepends=('cmake' 'python' 'pybind11' 'ninja')
+optdepends=('python: python bindings')
+source=($pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$pkgver.tar.gz
+        opencolorio-openexr3.patch)
+sha512sums=('5787cc4cadb0a1832c925712ca0dfef6e843082b9461460e1798326c6fceaa97bee78e5298651e6a8a3662b348eab5ab9791e94c3efcac337da07229fb559338'
+            '269a86e4020d272b64af631ba01f9b1e644bde119e9bfb1d5ec3fd62579d5d3f7ab31295fb6cffc51d7349c469e2ca6e12f69310317266eda602541e9fcff94f')
+
+prepare() {
+  patch -d OpenColorIO-$pkgver -p1 < opencolorio-openexr3.patch
+}
+
+build() {
+  cd OpenColorIO-$pkgver
+
+  cmake \
+    -GNinja \
+    -Bbuild \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=lib
+  ninja -C build
+}
+
+package() {
+  cd OpenColorIO-$pkgver
+
+  DESTDIR="$pkgdir" ninja -C build install
+  install -Dm644 LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+}
+
+# vim:set ts=2 sw=2 et:

Deleted: opencolorio-openexr3.patch
===================================================================
--- opencolorio-openexr3.patch	2021-05-15 14:52:00 UTC (rev 934675)
+++ opencolorio-openexr3.patch	2021-05-15 14:52:07 UTC (rev 934676)
@@ -1,182 +0,0 @@
-diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
-index c98e0af3..5f685935 100644
---- a/share/cmake/modules/FindExtPackages.cmake
-+++ b/share/cmake/modules/FindExtPackages.cmake
-@@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED)
- 
- # Half (OpenEXR/IlmBase)
- # https://github.com/openexr/openexr
--find_package(Half 2.4.0 REQUIRED)
-+find_package(Imath 3.0 REQUIRED)
- 
- # pystring
- # https://github.com/imageworks/pystring
-diff --git a/src/OpenColorIO/BitDepthUtils.h b/src/OpenColorIO/BitDepthUtils.h
-index a8b3cbd9..bb0163bf 100644
---- a/src/OpenColorIO/BitDepthUtils.h
-+++ b/src/OpenColorIO/BitDepthUtils.h
-@@ -7,7 +7,7 @@
- 
- #include <OpenColorIO/OpenColorIO.h>
- 
--#include "OpenEXR/half.h"
-+#include "Imath/half.h"
- 
- 
- namespace OCIO_NAMESPACE
-diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
-index 2ce801e6..824f8a98 100755
---- a/src/OpenColorIO/CMakeLists.txt
-+++ b/src/OpenColorIO/CMakeLists.txt
-@@ -207,7 +207,7 @@ target_link_libraries(OpenColorIO
- 		public_api
- 	PRIVATE
- 		expat::expat
--		IlmBase::Half
-+		Imath::Imath
- 		pystring::pystring
- 		sampleicc::sampleicc
- 		utils::strings
-diff --git a/src/OpenColorIO/MathUtils.h b/src/OpenColorIO/MathUtils.h
-index 309c6244..0873d490 100644
---- a/src/OpenColorIO/MathUtils.h
-+++ b/src/OpenColorIO/MathUtils.h
-@@ -9,7 +9,7 @@
- 
- #include <OpenColorIO/OpenColorIO.h>
- 
--#include "OpenEXR/half.h"
-+#include "Imath/half.h"
- 
- namespace OCIO_NAMESPACE
- {
-diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp
-index 9ec863e2..444dac75 100644
---- a/src/OpenColorIO/ops/range/RangeOp.cpp
-+++ b/src/OpenColorIO/ops/range/RangeOp.cpp
-@@ -7,7 +7,7 @@
- #include <OpenColorIO/OpenColorIO.h>
- 
- #include "GpuShaderUtils.h"
--#include "OpenEXR/half.h"
-+#include "Imath/half.h"
- #include "HashUtils.h"
- #include "MathUtils.h"
- #include "ops/lut1d/Lut1DOpData.h"
-diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp
-index 20968c0d..9ee2ac27 100644
---- a/src/OpenColorIO/transforms/builtins/ACES.cpp
-+++ b/src/OpenColorIO/transforms/builtins/ACES.cpp
-@@ -6,7 +6,7 @@
- 
- #include <OpenColorIO/OpenColorIO.h>
- 
--#include "OpenEXR/half.h"
-+#include "Imath/half.h"
- #include "ops/fixedfunction/FixedFunctionOp.h"
- #include "ops/gradingrgbcurve/GradingRGBCurveOp.h"
- #include "ops/log/LogOp.h"
-diff --git a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
-index 04b8fbd4..288ca566 100644
---- a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
-+++ b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
-@@ -4,7 +4,7 @@
- 
- #include <OpenColorIO/OpenColorIO.h>
- 
--#include "OpenEXR/half.h"
-+#include "Imath/half.h"
- #include "ops/lut1d/Lut1DOp.h"
- #include "transforms/builtins/OpHelpers.h"
- 
-diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt
-index 68a5db17..6fea394a 100755
---- a/src/apps/ocioconvert/CMakeLists.txt
-+++ b/src/apps/ocioconvert/CMakeLists.txt
-@@ -27,7 +27,7 @@ set_target_properties(ocioconvert PROPERTIES
- target_link_libraries(ocioconvert
-     PRIVATE
-         apputils
--        IlmBase::Half
-+        Imath::Imath
-         ${OCIO_GL_LIB}
-         oiiohelpers
-         OpenColorIO
-diff --git a/src/apps/ocioconvert/main.cpp b/src/apps/ocioconvert/main.cpp
-index b56d4999..7e8af7d0 100644
---- a/src/apps/ocioconvert/main.cpp
-+++ b/src/apps/ocioconvert/main.cpp
-@@ -24,7 +24,7 @@ namespace OIIO = OIIO_NAMESPACE;
- #endif // OCIO_GPU_ENABLED
- 
- #include "oiiohelpers.h"
--#include "OpenEXR/half.h"
-+#include "Imath/half.h"
- 
- 
- // Array of non OpenColorIO arguments.
-diff --git a/src/apps/ocioperf/CMakeLists.txt b/src/apps/ocioperf/CMakeLists.txt
-index 69e9ba4c..bcbe47be 100644
---- a/src/apps/ocioperf/CMakeLists.txt
-+++ b/src/apps/ocioperf/CMakeLists.txt
-@@ -20,7 +20,7 @@ set_target_properties(ocioperf PROPERTIES
- target_link_libraries(ocioperf
-     PRIVATE
-         apputils
--        IlmBase::Half
-+        Imath::Imath
-         oiiohelpers
-         OpenColorIO
-         OpenImageIO::OpenImageIO
-diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp
-index 6427860d..f6e4a63c 100644
---- a/src/apps/ocioperf/main.cpp
-+++ b/src/apps/ocioperf/main.cpp
-@@ -11,7 +11,7 @@ namespace OIIO = OIIO_NAMESPACE;
- #endif
- 
- #include "apputils/argparse.h"
--#include "OpenEXR/half.h"
-+#include "Imath/half.h"
- #include "oiiohelpers.h"
- #include "utils/StringUtils.h"
- 
-diff --git a/src/libutils/oiiohelpers/CMakeLists.txt b/src/libutils/oiiohelpers/CMakeLists.txt
-index 6ef7c368..5f4a5113 100644
---- a/src/libutils/oiiohelpers/CMakeLists.txt
-+++ b/src/libutils/oiiohelpers/CMakeLists.txt
-@@ -31,7 +31,7 @@ target_link_libraries(oiiohelpers
- 
-     PRIVATE
-         OpenColorIO
--        IlmBase::Half
-+        Imath::Imath
-         utils::strings
- )
- 
-diff --git a/src/libutils/oiiohelpers/oiiohelpers.cpp b/src/libutils/oiiohelpers/oiiohelpers.cpp
-index be1a937d..e7db652c 100644
---- a/src/libutils/oiiohelpers/oiiohelpers.cpp
-+++ b/src/libutils/oiiohelpers/oiiohelpers.cpp
-@@ -5,7 +5,7 @@
- #include <OpenColorIO/OpenColorIO.h>
- 
- 
--#include "OpenEXR/half.h"
-+#include "Imath/half.h"
- #include "oiiohelpers.h"
- #include "utils/StringUtils.h"
- 
-diff --git a/tests/cpu/CMakeLists.txt b/tests/cpu/CMakeLists.txt
-index 67389962..8e8dd900 100755
---- a/tests/cpu/CMakeLists.txt
-+++ b/tests/cpu/CMakeLists.txt
-@@ -18,7 +18,7 @@ function(add_ocio_test NAME SOURCES PRIVATE_INCLUDES)
-             public_api
-         PRIVATE
-             expat::expat
--            IlmBase::Half
-+            Imath::Imath
-             pystring::pystring
-             sampleicc::sampleicc
-             unittest_data

Copied: opencolorio/repos/community-x86_64/opencolorio-openexr3.patch (from rev 934675, opencolorio/trunk/opencolorio-openexr3.patch)
===================================================================
--- opencolorio-openexr3.patch	                        (rev 0)
+++ opencolorio-openexr3.patch	2021-05-15 14:52:07 UTC (rev 934676)
@@ -0,0 +1,182 @@
+diff --git a/share/cmake/modules/FindExtPackages.cmake b/share/cmake/modules/FindExtPackages.cmake
+index c98e0af3..5f685935 100644
+--- a/share/cmake/modules/FindExtPackages.cmake
++++ b/share/cmake/modules/FindExtPackages.cmake
+@@ -34,7 +34,7 @@ find_package(yaml-cpp 0.6.3 REQUIRED)
+ 
+ # Half (OpenEXR/IlmBase)
+ # https://github.com/openexr/openexr
+-find_package(Half 2.4.0 REQUIRED)
++find_package(Imath 3.0 REQUIRED)
+ 
+ # pystring
+ # https://github.com/imageworks/pystring
+diff --git a/src/OpenColorIO/BitDepthUtils.h b/src/OpenColorIO/BitDepthUtils.h
+index a8b3cbd9..bb0163bf 100644
+--- a/src/OpenColorIO/BitDepthUtils.h
++++ b/src/OpenColorIO/BitDepthUtils.h
+@@ -7,7 +7,7 @@
+ 
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ 
+ 
+ namespace OCIO_NAMESPACE
+diff --git a/src/OpenColorIO/CMakeLists.txt b/src/OpenColorIO/CMakeLists.txt
+index 2ce801e6..824f8a98 100755
+--- a/src/OpenColorIO/CMakeLists.txt
++++ b/src/OpenColorIO/CMakeLists.txt
+@@ -207,7 +207,7 @@ target_link_libraries(OpenColorIO
+ 		public_api
+ 	PRIVATE
+ 		expat::expat
+-		IlmBase::Half
++		Imath::Imath
+ 		pystring::pystring
+ 		sampleicc::sampleicc
+ 		utils::strings
+diff --git a/src/OpenColorIO/MathUtils.h b/src/OpenColorIO/MathUtils.h
+index 309c6244..0873d490 100644
+--- a/src/OpenColorIO/MathUtils.h
++++ b/src/OpenColorIO/MathUtils.h
+@@ -9,7 +9,7 @@
+ 
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ 
+ namespace OCIO_NAMESPACE
+ {
+diff --git a/src/OpenColorIO/ops/range/RangeOp.cpp b/src/OpenColorIO/ops/range/RangeOp.cpp
+index 9ec863e2..444dac75 100644
+--- a/src/OpenColorIO/ops/range/RangeOp.cpp
++++ b/src/OpenColorIO/ops/range/RangeOp.cpp
+@@ -7,7 +7,7 @@
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+ #include "GpuShaderUtils.h"
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ #include "HashUtils.h"
+ #include "MathUtils.h"
+ #include "ops/lut1d/Lut1DOpData.h"
+diff --git a/src/OpenColorIO/transforms/builtins/ACES.cpp b/src/OpenColorIO/transforms/builtins/ACES.cpp
+index 20968c0d..9ee2ac27 100644
+--- a/src/OpenColorIO/transforms/builtins/ACES.cpp
++++ b/src/OpenColorIO/transforms/builtins/ACES.cpp
+@@ -6,7 +6,7 @@
+ 
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ #include "ops/fixedfunction/FixedFunctionOp.h"
+ #include "ops/gradingrgbcurve/GradingRGBCurveOp.h"
+ #include "ops/log/LogOp.h"
+diff --git a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
+index 04b8fbd4..288ca566 100644
+--- a/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
++++ b/src/OpenColorIO/transforms/builtins/OpHelpers.cpp
+@@ -4,7 +4,7 @@
+ 
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ #include "ops/lut1d/Lut1DOp.h"
+ #include "transforms/builtins/OpHelpers.h"
+ 
+diff --git a/src/apps/ocioconvert/CMakeLists.txt b/src/apps/ocioconvert/CMakeLists.txt
+index 68a5db17..6fea394a 100755
+--- a/src/apps/ocioconvert/CMakeLists.txt
++++ b/src/apps/ocioconvert/CMakeLists.txt
+@@ -27,7 +27,7 @@ set_target_properties(ocioconvert PROPERTIES
+ target_link_libraries(ocioconvert
+     PRIVATE
+         apputils
+-        IlmBase::Half
++        Imath::Imath
+         ${OCIO_GL_LIB}
+         oiiohelpers
+         OpenColorIO
+diff --git a/src/apps/ocioconvert/main.cpp b/src/apps/ocioconvert/main.cpp
+index b56d4999..7e8af7d0 100644
+--- a/src/apps/ocioconvert/main.cpp
++++ b/src/apps/ocioconvert/main.cpp
+@@ -24,7 +24,7 @@ namespace OIIO = OIIO_NAMESPACE;
+ #endif // OCIO_GPU_ENABLED
+ 
+ #include "oiiohelpers.h"
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ 
+ 
+ // Array of non OpenColorIO arguments.
+diff --git a/src/apps/ocioperf/CMakeLists.txt b/src/apps/ocioperf/CMakeLists.txt
+index 69e9ba4c..bcbe47be 100644
+--- a/src/apps/ocioperf/CMakeLists.txt
++++ b/src/apps/ocioperf/CMakeLists.txt
+@@ -20,7 +20,7 @@ set_target_properties(ocioperf PROPERTIES
+ target_link_libraries(ocioperf
+     PRIVATE
+         apputils
+-        IlmBase::Half
++        Imath::Imath
+         oiiohelpers
+         OpenColorIO
+         OpenImageIO::OpenImageIO
+diff --git a/src/apps/ocioperf/main.cpp b/src/apps/ocioperf/main.cpp
+index 6427860d..f6e4a63c 100644
+--- a/src/apps/ocioperf/main.cpp
++++ b/src/apps/ocioperf/main.cpp
+@@ -11,7 +11,7 @@ namespace OIIO = OIIO_NAMESPACE;
+ #endif
+ 
+ #include "apputils/argparse.h"
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ #include "oiiohelpers.h"
+ #include "utils/StringUtils.h"
+ 
+diff --git a/src/libutils/oiiohelpers/CMakeLists.txt b/src/libutils/oiiohelpers/CMakeLists.txt
+index 6ef7c368..5f4a5113 100644
+--- a/src/libutils/oiiohelpers/CMakeLists.txt
++++ b/src/libutils/oiiohelpers/CMakeLists.txt
+@@ -31,7 +31,7 @@ target_link_libraries(oiiohelpers
+ 
+     PRIVATE
+         OpenColorIO
+-        IlmBase::Half
++        Imath::Imath
+         utils::strings
+ )
+ 
+diff --git a/src/libutils/oiiohelpers/oiiohelpers.cpp b/src/libutils/oiiohelpers/oiiohelpers.cpp
+index be1a937d..e7db652c 100644
+--- a/src/libutils/oiiohelpers/oiiohelpers.cpp
++++ b/src/libutils/oiiohelpers/oiiohelpers.cpp
+@@ -5,7 +5,7 @@
+ #include <OpenColorIO/OpenColorIO.h>
+ 
+ 
+-#include "OpenEXR/half.h"
++#include "Imath/half.h"
+ #include "oiiohelpers.h"
+ #include "utils/StringUtils.h"
+ 
+diff --git a/tests/cpu/CMakeLists.txt b/tests/cpu/CMakeLists.txt
+index 67389962..8e8dd900 100755
+--- a/tests/cpu/CMakeLists.txt
++++ b/tests/cpu/CMakeLists.txt
+@@ -18,7 +18,7 @@ function(add_ocio_test NAME SOURCES PRIVATE_INCLUDES)
+             public_api
+         PRIVATE
+             expat::expat
+-            IlmBase::Half
++            Imath::Imath
+             pystring::pystring
+             sampleicc::sampleicc
+             unittest_data



More information about the arch-commits mailing list