fltk14-devel: Update to git b3b051240ecf3ab562e73d3d5674d05aff261fc4

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: fltk14-devel: Update to git b3b051240ecf3ab562e73d3d5674d05aff261fc4
From: Michael Baeuerle <micha%NetBSD.org@localhost>
Date: Fri, 22 Mar 2024 12:55:42 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <micha%NetBSD.org@localhost>
Pushed By:	micha
Date:		Fri Mar 22 13:55:42 2024 +0100
Changeset:	dce121e0cca23d421c2e38845af71e14565a2414

Modified Files:
	fltk14-devel/Makefile
	fltk14-devel/PLIST
	fltk14-devel/TODO
	fltk14-devel/buildlink3.mk
	fltk14-devel/distinfo
	fltk14-devel/options.mk

Log Message:
fltk14-devel: Update to git b3b051240ecf3ab562e73d3d5674d05aff261fc4

pkgsrc: Add support for cairo and wayland.

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=dce121e0cca23d421c2e38845af71e14565a2414

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 fltk14-devel/Makefile      | 20 ++++++++-------
 fltk14-devel/PLIST         |  3 +++
 fltk14-devel/TODO          |  5 +++-
 fltk14-devel/buildlink3.mk | 32 +++++++++++++++++++++---
 fltk14-devel/distinfo      |  7 +++---
 fltk14-devel/options.mk    | 61 +++++++++++++++++++++++++++++++++++++---------
 6 files changed, 101 insertions(+), 27 deletions(-)

diffs:
diff --git a/fltk14-devel/Makefile b/fltk14-devel/Makefile
index 0a12471882..89d27dfdc4 100644
--- a/fltk14-devel/Makefile
+++ b/fltk14-devel/Makefile
@@ -3,7 +3,7 @@
 DISTNAME=	fltk-1.4.x
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_GITHUB:=fltk/}
-GITHUB_TAG=	2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54
+GITHUB_TAG=	b3b051240ecf3ab562e73d3d5674d05aff261fc4
 EXTRACT_SUFX=	.zip
 
 MAINTAINER=	micha%NetBSD.org@localhost
@@ -11,19 +11,20 @@ HOMEPAGE=	https://www.fltk.org/
 COMMENT=	Fast Light Tool Kit for graphical user interfaces
 LICENSE=	gnu-lgpl-v2
 
-USE_LANGUAGES=	c c++
-USE_LIBTOOL=	yes
-USE_TOOLS+=	autoconf gmake nroff pkg-config
+USE_LANGUAGES=		c c++
+USE_CC_FEATURES+=	c99
+FORCE_C_STD=		c99
+FORCE_CXX_STD=		c++98
+
+USE_TOOLS+=		autoconf gmake nroff pkg-config
+USE_LIBTOOL=		yes
 
 PTHREAD_OPTS+=		require
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--enable-svg
 CONFIGURE_ARGS+=	--enable-print
 CONFIGURE_ARGS+=	--enable-shared
+CONFIGURE_ARGS+=	--enable-svg
 CONFIGURE_ARGS+=	--enable-threads
-CONFIGURE_ARGS+=	--enable-xcursor
-CONFIGURE_ARGS+=	--enable-xfixes
-CONFIGURE_ARGS+=	--enable-xrender
 
 # Use pkgsrc versions of libraries, not package's bundled versions
 CONFIGURE_ARGS+=	--disable-localjpeg
@@ -48,7 +49,8 @@ pre-configure:
 
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../mk/jpeg.buildlink3.mk"
 .include "../../graphics/png/buildlink3.mk"
+.include "../../mk/jpeg.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
+
 .include "../../mk/bsd.pkg.mk"
diff --git a/fltk14-devel/PLIST b/fltk14-devel/PLIST
index 27ed3c2eb4..8162db73a9 100644
--- a/fltk14-devel/PLIST
+++ b/fltk14-devel/PLIST
@@ -169,6 +169,9 @@ include/FL/x11.H
 lib/libfltk.a
 lib/libfltk.so
 lib/libfltk.so.1.4
+${PLIST.cairo}lib/libfltk_cairo.a
+${PLIST.cairo}lib/libfltk_cairo.so
+${PLIST.cairo}lib/libfltk_cairo.so.1.4
 lib/libfltk_forms.a
 lib/libfltk_forms.so
 lib/libfltk_forms.so.1.4
diff --git a/fltk14-devel/TODO b/fltk14-devel/TODO
index d4f5f88c30..c331b1f415 100644
--- a/fltk14-devel/TODO
+++ b/fltk14-devel/TODO
@@ -1,10 +1,13 @@
 [X] Add zlib dependency
 [X] Support for HP-UX
