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 4E9CA15808B for ; Fri, 25 Feb 2022 20:53:31 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5221EE081A; Fri, 25 Feb 2022 20:53:30 +0000 (UTC) Received: from smtp.gentoo.org (mail.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) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 2A913E081A for ; Fri, 25 Feb 2022 20:53:30 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 1A19A342BB0 for ; Fri, 25 Feb 2022 20:53:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 49A79287 for ; Fri, 25 Feb 2022 20:53:27 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1645822395.f183705a78237d697d57279c392fe4afb27b9ae3.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-gfx/luminance-hdr/files/, media-gfx/luminance-hdr/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-gfx/luminance-hdr/Manifest media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild X-VCS-Directories: media-gfx/luminance-hdr/ media-gfx/luminance-hdr/files/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: f183705a78237d697d57279c392fe4afb27b9ae3 X-VCS-Branch: master Date: Fri, 25 Feb 2022 20:53:27 +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: 8511b556-f52c-4df9-b50e-169a0304a4f9 X-Archives-Hash: 3aaa7debd9d5eafe7572d2c7052adf76 commit: f183705a78237d697d57279c392fe4afb27b9ae3 Author: Andreas K. Hüttel gentoo org> AuthorDate: Fri Feb 25 20:52:56 2022 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Fri Feb 25 20:53:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f183705a media-gfx/luminance-hdr: Version bump, for un-slotted OpenEXR 3 Bug: https://bugs.gentoo.org/833486 Bug: https://bugs.gentoo.org/833487 Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel gentoo.org> media-gfx/luminance-hdr/Manifest | 1 + .../files/luminance-hdr-2.6.1.1-fixheaders.patch | 15 ++++ .../files/luminance-hdr-2.6.1.1-openexr3.patch | 28 ++++++ .../luminance-hdr/luminance-hdr-2.6.1.1.ebuild | 100 +++++++++++++++++++++ 4 files changed, 144 insertions(+) diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest index ef8d09c6f1ef..7c5171716fc9 100644 --- a/media-gfx/luminance-hdr/Manifest +++ b/media-gfx/luminance-hdr/Manifest @@ -1 +1,2 @@ DIST luminance-hdr-2.6.0.tar.bz2 11556372 BLAKE2B 0026768202d35126b82101eb2dc7cdc2917728b519c1cadc62ffb6470204077b4b6ae220ebf09c7f903839fe0c714715efe796ee4830cc92174370cd2741d576 SHA512 6cfb21b1ddc9cac612e3d176323e34c5181333f1b52953c02ad5aec28cc86bf519ecede248847082085879c5c2fd2c5570b05f5d3bffa96ba3781ff8cd1967d1 +DIST luminance-hdr-2.6.1.1.tar.bz2 11569153 BLAKE2B bbeb991c05f1058fe9fde59014d4c6326283bad34d84dc0454a0b4df1b600b02835e6c3013199d2b2811d59409b892129c580e4a2a5cb00c8014e1267c16ab84 SHA512 9006339037aa3a0b7332cf71e1cf143d9e700eaae1102dfb8eccea8a9d97a5bcb6331202684adf76542116927dd9a69169882518af6ebb25c85d08057fdc552e diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch new file mode 100644 index 000000000000..58974ea998ee --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-fixheaders.patch @@ -0,0 +1,15 @@ +Source: arch linux + +diff --git a/src/Common/init_fftw.h b/src/Common/init_fftw.h +index af2fc02c..a4aad47f 100644 +--- a/src/Common/init_fftw.h ++++ b/src/Common/init_fftw.h +@@ -22,7 +22,7 @@ + #ifndef INIT_FFTW_H + #define INIT_FFTW_H + +-#include ++#include + + class FFTW_MUTEX { + public: diff --git a/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch new file mode 100644 index 000000000000..9ab283298704 --- /dev/null +++ b/media-gfx/luminance-hdr/files/luminance-hdr-2.6.1.1-openexr3.patch @@ -0,0 +1,28 @@ +Source: arch linux + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index 8ff498d0..23f5c387 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -191,7 +191,7 @@ INCLUDE_DIRECTORIES(${TIFF_INCLUDE_DIR}) + FIND_PACKAGE(PNG REQUIRED) + INCLUDE_DIRECTORIES(${PNG_INCLUDE_DIR}) + +-FIND_PACKAGE(OpenEXR REQUIRED) ++FIND_PACKAGE(OpenEXR CONFIG REQUIRED) + INCLUDE_DIRECTORIES(${OPENEXR_INCLUDE_DIR} "${OPENEXR_INCLUDE_DIR}/OpenEXR") + + FIND_PACKAGE(GSL REQUIRED) +diff --git a/src/Libpfs/CMakeLists.txt b/src/Libpfs/CMakeLists.txt +index 80617998..ce3c746e 100644 +--- a/src/Libpfs/CMakeLists.txt ++++ b/src/Libpfs/CMakeLists.txt +@@ -12,7 +12,7 @@ ADD_SUBDIRECTORY(colorspace) + ADD_SUBDIRECTORY(io) + + ADD_LIBRARY(pfs STATIC ${LIBPFS_H} ${LIBPFS_HXX} ${LIBPFS_CPP}) +-TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets) ++TARGET_LINK_LIBRARIES(pfs Qt5::Core Qt5::Gui Qt5::Widgets OpenEXR::OpenEXR) + + SET(LUMINANCE_MODULES_GUI ${LUMINANCE_MODULES_GUI} pfs PARENT_SCOPE) + SET(LUMINANCE_MODULES_CLI ${LUMINANCE_MODULES_CLI} pfs PARENT_SCOPE) diff --git a/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild new file mode 100644 index 000000000000..faa03a474af5 --- /dev/null +++ b/media-gfx/luminance-hdr/luminance-hdr-2.6.1.1.ebuild @@ -0,0 +1,100 @@ +# Copyright 1999-2022 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +inherit cmake toolchain-funcs flag-o-matic xdg-utils + +DESCRIPTION="Graphical user interface that provides a workflow for HDR imaging" +HOMEPAGE="http://qtpfsgui.sourceforge.net https://github.com/LuminanceHDR/LuminanceHDR" +SRC_URI="mirror://sourceforge/qtpfsgui/${P/_/.}.tar.bz2" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="cpu_flags_x86_sse2 fits openmp test" +RESTRICT="!test? ( test )" + +BDEPEND=" + dev-qt/linguist-tools:5 +" +RDEPEND=" + dev-libs/boost:0= + dev-qt/qtconcurrent:5 + dev-qt/qtcore:5 + dev-qt/qtdeclarative:5 + dev-qt/qtgui:5 + dev-qt/qtnetwork:5 + dev-qt/qtprintsupport:5 + dev-qt/qtsql:5 + dev-qt/qtsvg:5 + dev-qt/qtwebengine:5[widgets] + dev-qt/qtwidgets:5 + dev-qt/qtxml:5 + media-gfx/exiv2:= + media-libs/lcms:2 + media-libs/libpng:0= + media-libs/libraw:= + >=media-libs/openexr-3:0= + media-libs/tiff:0 + sci-libs/fftw:3.0=[threads] + sci-libs/gsl:= + virtual/jpeg:0 + fits? ( sci-libs/cfitsio:= ) +" +DEPEND="${RDEPEND} + dev-cpp/eigen:3 + test? ( dev-cpp/gtest ) +" + +PATCHES=( + "${FILESDIR}"/${P}-openexr3.patch + "${FILESDIR}"/${P}-fixheaders.patch + "${FILESDIR}"/${PN}-2.6.0-cmake.patch + "${FILESDIR}"/${PN}-2.6.0-no-git.patch + "${FILESDIR}"/${PN}-2.6.0-docs.patch + "${FILESDIR}"/${PN}-2.5.1-openmp-automagic.patch +) + +pkg_pretend() { + if use cpu_flags_x86_sse2 ; then + append-flags -msse2 + else + eerror "This package requires a CPU supporting the SSE2 instruction set." + die "SSE2 support missing" + fi + + if use openmp ; then + tc-has-openmp || die "Please switch to an openmp compatible compiler" + fi + + append-flags -std=c++17 +} + +src_configure() { + local mycmakeargs=( + $(cmake_use_find_package fits CFITSIO) + -DUSE_OPENMP="$(usex openmp)" + ) + cmake_src_configure +} + +src_install() { + cmake_src_install + + mkdir -p "${D}/usr/share/metainfo" || die + mv "${D}/usr/share/appdata/"* "${D}/usr/share/metainfo/" || die + rmdir "${D}/usr/share/appdata" || die +} + +pkg_postinst() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +} + +pkg_postrm() { + xdg_icon_cache_update + xdg_desktop_database_update + xdg_mimeinfo_database_update +}