cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gimp-plugin-lensfun: don't try to use openmp, which causes build failure

Browse Source 
on gcc arches. don't hardcode "gcc" in Makefile check. don't hardcode a
link with libstdc++.
This commit is contained in:
sthen 2020-12-09 10:28:02 +00:00
parent 2deeee1e8e
commit 3f1b361414
2 changed files with 36 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/gimp/lensfun/Makefile
View File

@ -1,22 +1,24 @@
# $OpenBSD: Makefile,v 1.1.1.1 2020/10/31 10:40:05 espie Exp $ # $OpenBSD: Makefile,v 1.2 2020/12/09 10:28:02 sthen Exp $
COMMENT = gimp plugin for correcting lens distortion COMMENT = gimp plugin for correcting lens distortion
PKGNAME = gimp-lensfun-plugin-$V PKGNAME = gimp-lensfun-plugin-$V
V = 0.2.4 V = 0.2.4
GH_ACCOUNT = seebk GH_ACCOUNT = seebk
GH_PROJECT = GIMP-Lensfun GH_PROJECT = GIMP-Lensfun
GH_TAGNAME = $V GH_TAGNAME = $V
CATEGORIES = graphics REVISION = 0
CATEGORIES = graphics
HOMEPAGE = https://seebk.github.io/GIMP-Lensfun/ HOMEPAGE = https://seebk.github.io/GIMP-Lensfun/
# GPLv3 # GPLv3
PERMIT_PACKAGE = Yes PERMIT_PACKAGE = Yes
WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext WANTLIB += ${COMPILER_LIBCXX} X11 Xcomposite Xcursor Xdamage Xext
WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 babl-0.1 WANTLIB += Xfixes Xi Xinerama Xrandr Xrender atk-1.0 babl-0.1
WANTLIB += c cairo exiv2 fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0 WANTLIB += c cairo exiv2 fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gegl-0.4 gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0 WANTLIB += gegl-0.4 gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0
@ -27,7 +29,6 @@ WANTLIB += pangoft2-1.0 z lensfun
# MASTER_SITES = http://www.logarithmic.net/pfh-files/resynthesizer/ # MASTER_SITES = http://www.logarithmic.net/pfh-files/resynthesizer/
MASTER_SITES = ${MASTER_SITES_GITHUB}
COMPILER = base-clang ports-gcc COMPILER = base-clang ports-gcc

29
graphics/gimp/lensfun/patches/patch-Makefile Normal file
View File

@ -0,0 +1,29 @@
$OpenBSD: patch-Makefile,v 1.1 2020/12/09 10:28:02 sthen Exp $
Index: Makefile
--- Makefile.orig
+++ Makefile
@@ -15,19 +15,19 @@ CXXFLAGS += -O3 -Wall
# project-specific flags
EXTRA_CXXFLAGS += $(shell gimptool-2.0 --cflags && pkg-config --cflags lensfun exiv2)
-LDFLAGS += $(shell gimptool-2.0 --libs && pkg-config --libs lensfun exiv2) -lstdc++
+LDFLAGS += $(shell gimptool-2.0 --libs && pkg-config --libs lensfun exiv2)
# set some system dependent options
-SYS := $(shell gcc -dumpmachine)
+SYS := $(shell ${CC} -dumpmachine)
ifneq (, $(findstring mingw, $(SYS)))
ifeq ($(DEBUG), 0)
LDFLAGS += -Wl,-subsystem,windows
endif
else
# comment to disable OpenMP
- CXXFLAGS += -fopenmp
- LDFLAGS += -fopenmp
+ #CXXFLAGS += -fopenmp
+ #LDFLAGS += -fopenmp
endif