Ports: Update and refactor opentyrian

- Add SDL2_net
- Bring CMake file closer to proposed upstream
- Remove opentyrian-data port and merge it into the main port
- Do a release build
- Add correct icon

Ports/AvailablePorts.md

@@ -215,8 +215,7 @@ This list is also available at [ports.serenityos.net](https://ports.serenityos.n
 | [`openttd`](openttd/)                               | OpenTTD                                                         | 12.2                      | https://www.openttd.org/                                                       |
 | [`openttd-opengfx`](openttd-opengfx/)               | OpenGFX graphics for OpenTTD                                    | 7.1                       | https://www.openttd.org/                                                       |
 | [`openttd-opensfx`](openttd-opensfx/)               | OpenSFX audio files for OpenTTD                                 | 1.0.3                     | https://www.openttd.org/                                                       |
-| [`opentyrian`](opentyrian/)                         | OpenTyrian                                                      | 84b820f                   | https://github.com/opentyrian/opentyrian                                       |
+| [`opentyrian`](opentyrian/)                         | OpenTyrian                                                      | 9750f8c                   | https://github.com/opentyrian/opentyrian                                       |
-| [`opentyrian-data`](opentyrian-data/)               | OpenTyrian graphics and audio                                   | 1.0.0                     | https://camanis.net/tyrian/tyrian21.zip                                        |
 | [`opfor`](opfor/)                                   | Half-Life: Opposing Force                                       | 2022.12.26                | https://github.com/FWGS/hlsdk-portable                                         |
 | [`optipng`](optipng/)                               | OptiPNG                                                         | 0.7.7                     | http://optipng.sourceforge.net/                                                |
 | [`opusfile`](opusfile/)                             | opusfile                                                        | 0.12                      | https://opus-codec.org/                                                        |

Ports/opentyrian-data/package.sh

@@ -1,14 +0,0 @@
-#!/usr/bin/env -S bash ../.port_include.sh
-port=opentyrian-data
-version=1.0.0
-workdir=.
-files="http://camanis.net/tyrian/tyrian21.zip tyrian21.zip 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
-
-build() {
-    run_nocd rm -v tyrian21/*.exe
-}
-
-install() {
-    run_nocd mkdir -p ${SERENITY_INSTALL_ROOT}/usr/local/share/games/opentyrian/
-    run_nocd cp -a tyrian21/* ${SERENITY_INSTALL_ROOT}/usr/local/share/games/opentyrian/
-}

Ports/opentyrian/package.sh

@@ -1,19 +1,30 @@
 #!/usr/bin/env -S bash ../.port_include.sh
-port=opentyrian
+port='opentyrian'
-version=84b820f852f3f6b812b4d00d6b3906adbbf3bbdb
+version='9750f8cfab738d0ea08ccb8d8752b95f5c09df07'
-useconfigure=true
+useconfigure='true'
-files="https://github.com/opentyrian/opentyrian/archive/${version}.tar.gz ${version}.tar.gz 7429cc8e3468e3462b886cb99fe6cc0f5d232c193b68a94dc427493107c30dec"
+files="https://github.com/opentyrian/opentyrian/archive/${version}.tar.gz ${version}.tar.gz f9cd08210df3990c0bc3ac9241694bd6c58e0ddec4716b6e74a7cc655637e5a0
-configopts=("-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt")
+http://camanis.net/tyrian/tyrian21.zip tyrian21.zip 7790d09a2a3addcd33c66ef063d5900eb81cc9c342f4807eb8356364dd1d9277"
-depends=("SDL2" "opentyrian-data")
+configopts=(
+    '-DCMAKE_BUILD_TYPE=release'
+    "-DCMAKE_TOOLCHAIN_FILE=${SERENITY_BUILD_DIR}/CMakeToolchain.txt"
+)
+depends=(
+    'SDL2'
+    'SDL2_net'
+)
 
-launcher_name=OpenTyrian
+launcher_name='OpenTyrian'
-launcher_category=Games
+launcher_category='Games'
-launcher_command=/usr/local/bin/tyrian
+launcher_command='/usr/local/bin/opentyrian'
+icon_file='linux/icons/tyrian-128.png'
 
 configure() {
-    run cmake "${configopts[@]}"
+    run cmake "${configopts[@]}" .
 }
 
 install() {
     run make install
+    run_nocd rm -f tyrian21/*.exe
+    run_nocd mkdir -p "${SERENITY_INSTALL_ROOT}/usr/local/share/games/opentyrian/"
+    run_nocd cp -a tyrian21/* "${SERENITY_INSTALL_ROOT}/usr/local/share/games/opentyrian/"
 }

Ports/opentyrian/patches/0001-Build-with-CMake.patch

@@ -1,95 +1,126 @@
 From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
-From: Oleg Kosenkov <okosenkov@gmail.com>
+From: Fabian Dellwing <fabian.dellwing@gmail.com>
-Date: Mon, 31 May 2021 14:01:49 -0400
+Date: Sun, 16 Jul 2023 07:09:55 +0200
 Subject: [PATCH] Build with CMake
 
 ---
- CMakeLists.txt     |  4 +++
+ CMakeLists.txt | 110 +++++++++++++++++++++++++++++++++++++++++++++++++
- src/CMakeLists.txt | 67 ++++++++++++++++++++++++++++++++++++++++++++++
+ 1 file changed, 110 insertions(+)
- 2 files changed, 71 insertions(+)
  create mode 100644 CMakeLists.txt
- create mode 100644 src/CMakeLists.txt
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
 new file mode 100644
-index 0000000..dfb9649
+index 0000000000000000000000000000000000000000..f52fb4d501707d290bf2e41bdca1867992fbb19d
 --- /dev/null
 +++ b/CMakeLists.txt
-@@ -0,0 +1,4 @@
+@@ -0,0 +1,110 @@
-+cmake_minimum_required(VERSION 3.16)
++cmake_minimum_required(VERSION 3.8)
-+project(opentyrian LANGUAGES C)
++
-+install(FILES CREDITS NEWS README DESTINATION share/doc/opentyrian)
++# set version number
-+add_subdirectory(src)
++set (OPENTYRIAN_VERSION 2.1)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
++
-new file mode 100644
++# set the project name
-index 0000000..19d68c0
++project(OpenTyrian VERSION ${OPENTYRIAN_VERSION})
---- /dev/null
++
-+++ b/src/CMakeLists.txt
++install(FILES NEWS README DESTINATION share/doc/opentyrian)
-@@ -0,0 +1,67 @@
++
++set (CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
++
++# Options enabled by default
++option ( enable-network "compile support for network" on )
++
++# Include required scripts
++include(GNUInstallDirs)
++
++# Search for dependencies
 +find_package(SDL2 REQUIRED)
-+add_executable(tyrian
++
-+        animlib.c
++if (enable-network)
-+        arg_parse.c
++    find_package(SDL2_net REQUIRED)
-+        backgrnd.c
++    add_definitions(-DWITH_NETWORK)
-+        config.c
-+        config_file.c
-+        destruct.c
-+        editship.c
-+        episodes.c
-+        file.c
-+        font.c
-+        fonthand.c
-+        game_menu.c
-+        helptext.c
-+        joystick.c
-+        jukebox.c
-+        keyboard.c
-+        lds_play.c
-+        loudness.c
-+        lvllib.c
-+        lvlmast.c
-+        mainint.c
-+        menus.c
-+        mouse.c
-+        mtrand.c
-+        musmast.c
-+        network.c
-+        nortsong.c
-+        nortvars.c
-+        opentyr.c
-+        opl.c
-+        palette.c
-+        params.c
-+        pcxload.c
-+        pcxmast.c
-+        picload.c
-+        player.c
-+        scroller.c
-+        setup.c
-+        shots.c
-+        sizebuf.c
-+        sndmast.c
-+        sprite.c
-+        starlib.c
-+        std_support.c
-+        tyrian2.c
-+        varz.c
-+        vga256d.c
-+        vga_palette.c
-+        video.c
-+        video_scale.c
-+        video_scale_hqNx.c
-+        xmas.c)
-+target_include_directories(tyrian PRIVATE . ${SDL2_INCLUDE_DIRS})
-+if("${SDL2_LIBRARIES}" STREQUAL "")
-+    message(WARNING "SDL2_LIBRARIES wasn't set, manually setting to SDL2::SDL2")
-+    set(SDL2_LIBRARIES "SDL2::SDL2")
 +endif()
 +
-+target_compile_options(tyrian PRIVATE -std=iso9899:1999 )
++# add the executable
-+target_compile_definitions(tyrian PRIVATE
++add_executable(opentyrian WIN32
-+        -DNDEBUG
++    src/animlib.c
-+        -DTYRIAN_DIR=\"/usr/local/share/games/opentyrian\")
++    src/arg_parse.c
-+target_link_libraries(tyrian m ${SDL2_LIBRARIES})
++    src/backgrnd.c
-+install(TARGETS tyrian
++    src/config.c
-+        RUNTIME DESTINATION bin)
++    src/config_file.c
++    src/destruct.c
++    src/editship.c
++    src/episodes.c
++    src/file.c
++    src/font.c
++    src/fonthand.c
++    src/game_menu.c
++    src/helptext.c
++    src/joystick.c
++    src/jukebox.c
++    src/keyboard.c
++    src/lds_play.c
++    src/loudness.c
++    src/lvllib.c
++    src/lvlmast.c
++    src/mainint.c
++    src/menus.c
++    src/mouse.c
++    src/mtrand.c
++    src/musmast.c
++    src/network.c
++    src/nortsong.c
++    src/nortvars.c
++    src/opentyr.c
++    src/opl.c
++    src/palette.c
++    src/params.c
++    src/pcxload.c
++    src/pcxmast.c
++    src/picload.c
++    src/player.c
++    src/shots.c
++    src/sizebuf.c
++    src/sndmast.c
++    src/sprite.c
++    src/starlib.c
++    src/tyrian2.c
++    src/varz.c
++    src/vga256d.c
++    src/vga_palette.c
++    src/video.c
++    src/video_scale.c
++    src/video_scale_hqNx.c
++    src/xmas.c
++)
++
++# Setup version
++target_compile_definitions(opentyrian PUBLIC
++    OPENTYRIAN_VERSION=\"${OPENTYRIAN_VERSION}\"
++    -DTYRIAN_DIR=\"/usr/local/share/games/opentyrian\"
++)
++
++# Compile options
++target_include_directories(opentyrian
++    PRIVATE
++    ${CMAKE_SOURCE_DIR}/src
++)
++
++target_link_libraries(opentyrian
++    SDL2::SDL2
++    SDL2::SDL2main
++    $<$<AND:$<BOOL:${enable-network}>,$<BOOL:${SDL2_net_FOUND}>>:
++        SDL2_net::SDL2_net
++    >
++)
++
++find_library(MATH_LIBRARY m)
++
++if (MATH_LIBRARY)
++    message(STATUS "Add math library ${MATH_LIBRARY}")
++    target_link_libraries(opentyrian
++        ${MATH_LIBRARY}
++    )
++endif()
++
++install(TARGETS opentyrian
++    RUNTIME DESTINATION bin)