From nobody Tue Feb 01 17:04:37 2022 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id BE587198C721; Tue, 1 Feb 2022 17:04:48 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4JpBB10858z4p78; Tue, 1 Feb 2022 17:04:41 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 0ABA014B10; Tue, 1 Feb 2022 17:04:38 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 211H4b0Q086378; Tue, 1 Feb 2022 17:04:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 211H4bkl086377; Tue, 1 Feb 2022 17:04:37 GMT (envelope-from git) Date: Tue, 1 Feb 2022 17:04:37 GMT Message-Id: <202202011704.211H4bkl086377@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dima Panov Subject: git: 5c85328abe9e - main - graphics/krita: follow ICIOv1 port (+) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fluffy X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 5c85328abe9e15b35a6e581997c1b8791eefb671 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1643735082; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=+bXRKv3mcvM/TNf2wXoB4keD0va7HllhfRD+EPT0KP8=; b=OYlvFuZP9o3/okP2UNZqkDyRKMdfp6PPMXZkcALIOmC1pUFp70fTawAL1zyoXdkKiu1xxG HQwopIibvHeYL+MU+3KGDk0pcA4K0qT9iY6a7ubvps9NsobdKyLHgMXsT1TWNxejwuZdmN k7IhKakRl+ZbmgKFtLsR5txGyO7nidit+pdPyb4t4nMJbYFrRBEf37yNcascL4GHcfs8Kv wADL9feZw0bXmahzfzXGI80rOARZ7Fqox/LxxaV8EsPIAoBrkac0K1hIdx2qzeAUYGa/aQ H0szg5DXPJfViimmr6vHk3sxxMahmV3qhwLEEYTR7bs+k/Q+QP0LSNIk+DPUjA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1643735082; a=rsa-sha256; cv=none; b=I2xd/x7Vrn5d5N/LdYZUACI5pchm6JTqDWWZdvASgd+9AcDBLy4lAeZYMObXbMKEn5ZHBN d+liWDq2/LwL6ycuDjEcu6DU3bn7jW2RDMQCbza2Dljva8GQvWoEjYhFgOG1QOW8bdBtNn Bqb+i410YB8rfEeoCguJg9lk/LjU5gN06vmpR4H+Ue8zVqrsgX/74FOdNUXpgPK3KBjA9C mq0Ij1jJ+C853+sn/dannsiPr3zqcjm6HEzYsOTKYraUaMjA8iilLGr4Z/KJUvRzTRWJE2 n9VR8deUEzPlPwsCL+k7GTCmg1ImIN+f1VvHi/m15bOUNfHQFcYQcptiZygG5Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fluffy: URL: https://cgit.FreeBSD.org/ports/commit/?id=5c85328abe9e15b35a6e581997c1b8791eefb671 commit 5c85328abe9e15b35a6e581997c1b8791eefb671 Author: Dima Panov AuthorDate: 2022-02-01 16:43:35 +0000 Commit: Dima Panov CommitDate: 2022-02-01 17:04:14 +0000 graphics/krita: follow ICIOv1 port (+) Due to updating opencolorio to v2.1.0 krita fails to compile. This patch adjusts krita to build using ociov1 provided by new port. PR: 260313 Sponsored by: Netzkommune GmbH. --- graphics/krita/Makefile | 11 +++++++++-- graphics/krita/files/patch-cmake_modules_FindOCIO.cmake | 16 ++++++++++++++++ 2 files changed, 25 insertions(+), 2 deletions(-) diff --git a/graphics/krita/Makefile b/graphics/krita/Makefile index dfcc937a7217..ee3bca9bf174 100644 --- a/graphics/krita/Makefile +++ b/graphics/krita/Makefile @@ -1,6 +1,6 @@ PORTNAME= krita DISTVERSION= 4.4.8 -PORTREVISION= 5 +PORTREVISION= 6 CATEGORIES= graphics kde MASTER_SITES= KDE/stable/${PORTNAME}/${DISTVERSION} DIST_SUBDIR= KDE/${PORTNAME} @@ -12,7 +12,7 @@ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING LIB_DEPENDS= libImath.so:math/Imath \ - libOpenColorIO.so:graphics/opencolorio \ + libOpenColorIOv1.so:graphics/opencoloriov1 \ libX11.so:x11/libX11 \ libboost_system.so:devel/boost-libs \ libfftw3.so:math/fftw3 \ @@ -63,4 +63,11 @@ PLIST_SUB= SHLIB_VER=20.0.0 \ CFLAGS+= -I${LOCALBASE}/include/Imath LDFLAGS+= -lpthread +post-patch: + ${REINPLACE_CMD} -e 's| diff --git a/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake b/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake new file mode 100644 index 000000000000..968acdbc56c3 --- /dev/null +++ b/graphics/krita/files/patch-cmake_modules_FindOCIO.cmake @@ -0,0 +1,16 @@ +--- cmake/modules/FindOCIO.cmake.orig 2021-08-24 07:56:28 UTC ++++ cmake/modules/FindOCIO.cmake +@@ -33,11 +33,11 @@ find_path(OCIO_INCLUDE_DIR OpenColorIO.h + /usr/local/include + /sw/include + /opt/local/include +- PATH_SUFFIXES OpenColorIO ++ PATH_SUFFIXES OpenColorIOv1 + DOC "The directory where OpenColorIO/OpenColorIO.h resides" + ) + +-find_library(OCIO_LIBRARIES OpenColorIO ++find_library(OCIO_LIBRARIES OpenColorIOv1 + PATHS + ${OCIO_LIBRARY_PATH} + ${OCIO_PATH}/lib/