gentoo resync : 20.03.2022

4 files changed, 147 insertions, 0 deletions

diff --git a/media-gfx/luminance-hdr/Manifest b/media-gfx/luminance-hdr/Manifest
index 4f702c71cbae..8c2756649545 100644
--- a/media-gfx/luminance-hdr/Manifest
+++ b/media-gfx/luminance-hdr/Manifest
@@ -2,6 +2,10 @@ AUX luminance-hdr-2.5.1-openmp-automagic.patch 1574 BLAKE2B e8c289b8a66e258dd0ea
 AUX luminance-hdr-2.6.0-cmake.patch 855 BLAKE2B 2656ec16d554199a8cb0dca0df77ab710b6c2b16f5ae006ab07c06d8898fe2c0048222b80714d0343f105a623acbd535119853831e2d207a50e6407e1de33aff SHA512 694106851d29a97485e7e438db206c5d08d37dc5d7a2c9a3f207f31c2b673d42b4c539429a658390d31f5f985bd8f330d9387f3eb19964aa4e5683f2031b0a33
 AUX luminance-hdr-2.6.0-docs.patch 948 BLAKE2B 5ac822b10ffc61c552292806adc3f5470a7f03a9b2df7ba385435904963e52af583a892762867abb6a76a5351ffbbf0ffbd67107310e84bab9b649cc33666e09 SHA512 2b242a558c3b734a653943f3128c4cbc2440f940407faa096505ac7abe945c729bd0b4c5e9d06f53141bdb1271b097d7de15e87cd31db75ef1e30839a64f32b0
 AUX luminance-hdr-2.6.0-no-git.patch 377 BLAKE2B 454a9973831aa3ba312926190a84622c8c3bd9481c67ece8ccf8916517f6b314931a09adf8a4168d8a1c7cd8a7694db27291009b9fae8a9cacc8356d32c7f5c3 SHA512 fba84a0415c8e514fb85b229adb29fbda238e8146d2dfff296d92fde33aeb22562e5ac98fed2422326354be9c0096cc2bd1b8947edfa9e7ca160d207ba0db476
+AUX luminance-hdr-2.6.1.1-fixheaders.patch 320 BLAKE2B 1037c958cb0eb08c186343c57bf530a2f8ed0b2cc9ef5b67f1363d9b595d267bd5f63a7fbca3d1b51ba4c3cbe3b92d6e56d6af28ee39333376d2411aae18c4d1 SHA512 6e5a51ba17648c619599b895ce9d2fd42b757652331e87799958372ad9c61f711619b0d5efac1d32fb8517732b3b3013fee1c86f0f4032531e390c1bfd229c06
+AUX luminance-hdr-2.6.1.1-openexr3.patch 1028 BLAKE2B fb0502bad89beafdd9cc6cd842e542d2cd9f7d4fc7fe6a29c9c1b67e3a0fc902c451650895c63e8405de82bb5e9e02fca3d1013227fc1a97220ebae245466889 SHA512 a040ee694fff2df06f0521db8c0bb98d4d80def4c342ea5997da535ea1b5e1634a4a9b26e7300476a061b7d7f2a90fc3d2b1cc4fca1c1df260b8847fef781060
 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
 EBUILD luminance-hdr-2.6.0-r1.ebuild 2076 BLAKE2B d22e0e67e352a2ff518999534223694a383e087250372d9d8b4909f6536df2680fd6c82d98bfab197ebe3964527f6d8d7733026e42eeb7fe15032dd3f7f0ded0 SHA512 09de47154150b2e7cbf1407f64f20b9d673ff4dc2f67abdbc074b224a3901b05ca36bc78b99370dbe33c25b196d73c6582c6fc916586d507faace9f4fea9c0d8
+EBUILD luminance-hdr-2.6.1.1.ebuild 2177 BLAKE2B dcfce415393738b77b0bd537c150ea47b2dd16555094dbed7f3543f7000ef3d2c5a27c214aea8889177775605671fa5d6e291898e8f870a41fdd4272d009718d SHA512 1db1a28c354d8a2098d866b788c7ca40c0b81dc26b56f672ce0f27ab2c88ba61ea6dfb55abda6fbcb0bd699c5c0c933482958315e01d7451c816872185be22d9
 MISC metadata.xml 1272 BLAKE2B 08d1f2e217eaffcb4419532ed41ba963a971b343e2d0ff7f3718c9df23ac9ffd5299264d5a87b66451acd231965f135bdeebf3b91244e3d9e51763c818b317f9 SHA512 98f1fa351c3e0bc7e47b30263093408cbbebacf8e0eb23d780cd704f5ddfff3d6939aee4d18c06cd083d90dc8a68ea51995352ab1f15ce75b0585230a3f9cbc8
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 <boost/thread/mutex.hpp>
++#include <mutex>
+ 
+ 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..063d91bee932
--- /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
+}