descent3 1.6.0~git397.ab3f28dc

descent3.changes

@@ -1,3 +1,11 @@
+-------------------------------------------------------------------
+Tue Nov 12 11:16:54 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
+
+- Update to snapshot 1.6.0~git397.ab3f28dc
+  * Resolve a game crash in Retribution level 12's matcen room
+  * Level selector dialog has been reworked, now shows level titles
+  * Fixed cutscenes sometimes having excessive black borders
+
 -------------------------------------------------------------------
 Mon Sep 23 13:54:27 UTC 2024 - Jan Engelhardt <jengelh@inai.de>
 

descent3.spec

@@ -17,23 +17,25 @@
 
 
 Name:           descent3
-%define commit  616f921e97b0fb4745a2d36de149c737bf720214
-Version:        1.6.0~g226.g616f921e
+%define commit  ab3f28dc3b288ebeff868787861fc9099dae71fa
+Version:        1.6.0~git397.ab3f28dc
 Release:        0
 Summary:        Tunnel–terrain-hybrid ship-based shooter fighting robots
 License:        GPL-3.0-or-later
 Group:          Amusements/Games/3D/Shoot
 URL:            https://github.com/DescentDevelopers/Descent3
-Source:         https://github.com/DescentDevelopers/Descent3/archive/%commit.tar.gz
+Source:         https://github.com/jengelh/descent3/archive/%commit.tar.gz
+Source2:        https://github.com/SergiusTheBest/plog/archive/e21baecd4753f14da64ede979c5a19302618b752.tar.gz
 Patch1:         system-libacm.patch
 %if 0%{?suse_version} && 0%{?suse_version} < 1600
 BuildRequires:  gcc11-c++
+Provides:       bundled(plog)
 %else
 BuildRequires:  c++_compiler
+BuildRequires:  plog-devel
 %endif
 BuildRequires:  cmake
 BuildRequires:  libacm-devel
-BuildRequires:  plog-devel
 BuildRequires:  pkgconfig(glm)
 BuildRequires:  pkgconfig(sdl2)
 BuildRequires:  pkgconfig(zlib)
@@ -55,7 +57,9 @@ mode where numerous players can compete against each other in
 different game types.
 
 %prep
-%autosetup -p1 -n Descent3-%commit
+%autosetup -p1 -n descent3-%commit -a2
+rm -Rf third_party/plog
+mv plog-* third_party/plog
 
 %build
 %if 0%{?suse_version} && 0%{?suse_version} < 1600
@@ -64,7 +68,10 @@ export CXX=g++-11
 %cmake -DCMAKE_INSTALL_BINDIR="%_libexecdir/%name" \
 	-DCMAKE_INSTALL_DATADIR="%_datadir/%name" \
 	-DCMAKE_INSTALL_DOCDIR:PATH="share/doc/packages/%name" \
-	-DFORCE_PORTABLE_INSTALL=OFF -DUSE_EXTERNAL_PLOG=ON \
+	-DFORCE_PORTABLE_INSTALL=OFF \
+%if 0%{?suse_version} >= 1600
+	-DUSE_EXTERNAL_PLOG:BOOL=ON \
+%endif
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%optflags" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%optflags"
 %cmake_build

system-libacm.patch

@@ -8,37 +8,37 @@ Date: 2024-09-06 00:26:03.502953453 +0200
  third_party/CMakeLists.txt |    1 -
  4 files changed, 3 insertions(+), 4 deletions(-)
 
-Index: Descent3-616f921e97b0fb4745a2d36de149c737bf720214/AudioEncode/CMakeLists.txt
+Index: descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/AudioEncode/CMakeLists.txt
 ===================================================================
---- Descent3-616f921e97b0fb4745a2d36de149c737bf720214.orig/AudioEncode/CMakeLists.txt
-+++ Descent3-616f921e97b0fb4745a2d36de149c737bf720214/AudioEncode/CMakeLists.txt
+--- descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa.orig/AudioEncode/CMakeLists.txt
++++ descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/AudioEncode/CMakeLists.txt
 @@ -10,7 +10,7 @@ set(CPPS
  
  add_library(AudioEncode STATIC ${HEADERS} ${CPPS})
  target_link_libraries(AudioEncode PRIVATE
 -  libacm
 +  -lacm
-   plog::plog
+   logger
  )
  target_include_directories(AudioEncode PUBLIC
-Index: Descent3-616f921e97b0fb4745a2d36de149c737bf720214/Descent3/CMakeLists.txt
+Index: descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/Descent3/CMakeLists.txt
 ===================================================================
---- Descent3-616f921e97b0fb4745a2d36de149c737bf720214.orig/Descent3/CMakeLists.txt
-+++ Descent3-616f921e97b0fb4745a2d36de149c737bf720214/Descent3/CMakeLists.txt
-@@ -314,7 +314,7 @@ file(GLOB_RECURSE INCS "../lib/*.h")
- 
- add_executable(Descent3 WIN32 MACOSX_BUNDLE ${D3Icon} ${HEADERS} ${CPPS} ${INCS} ${MANIFEST} ${RC_FILE})
- target_link_libraries(Descent3 PRIVATE
--  2dlib AudioEncode bitmap cfile dd_video ddebug ddio libmve libacm
-+  2dlib AudioEncode bitmap cfile dd_video ddebug ddio libmve -lacm
-   fix grtext manage mem misc model module stream_audio linux SDL2::SDL2 plog::plog
-   music networking physics renderer rtperformance sndlib ui unzip vecmat md5
-   ${PLATFORM_LIBS})
-Index: Descent3-616f921e97b0fb4745a2d36de149c737bf720214/editor/CMakeLists.txt
+--- descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa.orig/Descent3/CMakeLists.txt
++++ descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/Descent3/CMakeLists.txt
+@@ -322,7 +322,7 @@ target_link_libraries(Descent3 PRIVATE
+   fix
+   grtext
+   libmve
+-  libacm
++  -lacm
+   linux
+   logger
+   manage
+Index: descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/editor/CMakeLists.txt
 ===================================================================
---- Descent3-616f921e97b0fb4745a2d36de149c737bf720214.orig/editor/CMakeLists.txt
-+++ Descent3-616f921e97b0fb4745a2d36de149c737bf720214/editor/CMakeLists.txt
-@@ -591,7 +591,7 @@ target_link_libraries(Descent3Editor
+--- descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa.orig/editor/CMakeLists.txt
++++ descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/editor/CMakeLists.txt
+@@ -588,7 +588,7 @@ target_link_libraries(Descent3Editor
      ddio
      ddebug
      libmve
@@ -47,10 +47,10 @@ Index: Descent3-616f921e97b0fb4745a2d36de149c737bf720214/editor/CMakeLists.txt
      fix
      grtext
      manage
-Index: Descent3-616f921e97b0fb4745a2d36de149c737bf720214/third_party/CMakeLists.txt
+Index: descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/third_party/CMakeLists.txt
 ===================================================================
---- Descent3-616f921e97b0fb4745a2d36de149c737bf720214.orig/third_party/CMakeLists.txt
-+++ Descent3-616f921e97b0fb4745a2d36de149c737bf720214/third_party/CMakeLists.txt
+--- descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa.orig/third_party/CMakeLists.txt
++++ descent3-ab3f28dc3b288ebeff868787861fc9099dae71fa/third_party/CMakeLists.txt
 @@ -1,6 +1,5 @@
  set(CMAKE_FOLDER "third_party")