+    Added upstream (Issue #937).
 [ ] Support for AIX
 [ ] Static libraries should not be installed with execute permissions
     "fltk.list" has entires with 444 permissions, looks like a bug.
 [ ] Check for library suffixes on AIX, HP-UX and macOS
-[ ] Some configurations create the compiler warnings below
+    Should use libtool like FLTK 1.3
 [X] Build test programs only on request (make test)
     This was rejected upstream (Issue #940).
     Disable build of test programs with new option "--disable-test".
+[X] Fix X11 options
+[X] Add cairo and wayland options
diff --git a/fltk14-devel/buildlink3.mk b/fltk14-devel/buildlink3.mk
index 77e31c3813..8faaecc6fb 100644
--- a/fltk14-devel/buildlink3.mk
+++ b/fltk14-devel/buildlink3.mk
@@ -14,6 +14,11 @@ pkgbase := fltk
 .include "../../mk/bsd.fast.prefs.mk"
 .include "../../mk/pkg-build-options.mk"
 
+# For "cairo" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mcairo}
+.  include "../../graphics/cairo/buildlink3.mk"
+.endif
+
 # For "opengl" option
 .if ${PKG_BUILD_OPTIONS.fltk:Mopengl}
 .  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
@@ -29,6 +34,11 @@ pkgbase := fltk
 .  endif
 .endif
 
+# For "wayland" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mwayland}
+.  include "../../devel/wayland/buildlink3.mk"
+.endif
+
 # For "x11" option
 .if ${PKG_BUILD_OPTIONS.fltk:Mx11}
 .  include "../../x11/libX11/buildlink3.mk"
@@ -38,9 +48,18 @@ pkgbase := fltk
 .  include "../../x11/libXrender/buildlink3.mk"
 .endif
 
-# For "xdbe" option
-.if ${PKG_BUILD_OPTIONS.fltk:Mxdbe}
-# No client library required
+# For "xcursor" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mxcursor}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXcursor/buildlink3.mk"
+.  endif
+.endif
+
+# For "xfixes" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mxfixes}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXfixes/buildlink3.mk"
+.  endif
 .endif
 
 # For "xft2" option
@@ -57,6 +76,13 @@ pkgbase := fltk
 .  endif
 .endif
 
+# For "xrender" option
+.if ${PKG_BUILD_OPTIONS.fltk:Mxrender}
+.  if ${PKG_BUILD_OPTIONS.fltk:Mx11}
+.    include "../../x11/libXrender/buildlink3.mk"
+.  endif
+.endif
+
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../mk/jpeg.buildlink3.mk"
diff --git a/fltk14-devel/distinfo b/fltk14-devel/distinfo
index 128d72a674..1cab8584d6 100644
--- a/fltk14-devel/distinfo
+++ b/fltk14-devel/distinfo
@@ -1,6 +1,7 @@
 $NetBSD$
 
-BLAKE2s (fltk-1.4.x-2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54.zip) = 194b20c9029082b04d48c8672d3d84b39360b1b09dcf280500bf5f6edf5c06dc
-SHA512 (fltk-1.4.x-2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54.zip) = a2d54875ba982d17866ed27205eeefd8aba5bcddd6d93d9e4759c6541841694f66eee385957d275e184f9e071a2c73125cd9c59a67ee358113d8a9bd06222577
-Size (fltk-1.4.x-2001132f4a1ab2ad02f31c4a7c4cf9a5d803ed54.zip) = 9337915 bytes
+SHA1 (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = 01b77299e8249ff2e336c48505daa3f3dcb54a67
+RMD160 (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = 2a4c294afcce823ce3a5b13f008484d736542a04
+SHA512 (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = b7878bba337308429ee8595c73124cb671f556539061d8f3922ed2c70a117e9f452afa4b9ffddc832ab3644cd44d1dafaac07cf85a0c99aa3d1341850a44cfa7
+Size (fltk-1.4.x-b3b051240ecf3ab562e73d3d5674d05aff261fc4.zip) = 9337926 bytes
 SHA1 (patch-documentation_Makefile) = 4af65225feb343f8d4bf1af11cfb4929b7fe81c6
diff --git a/fltk14-devel/options.mk b/fltk14-devel/options.mk
index e8b8cc4bc0..65ff0281f6 100644
--- a/fltk14-devel/options.mk
+++ b/fltk14-devel/options.mk
@@ -3,19 +3,30 @@
 .include "../../mk/bsd.prefs.mk"
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.fltk14
-PKG_SUPPORTED_OPTIONS=	opengl pango x11 xdbe xft2 xinerama
+PKG_SUPPORTED_OPTIONS=	cairo opengl pango x11 xcursor xfixes xft2 xinerama xrender
+PKG_SUPPORTED_OPTIONS+=	wayland  # untested
 # FLTK has native backends for macOS and Windows (Cygwin)
 # Enabling the "x11" option forces X11 backend on such systems.
 # Most users want the native backends.
 .if ${OPSYS} == "Darwin" || ${OPSYS} == "Cygwin"
-PKG_SUGGESTED_OPTIONS=	opengl pango xdbe xft2 xinerama
+PKG_SUGGESTED_OPTIONS=	opengl
 .else
-PKG_SUGGESTED_OPTIONS=	opengl pango x11 xdbe xft2 xinerama
+PKG_SUGGESTED_OPTIONS=	cairo opengl pango x11 xcursor xfixes xft2 xinerama xrender
 .endif
-PLIST_VARS+=		opengl
+PLIST_VARS+=		cairo opengl
 
 .include "../../mk/bsd.options.mk"
 
+# "cairo" option: Use cairo 2D graphics library
+# Required for Fl_Cairo_Window.
+.if !empty(PKG_OPTIONS:Mcairo)
+.  include "../../graphics/cairo/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-cairo
+PLIST.cairo=		yes
+.else
+CONFIGURE_ARGS+=	--disable-cairo
+.endif
+
 # "opengl" option: Enable support for OpenGL based rendering
 # Disabling this option removes expensive dependencies for X11 backend.
 # Attention: Some packages that use FLTK need this option (disable with care)
@@ -47,6 +58,14 @@ CONFIGURE_ARGS+=	--enable-pango
 CONFIGURE_ARGS+=	--disable-pango
 .endif
 
+# "wayland" option: Use wayland backend
+.if !empty(PKG_OPTIONS:Mwayland)
+.  include "../../devel/wayland/buildlink3.mk"
+CONFIGURE_ARGS+=	--enable-wayland
+.else
+CONFIGURE_ARGS+=	--disable-wayland
+.endif
+
 # "x11" option [X11 backend]: Use X11 backend
 # For some systems there are native backends available, do not use them.
 # Attention: Forcing X11 backend requires X Window system to be installed.
@@ -61,14 +80,24 @@ CONFIGURE_ARGS+=	--enable-x11
 CONFIGURE_ARGS+=	--disable-x11
 .endif
 
-# "xdbe" option [X11 backend]: Use X double buffer extension (DBE)
-# On older systems double buffering can be very slow. Disabling this option can
-# make the GUI more responsive. The drawback is potential flickering, e.g. in
-# a text field while a scrollbar is moved.
-.if !empty(PKG_OPTIONS:Mxdbe)
-CONFIGURE_ARGS+=	--enable-xdbe
+# "xcursor" option [X11 backend]: Use X cursor management library
+.if !empty(PKG_OPTIONS:Mxcursor)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../x11/libXcursor/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=	--enable-xcursor
+.else
+CONFIGURE_ARGS+=	--disable-xcursor
+.endif
+
+# "xfixes" option [X11 backend]: Use X11 XFIXES extension
+.if !empty(PKG_OPTIONS:Mxfixes)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../x11/libXfixes/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=	--enable-xfixes
 .else
-CONFIGURE_ARGS+=	--disable-xdbe
+CONFIGURE_ARGS+=	--disable-xfixes
 .endif
 
 # "xft2" option [X11 backend]: Use X FreeType interface library
@@ -97,3 +126,13 @@ CONFIGURE_ARGS+=	--enable-xinerama
 .else
 CONFIGURE_ARGS+=	--disable-xinerama
 .endif
+
+# "xrender" option [X11 backend]: Use X11 RENDER extension
+.if !empty(PKG_OPTIONS:Mxrender)
+.  if !empty(PKG_OPTIONS:Mx11)
+.    include "../../x11/libXrender/buildlink3.mk"
+.  endif
+CONFIGURE_ARGS+=	--enable-xrender
+.else
+CONFIGURE_ARGS+=	--disable-xrender
+.endif
Prev by Date: flnews-devel: Update to 1.2.1pre9
Next by Date: fltk14-devel: Should now work on AIX again.
Previous by Thread: flnews-devel: Update to 1.2.1pre9
Next by Thread: fltk14-devel: Should now work on AIX again.
Indexes:
Home | Main Index | Thread Index | Old Index