RetroPie-Setup icon indicating copy to clipboard operation
RetroPie-Setup copied to clipboard

Update SRB2 to 2.2.10

Open cobalt2727 opened this issue 3 years ago • 10 comments

https://www.srb2.org/2022/03/srb2-v2-2-10-patch-release/

cobalt2727 avatar Mar 14 '22 11:03 cobalt2727

Thanks for taking a stab at updating this. Note : you'll have to match the assets files with the installed files (in install_srb2). The new 2.2.10 release doesn't have the patch.pk3 included, so it should be taken out from md_ret_files.

@joolswills this will need an updated set of assets from https://github.com/STJr/SRB2/releases/download/SRB2_release_2.2.10/SRB2-v2210-Full.zip (srb2.pk3, music.dta, player.dta and zones.pk3).

cmitu avatar Mar 14 '22 12:03 cmitu

(srb2.pk3, music.dta, player.dta and zones.pk3).

do the README.txt and LICENSE.txt files still exist? those should probably be kept in if they're still there

cobalt2727 avatar Mar 14 '22 20:03 cobalt2727

The files are part of the source repository (here).

cmitu avatar Mar 14 '22 20:03 cmitu

Is there anything else needed for this PR, then?

cobalt2727 avatar Mar 17 '22 20:03 cobalt2727

No thanks. I will sort it.

joolswills avatar Mar 17 '22 21:03 joolswills

SRB2_release_2.2.10 doesn't build on my Ubuntu 21.10 system due to an issue with the CMakeLists.txt

It needs the following

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index ae93aac37..4fe16c37e 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -253,7 +253,7 @@ if (CMAKE_CXX_COMPILER_ID MATCHES "Clang")
        set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-absolute-value)
 endif()
 
-set(CMAKE_C_FLAGS ${CMAKE_C_FLAGS} -Wno-trigraphs)
+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-trigraphs")
 
 target_compile_definitions(SRB2SDL2 PRIVATE -DCMAKECONFIG)

I need to make some other changes to the module so I won't be merging this as is - I will do a separate PR.

joolswills avatar Mar 18 '22 22:03 joolswills

https://github.com/STJr/SRB2/issues/500

joolswills avatar Mar 18 '22 22:03 joolswills

You might get a faster response on their GitLab.

cobalt2727 avatar Apr 16 '22 22:04 cobalt2727

@joolswills should be fixed in https://git.do.srb2.org/STJr/SRB2/-/commit/695722269bf953af1126e571e6ab18d00bf3b43a.

cmitu avatar May 05 '23 09:05 cmitu

@cmitu Thank you.

joolswills avatar May 05 '23 09:05 joolswills