openbsd/ports
1
0
Fork 0
mirror of https://github.com/openbsd/ports.git synced 2026-06-17 23:13:55 +02:00
Code Issues Packages Projects Releases Wiki Activity

Update to 0.8.4, switching to GH distfiles.

Browse Source 
ok bcallah@ (maintainer)
No change to README about freeware distfile yet.
This commit is contained in:
thfr
2025-09-18 13:29:28 +00:00
parent b1183a303f
commit 77f090559b
7 changed files with 75 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files
games/openomf/Makefile
+12 -10
View File
@@ -1,6 +1,9 @@
COMMENT = free remake of One Must Fall 2097 game engine
DISTNAME = openomf-0.6.5.2
REVISION = 0
V = 0.8.4
PKGNAME = openomf-${V}
DIST_TUPLE += github omf2097 openomf ${V} .
CATEGORIES = games x11
HOMEPAGE = https://www.openomf.org/
@@ -9,10 +12,8 @@ MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# MIT
PERMIT_PACKAGE = Yes
WANTLIB += SDL2 argtable2 c confuse enet intl m openal png xmp
WANTLIB += z
SITES = https://mirrors.nycbug.org/pub/distfiles/
WANTLIB += SDL2 SDL2_mixer c confuse enet epoxy m miniupnpc
WANTLIB += natpmp opusfile png pthread xmp z
# C11
COMPILER = base-clang ports-gcc
@@ -21,12 +22,13 @@ COMPILER_LANGS = c
MODULES = devel/cmake
LIB_DEPENDS = audio/libxmp \
audio/openal \
devel/argtable \
audio/opusfile \
devel/libconfuse \
devel/sdl2 \
devel/sdl2-mixer \
graphics/png \
net/enet
net/enet \
net/miniupnp/libnatpmp \
net/miniupnp/miniupnpc
NO_TEST = Yes
games/openomf/distinfo
+2 -2
View File
@@ -1,2 +1,2 @@
SHA256 (openomf-0.6.5.2.tar.gz) = weiWhJXQacBs9u6pfA6eQMoREh0NR8Bk1yZsDLeZ8VU=
SIZE (openomf-0.6.5.2.tar.gz) = 369944
SHA256 (omf2097-openomf-0.8.4.tar.gz) = u8zwuWXalpvnBSdU3yrY+YAKYZ/PrWk1bSTbgX8Rhv8=
SIZE (omf2097-openomf-0.8.4.tar.gz) = 816107
games/openomf/patches/patch-CMakeLists_txt
+24 -16
View File
@@ -1,22 +1,30 @@
Install to a better location.
Remove hardcoded optimization flags.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -174,7 +174,7 @@ include_directories(${COREINCS})
@@ -86,9 +86,9 @@ if(MSVC)
else()
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wno-unused-parameter -Wformat -pedantic -Wvla")
set(CMAKE_C_FLAGS_DEBUG "${CMAKE_C_FLAGS_DEBUG} -ggdb -Werror -fno-omit-frame-pointer")
- set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -O2 -fno-omit-frame-pointer -DNDEBUG")
- set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -O2 -DNDEBUG")
- set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -Os -DNDEBUG")
+ set(CMAKE_C_FLAGS_RELWITHDEBINFO "${CMAKE_C_FLAGS_RELWITHDEBINFO} -g -fno-omit-frame-pointer -DNDEBUG")
+ set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -DNDEBUG")
+ set(CMAKE_C_FLAGS_MINSIZEREL "${CMAKE_C_FLAGS_MINSIZEREL} -DNDEBUG")
endif()
# Build core sources first as an object library
# this can then be reused in tests and main executable to speed things up
-add_library(openomf_core OBJECT ${OPENOMF_SRC})
+add_library(openomf_core STATIC ${OPENOMF_SRC})
set(CORELIBS openomf_core ${CORELIBS})
# Build the game binary
@@ -263,6 +263,6 @@ install(TARGETS openomf
COMPONENT Binaries
)
install(FILES resources/openomf.bk resources/openomf_icon.png
- DESTINATION share/games/openomf/
+ DESTINATION share/openomf/
COMPONENT Data
)
# Enable AddressSanitizer if requested
@@ -478,8 +478,8 @@ else()
# On unixy systems, follow standard.
install(TARGETS openomf RUNTIME DESTINATION bin COMPONENT Binaries)
install(FILES ${DOC_FILES} resources/openomf.bk resources/gamecontrollerdb/gamecontrollerdb.txt resources/icons/openomf.png
- DESTINATION share/games/openomf/
+ DESTINATION share/openomf/
COMPONENT Data
)
- install(DIRECTORY shaders/ DESTINATION share/games/openomf/shaders COMPONENT Data)
+ install(DIRECTORY shaders/ DESTINATION share/openomf/shaders COMPONENT Data)
endif()
games/openomf/patches/patch-cmake-scripts_BuildLanguages_cmake
+12
View File
@@ -0,0 +1,12 @@
Index: cmake-scripts/BuildLanguages.cmake
--- cmake-scripts/BuildLanguages.cmake.orig
+++ cmake-scripts/BuildLanguages.cmake
@@ -12,7 +12,7 @@ set(OPENOMF_LANGS DANISH)
if(WIN32)
set(LANGUAGE_INSTALL_PATH "openomf/resources/")
else()
- set(LANGUAGE_INSTALL_PATH "share/games/openomf/")
+ set(LANGUAGE_INSTALL_PATH "share/openomf/")
endif()
# generate custom target info
games/openomf/patches/patch-src_game_gui_menu_c
-14
View File
@@ -1,14 +0,0 @@
https://github.com/omf2097/openomf/issues/351
Index: src/game/gui/menu.c
--- src/game/gui/menu.c.orig
+++ src/game/gui/menu.c
@@ -158,7 +158,7 @@ static int menu_action(component *mc, int action) {
// Update selected component
c = sizer_get(mc, m->selected);
- } while(component_is_disabled(c));
+ } while(component_is_disabled(c) && c->supports_disable);
// Play menu sound
sound_play(19, 0.5f, 0.0f, 2.0f);
component_select(c, 1);
games/openomf/patches/patch-src_resources_pathmanager_c
+10 -12
View File
@@ -3,21 +3,19 @@ Reconfigure game asset search paths.
Index: src/resources/pathmanager.c
--- src/resources/pathmanager.c.orig
+++ src/resources/pathmanager.c
@@ -91,7 +91,7 @@ int pm_init() {
@@ -126,12 +126,12 @@ int pm_init(void) {
local_path_build(RESOURCE_PATH, bin_base_dir, "resources\\");
local_path_build(SHADER_PATH, bin_base_dir, "shaders\\");
m_ok = 1;
- } else if(strcmp(SDL_GetPlatform(), "Linux") == 0) {
+ } else if(strcmp(SDL_GetPlatform(), "Linux") == 0 || strcmp(SDL_GetPlatform(), "OpenBSD") == 0) {
// on linux, the resources will be in ../share/games/openomf, relative to the binary
// so if openomf is installed to /usr/local/bin,
// the resources will be in /usr/local/share/games/openomf
- local_path_build(RESOURCE_PATH, bin_base_dir, "../share/games/openomf/");
- local_path_build(SHADER_PATH, bin_base_dir, "../share/games/openomf/shaders/");
+ local_path_build(RESOURCE_PATH, bin_base_dir, "../share/openomf/");
local_path_build(PLUGIN_PATH, bin_base_dir, "../lib/openomf/");
+ local_path_build(SHADER_PATH, bin_base_dir, "../share/openomf/shaders/");
m_ok = 1;
} else if(!strcasecmp(SDL_GetPlatform(), "Mac OS X")) {
@@ -112,7 +112,7 @@ int pm_init() {
local_path_build(RESOURCE_PATH, "resources\\", "");
local_path_build(PLUGIN_PATH, "plugins\\", "");
} else {
- local_path_build(RESOURCE_PATH, "resources/", "");
+ local_path_build(RESOURCE_PATH, "", "");
local_path_build(PLUGIN_PATH, "plugins/", "");
}
}
} else if(strcmp(SDL_GetPlatform(), "Mac OS X") == 0) {
// on OSX, GetBasePath returns the 'Resources' directory
games/openomf/pkg/PLIST
+15 -1
View File
@@ -1,5 +1,19 @@
@bin bin/openomf
share/doc/pkg-readmes/${PKGSTEM}
share/openomf/
share/openomf/DANISH.LNG
share/openomf/DANISH.LNG2
share/openomf/ENGLISH.DAT2
share/openomf/GERMAN.DAT2
share/openomf/LICENSE
share/openomf/LICENSE.argtable3
share/openomf/LICENSE.gamecontrollerdb
share/openomf/README.md
share/openomf/gamecontrollerdb.txt
share/openomf/openomf.bk
share/openomf/openomf_icon.png
share/openomf/openomf.png
share/openomf/shaders/
share/openomf/shaders/palette.frag
share/openomf/shaders/palette.vert
share/openomf/shaders/rgba.frag
share/openomf/shaders/rgba.vert