extra/opencolorio1 to 1.1.1-3

extra/krita/krita-opencolorio1.patch

@@ -0,0 +1,18 @@
+diff --git a/cmake/modules/FindOCIO.cmake b/cmake/modules/FindOCIO.cmake
+index 89b404088c..02a8753221 100644
+--- a/cmake/modules/FindOCIO.cmake
++++ b/cmake/modules/FindOCIO.cmake
+@@ -34,11 +34,11 @@ find_path(OCIO_INCLUDE_DIR OpenColorIO.h
+         /usr/local/include
+         /sw/include
+         /opt/local/include
+-        PATH_SUFFIXES OpenColorIO
++        PATH_SUFFIXES OpenColorIO1
+         DOC "The directory where OpenColorIO/OpenColorIO.h resides"
+ )
+ 
+-find_library(OCIO_LIBRARIES OpenColorIO
++find_library(OCIO_LIBRARIES OpenColorIO1
+         PATHS
+         ${OCIO_LIBRARY_PATH}
+         ${OCIO_PATH}/lib/

extra/opencolorio1/PKGBUILD

@@ -6,20 +6,19 @@
 
 pkgname=opencolorio1
 pkgver=1.1.1
-pkgrel=2
+pkgrel=3
 pkgdesc="A color management framework for visual effects and animation"
 arch=('x86_64')
 url="https://opencolorio.org"
 license=('BSD')
 depends=('lcms2' 'tinyxml' 'yaml-cpp')
-makedepends=('boost' 'cmake' 'python')
-optdepends=('python: python bindings')
-provides=("opencolorio=1")
-conflicts=('opencolorio')
+makedepends=('boost' 'cmake')
 source=($pkgname-$pkgver.tar.gz::https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/v$pkgver.tar.gz
-        8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch)
+        8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch
+        make-coinstallable.patch)
 sha512sums=('bed722f9ddce1887d28aacef2882debccd7c3f3c0c708d2723fea58a097de9f02721af9e85453e089ffda5406aef593ab6536c6886307823c132aa787e492e33'
-            'fd1c6e134ef898a8715333b1e85a606736685ec0fce07188c0fba68ae048edb61dc4f107eff8de79a53dbbf226a1f84bb0a7d046a15fafb981ce02568350fd49')
+            'fd1c6e134ef898a8715333b1e85a606736685ec0fce07188c0fba68ae048edb61dc4f107eff8de79a53dbbf226a1f84bb0a7d046a15fafb981ce02568350fd49'
+            'e7ed107012f94e14bc883baade73ac11c136fbd315832b2c770ca4f0e8cb39ca160da86d848f7762c5e531af88315f2e27b65ef294bf05a6a2130af7285e5369')
 
 prepare() {
   mv OpenColorIO-* $pkgname-$pkgver
@@ -30,6 +29,7 @@ prepare() {
   sed -i "s/push(hidden)/push(default)/g" src/core/OCIOYaml.cpp
 
   patch -Np1 -i "$srcdir"/8d48ee8da42de2d878db7b42586db8b3c67f83e1.patch
+  patch -p1 < "$srcdir"/make-coinstallable.patch # Make it coinstallable with OCIO2
 }
 
 build() {
@@ -38,7 +38,9 @@ build() {
   mkdir -p build && cd build
   cmake .. \
     -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_INSTALL_LIBDIR=lib \
+    -DOCIO_BUILD_STATIC=OFF \
+    -DOCIO_BUILD_APPS=OFF \
+    -DOCIO_BUILD_PYGLUE=OFF \
     -DUSE_EXTERNAL_YAML=ON \
     -DUSE_EXTERNAL_TINYXML=ON \
     -DUSE_EXTERNAL_LCMS=ON \
@@ -51,10 +53,10 @@ package() {
 
   make DESTDIR="$pkgdir" install
 
-  mv "$pkgdir"/usr/lib/static/libOpenColorIO.a "$pkgdir"/usr/lib/libOpenColorIO.a
-  rmdir "$pkgdir"/usr/lib/static
-
   install -Dm644 ../LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+
+  rm -r "$pkgdir"/usr/lib/{cmake,pkgconfig} # krita provides its own FindOCIO
+  rm -r "$pkgdir"/usr/share/ocio
 }
 
 # vim:set ts=2 sw=2 et:

extra/opencolorio1/make-coinstallable.patch

@@ -0,0 +1,22 @@
+diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
+index 1eb691b6..1d8e3466 100644
+--- a/src/core/CMakeLists.txt
++++ b/src/core/CMakeLists.txt
+@@ -56,7 +56,7 @@ if(OCIO_BUILD_SHARED)
+     endif()
+ 
+     set_target_properties(OpenColorIO PROPERTIES
+-        OUTPUT_NAME OpenColorIO
++        OUTPUT_NAME OpenColorIO1
+         COMPILE_FLAGS   "${EXTERNAL_COMPILE_FLAGS}"
+         LINK_FLAGS      "${EXTERNAL_LINK_FLAGS}")
+     
+@@ -109,7 +109,7 @@ endmacro()
+ 
+ # public interface
+ install(FILES ${core_export_headers}
+-    DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO/)
++    DESTINATION ${CMAKE_INSTALL_PREFIX}/include/OpenColorIO1/)
+ 
+ # pkg-config
+ message(STATUS "Create OpenColorIO.pc from OpenColorIO.pc.in")