GMIC needs a patch for recent Gimp

HJarausch · March 25, 2017, 2:55pm

The recent GIMP (GIT 2017/03/25) has renamed
GIMP_LAYER_MODE_HSV_COLOR_LEGACY to
GIMP_LAYER_MODE_HSL_COLOR_LEGACY

Therefore the following patch is needed

— src/gmic_gimp_gtk.cpp.ORIG 2017-03-25 12:52:17.835176235 +0100
+++ src/gmic_gimp_gtk.cpp 2017-03-25 14:06:45.349219958 +0100
@@ -404,7 +404,7 @@
#define GIMP_LIGHTEN_ONLY_MODE GIMP_LAYER_MODE_LIGHTEN_ONLY_LEGACY
#define GIMP_HUE_MODE GIMP_LAYER_MODE_HSV_HUE_LEGACY
#define GIMP_SATURATION_MODE GIMP_LAYER_MODE_HSV_SATURATION_LEGACY
-#define GIMP_COLOR_MODE GIMP_LAYER_MODE_HSV_COLOR_LEGACY
+#define GIMP_COLOR_MODE GIMP_LAYER_MODE_HSL_COLOR_LEGACY
#define GIMP_VALUE_MODE GIMP_LAYER_MODE_HSV_VALUE_LEGACY
#define GIMP_DIVIDE_MODE GIMP_LAYER_MODE_DIVIDE_LEGACY
#define GIMP_DODGE_MODE GIMP_LAYER_MODE_DODGE_LEGACY

rich2005 · March 25, 2017, 4:27pm

I think that might be the same for the 'buntu based Gimp 2.9.5 ppa

Trying to compile gmic against the 2.9.5 dev fails.

gmic-cmake.txt.zip (1.6 KB)

using cmake

Edit:
OK that was a couple of days ago,

code refreshed and editing line 407 as previous post, gmic_gimp_gtk now compiles.
That works fine in the VM I used for the purpose.
However, my regular Kubuntu 16.04 does not normally have the opencv and GraphickMagick libraries installed. Not there and gmic-gimp does not load.

Question are these essential and should be considered dependencies or can I compile gmic_gimp_gtk without them?

Edit: some time later: 27th.
Seems to compile ok without the opencv / graphicsmagick++ lib’s.

David_Tschumperle · April 3, 2017, 11:27am

Thanks for the feedback.
To compile the plug-in, OpenCV and ImageMagick libraries should not be used actually, so maybe there is an error in the CMakefile.txt ?
I’m definitely not an expert in the use of CMake, so if someone can help, he is more than welcome !

David_Tschumperle · April 3, 2017, 11:37am

@Carmelo_DrRaw maybe ?
It seems the plug-in compiled with the CMake links with a lot of ‘useless’ libraries, like TIFF/JPEG/GRAPHICSMAGICK/OPENEXR and OPENCV.
Any idea how to remove these dependencies for the plug-in (but let them for the CLI interface of course) ?
Thanks

Carmelo_DrRaw · April 4, 2017, 11:05am

Hi David,

sorry for answering late… I didn’t know that those libraries were not needed for the plug-in.

The easiest way to fix this is to remove the corresponding lines in the target_link_libraries cmake command for the plug-in. Those are the lines starting from 309 in CMakeLists.txt:

github.com

