[arch-commits] Commit in krita/trunk (PKGBUILD krita-opencolorio1.patch)

[Antonio Rojas]

    Date: Thursday, June 3, 2021 @ 11:32:29
  Author: arojas
Revision: 417037

Build against coinstallable opencolorio and make it a hard dependency

Added:
  krita/trunk/krita-opencolorio1.patch
Modified:
  krita/trunk/PKGBUILD

--------------------------+
 PKGBUILD                 |   18 ++++++++++++------
 krita-opencolorio1.patch |   18 ++++++++++++++++++
 2 files changed, 30 insertions(+), 6 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2021-06-03 10:22:36 UTC (rev 417036)
+++ PKGBUILD	2021-06-03 11:32:29 UTC (rev 417037)
@@ -3,28 +3,34 @@
 pkgname=krita
 _pkgver=4.4.3
 pkgver=${_pkgver/-/}
-pkgrel=3
+pkgrel=4
 pkgdesc="Edit and paint images"
 arch=(x86_64)
 url="https://krita.org"
 license=(GPL3)
 depends=(kitemviews kitemmodels ki18n kcompletion kguiaddons kcrash qt5-svg qt5-multimedia quazip
-         gsl libraw exiv2 openexr fftw giflib openjpeg2 hicolor-icon-theme)
-makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5 opencolorio1 python-pyqt5 libheif
+         gsl libraw exiv2 openexr fftw giflib openjpeg2 opencolorio1 hicolor-icon-theme)
+makedepends=(extra-cmake-modules kdoctools boost eigen vc poppler-qt5 python-pyqt5 libheif
              qt5-tools sip4 python-sip4 kseexpr)
-optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations' 'opencolorio1: for the LUT docker'
+optdepends=('poppler-qt5: PDF filter' 'ffmpeg: to save animations'
             "krita-plugin-gmic: G'MIC plugin" 'python-pyqt5: for the Python plugins' 'libheif: HEIF filter'
             'kseexpr: SeExpr generator layer' 'kimageformats: PSD support')
 source=(https://download.kde.org/stable/krita/$_pkgver/$pkgname-$_pkgver.tar.gz{,.sig}
-        krita-openexr3.patch)
+        krita-openexr3.patch
+        https://invent.kde.org/graphics/krita/-/commit/86dc361a.patch
+        krita-opencolorio1.patch)
 sha256sums=('d4062323c2237ab9195c0b8bce1a69e30bd6fd10fadbad6395c27211d9878f67'
             'SKIP'
-            '3825dac0317f4501c8dd8b0844540bbd0841702cd15903ce3a659755eaa226f5')
+            '3825dac0317f4501c8dd8b0844540bbd0841702cd15903ce3a659755eaa226f5'
+            '00c4e519bbef9575f8d4ae2183aff1da3ad9f44d324c1c1d45a7803368a1a008'
+            '2f892449e20abc370fe3dc8b5dd12f9964d1d402a909e775641e28685b1719b3')
 validpgpkeys=('05D00A8B73A686789E0A156858B9596C722EA3BD'  # Boudewijn Rempt <foundation at krita.org>
               'E9FB29E74ADEACC5E3035B8AB69EB4CF7468332F') # Dmitry Kazakov (main key) <dimula73 at gmail.com>
 
 prepare() {
   patch -d $pkgname-$_pkgver -p1 < krita-openexr3.patch # Fix build with OpenEXR 3
+  patch -d $pkgname-$_pkgver -p1 < 86dc361a.patch # Fix OCIO include dir detection
+  patch -d $pkgname-$_pkgver -p1 < krita-opencolorio1.patch # Fix build with renamed OCIO library
 }
 
 build() {

Added: krita-opencolorio1.patch
===================================================================
--- krita-opencolorio1.patch	                        (rev 0)
+++ krita-opencolorio1.patch	2021-06-03 11:32:29 UTC (rev 417037)
@@ -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/