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

Update to checkout from 2023-01-03. This way version 3 of Northgard can run.

Browse Source 
Also tested with other major hashlink games without issues: Dead Cells,
Nuclear Blaze, Evoland Legendary Edition.

Northgard DLC Cross of Vidar needs hlvideo (video.hdll library) before this
can be run.
This commit is contained in:
thfr 2023-01-04 20:40:47 +00:00
parent 331a9eca12
commit d91372f3ae
5 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lang/hashlink/Makefile
View File

@ -3,9 +3,11 @@ USE_WXNEEDED = Yes
COMMENT = virtual machine for Haxe
DISTNAME = hashlink-1.12pl0
GH_ACCOUNT = HaxeFoundation
GH_PROJECT = hashlink
GH_TAGNAME = 1.12
# checkout from 2023-01-03
GH_COMMIT = 76ca98fee1ace39a3e5843724c226ee809d5928e
SHARED_LIBS = hl 1.0 # 1.12
@ -16,7 +18,7 @@ MAINTAINER = Thomas Frohwein <thfr@openbsd.org>
# MIT
PERMIT_PACKAGE = Yes
WANTLIB += SDL2 c m mbedcrypto mbedtls mbedx509 openal png pthread
WANTLIB += GL SDL2 c m mbedcrypto mbedtls mbedx509 openal png pthread
WANTLIB += sqlite3 turbojpeg uv vorbisfile z
# C11
@ -40,6 +42,8 @@ FIX_CRLF_FILES = libs/uv/uv.c \
src/std/socket.c \
src/std/thread.c
NO_TEST = Yes
post-extract:
rm -rf ${WRKSRC}/include/{fmt,turbojpeg}

4
lang/hashlink/distinfo
View File

@ -1,2 +1,2 @@
SHA256 (hashlink-1.12.tar.gz) = djKED09ksGZiIQhYQYxtJrhJLPdIak6G6+JC4nz4ur0=
SIZE (hashlink-1.12.tar.gz) = 4376163
SHA256 (hashlink-1.12pl0-76ca98fe.tar.gz) = cAjGRGnDgFWEh4PVJE0ZoAn+gbPD/aF4sc7IyaTacOU=
SIZE (hashlink-1.12pl0-76ca98fe.tar.gz) = 4397624

16
lang/hashlink/patches/patch-Makefile
View File

@ -31,8 +31,8 @@ Index: Makefile
+LIBEXT = so.${LIBhl_VERSION}
LIBTURBOJPEG = -lturbojpeg
PCRE_INCLUDE = -I include/pcre
@@ -96,16 +94,9 @@ LIB += ${HL_DEBUG}
PCRE_FLAGS = -I include/pcre
@@ -105,16 +103,9 @@ LIB += ${HL_DEBUG}
else
# Linux
@ -48,17 +48,17 @@ Index: Makefile
-endif
-
LIBOPENAL = -lopenal
LIBOPENGL = -lGL
RELEASE_NAME = linux
@@ -123,7 +114,6 @@ endif
@@ -133,7 +124,6 @@ endif
all: libhl hl libs
install:
- $(UNAME)==Darwin && make uninstall
- $(UNAME)==Darwin && ${MAKE} uninstall
mkdir -p $(INSTALL_BIN_DIR)
cp hl $(INSTALL_BIN_DIR)
mkdir -p $(INSTALL_LIB_DIR)
@@ -139,46 +129,46 @@ uninstall:
@@ -149,46 +139,46 @@ uninstall:
libs: $(LIBS)
./include/pcre/%.o: include/pcre/%.c
@ -118,8 +118,8 @@ Index: Makefile
+ ${CC} $(CFLAGS) -shared -o sqlite.hdll ${SQLITE} ${LIBFLAGS} -L. -lhl -lsqlite3
mesa:
(cd libs/mesa && make)
@@ -241,7 +231,7 @@ codesign_osx:
(cd libs/mesa && ${MAKE})
@@ -249,7 +239,7 @@ codesign_osx:
.SUFFIXES : .c .o
.c.o :

2
lang/hashlink/patches/patch-src_hl_h
View File

@ -3,7 +3,7 @@ work around not having uchar.h
Index: src/hl.h
--- src/hl.h.orig
+++ src/hl.h
@@ -234,7 +234,7 @@ typedef uint16_t uchar;
@@ -246,7 +246,7 @@ typedef uint16_t uchar;
# define USTR(str) u##str
#else
# include <stdarg.h>

12
lang/hashlink/patches/patch-src_std_thread_c
View File

@ -1,9 +1,10 @@
enable hl_thread_id for OpenBSD using getthrid(2)
pthread_setname_np -> pthread_set_name_np
Index: src/std/thread.c
--- src/std/thread.c.orig
+++ src/std/thread.c
@@ -772,6 +772,8 @@ HL_PRIM int hl_thread_id() {
@@ -809,6 +809,8 @@ HL_PRIM int hl_thread_id() {
uint64_t tid64;
pthread_threadid_np(NULL, &tid64);
return (pid_t)tid64;
@ -12,3 +13,12 @@ Index: src/std/thread.c
#elif defined(SYS_gettid) && !defined(HL_TVOS)
return syscall(SYS_gettid);
#else
@@ -940,7 +942,7 @@ HL_PRIM void hl_thread_set_name( hl_thread *t, const c
#elif defined(HL_MAC)
// pthread_setname_np only possible for current thread
#else
- pthread_setname_np((pthread_t)t,name);
+ pthread_set_name_np((pthread_t)t,name);
#endif
#ifdef HL_THREADS
hl_threads_info *threads = hl_gc_threads_info();