dtschump/gmic/blob/master/CMakeLists.txt#L309

    
      
          #
          #  File        : CMakeLists.txt
          #                ( cmake-based build system configuration file )
          #
          #  Basic usage :
          #
          #                 - cmake .
          #                 - make
          #
          #                ( https://gmic.eu )
          #
          #  Author      : Sander Knopper
          #                ( https://github.com/saknopper )
          #
          #                Based on work by Ștefan Talpalaru
          #                ( https://github.com/stefantalpalaru )
          #
          #  Licenses    : This file is 'dual-licensed', you have to choose one
          #                 of the two licenses below to apply.
          #
          #                CeCILL-C
          #                The CeCILL-C license is close to the GNU LGPL.
          #                ( http://cecill.info/licences/Licence_CeCILL-C_V1-en.html )
          #
          #            or  CeCILL v2.1
          #                The CeCILL license is compatible with the GNU GPL.
          #                ( http://cecill.info/licences/Licence_CeCILL_V2.1-en.html )
          #
          #  This software is governed either by the CeCILL or the CeCILL-C license
          #  under French law and abiding by the rules of distribution of free software.
          #  You can  use, modify and or redistribute the software under the terms of
          #  the CeCILL or CeCILL-C licenses as circulated by CEA, CNRS and INRIA
          #  at the following URL: "http://cecill.info".
          #
          #  As a counterpart to the access to the source code and  rights to copy,
          #  modify and redistribute granted by the license, users are provided only
          #  with a limited warranty  and the software's author,  the holder of the
          #  economic rights,  and the successive licensors  have only  limited
          #  liability.
          #
          #  In this respect, the user's attention is drawn to the risks associated
          #  with loading,  using,  modifying and/or developing or reproducing the
          #  software by the user in light of its specific status of free software,
          #  that may mean  that it is complicated to manipulate,  and  that  also
          #  therefore means  that it is reserved for developers  and  experienced
          #  professionals having in-depth computer knowledge. Users are therefore
          #  encouraged to load and test the software's suitability as regards their
          #  requirements in conditions enabling the security of their systems and/or
          #  data to be ensured and,  more generally, to use and operate it in the
          #  same conditions as regards security.
          #
          #  The fact that you are presently reading this means that you have had
          #  knowledge of the CeCILL and CeCILL-C licenses and that you accept its terms.
          #
          
          
cmake_minimum_required(VERSION 3.14.0)
          
          
if(CMAKE_SOURCE_DIR STREQUAL CMAKE_BINARY_DIR)
            message("Build directory is equal to source directory. Binaries will be put in the src directory.")
            message("")
          
          
  set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_SOURCE_DIR}/src/" CACHE FILEPATH "Output directory for all targets." FORCE)
            set(GMIC_BINARIES_PATH ${CMAKE_RUNTIME_OUTPUT_DIRECTORY})
          else()
            set(GMIC_BINARIES_PATH ${CMAKE_BINARY_DIR})
          endif()
          
          
set(CMAKE_CXX_STANDARD 11)
          set(CXX_STANDARD_REQUIRED ON)
          
          
project(gmic CXX C)
          
          
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/cmake")
          
          
find_package(PkgConfig)
          include(FeatureSummary)
          include(GNUInstallDirs)
          
          
find_package(CImg REQUIRED)
          find_package(GMicStdlib REQUIRED)
          
          
# options controlling the build process
          option(BUILD_LIB "Build the GMIC shared library" ON)
          option(BUILD_LIB_STATIC "Build the GMIC static library" ON)
          option(BUILD_CLI "Build the CLI interface" ON)
          option(BUILD_MAN "Build the manpage" ON)
          option(BUILD_BASH_COMPLETION "Build Bash completion" ON)
          option(CUSTOM_CFLAGS "Override default compiler optimization flags" OFF)
          option(ENABLE_DYNAMIC_LINKING "Dynamically link the binaries to the GMIC shared library" OFF)
          option(ENABLE_LTO "Enable -flto (Link Time Optimizer) on gcc and clang" OFF)
          
          
if(NOT CMAKE_BUILD_TYPE)
            set(CMAKE_BUILD_TYPE Release)
          endif()
          
          
# compile flags
          set(CMAKE_POSITION_INDEPENDENT_CODE True)
          
          
set(COMPILE_FLAGS "-Dgmic_build -Dcimg_use_vt100 -Dgmic_is_parallel -Dcimg_use_abort")
          if(APPLE)
             set(COMPILE_FLAGS "${COMPILE_FLAGS} -mmacosx-version-min=10.8 -stdlib=libc++ -Wno-error=c++11-narrowing -Wc++11-extensions -fpermissive")
          elseif(CMAKE_CXX_COMPILER_ID STREQUAL "GNU") 
            # GCC
            set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fno-ipa-sra -fpermissive")
          elseif(CMAKE_CXX_COMPILER_ID STREQUAL "Clang")
            # Clang
            set(COMPILE_FLAGS "${COMPILE_FLAGS} -Wno-error=narrowing -fpermissive")
          endif()
          
          
