bstone: update to bstone-1.2.11

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: bstone: update to bstone-1.2.11
From: Yorick Hardy <yorickhardy%gmail.com@localhost>
Date: Mon, 22 Mar 2021 14:18:07 +0000
Module Name:	pkgsrc-wip
Committed By:	Yorick Hardy <yorickhardy%gmail.com@localhost>
Pushed By:	yhardy
Date:		Mon Mar 22 16:18:07 2021 +0200
Changeset:	f0995bdaa7f30f4e5ae6ffd7b6630781c3c4d553

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

Log Message:
bstone: update to bstone-1.2.11

Release announcement:

Added

  * [CMake] Root CMakeLists.txt.
  * [CMake] Add option BSTONE_MORE_COMPILER_WARNINGS for more compiler
    warnings.
  * Bindings to take screenshots (default F5).
  * Option to control weapon bobbing (actual for Planet Strike only).
  * PC Speaker SFX.
  * Option snd_sfx_type to switch between AdLib and PC Speaker audio.
  * Option snd_is_sfx_digitized to toggle SFX digitization.
  * Extracting unprocessed audio (*.data).
  * Extracting PC Speaker audio.

Changed

  * [CMake] Minimum supported version is 3.4.0.
  * Audio low-pass filtering is disabled by default.

Fixed

  * Compiling under non-MSYS MinGW.
  * Content search.
  * Show dropped important items (keys, etc.) on auto-map.
  * Don't draw the scene for "show full map" cheat.
  * Reduce compiling warnings.
  * Make the application DPI aware.
  * [OAL] Discard sounds with lower priority on same actor's channel.
  * [OAL] Fix hangs on changing audio settings when any world's sound
    playing.
  * [HWR] Mismatched texture for door track.
  * [HWR] Flooring / Ceiling texture direction.
  * Non-readable log file while application is running.
  * Item flags for message box.

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

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

diffstat:
 bstone/Makefile                         |  8 ++++----
 bstone/distinfo                         | 12 ++++++------
 bstone/patches/patch-CMakeLists.txt     | 33 ---------------------------------
 bstone/patches/patch-id__sd.cpp         | 21 ---------------------
 bstone/patches/patch-src_CMakeLists.txt | 33 +++++++++++++++++++++++++++++++++
 bstone/patches/patch-src_id__sd.cpp     | 21 +++++++++++++++++++++
 6 files changed, 64 insertions(+), 64 deletions(-)

diffs:
diff --git a/bstone/Makefile b/bstone/Makefile
index 898e0bc6b9..2e1eb3ff93 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.10
+DISTNAME=	bstone-1.2.11
 CATEGORIES=	games
 MASTER_SITES=	${MASTER_SITE_GITHUB:=bibendovsky/}
 GITHUB_TAG=	v${PKGVERSION_NOREV}
@@ -10,7 +10,7 @@ HOMEPAGE=	https://bibendovsky.github.io/bstone/
 COMMENT=	Source port of Blake Stone game engines
 LICENSE=	gnu-gpl-v3
 
-WRKSRC=		${WRKDIR}/bstone-${PKGVERSION_NOREV}/src
+#WRKSRC=		${WRKDIR}/bstone-${PKGVERSION_NOREV}
 USE_CMAKE=	yes
 USE_LANGUAGES=	c++14
 USE_TOOLS+=	pkg-config
@@ -18,8 +18,8 @@ USE_TOOLS+=	pkg-config
 INSTALLATION_DIRS+=	bin share/doc/${PKGNAME}
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/bstone ${DESTDIR}${PREFIX}/bin/bstone
-	${INSTALL_DATA} ${WRKSRC}/../README.md ${DESTDIR}${PREFIX}/share/doc/${PKGNAME}/README
+	${INSTALL_PROGRAM} ${WRKSRC}/src/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"
diff --git a/bstone/distinfo b/bstone/distinfo
index 2b9abac48c..b52640873a 100644
--- a/bstone/distinfo
+++ b/bstone/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.4 2015/09/13 20:07:57 yhardy Exp $
 
-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
+SHA1 (bstone-1.2.11.tar.gz) = deaf1c4d567abd7dc635327176b23dd01df4a34f
+RMD160 (bstone-1.2.11.tar.gz) = 4ec648034e6f1e7e377fbce21e3c9f9e6f5851fe
+SHA512 (bstone-1.2.11.tar.gz) = 986907c268ace6dce9bd1f2f4c95a12f8c07b5b1e2abec4224db93a7aabcdbdfc35bfbe33b7817e9e41566ec92b76e83535693f3fad6976cc7e8ec0f0c468887
+Size (bstone-1.2.11.tar.gz) = 1390580 bytes
+SHA1 (patch-src_CMakeLists.txt) = f765fe134b423f1a8ef578bbad000ddadce46fe7
+SHA1 (patch-src_id__sd.cpp) = d3262f6fd8f395cdc817f43c3e5b61d0a85bcf99
diff --git a/bstone/patches/patch-CMakeLists.txt b/bstone/patches/patch-CMakeLists.txt
deleted file mode 100644
index 380f516978..0000000000
--- a/bstone/patches/patch-CMakeLists.txt
+++ /dev/null
@@ -1,33 +0,0 @@
-$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
deleted file mode 100644
index 12c09e1e6b..0000000000
--- a/bstone/patches/patch-id__sd.cpp
+++ /dev/null
@@ -1,21 +0,0 @@
-$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;
- 				}
diff --git a/bstone/patches/patch-src_CMakeLists.txt b/bstone/patches/patch-src_CMakeLists.txt
new file mode 100644
index 0000000000..96dff7389b
--- /dev/null
+++ b/bstone/patches/patch-src_CMakeLists.txt
@@ -0,0 +1,33 @@
+$NetBSD$
+
+Use pkgsrc openal-soft.
+
+--- src/CMakeLists.txt.orig	2021-02-14 11:47:46.000000000 +0000
++++ src/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-src_id__sd.cpp b/bstone/patches/patch-src_id__sd.cpp
new file mode 100644
index 0000000000..84cee4974f
--- /dev/null
+++ b/bstone/patches/patch-src_id__sd.cpp
@@ -0,0 +1,21 @@
+$NetBSD$
+
+Prefer the SDL driver, since the openal driver may crash the game
+(issue needs investigating).
+
+--- src/id_sd.cpp.orig	2021-02-14 11:47:46.000000000 +0000
++++ src/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;
+ 				}
Prev by Date: ags: update to ags-3.5.0.31
Next by Date: quest-tui: update to 0.1.2
Previous by Thread: ags: update to ags-3.5.0.31
Next by Thread: quest-tui: update to 0.1.2
Indexes:
Home | Main Index | Thread Index | Old Index