commit: 7868cf824003c710cbf58cd04d316765e7ce9a02 Author: Jonathan Scruggs <j.scruggs <AT> gmail <DOT> com> AuthorDate: Sat Oct 8 13:12:14 2016 +0000 Commit: David Seifert <soap <AT> gentoo <DOT> org> CommitDate: Sat Oct 8 16:57:57 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7868cf82
media-gfx/enblend: Bump version to 4.2.0_p20161007 Gentoo-bug: 577512, 593094, 595630 The 4.2.0 release has missing CMake files, thus doesn't build, and there are general runtime bugs. This patch is from upstream that fixes all these issues. * Added more depends for document building * Added fix for document fonts access violation * Changed to EAPI 6 * Added SIMD use flag * General ebuild tidy ups * Depend on Boost version >=1.62 (due to C++11/14) Signed off by: Jonathan Scruggs (j.scruggs <AT> gmail.com, irc: Dracwyrm) Closes: https://github.com/gentoo/gentoo/pull/2510 Signed-off-by: David Seifert <soap <AT> gentoo.org> media-gfx/enblend/Manifest | 1 + media-gfx/enblend/enblend-4.2.0_p20161007.ebuild | 73 ++++++++++++++++++++++ .../files/enblend-4.2-doc-install-dir-fix.patch | 66 +++++++++++++++++++ media-gfx/enblend/metadata.xml | 22 +++---- 4 files changed, 151 insertions(+), 11 deletions(-) diff --git a/media-gfx/enblend/Manifest b/media-gfx/enblend/Manifest index a505c8f..1ec31a5 100644 --- a/media-gfx/enblend/Manifest +++ b/media-gfx/enblend/Manifest @@ -1 +1,2 @@ +DIST enblend-4.2.0_p20161007.tar.xz 494060 SHA256 4fe05af3d697bd6b2797facc8ba5aeabdc91e233156552301f1c7686232ff4c3 SHA512 ede037f19a7c3b358f533ecfb235f70824261eaf189d0bdcde6f9cedaa5952be2a6940884e688418b725cb3a67fc1b7d366483a76b7c62326ca857b8efe3a3f3 WHIRLPOOL 791c36ee422496170a7cfc8da7d701e40a4d9d1205ebebd692d4d4c4f694d99dad4260bf8b6b1a8957c686590f20edbd5b561760311151c4bc04394542979de7 DIST enblend-enfuse-4.1.3.tar.gz 862079 SHA256 1c00ae95cd05502759d7d47f99e6ba1150f8807f8f4f46c800cd46c5ad0df9ac SHA512 0a3487783afadee896b84411330898393cda4be4cbb79d36013daa98c17ab88f97a298c21a5c398b7cb2ce83e8dc4519a80e18be472c5fec10c3114037b6db73 WHIRLPOOL ab33a8ca5c38d9a5dca6aaeed7cbc806f7c34c5642f9e568a90d14789ecede896c0da888e5fe7e7d30e586778e0734495d06055fc189732e55bc0c013e699b48 diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007.ebuild new file mode 100644 index 00000000..0c86b867 --- /dev/null +++ b/media-gfx/enblend/enblend-4.2.0_p20161007.ebuild @@ -0,0 +1,73 @@ +# Copyright 1999-2016 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=6 + +inherit cmake-utils + +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 VIGRA" +SLOT="0" +KEYWORDS="~amd64 ~ppc ~x86" +IUSE="debug doc openmp tcmalloc cpu_flags_x86_sse2" +REQUIRED_USE="tcmalloc? ( !debug )" + +RDEPEND=" + >=dev-libs/boost-1.62.0:= + media-libs/glew:* + media-libs/lcms:2 + media-libs/libpng:0= + media-libs/openexr:= + media-libs/plotutils[X] + media-libs/tiff:0 + media-libs/vigra[openexr] + sci-libs/gsl:= + virtual/jpeg:0 + debug? ( dev-libs/dmalloc ) + tcmalloc? ( dev-util/google-perftools ) + media-libs/freeglut" +DEPEND="${RDEPEND} + media-gfx/imagemagick + sys-apps/help2man + virtual/pkgconfig + doc? ( + media-gfx/transfig + sci-visualization/gnuplot[gd] + virtual/latex-base + dev-lang/perl + dev-perl/Readonly + media-gfx/graphviz + gnome-base/librsvg + dev-tex/hevea + )" + +PATCHES=( "${FILESDIR}/${PN}-4.2-doc-install-dir-fix.patch" ) + +src_prepare() { + cmake-utils_src_prepare + + sed -i -e "s:share/doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die +} + +src_configure() { + local mycmakeargs=( + -DENABLE_DMALLOC=$(usex debug) + -DENABLE_TCMALLOC=$(usex tcmalloc) + -DDOC=$(usex doc) + -DINSTALL_HTML_DOC=$(usex doc) + -DINSTALL_PDF_DOC=$(usex doc) + -DENABLE_OPENMP=$(usex openmp) + -DENABLE_SSE2=$(usex cpu_flags_x86_sse2) + ) + cmake-utils_src_configure +} + +src_compile() { + export VARTEXFONTS="${T}/fonts" + # forcing -j1 as every parallel compilation process needs about 1 GB RAM. + cmake-utils_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 new file mode 100644 index 00000000..c952eeb --- /dev/null +++ b/media-gfx/enblend/files/enblend-4.2-doc-install-dir-fix.patch @@ -0,0 +1,66 @@ +* 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 diff --git a/media-gfx/enblend/metadata.xml b/media-gfx/enblend/metadata.xml index 5d7ddb7..621b21a 100644 --- a/media-gfx/enblend/metadata.xml +++ b/media-gfx/enblend/metadata.xml @@ -1,15 +1,15 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd";> <pkgmetadata> - <maintainer type="project"> - <email>graph...@gentoo.org</email> - <name>Gentoo Graphics Project</name> - </maintainer> - <use> - <flag name="gpu">GPU support for Enblend</flag> - <flag name="image-cache">allow for processing of large images</flag> - </use> - <upstream> - <remote-id type="sourceforge">enblend</remote-id> - </upstream> + <maintainer type="project"> + <email>graph...@gentoo.org</email> + <name>Gentoo Graphics Project</name> + </maintainer> + <use> + <flag name="gpu">GPU support for Enblend</flag> + <flag name="image-cache">allow for processing of large images</flag> + </use> + <upstream> + <remote-id type="sourceforge">enblend</remote-id> + </upstream> </pkgmetadata>
