Update to frotz-2.52
Changelog: https://gitlab.com/DavidGriffith/frotz/-/releases Big-ticket user facing items are UTF8 and audio support. Enable the SDL2 client Slightly improve COMMENT Take MAINTAINER Tweak hint to remove libexecinfo and ok sthen@
This commit is contained in:
bcallah
parent
ed4c6e9925
commit
ac8424cbb2
@ -1,29 +1,39 @@
|
||||
# $OpenBSD: Makefile,v 1.20 2019/07/12 20:46:18 sthen Exp $
|
||||
# $OpenBSD: Makefile,v 1.21 2021/01/03 16:12:02 bcallah Exp $
|
||||
|
||||
COMMENT= curses-based interpreter for Infocom-compatible games
|
||||
V = 2.52
|
||||
COMMENT= interpreter for Infocom-compatible games
|
||||
|
||||
DISTNAME= frotz-2.44
|
||||
REVISION= 0
|
||||
DISTNAME= frotz-${V}
|
||||
CATEGORIES= games
|
||||
|
||||
HOMEPAGE= http://frotz.sourceforge.net/
|
||||
HOMEPAGE= https://davidgriffith.gitlab.io/frotz/
|
||||
MAINTAINER= Brian Callahan <bcallah@openbsd.org>
|
||||
|
||||
# GPLv2+
|
||||
PERMIT_PACKAGE= Yes
|
||||
|
||||
WANTLIB= c curses
|
||||
WANTLIB += SDL2 SDL2_mixer ao c curses freetype jpeg m modplug
|
||||
WANTLIB += png pthread samplerate sndfile vorbisfile z
|
||||
|
||||
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=frotz/}
|
||||
MASTER_SITES= https://gitlab.com/DavidGriffith/frotz/-/archive/${V}/
|
||||
|
||||
LIB_DEPENDS= audio/libao \
|
||||
audio/libmodplug \
|
||||
audio/libsamplerate \
|
||||
devel/sdl2-mixer \
|
||||
graphics/jpeg \
|
||||
graphics/png
|
||||
|
||||
USE_GMAKE= Yes
|
||||
MAKE_FLAGS= CC="${CC}" OPTS="${CFLAGS}" CONFIG_DIR="${SYSCONFDIR}"
|
||||
FAKE_FLAGS= PREFIX=${WRKINST}${TRUEPREFIX}
|
||||
|
||||
ALL_TARGET= frotz dfrotz
|
||||
INSTALL_TARGET= install install_dumb
|
||||
INSTALL_TARGET= install install_dumb install_sdl
|
||||
|
||||
CFLAGS += -DUSE_UNISTD_H -DCOLOR_SUPPORT -DEMACS_EDITING
|
||||
|
||||
FAKE_FLAGS = DESTDIR= MAN_PREFIX="${DESTDIR}${PREFIX}"
|
||||
|
||||
NO_TEST= Yes
|
||||
|
||||
.include <bsd.port.mk>
|
||||
|
||||
@ -1,2 +1,2 @@
|
||||
SHA256 (frotz-2.44.tar.gz) = c+wg8DTS6RV4w4fP868knVK4gz5CcesQU/bTNXIv4+w=
|
||||
SIZE (frotz-2.44.tar.gz) = 275534
|
||||
SHA256 (frotz-2.52.tar.gz) = Prmvuecm84ijNz/s7ZuCB3ufUpxtkEE+N79/cg6404U=
|
||||
SIZE (frotz-2.52.tar.gz) = 353485
|
||||
|
||||
25
games/frotz/patches/patch-Makefile
Normal file
25
games/frotz/patches/patch-Makefile
Normal file
@ -0,0 +1,25 @@
|
||||
$OpenBSD: patch-Makefile,v 1.1 2021/01/03 16:12:02 bcallah Exp $
|
||||
|
||||
Remove hardcoded optimizations
|
||||
Remove -lexecinfo
|
||||
|
||||
Index: Makefile
|
||||
--- Makefile.orig
|
||||
+++ Makefile
|
||||
@@ -6,7 +6,7 @@
|
||||
#CC ?= clang
|
||||
|
||||
# Enable compiler warnings. This is an absolute minimum.
|
||||
-CFLAGS += -Wall -std=c99 -O3 #-Wextra
|
||||
+CFLAGS += -Wall -std=c99 #-Wextra
|
||||
|
||||
# Define your optimization flags.
|
||||
#
|
||||
@@ -161,7 +161,6 @@ NO_IMMINTRIN_H = yes
|
||||
CFLAGS += -I/usr/local/include
|
||||
LDFLAGS += -L/usr/local/lib
|
||||
SDL_CFLAGS += -DSDL_DISABLE_IMMINTRIN_H
|
||||
-SDL_LDFLAGS += -lexecinfo
|
||||
endif
|
||||
|
||||
# Linux
|
||||
55
games/frotz/patches/patch-src_sdl_sf_sig_c
Normal file
55
games/frotz/patches/patch-src_sdl_sf_sig_c
Normal file
@ -0,0 +1,55 @@
|
||||
$OpenBSD: patch-src_sdl_sf_sig_c,v 1.1 2021/01/03 16:12:02 bcallah Exp $
|
||||
|
||||
Remove execinfo and backtrace
|
||||
|
||||
Index: src/sdl/sf_sig.c
|
||||
--- src/sdl/sf_sig.c.orig
|
||||
+++ src/sdl/sf_sig.c
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <stdio.h>
|
||||
#include <signal.h>
|
||||
#include <stdlib.h>
|
||||
-#include <execinfo.h>
|
||||
|
||||
#include <SDL.h>
|
||||
|
||||
@@ -66,10 +65,6 @@ void sf_installhandlers()
|
||||
|
||||
#else
|
||||
|
||||
-#ifndef NO_EXECINFO_H
|
||||
-#include <execinfo.h>
|
||||
-#endif
|
||||
-
|
||||
/* get REG_EIP from ucontext.h */
|
||||
#ifndef NO_UCONTEXT_H
|
||||
#ifndef __USE_GNU
|
||||
@@ -109,9 +104,7 @@ static char *getsigname(int s)
|
||||
static void bt_sighandler(int sig, siginfo_t * info, void *secret)
|
||||
{
|
||||
|
||||
- void *trace[16];
|
||||
char *nam;
|
||||
- int i, trace_size = 0;
|
||||
|
||||
if (sig == SIGINT) {
|
||||
fprintf(stderr, "Emergency Exit (Signal SIGITNT received)\n");
|
||||
@@ -130,18 +123,10 @@ static void bt_sighandler(int sig, siginfo_t * info, v
|
||||
|
||||
printf("\n");
|
||||
|
||||
- trace_size = backtrace(trace, 16);
|
||||
/* overwrite sigaction with caller's address */
|
||||
/* trace[1] = (void *) uc->uc_mcontext.gregs[_PROG_COUNTER]; */
|
||||
|
||||
/* skip first stack frame (points here) */
|
||||
- printf("Backtrace:\n");
|
||||
-
|
||||
- for (i = 1; i < trace_size; i++) {
|
||||
- printf(" ");
|
||||
- fflush(stdout);
|
||||
- backtrace_symbols_fd(trace + i, 1, fileno(stdout));
|
||||
- }
|
||||
|
||||
os_quit(EXIT_SUCCESS);
|
||||
}
|
||||
@ -1,5 +1,7 @@
|
||||
@comment $OpenBSD: PLIST,v 1.5 2016/10/18 19:19:29 sthen Exp $
|
||||
@comment $OpenBSD: PLIST,v 1.6 2021/01/03 16:12:02 bcallah Exp $
|
||||
@bin bin/dfrotz
|
||||
@bin bin/frotz
|
||||
@bin bin/sfrotz
|
||||
@man man/man6/dfrotz.6
|
||||
@man man/man6/frotz.6
|
||||
@man man/man6/sfrotz.6
|
||||
|
||||
Loading…
Reference in New Issue
Block a user