* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/files/, media-gfx/enblend/
@ 2016-10-08 16:58 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2016-10-08 16:58 UTC (permalink / raw
To: gentoo-commits
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>graphics@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>graphics@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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/files/, media-gfx/enblend/
@ 2017-02-12 13:19 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2017-02-12 13:19 UTC (permalink / raw
To: gentoo-commits
commit: 480753efd49061c8ea1fff89a9f0a7c16678c175
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sat Feb 11 15:31:24 2017 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Feb 12 13:19:14 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=480753ef
media-gfx/enblend: Fix Find{LCMS2,OpenGL}.cmake hardcoded lib32 paths
Fixes build on amd64 without ABI_X86_32 enabled deps.
- enblend-4.1.3-r2: EAPI 6, cleanup deps, add missing virtual/glu dep
- enblend-4.2.0_p20161007-r1: Cleanup, fix, sort, drop unused deps
- push back media-libs/libpng, virtual/jpeg to DEPEND (only headers)
- media-gfx/imagemagick -> virtual/imagemagick-tools, only if USE=doc
Package-Manager: portage-2.3.3
Closes: https://github.com/gentoo/gentoo/pull/3923
media-gfx/enblend/enblend-4.1.3-r2.ebuild | 87 ++++++++++++++++++++++
.../enblend/enblend-4.2.0_p20161007-r1.ebuild | 79 ++++++++++++++++++++
media-gfx/enblend/files/enblend-4.1.3-cmake.patch | 22 ++++++
.../enblend/files/enblend-4.1.3-vigra_check.patch | 4 +-
.../files/enblend-4.2.0_p20161007-cmake.patch | 11 +++
5 files changed, 201 insertions(+), 2 deletions(-)
diff --git a/media-gfx/enblend/enblend-4.1.3-r2.ebuild b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
new file mode 100644
index 0000000000..4405286b04
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.1.3-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit cmake-utils
+
+MY_P="${PN}-enfuse-${PV}"
+
+DESCRIPTION="Image Blending with Multiresolution Splines"
+HOMEPAGE="http://enblend.sourceforge.net/"
+SRC_URI="mirror://sourceforge/enblend/${MY_P}.tar.gz"
+
+LICENSE="GPL-2 VIGRA"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="debug doc gpu openmp"
+
+RDEPEND="
+ dev-libs/boost:=
+ media-libs/lcms:2
+ media-libs/openexr:=
+ media-libs/tiff:=
+ media-libs/vigra[openexr]
+ sci-libs/gsl:=
+ debug? ( dev-libs/dmalloc )
+ gpu? (
+ media-libs/freeglut
+ media-libs/glew:*
+ virtual/glu
+ virtual/opengl
+ )"
+DEPEND="${RDEPEND}
+ media-libs/libpng:0
+ sys-apps/help2man
+ virtual/jpeg:0
+ virtual/pkgconfig
+ doc? (
+ media-gfx/transfig
+ sci-visualization/gnuplot[gd]
+ virtual/imagemagick-tools
+ virtual/latex-base
+ )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS NEWS README )
+
+PATCHES=(
+ "${FILESDIR}"/${P}-vigra_check.patch
+ "${FILESDIR}"/${P}-texinfo-5-upstream.patch
+ "${FILESDIR}"/${P}-texinfo-5-more.patch
+ "${FILESDIR}"/${P}-cmake.patch
+)
+
+src_prepare() {
+ cmake-utils_src_prepare
+
+ # CRLF in files, don't bother with patch
+ sed -i -e "/FIND_LIBRARY(LCMS2_LIBRARIES/s/lib32/lib/" \
+ CMakeModules/FindLCMS2.cmake || die
+ sed -e "/FIND_LIBRARY(OPENGL_gl_LIBRARY/s/lib32/lib/" \
+ -e "/NAMES.*MesaGLU/s/lib32/lib/" \
+ -i CMakeModules/FindOpenGL.cmake || die
+
+ sed -i -e "/CXX_FLAGS/s:-O3::g" CMakeLists.txt || die
+ sed -i -e "s:doc/enblend:share/doc/${PF}:" doc/CMakeLists.txt || die
+}
+
+src_configure() {
+ local mycmakeargs=(
+ -DCMAKE_CXX_FLAGS_RELEASE=""
+ -DENABLE_DMALLOC=$(usex debug)
+ -DDOC=$(usex doc)
+ -DENABLE_GPU=$(usex gpu)
+ -DENABLE_IMAGECACHE=$(usex !openmp)
+ -DENABLE_OPENMP=$(usex openmp)
+ )
+ CMAKE_BUILD_TYPE="Release"
+ cmake-utils_src_configure
+}
+
+src_compile() {
+ # forcing -j1 as every parallel compilation process needs about 1 GB RAM.
+ cmake-utils_src_compile -j1
+}
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
new file mode 100644
index 0000000000..3480db3193
--- /dev/null
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r1.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2017 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="
+ media-libs/lcms:2
+ media-libs/openexr:=
+ media-libs/tiff:0
+ media-libs/vigra[openexr]
+ sci-libs/gsl:=
+ debug? ( dev-libs/dmalloc )
+ tcmalloc? ( dev-util/google-perftools )"
+DEPEND="${RDEPEND}
+ >=dev-libs/boost-1.62.0
+ media-libs/libpng:0
+ sys-apps/help2man
+ virtual/jpeg:0
+ virtual/pkgconfig
+ doc? (
+ dev-lang/perl
+ dev-perl/Readonly
+ dev-tex/hevea
+ gnome-base/librsvg
+ media-gfx/graphviz
+ media-gfx/transfig
+ sci-visualization/gnuplot[gd]
+ virtual/imagemagick-tools
+ virtual/latex-base
+ )"
+
+PATCHES=(
+ "${FILESDIR}"/${PN}-4.2-doc-install-dir-fix.patch
+ "${FILESDIR}"/${P}-cmake.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() {
+ # 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-utils_src_compile -j1
+}
diff --git a/media-gfx/enblend/files/enblend-4.1.3-cmake.patch b/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
new file mode 100644
index 0000000000..e9fef85278
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.1.3-cmake.patch
@@ -0,0 +1,22 @@
+--- a/CMakeLists.txt 2017-02-12 13:43:46.862787952 +0100
++++ b/CMakeLists.txt 2017-02-12 13:50:03.461229021 +0100
+@@ -185,7 +185,6 @@
+ FIND_PACKAGE(TIFF REQUIRED)
+ FIND_PACKAGE(Perl REQUIRED)
+ # this one is needed in doc. (Especially the program "convert")
+-FIND_PACKAGE(ImageMagick REQUIRED)
+ FIND_PACKAGE(GSL REQUIRED)
+ include_directories(${GSL_INCLUDE_DIR})
+ LIST(APPEND common_libs ${LCMS2_LIBRARIES} ${TIFF_LIBRARIES} ${GSL_LIBRARIES})
+@@ -394,8 +393,9 @@
+ add_subdirectory(src)
+
+ # you really should have perl installed, when creating doc's
+-if (PERL_FOUND AND IMAGEMAGICK_FOUND AND DOC)
+- # this should be set from comman line
++if (PERL_FOUND AND DOC)
++ FIND_PACKAGE(ImageMagick REQUIRED)
++ # this should be set from command line
+ # Possible values like described in README: @smallbook @afivepaper @afourpaper @afourwide @afourlatex
+ # @letter is default
+ set(EXTRATEXI2DVIFLAGS "@afourpaper" CACHE STRING "Papersize: @letter @smallbook @afivepaper @afourpaper @afourwide @afourlatex")
diff --git a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
index 982293e477..d067df3c57 100644
--- a/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
+++ b/media-gfx/enblend/files/enblend-4.1.3-vigra_check.patch
@@ -1,5 +1,5 @@
---- ConfigureChecks.cmake.orig 2013-10-07 10:50:00.000000000 +0400
-+++ ConfigureChecks.cmake 2015-03-31 13:42:40.179527224 +0300
+--- a/ConfigureChecks.cmake 2013-10-07 10:50:00.000000000 +0400
++++ b/ConfigureChecks.cmake 2015-03-31 13:42:40.179527224 +0300
@@ -53,7 +53,7 @@
if(VIGRA_FOUND AND NOT VIGRA_VERSION_CHECK)
unset(VIGRA_SETIMAGEINDEX CACHE)
diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20161007-cmake.patch b/media-gfx/enblend/files/enblend-4.2.0_p20161007-cmake.patch
new file mode 100644
index 0000000000..fcbeb64232
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2.0_p20161007-cmake.patch
@@ -0,0 +1,11 @@
+--- a/CMakeModules/FindLCMS2.cmake 2016-09-24 11:28:47.000000000 +0200
++++ b/CMakeModules/FindLCMS2.cmake 2017-02-11 16:15:33.492507341 +0100
+@@ -5,7 +5,7 @@
+ /usr/local/include
+ /usr/include
+ )
+- FIND_LIBRARY(LCMS2_LIBRARIES lcms2 HINTS /usr/local/lib /usr/lib/x86_64-linux-gnu /usr/lib32)
++ FIND_LIBRARY(LCMS2_LIBRARIES lcms2 HINTS /usr/local/lib /usr/lib/x86_64-linux-gnu /usr/lib)
+ ELSE(NOT WIN32)
+ FIND_PATH(LCMS2_ROOT_DIR
+ NAMES include/lcms2.h
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/files/, media-gfx/enblend/
@ 2023-01-04 5:50 Sam James
0 siblings, 0 replies; 4+ messages in thread
From: Sam James @ 2023-01-04 5:50 UTC (permalink / raw
To: gentoo-commits
commit: d3c1416258227e409c2d69344fd6291f3834a4b7
Author: Mario Haustein <mario.haustein <AT> hrz <DOT> tu-chemnitz <DOT> de>
AuthorDate: Tue Dec 27 06:42:17 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Wed Jan 4 05:48:13 2023 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d3c14162
media-gfx/enblend: fix docs build error
Closes: https://bugs.gentoo.org/888025
Signed-off-by: Mario Haustein <mario.haustein <AT> hrz.tu-chemnitz.de>
Closes: https://github.com/gentoo/gentoo/pull/28839
Signed-off-by: Sam James <sam <AT> gentoo.org>
media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild | 1 +
.../enblend-4.2.0_p20161007-doc-scaleable-fonts.patch | 16 ++++++++++++++++
2 files changed, 17 insertions(+)
diff --git a/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild b/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild
index f06af141e1d9..2871a62a8325 100644
--- a/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild
+++ b/media-gfx/enblend/enblend-4.2.0_p20161007-r5.ebuild
@@ -49,6 +49,7 @@ 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() {
diff --git a/media-gfx/enblend/files/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch b/media-gfx/enblend/files/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch
new file mode 100644
index 000000000000..638cd8c1ecbb
--- /dev/null
+++ b/media-gfx/enblend/files/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch
@@ -0,0 +1,16 @@
+Use scaleable fonts.
+
+Bug: https://bugs.gentoo.org/888025
+
+diff -Naur enblend-4.2.0_p20161007.org/doc/static-preamble.tex enblend-4.2.0_p20161007/doc/static-preamble.tex
+--- enblend-4.2.0_p20161007.org/doc/static-preamble.tex 2016-09-24 11:29:40.000000000 +0200
++++ enblend-4.2.0_p20161007/doc/static-preamble.tex 2022-12-27 07:30:42.966176272 +0100
+@@ -5,6 +5,8 @@
+ \RequirePackage[l2tabu, orthodox]{nag}
+
+
++\usepackage[T1]{fontenc}
++\usepackage{lmodern} % scaleable fonts
+ \usepackage{amsmath} % align, align*
+ \usepackage{bold-extra} % Bold typewriter for programming language keywords
+ \usepackage{color} % \colorbox
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/files/, media-gfx/enblend/
@ 2024-09-23 20:16 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2024-09-23 20:16 UTC (permalink / raw
To: gentoo-commits
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
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-09-23 20:16 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-01-04 5:50 [gentoo-commits] repo/gentoo:master commit in: media-gfx/enblend/files/, media-gfx/enblend/ Sam James
-- strict thread matches above, loose matches on Subject: below --
2024-09-23 20:16 Andreas Sturmlechner
2017-02-12 13:19 Andreas Sturmlechner
2016-10-08 16:58 David Seifert
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox