theforceengine: update to TheForceEngine-1.09.410

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: theforceengine: update to TheForceEngine-1.09.410
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Sun, 06 Aug 2023 17:01:00 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Sun Aug 6 19:01:00 2023 +0200
Changeset:	51ba7a85c3cd13995605b07a9dce08e868077479

Modified Files:
	theforceengine/Makefile
	theforceengine/PLIST
	theforceengine/distinfo
	theforceengine/patches/patch-TheForceEngine_main.cpp
Added Files:
	theforceengine/patches/patch-TheForceEngine_TFE__DarkForces_vueLogic.cpp
	theforceengine/patches/patch-TheForceEngine_TFE__FileSystem_CMakeLists.txt

Log Message:
theforceengine: update to TheForceEngine-1.09.410

pkgsrc: assume posix paths for non-windows platforms.

Version 1.09.410:

A quick bug-fix release following up version 1.09.4.

  * Fixed the Linux build.
  * Fixed a crash on some graphics drivers when creating textures for bloom.
  * Color correction and bloom can now be used at the same time.
  * Fixed captions and subtitles both showing if you had either one or the
    other enabled.
  * Fixed a timing issue with subtitles when running at very high framerates
    (the subtitles would never disappear and become "stuck").

Version 1.09.400:

  * Smooth Vue Animations (optional).
  * Fixed color flashing when switching between levels.
  * Ported over GPU Renderer portal fixes - now supports up to 65536 visible
    portals as originally intended.
  * Fixed GPU Renderer issues when using more than 65536 vertices for sector or
    sprite geometry in a frame.
  * Fixed Wireframe so it works correctly in release mode, and made 3DOs solid
    color when in wireframe.
  * Added a new "Retro" settings template that matches the "Modern" template
    from previous versions, where "Modern" enables new features, such as Bloom
    by default.
  * Added an "8-bit Interpolated" color mode, which smooths out colormap-based
    shading and removes most of the banding.
  * Added a new console command exportTexture that will export the texture on
    the surface the camera is currently pointing at.
  * Added a bloom option, with the ability to adjust its strength and spread.
  * Added Accessibility options, starting out with Closed Captions / Subtitles
    (Beta).

See blog post: https://theforceengine.github.io/2023/07/31/Version-1-09-04.html

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

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

diffstat:
 theforceengine/Makefile                            |  3 ++-
 theforceengine/PLIST                               |  9 +++++++++
 theforceengine/distinfo                            | 11 ++++++-----
 ...tch-TheForceEngine_TFE__DarkForces_vueLogic.cpp | 22 ++++++++++++++++++++++
 ...h-TheForceEngine_TFE__FileSystem_CMakeLists.txt | 15 +++++++++++++++
 .../patches/patch-TheForceEngine_main.cpp          |  9 +--------
 6 files changed, 55 insertions(+), 14 deletions(-)

diffs:
diff --git a/theforceengine/Makefile b/theforceengine/Makefile
index f52026395e..b8e983569d 100644
--- a/theforceengine/Makefile
+++ b/theforceengine/Makefile
@@ -1,7 +1,7 @@
 # $NetBSD$
 
 GITHUB_TAG=	v${PKGVERSION_NOREV}
-DISTNAME=	TheForceEngine-1.09.200
+DISTNAME=	TheForceEngine-1.09.410
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=luciusDXL/}
 
@@ -19,6 +19,7 @@ PTHREAD_AUTO_VARS=	yes
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../devel/cmake/build.mk"
 .include "../../devel/devIL/buildlink3.mk"
+.include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../graphics/glew/buildlink3.mk"
 .include "../../graphics/hicolor-icon-theme/buildlink3.mk"
 .include "../../wip/rtaudio/buildlink3.mk"
diff --git a/theforceengine/PLIST b/theforceengine/PLIST
index 10c8145bc0..163fda3283 100644
--- a/theforceengine/PLIST
+++ b/theforceengine/PLIST
@@ -1,5 +1,7 @@
 @comment $NetBSD$
 bin/theforceengine
+share/TheForceEngine/Captions/README.txt
+share/TheForceEngine/Captions/subtitles.txt
 share/TheForceEngine/Documentation/internal/darkforces-manual.pdf
 share/TheForceEngine/Documentation/markdown/Credits.md
 share/TheForceEngine/Documentation/markdown/TheForceEngine.md
@@ -25,6 +27,11 @@ share/TheForceEngine/Mods/TFE/AdjustableHud/HudStatusRightAddon.bm
 share/TheForceEngine/Mods/TFE/AdjustableHud/HudStatusRightAddon.png
 share/TheForceEngine/Shaders/blit.frag
 share/TheForceEngine/Shaders/blit.vert
+share/TheForceEngine/Shaders/bloom.vert
+share/TheForceEngine/Shaders/bloomDownsample.frag
+share/TheForceEngine/Shaders/bloomMerge.frag
+share/TheForceEngine/Shaders/bloomThreshold.frag
+share/TheForceEngine/Shaders/filter.h
 share/TheForceEngine/Shaders/gpu_render_modelHologram.frag
 share/TheForceEngine/Shaders/gpu_render_modelHologram.vert
 share/TheForceEngine/Shaders/gpu_render_modelSolid.frag
@@ -40,6 +47,7 @@ share/TheForceEngine/Shaders/grid2d.frag
 share/TheForceEngine/Shaders/grid2d.vert
 share/TheForceEngine/Shaders/grid3d.frag
 share/TheForceEngine/Shaders/grid3d.vert
+share/TheForceEngine/Shaders/lighting.h
 share/TheForceEngine/Shaders/line2d.frag
 share/TheForceEngine/Shaders/line2d.vert
 share/TheForceEngine/Shaders/line3d.frag
@@ -50,6 +58,7 @@ share/TheForceEngine/Shaders/overlay.frag
 share/TheForceEngine/Shaders/overlay.vert
 share/TheForceEngine/Shaders/quad2d.frag
 share/TheForceEngine/Shaders/quad2d.vert
+share/TheForceEngine/Shaders/textureSampleFunc.h
 share/TheForceEngine/Shaders/tri2dColor.frag
 share/TheForceEngine/Shaders/tri2dColor.vert
 share/TheForceEngine/Shaders/tri2dTextured.frag
diff --git a/theforceengine/distinfo b/theforceengine/distinfo
index 0a966fe829..f261fddc9d 100644
--- a/theforceengine/distinfo
+++ b/theforceengine/distinfo
@@ -1,10 +1,11 @@
 $NetBSD$
 
-BLAKE2s (TheForceEngine-1.09.200.tar.gz) = 331302749e1c47cb936d7a36f718688de4bfa636048044edad76d4d28f8c6eee
-SHA512 (TheForceEngine-1.09.200.tar.gz) = 3382a36cc5790107073e906d2f451cf216d9408760118f0578f6af630adb6d70207d838756270b7fc8015de4eae54b1b71ff62d06a6aa68f4a9f9afd8897833a
-Size (TheForceEngine-1.09.200.tar.gz) = 20559146 bytes
+BLAKE2s (TheForceEngine-1.09.410.tar.gz) = 3c887717a31901405113a307875f10277b9e96ba303ba716be29981da104029b
+SHA512 (TheForceEngine-1.09.410.tar.gz) = fa474401d6864dd5f626653be417d739891b648f636268cf9604853c00b418c8d4dca455e1729206694a843ff0160ca0e9fe49a34cc881e2dda7dd90d33313b4
+Size (TheForceEngine-1.09.410.tar.gz) = 20586983 bytes
 SHA1 (patch-TheForceEngine_TFE__DarkForces_darkForcesMain.cpp) = 9ef01755114c1e1112cb3ee70952fa2fd06c1efe
-SHA1 (patch-TheForceEngine_TFE__System_CrashHandler_crashHandlerLinux.cpp) = 0a44e0141e508365e25c7b5577360175a1f36d9d
+SHA1 (patch-TheForceEngine_TFE__DarkForces_vueLogic.cpp) = 4205d9bb4726091890138263b34f688de9064d30
+SHA1 (patch-TheForceEngine_TFE__FileSystem_CMakeLists.txt) = 95880228de4eef163b448cd5f4c515dbc74bb660
 SHA1 (patch-TheForceEngine_TFE__System_system.cpp) = 9443243c036b8d5676818dc76ae44c0aea557df3
 SHA1 (patch-TheForceEngine_TFE__System_types.h) = 9ac18c31c65faf41572d8452bf6a9f22adddffe1
-SHA1 (patch-TheForceEngine_main.cpp) = db84d34d7a0ec84020441ae82bacda4185d62e3b
+SHA1 (patch-TheForceEngine_main.cpp) = 251196f327d4a6b728dc3f9171969a9166287c1f
diff --git a/theforceengine/patches/patch-TheForceEngine_TFE__DarkForces_vueLogic.cpp b/theforceengine/patches/patch-TheForceEngine_TFE__DarkForces_vueLogic.cpp
new file mode 100644
index 0000000000..49652fa795
--- /dev/null
+++ b/theforceengine/patches/patch-TheForceEngine_TFE__DarkForces_vueLogic.cpp
@@ -0,0 +1,22 @@
+$NetBSD$
+
+Use the correct modf function for float variables.
+
+--- TheForceEngine/TFE_DarkForces/vueLogic.cpp.orig	2023-08-02 00:48:43.000000000 +0000
++++ TheForceEngine/TFE_DarkForces/vueLogic.cpp
+@@ -577,7 +577,7 @@ namespace TFE_DarkForces
+ 						if (smoothVUEs)
+ 						{
+ 							f32 frameIndexF = f32(dt) / f32(local(vue)->frameDelay);
+-							t = std::modf(frameIndexF, &frameIndexF); //normalized progress from prev to cur frame
++							t = modff(frameIndexF, &frameIndexF); //normalized progress from prev to cur frame
+ 							frameIndex = s32(frameIndexF);
+ 						}
+ 						else
+@@ -646,4 +646,4 @@ namespace TFE_DarkForces
+ 		task_free(logic->task);
+ 	}
+ 
+-}  // TFE_DarkForces
+\ No newline at end of file
++}  // TFE_DarkForces
diff --git a/theforceengine/patches/patch-TheForceEngine_TFE__FileSystem_CMakeLists.txt b/theforceengine/patches/patch-TheForceEngine_TFE__FileSystem_CMakeLists.txt
new file mode 100644
index 0000000000..b927124b91
--- /dev/null
+++ b/theforceengine/patches/patch-TheForceEngine_TFE__FileSystem_CMakeLists.txt
@@ -0,0 +1,15 @@
+$NetBSD$
+
+Assume posix for non-windows.
+
+--- TheForceEngine/TFE_FileSystem/CMakeLists.txt.orig	2023-08-02 00:48:43.000000000 +0000
++++ TheForceEngine/TFE_FileSystem/CMakeLists.txt
+@@ -4,7 +4,7 @@ if(WIN32)
+ 		"${CMAKE_CURRENT_SOURCE_DIR}/fileutil.cpp"
+ 		"${CMAKE_CURRENT_SOURCE_DIR}/paths.cpp"
+         )
+-elseif(LINUX)
++else()
+ 	target_sources(tfe PRIVATE
+ 		"${CMAKE_CURRENT_SOURCE_DIR}/filestream-posix.cpp"
+ 		"${CMAKE_CURRENT_SOURCE_DIR}/fileutil-posix.cpp"
diff --git a/theforceengine/patches/patch-TheForceEngine_main.cpp b/theforceengine/patches/patch-TheForceEngine_main.cpp
index 0031eea25e..0b7397c8b0 100644
--- a/theforceengine/patches/patch-TheForceEngine_main.cpp
+++ b/theforceengine/patches/patch-TheForceEngine_main.cpp
@@ -4,7 +4,7 @@ Search for program files in the install prefix.
 
 --- TheForceEngine/main.cpp.orig	2023-05-27 05:02:04.000000000 +0000
 +++ TheForceEngine/main.cpp
-@@ -515,6 +515,7 @@ int main(int argc, char* argv[])
+@@ -528,6 +528,7 @@ int main(int argc, char* argv[])
  	#endif
  
  	// Paths
@@ -12,10 +12,3 @@ Search for program files in the install prefix.
  	bool pathsSet = true;
  	pathsSet &= TFE_Paths::setProgramPath();
  	pathsSet &= TFE_Paths::setProgramDataPath("TheForceEngine");
-@@ -938,4 +939,4 @@ void parseOption(const char* name, const
- 			s_nullAudioDevice = true;
- 		}
- 	}
--}
-\ No newline at end of file
-+}
Prev by Date: wip/pkgchkxx: Update to 0.1.5
Next by Date: cyclone: regenerate the patch for scheme/base.c from scheme/base.sld
Previous by Thread: wip/pkgchkxx: Update to 0.1.5
Next by Thread: cyclone: regenerate the patch for scheme/base.c from scheme/base.sld
Indexes:
Home | Main Index | Thread Index | Old Index