public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
From: "John Helmert III" <ajak@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/ctl/files/, media-libs/ctl/
Date: Sun,  1 Jan 2023 16:06:46 +0000 (UTC)	[thread overview]
Message-ID: <1672589193.c6eaff4100b4830d91f0547516bf52662edf0f49.ajak@gentoo> (raw)

commit:     c6eaff4100b4830d91f0547516bf52662edf0f49
Author:     Bernd Waibel <waebbl-gentoo <AT> posteo <DOT> net>
AuthorDate: Sat Dec 31 11:50:28 2022 +0000
Commit:     John Helmert III <ajak <AT> gentoo <DOT> 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 <waebbl-gentoo <AT> posteo.net>
Closes: https://github.com/gentoo/gentoo/pull/28906
Signed-off-by: John Helmert III <ajak <AT> 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 <waebbl-gentoo@posteo.net>
+Date: Sat, 31 Dec 2022 12:19:17 +0100
+Subject: [PATCH] fix installation directories
+
+Signed-off-by: Bernd Waibel <waebbl-gentoo@posteo.net>
+--- 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
+


             reply	other threads:[~2023-01-01 16:06 UTC|newest]

Thread overview: 5+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-01-01 16:06 John Helmert III [this message]
  -- strict thread matches above, loose matches on Subject: below --
2021-08-04 19:41 [gentoo-commits] repo/gentoo:master commit in: media-libs/ctl/files/, media-libs/ctl/ Sam James
2019-06-12 10:43 Andreas Sturmlechner
2019-04-07 10:31 Pacho Ramos
2018-01-15 12:23 Amy Liffey

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1672589193.c6eaff4100b4830d91f0547516bf52662edf0f49.ajak@gentoo \
    --to=ajak@gentoo.org \
    --cc=gentoo-commits@lists.gentoo.org \
    --cc=gentoo-dev@lists.gentoo.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox