gentoo auto-resync : 24:04:2024 - 23:59:27

4 files changed, 140 insertions, 0 deletions

diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 0921a8517d93..fb33b3d8268b 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest
index d8711807c0db..d5cf0121d28f 100644
--- a/media-gfx/enblend/Manifest
+++ b/media-gfx/enblend/Manifest
@@ -2,6 +2,9 @@ AUX enblend-4.2-doc-install-dir-fix.patch 2705 BLAKE2B a5bfb43521095bc088aef980f
 AUX enblend-4.2.0_p20161007-cmake.patch 477 BLAKE2B 9a27d95e78cc611c723824a300dbc3eaeb7c2ffe6bcacb19baeb8a24180450f2912310ae9584f450899ececca11636304d36631f8c57f6d4b7c2450043d6f147 SHA512 5b79944beabd97f71f05657ce17e31d9eab60506dfce27fefc3a8f9a10c92f33b1b4fa1411c6d1a33d23819a4020a50f130b9083fecaf3e1a072fda71e5f9ff0
 AUX enblend-4.2.0_p20161007-doc-scaleable-fonts.patch 650 BLAKE2B 633ae86947cfcb6d4f83c4aaf55a2056fc571ee3973379327f6416a4667b7c5d1d94a5e6b26bfc49a0207608d3b5de0d99cd6678d298de605d6eae5ec731c874 SHA512 b2c3e5367d83bd1b2e0053dd41d92737834045969db32fd9e07f294a8cd5ca120fa913f9fc4fab70abea893d974d8e92fd1ace38845cd1324d21c2455c961ab4
 AUX enblend-4.2.0_p20161007-gcc-10.patch 312 BLAKE2B bbc8521bb1c2b9f3f67dedffdbcab952628fc252d2ed81c37e469f06596f2cb9ab5907c7fc97de1dbfe408e29312c55d08b189b8e6f46215540e64354fbfd60a SHA512 9ed03b22237e1bf297db0daca2b5dd6aa7ad5cd9bf333e507160b7bbf24eb37be173c79314ce1cff7a7df10ba262266ca54f52c8ec6d85a7a411b78bef76d91e
+AUX enblend-4.2.0_p20240424-doc-install-dir-fix.patch 1977 BLAKE2B bb747bd4d98f0d27d7930d0376ddcfef02186c998e869a0f3843e9fa32c2bf39fedb8074abdaa09d4a8425d2fb066ed2483ede75a3fddcba2d86f95042de3b25 SHA512 3c76b3fad97e918ac3849204d067c64c03e03dbbb61d4b4f35e5a7f0f895080f23518797d98050ca12fe101cde6f7476438fa59f89f736f84df23e1b9b5ecd1e
 DIST enblend-4.2.0_p20161007.tar.xz 494060 BLAKE2B 8842dd70a1400a27170794246cb5c89d60b6798373e3a9d63e88738ad569e1174cb4303ccb5a2bc79846651e982e05f8cb9ac3e09b83ee33958b6ccf043ebda9 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3
+DIST enblend-4.2.0_p20240424.tar.xz 505928 BLAKE2B 49a9cfd2cb332573a1d3882ce6d50513008ee71d7235f69bb7920fc9b71f6c0c6e5e7ae88de4c5879d4cb2ee94d437b1752d6c13117c07ad81a6832b45985684 SHA512 1eed2cac0dd6d0ddec41097c4d21ebbad01981e6abbb5fe3db69fc4ef50728ce997faad73dc17255997e8eee9af9d540e38bc2bdf106eb6ca338ef1650680894
 EBUILD enblend-4.2.0_p20161007-r6.ebuild 1896 BLAKE2B 4fefdf5984d6fe55a3dcf0e241b2bd60dbc2d671980b047ec35c236de101587b74be6c26dfb86bb091bf6de5353292cdf2980a5f0b59f8d6239cd50c451fe968 SHA512 6509c2e7d4e97f79be3b65f452c0211fb09dbf3327b943515acab7212476f353f91fc8a2ec48eb48e1591c749e416ad9d4bf8b5e8b82c2ee965da0c67d622b9b
+EBUILD enblend-4.2.0_p20240424.ebuild 1989 BLAKE2B e93c07d8d4a5170b5d33a4fc954495b1104bbded99d18ba0af004967428c4173e42e2882d2e62bb15925c8e2e9727b8a66fd8a914b19df9d02d8c37c90bae6cb SHA512 fa06f725bc7f9e456b92ac89f2dbb69bf13a95f8501a80af0f1bdb4820d85ce60bcf991613a67f8eefcfdee82a558b334817481da5602e8199afd61f94676ed5
 MISC metadata.xml 438 BLAKE2B 6e1f7ffb0f56a8e668608a97c02e045546c76b90c18777a77c031a94f23ce59abd2df8b6688973b509872e9cca867d16d6b0c201e06f4e8026dcde7c1eb1632f SHA512 86a9f0ca54ad8c9f1409957d4bdbe7aec7b1992e4272ab5e9e3734442e4ca7fc599bafc0e1e55d30ef0220dbaaa3d4f38e7fc8e4dbe4972fb392c4b2a86e6181
