bstone: update to bston-1.2.10

[Yorick Hardy <yorickhardy%gmail.com@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Mon Feb 15 00:23:17 2021 +0200
Changeset:	83e0818e2f157c4715eea4f0ccaa6d1878b01889

Modified Files:
	bstone/Makefile
	bstone/distinfo
Added Files:
	bstone/patches/patch-CMakeLists.txt
	bstone/patches/patch-id__sd.cpp

Log Message:
bstone: update to bston-1.2.10

Pkgsrc:

- Use pkgsrc openal-soft.
- Prefer SDL sound by default (the sound system in 1.2.9)
  since the game may crash when using openal.

Changelog:

== [1.2.10] - 2021-02-14
=== Added
- Support for external textures (bmp, png).
- Configuration for external textures (`vid_external_textures`).
- OpenAL 3D audio driver.
- Configuration for OpenAL driver (`snd_driver`, `snd_oal_library`, `snd_oal_device_name`).

=== Fixed
- Search path with provided `data_dir`.
- Double fading on new game or load game when using hw renderer (Emile Belanger, @emileb).
- Fade whole screen when in widescreen and 3D view is showing (Emile Belanger, @emileb).
- Next map number for level transition.
- Support for lowercase resource file names.
- [CMake] Always enabled precompiled headers.

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

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

diffstat:
 bstone/Makefile                     |  3 ++-
 bstone/distinfo                     | 10 ++++++----
 bstone/patches/patch-CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++
 bstone/patches/patch-id__sd.cpp     | 21 +++++++++++++++++++++
 4 files changed, 62 insertions(+), 5 deletions(-)

diffs:
diff --git a/bstone/Makefile b/bstone/Makefile
index 9ce5cd7733..898e0bc6b9 100644
--- a/bstone/Makefile
+++ b/bstone/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD: Makefile,v 1.4 2015/09/13 20:07:57 yhardy Exp $
 
-DISTNAME=	bstone-1.2.9
+DISTNAME=	bstone-1.2.10
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bibendovsky/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -21,5 +21,6 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/bstone ${DESTDIR}${PREFIX}/bin/bstone
 	${INSTALL_DATA} ${WRKSRC}/../README.md ${DESTDIR}${PREFIX}/share/doc/${PKGNAME}/README
 
+.include "../../audio/openal-soft/buildlink3.mk"
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/bstone/distinfo b/bstone/distinfo
index d76413e9d1..2b9abac48c 100644
--- a/bstone/distinfo
+++ b/bstone/distinfo
@@ -1,6 +1,8 @@
 $NetBSD: distinfo,v 1.4 2015/09/13 20:07:57 yhardy Exp $
 
-SHA1 (bstone-1.2.9.tar.gz) = d69d2604fec03b3c9fb773febdf6e0567e64528e
-RMD160 (bstone-1.2.9.tar.gz) = 63fbe52ddacf549b5f3a6db1fc353c1e52cfa22a
-SHA512 (bstone-1.2.9.tar.gz) = 679f48caed076088307e30f88f71af8534856bab9cc693990839d8a63a9b08e7947f292dc7a3a90f3c58ce0b637ee889a3941ca3a6a903592ee17b46ddb3ddb6
-Size (bstone-1.2.9.tar.gz) = 1235502 bytes
+SHA1 (bstone-1.2.10.tar.gz) = f909173be0ee0b58b25603da2894d1dcf9574672
+RMD160 (bstone-1.2.10.tar.gz) = 97baef0bdeebd0a9d31dcfc5ddec58cfc22e9106
+SHA512 (bstone-1.2.10.tar.gz) = a1bc4803fa11d3d0f4ae39fb01d9915a2a448094193ca3933ce7f1409b8871b5e47a34b406adb25393fca9acff3d69c7bad877c7959fef74f7164cf4b076101d
+Size (bstone-1.2.10.tar.gz) = 1364126 bytes
+SHA1 (patch-CMakeLists.txt) = a7429b267bcfa753fe358d781f473cd58e261c88
+SHA1 (patch-id__sd.cpp) = 02e34dd28520bf266ad0593e5bb961e7d435de60
diff --git a/bstone/patches/patch-CMakeLists.txt b/bstone/patches/patch-CMakeLists.txt
new file mode 100644
index 0000000000..380f516978
--- /dev/null
+++ b/bstone/patches/patch-CMakeLists.txt
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Use pkgsrc openal-soft.
+
+--- CMakeLists.txt.orig	2021-02-14 11:47:46.000000000 +0000
++++ CMakeLists.txt
+@@ -63,6 +63,7 @@ if (BSTONE_USE_STATIC_LINKING)
+ 	set(BSTONE_SDL2_COMPONENTS "${BSTONE_SDL2_COMPONENTS};static")
+ endif ()
+ 
++find_package(OpenAL 1.7.3 REQUIRED)
+ find_package(SDL2W 2.0.4 REQUIRED COMPONENTS ${BSTONE_SDL2_COMPONENTS})
+ 
+ # Threads
+@@ -185,6 +186,8 @@ endif ()
+ 
+ target_link_libraries(
+ 	${PROJECT_NAME}
++	PUBLIC
++		${OPENAL_LIBRARY}
+ 	PRIVATE
+ 		SDL2W::SDL2Wmain
+ 		SDL2W::SDL2W
+@@ -216,8 +219,8 @@ target_include_directories(
+ 	PRIVATE
+ 		.
+ 		dosbox
++		${OPENAL_INCLUDE_DIR}
+ 		lib/glm
+-		lib/openal_soft/include/AL
+ 		lib/stb
+ 		lib/xbrz
+ 		sys/win32
diff --git a/bstone/patches/patch-id__sd.cpp b/bstone/patches/patch-id__sd.cpp
new file mode 100644
index 0000000000..12c09e1e6b
--- /dev/null
+++ b/bstone/patches/patch-id__sd.cpp
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Prefer the SDL driver, since the openal driver may crash the game
+(issue needs investigating).
+
+--- id_sd.cpp.orig	2021-02-14 11:47:46.000000000 +0000
++++ id_sd.cpp
+@@ -337,11 +337,11 @@ void sd_startup()
+ 
+ 			case AudioDriverType::auto_detect:
+ 			default:
+-				if (sd_initialize_driver(AudioDriverType::r3_openal, snd_rate, snd_mix_size))
++				if (sd_initialize_driver(AudioDriverType::r2_sdl, snd_rate, snd_mix_size))
+ 				{
+ 					is_driver_initialized = true;
+ 				}
+-				else if (sd_initialize_driver(AudioDriverType::r2_sdl, snd_rate, snd_mix_size))
++				else if (sd_initialize_driver(AudioDriverType::r3_openal, snd_rate, snd_mix_size))
+ 				{
+ 					is_driver_initialized = true;
+ 				}