if(NOT "${PRERELEASE_TAG}" STREQUAL "")
            set(COMPILE_FLAGS "${COMPILE_FLAGS} -Dgmic_prerelease=\"${PRERELEASE_TAG}\"")
          endif()
          
          
if (ENABLE_LTO)
            # https://stackoverflow.com/a/47370726/160386
            include(CheckIPOSupported)
            check_ipo_supported(RESULT supported OUTPUT error)
            if(supported)
              message(STATUS "IPO / LTO enabled")
              set(CMAKE_INTERPROCEDURAL_OPTIMIZATION TRUE)
            else()
              message(STATUS "IPO / LTO not supported: <${error}>")
            endif()
          endif()
          
          
if(ENABLE_DYNAMIC_LINKING)
            if(NOT BUILD_LIB)
              message(FATAL_ERROR "ENABLE_DYNAMIC_LINKING needs BUILD_LIB")
            endif()
            set(CMAKE_SKIP_RPATH TRUE)
          endif()
          
          
set(CMAKE_CXX_FLAGS_DEBUG "-g -ansi -Wall -Wextra -pedantic -Dcimg_verbosity=3 ${COMPILE_FLAGS}")
          set(CMAKE_CXX_FLAGS_RELEASE "${COMPILE_FLAGS}")
          set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-g ${COMPILE_FLAGS}")
          
          
if(NOT CUSTOM_CFLAGS)
            set(CMAKE_CXX_FLAGS_DEBUG "-Og ${CMAKE_CXX_FLAGS_DEBUG}")
            set(CMAKE_CXX_FLAGS_RELEASE "-Ofast ${CMAKE_CXX_FLAGS_RELEASE}")
            set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-Ofast ${CMAKE_CXX_FLAGS_RELWITHDEBINFO}")
          endif()
          
          
# source files
          set(CLI_Sources src/gmic.cpp)
          
          
if(BUILD_LIB)
            add_library(libgmic SHARED ${CLI_Sources})
            set_target_properties(libgmic PROPERTIES SOVERSION "1" OUTPUT_NAME "gmic")
            target_link_libraries(libgmic
              CImg::CImg
              GMicStdlib::Stdlib
            )
            target_include_directories(libgmic
              PUBLIC
                $<INSTALL_INTERFACE:include>
                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
            )
          
          
  install(TARGETS libgmic EXPORT GmicTargets
              PUBLIC_HEADER DESTINATION "${CMAKE_INSTALL_LIBDIR}"
              LIBRARY DESTINATION "${CMAKE_INSTALL_LIBDIR}"
              RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}"
              ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}"
            )
            install(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
          endif()
          
          

          
if(BUILD_LIB_STATIC)
            add_library(libgmicstatic STATIC ${CLI_Sources})
            set_target_properties(libgmicstatic PROPERTIES OUTPUT_NAME "gmic")
            target_link_libraries(libgmicstatic
              CImg::CImg
              GMicStdlib::Stdlib
            )
            target_include_directories(libgmicstatic
              PUBLIC
                $<INSTALL_INTERFACE:include>
                $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}/src>
            )
          
          
  install(TARGETS libgmicstatic EXPORT GmicTargets ARCHIVE DESTINATION "${CMAKE_INSTALL_LIBDIR}")
            install(FILES src/gmic.h DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}")
          endif()
          
          

          
if(BUILD_CLI)
            add_executable(gmic src/gmic_cli.cpp)
            if(ENABLE_DYNAMIC_LINKING)
              target_link_libraries(gmic libgmic)
            else()
              target_link_libraries(gmic libgmicstatic)
            endif()
          
          
  install(TARGETS gmic RUNTIME DESTINATION bin LIBRARY DESTINATION lib)
          endif()
          
          
