cpet/openbsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update to latest openomf code since it fixes a number of bugs and memory

Browse Source 
leaks. Also, the libshadowdive library was integrated into the code itself
since it never got any external users, and so it goes away from PLIST.
This commit is contained in:
bcallah 2019-05-10 06:20:18 +00:00
parent df32e91d24
commit 9a5ea5e1c7
5 changed files with 23 additions and 45 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
games/openomf/Makefile
View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.2 2018/09/04 12:46:13 espie Exp $
# $OpenBSD: Makefile,v 1.3 2019/05/10 06:20:18 bcallah Exp $
COMMENT = free remake of One Must Fall 2097 game engine
DISTNAME = openomf-0.6.5.1
DISTNAME = openomf-0.6.5.2
CATEGORIES = games x11
REVISION = 0
HOMEPAGE = https://www.openomf.org/
MAINTAINER = Brian Callahan <bcallah@openbsd.org>
@ -11,8 +10,8 @@ MAINTAINER = Brian Callahan <bcallah@openbsd.org>
# MIT
PERMIT_PACKAGE_CDROM = Yes
WANTLIB += SDL2 argtable2 c confuse enet intl m openal png pthread
WANTLIB += xmp z
WANTLIB += SDL2 argtable2 c confuse enet intl m openal png xmp
WANTLIB += z
MASTER_SITES = https://mirrors.nycbug.org/pub/distfiles/
@ -32,9 +31,7 @@ LIB_DEPENDS = audio/libxmp \
NO_TEST = Yes
# CONFIGURE_ARGS = -DCMAKE_C_FLAGS_RELEASE="${CFLAGS}" does not catch
pre-configure:
sed -i 's,-O2,${CFLAGS},g' \
${WRKSRC}/CMakeLists.txt \
${WRKSRC}/external/libShadowDive/CMakeLists.txt
do-gen:
sed -i 's,-O2,${CFLAGS},g' ${WRKSRC}/CMakeLists.txt
.include <bsd.port.mk>

4
games/openomf/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (openomf-0.6.5.1.tar.gz) = t8fnvEVKJ5ElWaw++qiqrbzfYAwgu7wcqciqv0G9VMQ=
SIZE (openomf-0.6.5.1.tar.gz) = 373677
SHA256 (openomf-0.6.5.2.tar.gz) = weiWhJXQacBs9u6pfA6eQMoREh0NR8Bk1yZsDLeZ8VU=
SIZE (openomf-0.6.5.2.tar.gz) = 369944

15
games/openomf/patches/patch-CMakeLists_txt
View File

@ -1,14 +1,23 @@
$OpenBSD: patch-CMakeLists_txt,v 1.1.1.1 2018/08/01 18:10:26 bcallah Exp $
$OpenBSD: patch-CMakeLists_txt,v 1.2 2019/05/10 06:20:18 bcallah Exp $
Install to a better location.
Index: CMakeLists.txt
--- CMakeLists.txt.orig
+++ CMakeLists.txt
@@ -385,6 +385,6 @@ INSTALL(TARGETS openomf
@@ -174,7 +174,7 @@ include_directories(${COREINCS})
# 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
install(FILES resources/openomf.bk resources/openomf_icon.png
- DESTINATION share/games/openomf/
+ DESTINATION share/openomf/
COMPONENT Data

4
games/openomf/patches/patch-src_game_gui_menu_c
View File

@ -1,11 +1,11 @@
$OpenBSD: patch-src_game_gui_menu_c,v 1.1.1.1 2018/08/01 18:10:26 bcallah Exp $
$OpenBSD: patch-src_game_gui_menu_c,v 1.2 2019/05/10 06:20:18 bcallah Exp $
https://github.com/omf2097/openomf/issues/351
Index: src/game/gui/menu.c
--- src/game/gui/menu.c.orig
+++ src/game/gui/menu.c
@@ -157,7 +157,7 @@ static int menu_action(component *mc, int action) {
@@ -158,7 +158,7 @@ static int menu_action(component *mc, int action) {
// Update selected component
c = sizer_get(mc, m->selected);

30
games/openomf/pkg/PLIST
View File

@ -1,33 +1,5 @@
@comment $OpenBSD: PLIST,v 1.2 2018/09/04 12:46:13 espie Exp $
@comment $OpenBSD: PLIST,v 1.3 2019/05/10 06:20:18 bcallah Exp $
@bin bin/openomf
include/shadowdive/
include/shadowdive/actions.h
include/shadowdive/af.h
include/shadowdive/altpal.h
include/shadowdive/animation.h
include/shadowdive/bk.h
include/shadowdive/bkanim.h
include/shadowdive/chr.h
include/shadowdive/colcoord.h
include/shadowdive/error.h
include/shadowdive/fonts.h
include/shadowdive/language.h
include/shadowdive/move.h
include/shadowdive/palette.h
include/shadowdive/pic.h
include/shadowdive/pilot.h
include/shadowdive/rec.h
include/shadowdive/rgba_image.h
include/shadowdive/score.h
include/shadowdive/script.h
include/shadowdive/setup.h
include/shadowdive/shadowdive.h
include/shadowdive/sounds.h
include/shadowdive/sprite.h
include/shadowdive/taglist.h
include/shadowdive/tournament.h
include/shadowdive/vga_image.h
lib/libshadowdive.a
share/doc/pkg-readmes/${PKGSTEM}
share/openomf/
share/openomf/openomf.bk