diff --git a/srcpkgs/gmic/patches/fix-includes.patch b/srcpkgs/gmic/patches/fix-includes.patch new file mode 100644 index 00000000000..1613bdb14f9 --- /dev/null +++ b/srcpkgs/gmic/patches/fix-includes.patch @@ -0,0 +1,126 @@ +--- src/CImg.h 2018-04-23 04:49:04.329501123 +0200 ++++ src/CImg.h 2018-04-23 04:48:23.850499833 +0200 +@@ -416,8 +416,8 @@ + #define _cimg_redefine_False + #endif + #include +-#include "cv.h" +-#include "highgui.h" ++#include ++#include + #endif + + // Configure LibPNG support. +@@ -429,7 +429,7 @@ + // (see methods 'CImg::{load,save}_png()'. + #ifdef cimg_use_png + extern "C" { +-#include "png.h" ++#include + } + #endif + +@@ -442,8 +442,8 @@ + // (see methods 'CImg::{load,save}_jpeg()'). + #ifdef cimg_use_jpeg + extern "C" { +-#include "jpeglib.h" +-#include "setjmp.h" ++#include ++#include + } + #endif + +@@ -458,7 +458,7 @@ + extern "C" { + #define uint64 uint64_hack_ + #define int64 int64_hack_ +-#include "tiffio.h" ++#include + #undef uint64 + #undef int64 + } +@@ -472,9 +472,9 @@ + // MINC2 library may be used to get a native support of '.mnc' files. + // (see methods 'CImg::{load,save}_minc2()'). + #ifdef cimg_use_minc2 +-#include "minc_io_simple_volume.h" +-#include "minc_1_simple.h" +-#include "minc_1_simple_rw.h" ++#include ++#include ++#include + #endif + + // Configure Zlib support. +@@ -486,7 +486,7 @@ + // (see methods 'CImg[List]::{load,save}_cimg()'). + #ifdef cimg_use_zlib + extern "C" { +-#include "zlib.h" ++#include + } + #endif + +@@ -498,7 +498,7 @@ + // Libcurl may be used to get a native support of file downloading from the network. + // (see method 'cimg::load_network()'.) + #ifdef cimg_use_curl +-#include "curl/curl.h" ++#include + #endif + + // Configure Magick++ support. +@@ -509,7 +509,7 @@ + // Magick++ library may be used to get a native support of various image file formats. + // (see methods 'CImg::{load,save}()'). + #ifdef cimg_use_magick +-#include "Magick++.h" ++#include + #endif + + // Configure FFTW3 support. +@@ -522,7 +522,7 @@ + // (see method 'CImg[List]::FFT()'). + #ifdef cimg_use_fftw3 + extern "C" { +-#include "fftw3.h" ++#include + } + #endif + +@@ -535,7 +535,7 @@ + // that can be saved as '.ps' or '.svg' files afterwards. + // (see method 'CImg::draw_object3d()'). + #ifdef cimg_use_board +-#include "Board.h" ++#include + #endif + + // Configure OpenEXR support. +@@ -546,11 +546,11 @@ + // OpenEXR library may be used to get a native support of '.exr' files. + // (see methods 'CImg::{load,save}_exr()'). + #ifdef cimg_use_openexr +-#include "ImfRgbaFile.h" +-#include "ImfInputFile.h" +-#include "ImfChannelList.h" +-#include "ImfMatrixAttribute.h" +-#include "ImfArray.h" ++#include ++#include ++#include ++#include ++#include + #endif + + // Configure TinyEXR support. +@@ -563,7 +563,7 @@ + #ifndef TINYEXR_IMPLEMENTATION + #define TINYEXR_IMPLEMENTATION + #endif +-#include "tinyexr.h" ++#include + #endif + + // Lapack configuration. diff --git a/srcpkgs/gmic/template b/srcpkgs/gmic/template index bf2e6c28417..f8d37a11eff 100644 --- a/srcpkgs/gmic/template +++ b/srcpkgs/gmic/template @@ -19,6 +19,7 @@ distfiles="http://gmic.eu/files/source/gmic_${version}.tar.gz checksum="f22783f14cb202dec4a840733f2028f6e2c464fdd2f0166fc38943702cea6bde ce71a7d6acf9acde79de42a660f715e8779933e1689f14d39fb0ceaca7582efd 0bb1683f7ad8f55476ec57e53d73454e05cb79fc55b297eb519b2a24df728b44" +nocross="https://build.voidlinux.eu/builders/armv7l_builder/builds/8869/steps/shell_3/logs/stdio" CXXFLAGS="-Wno-strict-overflow -Wno-deprecated -fkeep-inline-functions"