if(BUILD_MAN)
            file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/man)
            add_custom_command(
              OUTPUT ${CMAKE_BINARY_DIR}/man/gmic.1
              DEPENDS gmic
              COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic it ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic reference man > ${CMAKE_BINARY_DIR}/man/gmic.1
            )
            add_custom_target(man ALL DEPENDS ${CMAKE_BINARY_DIR}/man/gmic.1)
            install(FILES ${CMAKE_BINARY_DIR}/man/gmic.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1/)
          endif()
          
          
if(BUILD_BASH_COMPLETION)
            file(MAKE_DIRECTORY ${CMAKE_BINARY_DIR}/resources)
            add_custom_command(
              OUTPUT ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh
              DEPENDS gmic
              COMMAND LD_LIBRARY_PATH=${GMIC_BINARIES_PATH} ${GMIC_BINARIES_PATH}/gmic ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic it ${CMAKE_SOURCE_DIR}/src/gmic_stdlib.gmic parse_cli bashcompletion > ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh
            )
            add_custom_target(bashcompletion ALL DEPENDS ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh)
            install(FILES ${CMAKE_BINARY_DIR}/resources/gmic_bashcompletion.sh
              DESTINATION ${CMAKE_INSTALL_DATADIR}/bash-completion/completions
              RENAME gmic
            )
          endif()
          
          
include(CMakePackageConfigHelpers)
          file(WRITE "${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake.in" "@PACKAGE_INIT@\ninclude(\${CMAKE_CURRENT_LIST_DIR}/GmicTargets.cmake)\n")
          configure_package_config_file(
            ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake.in
            ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake
            INSTALL_DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic
          )
          install(EXPORT GmicTargets DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic)
          install(FILES ${CMAKE_CURRENT_BINARY_DIR}/GmicConfig.cmake DESTINATION ${CMAKE_INSTALL_LIBDIR}/cmake/gmic)
          feature_summary(WHAT ALL)

This file has been truncated. show original

Can you do this directly in the official G’MIC github repository?

Thanks!

David_Tschumperle · April 5, 2017, 6:47am

Hi Andrea, I think this is the thing I’ve tried at first, but I got link errors anyway.
I think this is because the macros enabling the use of these libs are still enabled when compiling the plug-in (things like -Dcimg_use_jpeg or -Dcimg_use_tiff), but they shouldn’t be defined in this case.

Carmelo_DrRaw · April 5, 2017, 3:36pm

@rich2005 @David_Tschumperle I have modified the CMakeLists.txt file such that TIFF/JPEG/GRAPHICSMAGICK/OPENEXR and OPENCV do not get linked to the plug-in.

However, at the moment I have no way to do extensive tests to make sure my modifications are correct.

Could one of you possibly get my G’MIC fork from here and check if everything compiles & links as expected?

If yes, David can go ahead an incorporate the full request in the official repository…

Thanks!

David_Tschumperle · April 6, 2017, 7:55am

That seems to work as expected. A big thank @Carmelo_DrRaw !

rich2005 · April 6, 2017, 12:05pm

Works fine here in Kubuntu 16.04, information while compiling is not much different from before, still checking for opencv and GraphicsMagick++ which I removed earlier as a fix. Removing openEXR also removes Gimp so that is not a good idea. A bit of the output

[quote]X11_LIBRARY_DIRS:
– Checking for module ‘fftw3>=3.0’
– Found fftw3, version 3.3.4
– Checking for module ‘opencv’
– No package ‘opencv’ found
– Checking for module ‘GraphicsMagick++’
– No package ‘GraphicsMagick++’ found
– Found TIFF: /usr/lib/x86_64-linux-gnu/libtiff.so (found version “4.0.6”)
– Found PNG: /usr/lib/x86_64-linux-gnu/libpng.so (found version “1.2.57”)
– Found JPEG: /usr/lib/x86_64-linux-gnu/libjpeg.so
– Checking for module ‘OpenEXR’
– Found OpenEXR, version 2.2.0
– Checking for module ‘gimp-2.0’
– Found gimp-2.0, version 2.9.5
– Checking for module ‘gimpui-2.0’
– Found gimpui-2.0, version 2.9.5
– Configuring done[/quote]

The compiled plugin gmic_gimp_gtk is a bit smaller (6.5M) that the update from yesterday from the regular git (6.7M).