diff options
| author | Christoph Willing <chris.willing@linux.com> | 2020-10-20 23:42:58 +1000 |
|---|---|---|
| committer | Willy Sudiarto Raharjo <willysr@slackbuilds.org> | 2020-10-24 08:14:56 +0700 |
| commit | 955a2de0b7d0d63f09b1de4ee086250f0a51ee18 (patch) | |
| tree | 561e5ecd9fb8c9eb624ecf98868a31291fe0086a /graphics | |
| parent | 74ca56f6ff4ed7b08343645cec1b5bd9107c01c0 (diff) | |
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>
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/gmic/README | 3 | ||||
| -rw-r--r-- | graphics/gmic/gmic.SlackBuild | 4 |
2 files changed, 2 insertions, 5 deletions
diff --git a/graphics/gmic/README b/graphics/gmic/README index 7d747e8eec798..da13ba4daab56 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 c72fbde487dd1..5c54c3b4d7baf 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 |