summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
author Christoph Willing2020-10-20 15:42:58 +0200
committer Willy Sudiarto Raharjo2020-10-24 03:14:56 +0200
commit955a2de0b7d0d63f09b1de4ee086250f0a51ee18 (patch)
tree561e5ecd9fb8c9eb624ecf98868a31291fe0086a
parent74ca56f6ff4ed7b08343645cec1b5bd9107c01c0 (diff)
downloadslackbuilds-955a2de0b7d0d63f09b1de4ee086250f0a51ee18.tar.gz
graphics/gmic: Enable build with latest opencv (4.5.0)
Signed-off-by: Christoph Willing <chris.willing@linux.com> Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>
-rw-r--r--graphics/gmic/README3
-rw-r--r--graphics/gmic/gmic.SlackBuild4
2 files changed, 2 insertions, 5 deletions
diff --git a/graphics/gmic/README b/graphics/gmic/README
index 7d747e8eec..da13ba4daa 100644
--- a/graphics/gmic/README
+++ b/graphics/gmic/README
@@ -7,6 +7,3 @@ convert/manipulate/filter/visualize generic image datasets, ranging from
thus including 2d color images.
This package contains the gimp plug-in.
-
-Note: When building opencv, make sure qt5 is not installed, otherwise
-it will link against it and cause gmic to fail to build.
diff --git a/graphics/gmic/gmic.SlackBuild b/graphics/gmic/gmic.SlackBuild
index c72fbde487..5c54c3b4d7 100644
--- a/graphics/gmic/gmic.SlackBuild
+++ b/graphics/gmic/gmic.SlackBuild
@@ -46,7 +46,7 @@ elif [ "$ARCH" = "i686" ]; then
SLKCFLAGS="-O0 -march=i686 -mtune=i686 -fno-fast-math"
LIBDIRSUFFIX=""
elif [ "$ARCH" = "x86_64" ]; then
- SLKCFLAGS="-O0 -fPIC -fno-fast-math"
+ SLKCFLAGS="-O3 -fPIC"
LIBDIRSUFFIX="64"
else
SLKCFLAGS="-O0 -fno-fast-math"
@@ -87,7 +87,7 @@ cd zart
patch -p1 -i $CWD/zart-opencv4.patch
cd -
-make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} -j1
+make -C src cli lib libc WGET=/bin/true LIBS=${LDFLAGS} OPT_CFLAGS="$SLKCFLAGS " -j1
cd gmic-qt
qmake-qt5 GMIC_PATH=../src GMIC_DYNAMIC_LINKING=on HOST=none