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

fs-uae: unbreak with ports-gcc. While here move HOMEPAGE to https.

Browse Source 
"Go ahead" edd@ (maintainer), "Looks good" sthen@
This commit is contained in:
cwen 2019-07-26 22:00:42 +00:00
parent b0fbf1a0ec
commit 25d8922367
3 changed files with 37 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
emulators/fs-uae/Makefile
View File

@ -1,4 +1,4 @@
# $OpenBSD: Makefile,v 1.32 2019/07/12 20:46:08 sthen Exp $
# $OpenBSD: Makefile,v 1.33 2019/07/26 22:00:42 cwen Exp $
BROKEN-alpha = error: invalid 'asm': invalid %xn code
@ -7,9 +7,9 @@ V = 2.4.0
MODPY_EGG_VERSION = ${V}
DISTNAME = fs-uae-$V
CATEGORIES = emulators
REVISION = 9
REVISION = 10
HOMEPAGE = http://fengestad.no/fs-uae/
HOMEPAGE = https://fs-uae.net/
MAINTAINER = Edd Barrett <edd@openbsd.org>
# GPLv2, LGPLv2.1

17
emulators/fs-uae/patches/patch-src_od-fs_bsdsocket_posix_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_od-fs_bsdsocket_posix_cpp,v 1.1 2019/07/26 22:00:42 cwen Exp $
BAD_THREAD is defined as NULL, and ports-gcc doesn't want to
compare nullptr and int.
Index: src/od-fs/bsdsocket_posix.cpp
--- src/od-fs/bsdsocket_posix.cpp.orig
+++ src/od-fs/bsdsocket_posix.cpp
@@ -1407,7 +1407,7 @@ int host_sbinit (TrapContext *context, SB)
sb->hostentsize = 1024;
/* @@@ The thread should be PTHREAD_CREATE_DETACHED */
- if (uae_start_thread ("bsdsocket", bsdlib_threadfunc, (void *)sb, &sb->thread) == BAD_THREAD) {
+ if (uae_start_thread ("bsdsocket", bsdlib_threadfunc, (void *)sb, &sb->thread) == 0) {
write_log ("BSDSOCK: Failed to create thread.\n");
uae_sem_destroy (&sb->sem);
close (sb->sockabort[0]);

17
emulators/fs-uae/patches/patch-src_od-fs_picasso96_cpp Normal file
View File

@ -0,0 +1,17 @@
$OpenBSD: patch-src_od-fs_picasso96_cpp,v 1.1 2019/07/26 22:00:42 cwen Exp $
ports-gcc fix for:
error: cannot convert 'std::nullptr_t' to 'uaecptr'
Index: src/od-fs/picasso96.cpp
--- src/od-fs/picasso96.cpp.orig
+++ src/od-fs/picasso96.cpp
@@ -4916,7 +4916,7 @@ static uaecptr uaegfx_card_install (TrapContext *ctx,
uaecptr exec = get_long (4);
if (uaegfx_old || !gfxmem_start)
- return NULL;
+ return (uaecptr)0;
uaegfx_resid = ds (_T("UAE Graphics Card 3.3"));
uaegfx_vblankname = ds (_T("UAE Graphics Card VBLANK"));