eureka: Update to 1.27

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: eureka: Update to 1.27
From: Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Date: Thu, 13 Feb 2020 11:11:09 +0000
Module Name:	pkgsrc-wip
Committed By:	Michael Baeuerle <michael.baeuerle%stz-e.de@localhost>
Pushed By:	micha
Date:		Thu Feb 13 12:11:09 2020 +0100
Changeset:	4fc626e0ac6b702b4243bc2ff7fdb867ea32babc

Modified Files:
	eureka/COMMIT_MSG
	eureka/Makefile
	eureka/TODO
	eureka/options.mk

Log Message:
eureka: Update to 1.27

The OpenGL renderer can be disabled with the new package option "opengl"
(recommended on machines without hardware acceleration for OpenGL).
The option "opengl" is ignored if the FLTK package was compiled without OpenGL
support.

CHANGES IN Eureka 1.27
======================

(Since version 1.24)

+ use OpenGL for faster rendering of 2D and 3D views
+ improved non-GL drawing of 2D view, much faster in Linux
+ support mixing textures and flats for ports that allow it
+ improved 3D mode, can move things and sector surfaces
+ ratio lock, makes producing lines at certain angles easier

- a single status bar for both 2D and 3D views
- new popup menus to set edit mode, browser mode, scaling
- render sectors in the 2D view with both lighting and texturing
- create void islands by drawing lines anti-clockwise in a sector
- snap position indicator for 2D view (a light-blue cross)
- added scale '-' and '+' buttons, show scale as percentage
- ability to highlight/select railings in 3D view
- beginning of support for UDMF maps (not usable yet...)

- render BOOM's deep water effect (linetype 242)
  [pkgrc note: Legacy linetype 301 "Translucent 3D water" is now visible
               with the OpenGL renderer too]
- render 3D Floors for EDGE, LEGACY and ZDOOM ports
  [pkgrc note: 3D floors are only visible with the OpenGL renderer]
- render basic slopes for EDGE, ETERNITY, ODAMEX and ZDOOM
  [pkgrc note: Slopes are only visible with the OpenGL renderer]
- render things with a NULL sprite as a blue triangle
- render Hexen map-spots as a green triangle
- render unknown things with a smaller '?' sprite

- preference to combine flats and textures in a single browser
- preference to show all textures on a one-sided linedef
- preference for linedef information (Length, Angle, Ratio)

- support ESC key to cancel a current action (e.g. dragging)
- support SHIFT and CTRL when using mouse-wheel to move in 3D view
- support the FreeDM iwad
- support TNT and Plutonia textures in FreeDoom2 iwad
- support Hexen map format in the ETERNITY port
- support PNG, JPEG and TGA images in sprite/flat/patch lumps
- added portal specials 156 and 107 to the ZDOOM port
- added missing specials 105, 106 and 130 to the ZDOOM port
- improvements to the Makefile
- improvements to the MacOS build files

- fixed mode menu disappearing into Window's task bar when maximized
- fixed not remembering test-in-game EXE when port is "vanilla"
- fixed the 'Online Docs' command in the Help menu
- fixed window title not showing correct map name
- fixed Re-bind in key binding dialog to show new key as valid
- fixed grid getting out-of-sync with the "hide in FREE mode"
- fixed needless line flips when drawing clockwise within a sector

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

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

diffstat:
 eureka/COMMIT_MSG | 10 ++++++++++
 eureka/Makefile   | 11 -----------
 eureka/TODO       |  5 +++++
 eureka/options.mk | 24 ++++++++++++++++--------
 4 files changed, 31 insertions(+), 19 deletions(-)

diffs:
diff --git a/eureka/COMMIT_MSG b/eureka/COMMIT_MSG
index bc3c84bd66..2404e957ad 100644
--- a/eureka/COMMIT_MSG
+++ b/eureka/COMMIT_MSG
@@ -1,5 +1,11 @@
 eureka: Update to 1.27
 
+The OpenGL renderer can be disabled with the new package option "opengl"
+(recommended on machines without hardware acceleration for OpenGL).
+The option "opengl" is ignored if the FLTK package was compiled without OpenGL
+support.
+
+
 CHANGES IN Eureka 1.27
 ======================
 
@@ -21,8 +27,12 @@ CHANGES IN Eureka 1.27
 - beginning of support for UDMF maps (not usable yet...)
 
 - render BOOM's deep water effect (linetype 242)
+  [pkgrc note: Legacy linetype 301 "Translucent 3D water" is now visible
+               with the OpenGL renderer too]
 - render 3D Floors for EDGE, LEGACY and ZDOOM ports
+  [pkgrc note: 3D floors are only visible with the OpenGL renderer]
 - render basic slopes for EDGE, ETERNITY, ODAMEX and ZDOOM
