CVS commit: pkgsrc/graphics/kimageformats

["Mark Davies" <markd%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   markd
Date:           Thu Jul  8 21:31:49 UTC 2021

Modified Files:
        pkgsrc/graphics/kimageformats: Makefile distinfo
Added Files:
        pkgsrc/graphics/kimageformats/patches: patch-CMakeLists.txt
            patch-src_imageformats_CMakeLists.txt
            patch-src_imageformats_exr.cpp

Log Message:
kimageformats: build with openexr3


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/graphics/kimageformats/Makefile
cvs rdiff -u -r1.11 -r1.12 pkgsrc/graphics/kimageformats/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/graphics/kimageformats/patches/patch-CMakeLists.txt \
    pkgsrc/graphics/kimageformats/patches/patch-src_imageformats_CMakeLists.txt \
    pkgsrc/graphics/kimageformats/patches/patch-src_imageformats_exr.cpp

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/graphics/kimageformats/Makefile
diff -u pkgsrc/graphics/kimageformats/Makefile:1.31 pkgsrc/graphics/kimageformats/Makefile:1.32
--- pkgsrc/graphics/kimageformats/Makefile:1.31 Wed Apr 21 11:41:55 2021
+++ pkgsrc/graphics/kimageformats/Makefile      Thu Jul  8 21:31:49 2021
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2021/04/21 11:41:55 adam Exp $
+# $NetBSD: Makefile,v 1.32 2021/07/08 21:31:49 markd Exp $
 
 DISTNAME=      kimageformats-${KF5VER}
-PKGREVISION=   1
+PKGREVISION=   2
 CATEGORIES=    graphics
 
 HOMEPAGE=      https://community.kde.org/Frameworks

Index: pkgsrc/graphics/kimageformats/distinfo
diff -u pkgsrc/graphics/kimageformats/distinfo:1.11 pkgsrc/graphics/kimageformats/distinfo:1.12
--- pkgsrc/graphics/kimageformats/distinfo:1.11 Tue Mar 30 10:58:25 2021
+++ pkgsrc/graphics/kimageformats/distinfo      Thu Jul  8 21:31:49 2021
@@ -1,6 +1,9 @@
-$NetBSD: distinfo,v 1.11 2021/03/30 10:58:25 markd Exp $
+$NetBSD: distinfo,v 1.12 2021/07/08 21:31:49 markd Exp $
 
 SHA1 (kimageformats-5.80.0.tar.xz) = 1a12823981369bc893ef9c858d27058c8d583722
 RMD160 (kimageformats-5.80.0.tar.xz) = 255c6a8c5dd40c430d14d2f596d9f7a67ce41a87
 SHA512 (kimageformats-5.80.0.tar.xz) = 07669deb80af6ed3055f34ca5ef82583deeafde4a7d2591dd479fa10db48e39007e82cf70645363b742c7f90c73d6d3f5cfcfed7e5cd80ca8856e4d0aa9e9d39
 Size (kimageformats-5.80.0.tar.xz) = 590368 bytes
+SHA1 (patch-CMakeLists.txt) = ac96040c8da9cc316ab418c4f10d0a131557828a
+SHA1 (patch-src_imageformats_CMakeLists.txt) = fc82f4aa7009403d82751d583f866b10dd5c7c17
+SHA1 (patch-src_imageformats_exr.cpp) = 91db996c0cfa9fb7e70b8ebf6242dee8c9cae8d8

Added files:

Index: pkgsrc/graphics/kimageformats/patches/patch-CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/kimageformats/patches/patch-CMakeLists.txt:1.1
--- /dev/null   Thu Jul  8 21:31:49 2021
+++ pkgsrc/graphics/kimageformats/patches/patch-CMakeLists.txt  Thu Jul  8 21:31:49 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-CMakeLists.txt,v 1.1 2021/07/08 21:31:49 markd Exp $
+
+use openexr 3.x
+
+--- CMakeLists.txt.orig        2021-07-07 22:42:12.771880448 +0000
++++ CMakeLists.txt
+@@ -42,7 +42,7 @@ if (UNIX)
+     endif()
+ endif()
+ 
+-find_package(OpenEXR)
++find_package(OpenEXR CONFIG)
+ set_package_properties(OpenEXR PROPERTIES
+     TYPE OPTIONAL
+     PURPOSE "Required for the QImage plugin for OpenEXR images"
Index: pkgsrc/graphics/kimageformats/patches/patch-src_imageformats_CMakeLists.txt
diff -u /dev/null pkgsrc/graphics/kimageformats/patches/patch-src_imageformats_CMakeLists.txt:1.1
--- /dev/null   Thu Jul  8 21:31:49 2021
+++ pkgsrc/graphics/kimageformats/patches/patch-src_imageformats_CMakeLists.txt Thu Jul  8 21:31:49 2021
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_imageformats_CMakeLists.txt,v 1.1 2021/07/08 21:31:49 markd Exp $
+
+use openexr 3.x
+
+--- src/imageformats/CMakeLists.txt.orig       2021-03-04 21:57:23.000000000 +0000
++++ src/imageformats/CMakeLists.txt
+@@ -58,7 +58,7 @@ install(FILES jp2.desktop DESTINATION ${
+ 
+ if(OpenEXR_FOUND)
+     kimageformats_add_plugin(kimg_exr JSON "exr.json" SOURCES exr.cpp)
+-    target_link_libraries(kimg_exr OpenEXR::IlmImf)
++    target_link_libraries(kimg_exr OpenEXR::OpenEXR)
+     kde_target_enable_exceptions(kimg_exr PRIVATE)
+ 
+     install(FILES exr.desktop DESTINATION ${KDE_INSTALL_KSERVICES5DIR}/qimageioplugins/)
Index: pkgsrc/graphics/kimageformats/patches/patch-src_imageformats_exr.cpp
diff -u /dev/null pkgsrc/graphics/kimageformats/patches/patch-src_imageformats_exr.cpp:1.1
--- /dev/null   Thu Jul  8 21:31:49 2021
+++ pkgsrc/graphics/kimageformats/patches/patch-src_imageformats_exr.cpp        Thu Jul  8 21:31:49 2021
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_imageformats_exr.cpp,v 1.1 2021/07/08 21:31:49 markd Exp $
+
+use openexr 3.x
+
+--- src/imageformats/exr.cpp.orig      2021-03-04 21:57:23.000000000 +0000
++++ src/imageformats/exr.cpp
+@@ -13,6 +13,7 @@
+ #include <ImfStandardAttributes.h>
+ #include <ImathBox.h>
+ #include <ImfInputFile.h>
++#include <ImfInt64.h>
+ #include <ImfBoxAttribute.h>
+ #include <ImfChannelListAttribute.h>
+ #include <ImfCompressionAttribute.h>