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

Fix WANTLIB for the gimp FLAVOR and enable building it by default to

Browse Source 
prevent it from drifting and/or breaking.
This commit is contained in:
ajacoutot 2013-08-21 10:36:25 +00:00
parent a96ce4abd9
commit 51f91d461d
3 changed files with 20 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
graphics/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.351 2013/07/19 07:16:38 kili Exp $
# $OpenBSD: Makefile,v 1.352 2013/08/21 10:36:25 ajacoutot Exp $
SUBDIR =
SUBDIR += DevIL
@ -232,6 +232,7 @@
SUBDIR += sane-backends
SUBDIR += sane-backends,snmp
SUBDIR += sane-frontends
SUBDIR += sane-frontends,gimp
SUBDIR += scratch
SUBDIR += scrot
SUBDIR += shared-color-targets
@ -265,6 +266,7 @@
SUBDIR += xoris
SUBDIR += xpaint
SUBDIR += xsane
SUBDIR += xsane,gimp
SUBDIR += xv
SUBDIR += xzgv
SUBDIR += zbar

21
graphics/sane-frontends/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.31 2013/03/11 11:10:55 espie Exp $
# $OpenBSD: Makefile,v 1.32 2013/08/21 10:36:25 ajacoutot Exp $
COMMENT= API for accessing scanners, frontends
DISTNAME= sane-frontends-1.0.14
REVISION= 18
REVISION= 19
CATEGORIES= graphics
@ -14,13 +14,11 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo
WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += gtk-x11-2.0 jpeg m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pixman-1 png pthread pthread-stubs sane tiff usb xcb
WANTLIB += xcb-render xcb-shm z
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gtk-x11-2.0 m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += sane z
MASTER_SITES= ftp://ftp.sane-project.org/pub/sane/${DISTNAME}/ \
http://gd.tuwien.ac.at/hci/sane/${DISTNAME}/ \
@ -44,10 +42,9 @@ FLAVORS= gimp
FLAVOR?=
.if ${FLAVOR} == "gimp"
WANTLIB += gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0
WANTLIB += gimpmath-2.0 gimpmodule-2.0 gimpui-2.0 gimpwidgets-2.0
LIB_DEPENDS+= graphics/gimp/stable
WANTLIB += gimp-2.0>=200.0 gimpui-2.0>=200.0 gimpmath-2.0>=200.0 \
gimpwidgets-2.0>=200.0 gimpbase-2.0>=200.0 \
gimpcolor-2.0>=200.0
CONFIGURE_ENV+= CPPFLAGS+="-I${LOCALBASE}/include/gimp-2.0"
.else
CONFIGURE_ARGS+=--disable-gimp

19
graphics/xsane/Makefile
View File

@ -1,9 +1,9 @@
# $OpenBSD: Makefile,v 1.35 2013/06/04 18:41:51 naddy Exp $
# $OpenBSD: Makefile,v 1.36 2013/08/21 10:36:25 ajacoutot Exp $
COMMENT= scanner frontend for SANE
DISTNAME= xsane-0.998
REVISION= 3
REVISION= 4
CATEGORIES= graphics
@ -16,13 +16,11 @@ MAINTAINER= Antoine Jacoutot <ajacoutot@openbsd.org>
# GPLv2
PERMIT_PACKAGE_CDROM= Yes
WANTLIB += GL X11 Xcomposite Xcursor Xdamage Xext Xfixes
WANTLIB += Xi Xinerama Xrandr Xrender atk-1.0 c cairo
WANTLIB += expat fontconfig freetype gdk-x11-2.0 gdk_pixbuf-2.0
WANTLIB += gio-2.0 glib-2.0 gmodule-2.0 gobject-2.0 gthread-2.0
WANTLIB += X11 Xcomposite Xcursor Xdamage Xext Xfixes Xi Xinerama
WANTLIB += Xrandr Xrender atk-1.0 c cairo fontconfig freetype
WANTLIB += gdk-x11-2.0 gdk_pixbuf-2.0 gio-2.0 glib-2.0 gobject-2.0
WANTLIB += gtk-x11-2.0 jpeg lcms m pango-1.0 pangocairo-1.0 pangoft2-1.0
WANTLIB += pixman-1 png pthread pthread-stubs sane tiff usb xcb
WANTLIB += xcb-render xcb-shm z
WANTLIB += png sane tiff z
MODULES= devel/gettext
LIB_DEPENDS= x11/gtk+2 \
@ -45,9 +43,8 @@ FLAVORS= gimp
FLAVOR?=
.if ${FLAVOR} == "gimp"
WANTLIB += gthread-2.0 gimp-2.0>=200.0 gimpmodule-2.0 gimpui-2.0
WANTLIB += gimpmath-2.0 gimpwidgets-2.0 gimpbase-2.0 gimpcolor-2.0
WANTLIB += gimpconfig-2.0
WANTLIB += gimp-2.0 gimpbase-2.0 gimpcolor-2.0 gimpconfig-2.0
WANTLIB += gimpmath-2.0 gimpmodule-2.0 gimpui-2.0 gimpwidgets-2.0
LIB_DEPENDS +=graphics/gimp/stable
CONFIGURE_ENV += CPPFLAGS+="-I${LOCALBASE}/include/gimp-2.0"
.else