+  [pkgrc note: Slopes are only visible with the OpenGL renderer]
 - render things with a NULL sprite as a blue triangle
 - render Hexen map-spots as a green triangle
 - render unknown things with a smaller '?' sprite
diff --git a/eureka/Makefile b/eureka/Makefile
index 29cba31074..90b9b086ea 100644
--- a/eureka/Makefile
+++ b/eureka/Makefile
@@ -38,16 +38,5 @@ SUBST_SED.dwd=		-e 's,PKGSRC_DOOMWADDIR,${PREFIX}/${DOOMWADDIR},'
 
 BUILDLINK_API_DEPENDS.zlib+=	zlib>=1.2.3
 .include "../../devel/zlib/buildlink3.mk"
-# FLTK version 1.4 is supported too
-.include "../../x11/fltk13/buildlink3.mk"
-
-.if empty(PKG_OPTIONS.fltk13:Mopengl) || empty(PKG_OPTIONS:Mopengl)
-SUBST_CLASSES+=		opengl
-SUBST_STAGE.opengl=	do-configure
-SUBST_MESSAGE.opengl=	Preparing Makefile ...
-SUBST_FILES.opengl=	Makefile
-SUBST_SED.opengl=	-e 's,\# CXXFLAGS += -DNO_OPENGL,CXXFLAGS += -DNO_OPENGL,'
-SUBST_SED.opengl+=	-e 's, --use-gl,,'
-.endif
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/eureka/TODO b/eureka/TODO
index bcfbc513c8..164fa85668 100644
--- a/eureka/TODO
+++ b/eureka/TODO
@@ -28,5 +28,10 @@
 [X] Update to Git commit 19c0d7e5dd1bb8e5bf7c6840868e9f6eecd14a9a
     => Remove patch for Ticket #37
     => Remove patch for install with nonpriviledged user
+[X] Make OpenGL an option (Default=on)
+    => An option "opengl" already exists in pkgsrc
+    => Ignore this option if FLTK is compiled without OpenGL support
 [X] Import final eureka 1.27 release
 [X] Switch back to FLTK version from pkgsrc current
+[X] Test with FLTK 1.3.5 again
+    => Good
diff --git a/eureka/options.mk b/eureka/options.mk
index 5ccf63529b..6a9866c879 100644
--- a/eureka/options.mk
+++ b/eureka/options.mk
@@ -1,22 +1,30 @@
 # $NetBSD$
 
-PKG_OPTIONS_VAR=	PKG_OPTIONS.eureka-devel
+PKG_OPTIONS_VAR=	PKG_OPTIONS.eureka
 PKG_SUPPORTED_OPTIONS=	opengl xdg-utils
 PKG_SUGGESTED_OPTIONS=	opengl xdg-utils
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/bsd.options.mk"
 
-# opengl: Use OpenGL for drawing
-# If FLTK is compiled without opengl option, it is ignored.
-# If FLTK is compiled with opengl option, removing it here allows to force usage
-# of the software renderer (recommended without hardware acceleration).
-.if !empty(PKG_OPTIONS:Mopengl)
-# Handled by Makefile because the FLTK dependency (not included here yet)
+.include "../../x11/fltk13/buildlink3.mk"
+
+# opengl: Use OpenGL for rendering
+# If FLTK is compiled without opengl option, it is always disabled here too.
+# If FLTK is compiled with opengl option, disabling it here allows to force
+# usage of the software renderer (recommended without hardware acceleration).
+.if empty(PKG_OPTIONS.fltk13:Mopengl) || empty(PKG_OPTIONS:Mopengl)
+SUBST_CLASSES+=		opengl
+SUBST_STAGE.opengl=	do-configure
+SUBST_MESSAGE.opengl=	Disable OpenGL renderer in Makefile ...
+SUBST_FILES.opengl=	Makefile
+SUBST_SED.opengl=	-e 's,\# CXXFLAGS += -DNO_OPENGL,CXXFLAGS += -DNO_OPENGL,'
+SUBST_SED.opengl+=	-e 's, --use-gl,,'
+SUBST_SED.opengl+=	-e 's,LIBS += -lGLU -lGL,\#LIBS += -lGLU -lGL,'
 .endif
 
 # xdg-utils: Create dependency for xdg-utils (Portland project)
-# Can be used by FLTK for fl_open_uri() on X11
+# Can be used by FLTK for fl_open_uri() on X11.
 .if !empty(PKG_OPTIONS:Mxdg-utils)
 DEPENDS+=	xdg-utils>=1.1:../../misc/xdg-utils
 .endif
Prev by Date: obconf-qt, minor correction in Makefile
Next by Date: flnews-devel: Update to 0.18pre10
Previous by Thread: eureka: Update to 1.27
Next by Thread: wlroots: Require llvm
Indexes:
Home | Main Index | Thread Index | Old Index