From c90785fcdb5a35f699b015c788bd19b7f5941f5f Mon Sep 17 00:00:00 2001 From: Rmys Date: Sun, 29 Oct 2023 14:39:22 +0300 Subject: [PATCH] enblend-4.2 --- .../enblend-4.2-doc-install-dir-fix.patch | 66 +++++++++++++++++++ .../enblend-4.2.0_p20161007-cmake.patch | 11 ++++ ...-4.2.0_p20161007-doc-scaleable-fonts.patch | 16 +++++ .../enblend-4.2.0_p20161007-gcc-10.patch | 16 +++++ multimedia/graphics/enblend/pspec.xml | 16 +++-- 5 files changed, 118 insertions(+), 7 deletions(-) create mode 100644 multimedia/graphics/enblend/files/gentoo/enblend-4.2-doc-install-dir-fix.patch create mode 100644 multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-cmake.patch create mode 100644 multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch create mode 100644 multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-gcc-10.patch diff --git a/multimedia/graphics/enblend/files/gentoo/enblend-4.2-doc-install-dir-fix.patch b/multimedia/graphics/enblend/files/gentoo/enblend-4.2-doc-install-dir-fix.patch new file mode 100644 index 0000000000..c952eeb778 --- /dev/null +++ b/multimedia/graphics/enblend/files/gentoo/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/multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-cmake.patch b/multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-cmake.patch new file mode 100644 index 0000000000..fcbeb64232 --- /dev/null +++ b/multimedia/graphics/enblend/files/gentoo/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 diff --git a/multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch b/multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch new file mode 100644 index 0000000000..638cd8c1ec --- /dev/null +++ b/multimedia/graphics/enblend/files/gentoo/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 diff --git a/multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-gcc-10.patch b/multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-gcc-10.patch new file mode 100644 index 0000000000..7203d6b667 --- /dev/null +++ b/multimedia/graphics/enblend/files/gentoo/enblend-4.2.0_p20161007-gcc-10.patch @@ -0,0 +1,16 @@ +Fix build with GCC-10. + +Thanks-to: Walter Hüttenmeyer +Bug: https://bugs.gentoo.org/724988 + +--- a/src/minimizer.cc 2016-09-24 11:29:40.000000000 +0200 ++++ b/src/minimizer.cc 2020-05-24 13:09:58.199170984 +0200 +@@ -19,7 +19,7 @@ + */ + + #include +- ++#include + #include "minimizer.h" + + diff --git a/multimedia/graphics/enblend/pspec.xml b/multimedia/graphics/enblend/pspec.xml index 6def1d7357..a2868b26d4 100644 --- a/multimedia/graphics/enblend/pspec.xml +++ b/multimedia/graphics/enblend/pspec.xml @@ -12,7 +12,7 @@ app:console Image blending with multiresolution splines enblend is a tool for compositing images. Given a set of images that overlap in some irregular way, enblend overlays them in such a way that the seam between the images is invisible, or at least very difficult to see. - mirrors://sourceforge/enblend/enblend-enfuse/enblend-enfuse-4.1/enblend-enfuse-4.1.5.tar.gz + https://mirrors.tencent.com/gentoo/distfiles/c7/enblend-4.2.0_p20161007.tar.xz cmake gsl-devel @@ -27,8 +27,10 @@ libjpeg-turbo-devel - gentoo_prepare.patch - + gentoo/enblend-4.2-doc-install-dir-fix.patch + gentoo/enblend-4.2.0_p20161007-cmake.patch + gentoo/enblend-4.2.0_p20161007-gcc-10.patch + gentoo/enblend-4.2.0_p20161007-doc-scaleable-fonts.patch @@ -53,10 +55,10 @@ 2023-10-29 - 4.1.5 - Rebuild - Pisi Linux Community - admin@pisilinux.org + 4.2 + Version bump. + Mustafa Cinasal + muscnsl@gmail.com 2023-01-04