diff --git a/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
new file mode 100644
index 000000000000..b94694b138e2
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.2.0_p20240424.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sourceforge.net/"
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
+
+S=${WORKDIR}/enblend
+
+LICENSE="GPL-2+ FDL-1.2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="cpu_flags_x86_sse2 debug doc openmp tcmalloc"
+
+REQUIRED_USE="tcmalloc? ( !debug )"
+
+BDEPEND="
+	sys-apps/help2man
+	virtual/pkgconfig
+	doc? (
+		app-text/ghostscript-gpl
+		app-text/texlive
+		dev-lang/perl
+		dev-perl/Readonly
+		dev-tex/hevea
+		gnome-base/librsvg
+		media-gfx/graphviz
+		>=media-gfx/fig2dev-3.2.9-r1
+		sci-visualization/gnuplot[cairo,gd]
+		virtual/imagemagick-tools[tiff]
+	)
+"
+RDEPEND="
+	media-libs/lcms:2
+	media-libs/openexr:=
+	media-libs/tiff:=
+	media-libs/vigra[openexr]
+	sci-libs/gsl:=
+	debug? ( dev-libs/dmalloc[threads] )
+	tcmalloc? ( dev-util/google-perftools )
+"
+DEPEND="${RDEPEND}
+	dev-libs/boost
+	media-libs/libpng:0
+	media-libs/libjpeg-turbo:=
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-doc-install-dir-fix.patch
+	"${FILESDIR}"/${PN}-4.2.0_p20161007-cmake.patch
+	"${FILESDIR}"/${PN}-4.2.0_p20161007-gcc-10.patch
+	"${FILESDIR}"/${PN}-4.2.0_p20161007-doc-scaleable-fonts.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DENABLE_SSE2=$(usex cpu_flags_x86_sse2)
+		-DENABLE_DMALLOC=$(usex debug)
+		-DDOC=$(usex doc)
+		-DENABLE_OPENMP=$(usex openmp)
+		-DENABLE_TCMALLOC=$(usex tcmalloc)
+	)
+	if use doc; then
+		mycmakeargs+=(
+			-DINSTALL_HTML_DOC=ON
+			-DINSTALL_PDF_DOC=ON
+		)
+	fi
+
+	cmake_src_configure
+}
+
+src_compile() {
+	# To allow icon resizing with renderers (no way to disable)
+	addpredict /dev/dri
+
+	# To compile fonts in the temp directory
+	export VARTEXFONTS="${T}/fonts"
+
+	# forcing -j1 as every parallel compilation process needs about 1 GB RAM.
+	cmake_src_compile -j1
+}
diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20240424-doc-install-dir-fix.patch b/media-gfx/enblend/files/enblend-4.2.0_p20240424-doc-install-dir-fix.patch
new file mode 100644
index 000000000000..7d3a24f72ce5
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2.0_p20240424-doc-install-dir-fix.patch
@@ -0,0 +1,45 @@
+diff -ruN enblend.orig/CMakeLists.txt enblend/CMakeLists.txt
+--- enblend.orig/CMakeLists.txt	2024-04-24 14:42:26.000000000 +1100
++++ enblend/CMakeLists.txt	2024-04-24 14:52:10.533011199 +1100
+@@ -15,9 +15,6 @@
+ endif()
+ 
+ project(enblend)
+-IF(NOT MSVC)
+-  SET(CMAKE_BUILD_TYPE Release CACHE STRING "Choose the type of build, options are: None Debug Release RelWithDebInfo MinSizeRel" FORCE)
+-ENDIF(NOT MSVC)
+ # where to look first for cmake modules, before ${CMAKE_ROOT}/Modules/
+ # is checked
+ # For now, reuse the hugin modules directory
+@@ -140,7 +137,6 @@
+ ENDIF()
+ 
+ IF(CMAKE_COMPILER_IS_GNUCXX)
+-  SET(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -O3 -ffast-math -DNDEBUG -Wall")
+   IF(APPLE AND CMAKE_MAJOR_VERSION EQUAL 2 AND CMAKE_MINOR_VERSION LESS 5)
+     ## Add needed Compiler and Linker flags for OSX
+     SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -flat_namespace -undefined suppress")
+diff -ruN enblend.orig/doc/CMakeLists.txt enblend/doc/CMakeLists.txt
+--- enblend.orig/doc/CMakeLists.txt	2024-04-24 14:42:26.000000000 +1100
++++ enblend/doc/CMakeLists.txt	2024-04-24 14:52:10.533011199 +1100
+@@ -406,7 +406,7 @@
+         "${CMAKE_BINARY_DIR}/doc/enfuse.html"
+         ${ENBLEND_PNGFILES}
+         ${ENFUSE_PNGFILES}
+-    DESTINATION ${DocumentsDirectory}
++    DESTINATION ${DocumentsDirectory}/html
+ )
+ endif()
+ 
+diff -ruN enblend.orig/src/CMakeLists.txt enblend/src/CMakeLists.txt
+--- enblend.orig/src/CMakeLists.txt	2024-04-24 14:42:26.000000000 +1100
++++ enblend/src/CMakeLists.txt	2024-04-24 14:55:27.323912752 +1100
+@@ -141,7 +141,7 @@
+   set_target_properties(enblend PROPERTIES LINK_FLAGS "/DELAYLOAD:opencl.dll")
+   set_target_properties(enfuse PROPERTIES LINK_FLAGS "/DELAYLOAD:opencl.dll")
+ endif()
+-install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel)
++install(TARGETS enblend enfuse DESTINATION bin)
+ 
+ IF(ENABLE_OPENCL AND NOT ${PREFER_SEPARATE_OPENCL_SOURCE})
+     add_dependencies(enblend cl_sources)