commit: 822ab758d9aa136ec82766379004144955176d35 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Mon Sep 23 20:14:37 2024 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Mon Sep 23 20:16:26 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=822ab758
media-gfx/enblend: drop 4.2.0_p20161007-r6 Closes: https://bugs.gentoo.org/938715 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> media-gfx/enblend/Manifest | 1 - .../enblend/enblend-4.2.0_p20161007-r6.ebuild | 89 ---------------------- .../files/enblend-4.2-doc-install-dir-fix.patch | 66 ---------------- 3 files changed, 156 deletions(-) diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index 9ce037e033f6..94a41f7e2096 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -1,2 +1 @@ -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 diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild deleted file mode 100644 index 76a89f6ab151..000000000000 --- a/media-gfx/enblend/enblend-4.2.0_p20161007-r6.ebuild +++ /dev/null @@ -1,89 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit cmake - -DESCRIPTION="Image Blending with Multiresolution Splines" -HOMEPAGE="http://enblend.sourceforge.net/" -SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz" - -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/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}"/${PN}-4.2-doc-install-dir-fix.patch - "${FILESDIR}"/${P}-cmake.patch - "${FILESDIR}"/${P}-gcc-10.patch - "${FILESDIR}"/${P}-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-doc-install-dir-fix.patch b/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch deleted file mode 100644 index c952eeb7780a..000000000000 --- a/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch +++ /dev/null @@ -1,66 +0,0 @@ -* Remove the CMAKE_BUILD_TYPE conditional code, in order to build using CMAKE_BUILD_TYPE=Gentoo -* Install html files in html subdir of doc dir - ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -11,9 +11,6 @@ - set(CMAKE_ALLOW_LOOSE_LOOP_CONSTRUCTS true) - - 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 -@@ -130,7 +127,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") -@@ -154,20 +150,6 @@ - SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /bigobj") - ENDIF(CMAKE_CL_64) - -- # compile everything for the static C runtime -- FOREACH(TYPE C CXX) -- # makefiles use blank configuration -- FOREACH(CFG "_DEBUG" "_MINSIZEREL" "_RELEASE" "_RELWITHDEBINFO") -- #MESSAGE("Replacing CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") -- SET(NEW_FLAGS "${CMAKE_${TYPE}_FLAGS${CFG}}") -- # fix up static libc flags -- STRING(REPLACE "/MD" "/MT" NEW_FLAGS "${NEW_FLAGS}") -- # *FORCE* to override whats already placed into the cache -- SET(CMAKE_${TYPE}_FLAGS${CFG} "${NEW_FLAGS}" CACHE STRING -- "CMAKE_${TYPE}_FLAGS${CFG} (overwritten to ensure static build)" FORCE) -- #MESSAGE("New CMAKE_${TYPE}_FLAGS${CFG}: ${CMAKE_${TYPE}_FLAGS${CFG}}") -- ENDFOREACH(CFG) -- ENDFOREACH(TYPE) - # link only with the static C runtime !! THIS IS A MUST !! - SET(NEW_FLAGS "${CMAKE_EXE_LINKER_FLAGS}") - # ensure that the flags are not duplicated on subsequent runs ---- a/doc/CMakeLists.txt -+++ b/doc/CMakeLists.txt -@@ -406,7 +406,7 @@ - "${CMAKE_BINARY_DIR}/doc/enfuse.html" - ${ENBLEND_PNGFILES} - ${ENFUSE_PNGFILES} -- DESTINATION ${DocumentsDirectory} -+ DESTINATION ${DocumentsDirectory}/html - ) - endif() - ---- a/src/CMakeLists.txt -+++ b/src/CMakeLists.txt -@@ -102,7 +102,7 @@ - endif(OpenMP_CXX_FLAGS AND NOT MSVC) - target_link_libraries(enblend ${common_libs} ${additional_libs}) - target_link_libraries(enfuse ${common_libs} ${additional_libs}) --install(TARGETS enblend enfuse DESTINATION bin CONFIGURATIONS Release RelWithDebInfo MinSizeRel) -+install(TARGETS enblend enfuse DESTINATION bin) - - if(NOT WIN32) - # create enblend.1 and enfuse.1