From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4F8AD15800F for ; Sun, 1 Jan 2023 16:06:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9D791E07AE; Sun, 1 Jan 2023 16:06:48 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 86A73E07AE for ; Sun, 1 Jan 2023 16:06:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id C4121335DAC for ; Sun, 1 Jan 2023 16:06:47 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 573567EF for ; Sun, 1 Jan 2023 16:06:46 +0000 (UTC) From: "John Helmert III" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "John Helmert III" Message-ID: <1672589193.c6eaff4100b4830d91f0547516bf52662edf0f49.ajak@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/ctl/files/, media-libs/ctl/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/ctl/Manifest media-libs/ctl/ctl-1.5.2_p20221224.ebuild media-libs/ctl/files/ctl-1.5.2-fix-installation-directories.patch X-VCS-Directories: media-libs/ctl/ media-libs/ctl/files/ X-VCS-Committer: ajak X-VCS-Committer-Name: John Helmert III X-VCS-Revision: c6eaff4100b4830d91f0547516bf52662edf0f49 X-VCS-Branch: master Date: Sun, 1 Jan 2023 16:06:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 604dd98b-3ae7-42eb-a6c6-2dee843ebc21 X-Archives-Hash: 556a895bf428ae16db46d89b9c365a9f commit: c6eaff4100b4830d91f0547516bf52662edf0f49 Author: Bernd Waibel posteo net> AuthorDate: Sat Dec 31 11:50:28 2022 +0000 Commit: John Helmert III gentoo org> CommitDate: Sun Jan 1 16:06:33 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6eaff41 media-libs/ctl: add 1.5.2_p20221224 Upstream has updated to be compatible to Imath / OpenEXR-3, but no new version released yet, so we use the commit id to fetch the correct version. Bug: https://github.com/ampas/CTL/issues/100 Closes: https://bugs.gentoo.org/878247 Signed-off-by: Bernd Waibel posteo.net> Closes: https://github.com/gentoo/gentoo/pull/28906 Signed-off-by: John Helmert III gentoo.org> media-libs/ctl/Manifest | 1 + media-libs/ctl/ctl-1.5.2_p20221224.ebuild | 39 ++++++++++++++++ .../ctl-1.5.2-fix-installation-directories.patch | 53 ++++++++++++++++++++++ 3 files changed, 93 insertions(+) diff --git a/media-libs/ctl/Manifest b/media-libs/ctl/Manifest index 1e6eb54355e0..702623070f72 100644 --- a/media-libs/ctl/Manifest +++ b/media-libs/ctl/Manifest @@ -1 +1,2 @@ DIST ctl-1.5.2.tar.gz 1411871 BLAKE2B 223740aa8b68630f449b65e17470c76b2825a77eead040724b65e9e69752a696f642ae6755116046e188305a7d043c4def7cb8a773ad08d51fba35e9273b3a71 SHA512 c92af23e897f30f96ecb27b4b865e2fe1a1e33c8616797fc18f68e7fcc89210ce8ae70a003169b2f449bfd5f90d192734f1e8038b1d3e03c5f48c81587c871c6 +DIST ctl-1.5.2_p20221224.tar.gz 1418659 BLAKE2B 6798439b270b785974cfd45381f927f2005884b6a00878fa845cc1c36cd912eb6f3acb913f896389a67bff52103d3d52032e3f1f9f53e1a3d98b545428c1580b SHA512 9cc132100d3ea622d954e783fbab43c07cfa72e1930f4b9c55cb01709e88f09f956ac02e973a09bfc2842e769060e6f50f082d5491be03c1499a58e79b0f1ca3 diff --git a/media-libs/ctl/ctl-1.5.2_p20221224.ebuild b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild new file mode 100644 index 000000000000..472fe1e2845f --- /dev/null +++ b/media-libs/ctl/ctl-1.5.2_p20221224.ebuild @@ -0,0 +1,39 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake + +MY_COMMIT=3fc4ae7a8af35d380654e573d895216fd5ba407e + +DESCRIPTION="AMPAS' Color Transformation Language" +HOMEPAGE="https://github.com/ampas/CTL" +SRC_URI="https://github.com/ampas/CTL/archive/${MY_COMMIT}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/CTL-${MY_COMMIT}" + +LICENSE="AMPAS" +SLOT="0" +KEYWORDS="~amd64 ~ia64 ~ppc64 ~x86" +IUSE="test" + +RESTRICT="!test? ( test )" + +RDEPEND=" + dev-libs/imath:= + >=media-libs/openexr-3:=[threads] + media-libs/tiff:= + !media-libs/openexr_ctl" +DEPEND="${RDEPEND}" +BDEPEND="virtual/pkgconfig" + +PATCHES=( "${FILESDIR}"/${PN}-1.5.2-fix-installation-directories.patch ) + +src_configure() { + local mycmakeargs=( + -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" + -DCTL_BUILD_TESTS=$(usex test) + -DCTL_BUILD_TOOLS=ON + ) + cmake_src_configure +} diff --git a/media-libs/ctl/files/ctl-1.5.2-fix-installation-directories.patch b/media-libs/ctl/files/ctl-1.5.2-fix-installation-directories.patch new file mode 100644 index 000000000000..42e2096d6fe7 --- /dev/null +++ b/media-libs/ctl/files/ctl-1.5.2-fix-installation-directories.patch @@ -0,0 +1,53 @@ +From c23f126d06abd97e70010ad1e0df2f87ebf09c39 Mon Sep 17 00:00:00 2001 +From: Bernd Waibel +Date: Sat, 31 Dec 2022 12:19:17 +0100 +Subject: [PATCH] fix installation directories + +Signed-off-by: Bernd Waibel +--- a/OpenEXR_CTL/CtlModules/CMakeLists.txt ++++ b/OpenEXR_CTL/CtlModules/CMakeLists.txt +@@ -2,6 +2,6 @@ install( + FILES + utilities.ctl + DESTINATION +- ${INSTALL_LIB_DIR}/CTL ++ ${CMAKE_INSTALL_DATADIR}/CTL + ) + +--- a/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt ++++ b/OpenEXR_CTL/exr_ctl_exr/CMakeLists.txt +@@ -39,4 +39,4 @@ target_link_libraries (exr_ctl_exr + + install( TARGETS exr_ctl_exr DESTINATION ${INSTALL_BIN_DIR} ) + +-install( FILES change_saturation.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) ++install( FILES change_saturation.ctl DESTINATION ${CMAKE_INSTALL_DATADIR}/CTL ) +--- a/OpenEXR_CTL/exrdpx/CMakeLists.txt ++++ b/OpenEXR_CTL/exrdpx/CMakeLists.txt +@@ -39,6 +39,6 @@ target_link_libraries (exrdpx + + install( TARGETS exrdpx DESTINATION ${INSTALL_BIN_DIR} ) + +-install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${INSTALL_LIB_DIR}/CTL ) ++install( FILES transform_DPX_EXR.ctl transform_EXR_DPX.ctl DESTINATION ${CMAKE_INSTALL_DATADIR}/CTL ) + + +--- a/doc/CMakeLists.txt ++++ b/doc/CMakeLists.txt +@@ -1 +1 @@ +-install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR}/CTL ) ++install( FILES CtlManual.pdf CtlManual.doc DESTINATION ${CMAKE_INSTALL_DOCDIR} ) +--- a/lib/IlmImfCtl/CMakeLists.txt ++++ b/lib/IlmImfCtl/CMakeLists.txt +@@ -38,7 +38,7 @@ target_link_libraries (IlmImfCtl + install(FILES + ImfCtlApplyTransforms.h + DESTINATION +- ${CMAKE_INSTALL_LIBDIR}/OpenEXR ++ ${CMAKE_INSTALL_INCLUDEDIR}/OpenEXR + ) + + install(TARGETS IlmImfCtl DESTINATION ${CMAKE_INSTALL_LIBDIR}) +-- +2.39.0 +