Page MenuHomeFreeBSD
Files F144500376

D20064.1775029985.diff
No OneTemporary
Actions

Size
4 KB
Referenced Files
None
Subscribers
None

D20064.1775029985.diff
View Options

Index: emulators/Makefile
===================================================================
--- emulators/Makefile
+++ emulators/Makefile
@@ -37,6 +37,7 @@
SUBDIR += fmsx
SUBDIR += frodo
SUBDIR += fs-uae
+ SUBDIR += fs-uae-devel
SUBDIR += fs-uae-launcher
SUBDIR += fuse
SUBDIR += fuse-roms
Index: emulators/fs-uae-devel/Makefile
===================================================================
--- emulators/fs-uae-devel/Makefile
+++ emulators/fs-uae-devel/Makefile
@@ -1,29 +1,35 @@
-# Created by: Danilo Egea Gondolfo <danilo@FreeBSD.org>
+# Created by: Johannes Lundberg <johalun@FreeBSD.org>
# $FreeBSD$
PORTNAME= fs-uae
-PORTVERSION= 2.8.4
+PORTVERSION= 2.9.7.g20180804
CATEGORIES= emulators
-MASTER_SITES= http://fs-uae.net/stable/${PORTVERSION}/
+PKGNAMESUFFIX= -devel
-MAINTAINER= tomse@oagd.net
-COMMENT= Amiga emulator
+MAINTAINER= johalun@FreeBSD.org
+COMMENT= Amiga emulator (development branch)
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= zip:archivers/zip
-LIB_DEPENDS= libpng.so:graphics/png \
+LIB_DEPENDS= libmpeg2.so:multimedia/libmpeg2 \
libopenal.so:audio/openal-soft \
- libmpeg2.so:multimedia/libmpeg2
+ libpng.so:graphics/png
-USES= compiler:c11 desktop-file-utils gettext gl gmake \
- gnome localbase pkgconfig shared-mime-info
+USES= autoreconf compiler:c11 desktop-file-utils gettext gl gmake \
+ gnome libtool localbase pkgconfig shared-mime-info
USE_SDL= sdl2
USE_GL= gl
USE_GNOME= glib20
USE_XORG= x11
+
+USE_GITHUB= yes
+GH_ACCOUNT= FrodeSolheim
+GH_TAGNAME= 7f4b992
+
+CONFLICTS_INSTALL= fs-uae-[0-9]*
LLD_UNSAFE= yes
INSTALLS_ICONS= yes
Index: emulators/fs-uae-devel/distinfo
===================================================================
--- emulators/fs-uae-devel/distinfo
+++ emulators/fs-uae-devel/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1542818023
-SHA256 (fs-uae-2.8.4.tar.gz) = 526bf56faf006bffcb5ac56fff443d824a16e5b0d1dfc4f0579ccbbbde588ca5
-SIZE (fs-uae-2.8.4.tar.gz) = 4768861
+TIMESTAMP = 1558472548
+SHA256 (FrodeSolheim-fs-uae-2.9.7.g20180804-7f4b992_GH0.tar.gz) = 18d3cd09478e88c06a6828d961c358da2747d2a2e800b3184c6e34e68080c664
+SIZE (FrodeSolheim-fs-uae-2.9.7.g20180804-7f4b992_GH0.tar.gz) = 4755344
Index: emulators/fs-uae-devel/files/patch-src_od-fs_bsdsocket__posix.cpp
===================================================================
--- /dev/null
+++ emulators/fs-uae-devel/files/patch-src_od-fs_bsdsocket__posix.cpp
@@ -0,0 +1,11 @@
+--- src/od-fs/bsdsocket_posix.cpp.orig 2018-08-04 22:15:48 UTC
++++ src/od-fs/bsdsocket_posix.cpp
+@@ -1257,7 +1257,7 @@ uae_u32 host_bind (TrapContext *context, SB, uae_u32 s
+ DEBUG_LOG ("bind(%u[%d], 0x%x, %u) -> ", sd, s, name, namelen);
+ copysockaddr_a2n (&addr, name, namelen);
+ printSockAddr (&addr);
+- if ((success = bind (s, (struct sockaddr *)&addr, len)) != 0) {
++ if ((success = ::bind (s, (struct sockaddr *)&addr, len)) != 0) {
+ SETERRNO;
+ DEBUG_LOG ("failed (%d)\n",sb->sb_errno);
+ } else {
Index: emulators/fs-uae-devel/files/patch-src_od-win32_picasso96__win.cpp
===================================================================
--- emulators/fs-uae-devel/files/patch-src_od-win32_picasso96__win.cpp
+++ emulators/fs-uae-devel/files/patch-src_od-win32_picasso96__win.cpp
@@ -1,6 +1,6 @@
---- src/od-win32/picasso96_win.cpp.orig 2017-01-24 16:58:57 UTC
+--- src/od-win32/picasso96_win.cpp.orig 2018-08-04 22:15:48 UTC
+++ src/od-win32/picasso96_win.cpp
-@@ -3300,7 +3300,7 @@ static uae_u32 REGPARAM2 picasso_BlitRec
+@@ -3302,7 +3302,7 @@ static uae_u32 REGPARAM2 picasso_BlitRect (TrapContext
if (NOBLITTER_BLIT)
return 0;
P96TRACE((_T("BlitRect(%d, %d, %d, %d, %d, %d, 0x%x)\n"), srcx, srcy, dstx, dsty, width, height, Mask));
Index: emulators/fs-uae-devel/files/patch-src_support_socket.cpp
===================================================================
--- /dev/null
+++ emulators/fs-uae-devel/files/patch-src_support_socket.cpp
@@ -0,0 +1,11 @@
+--- src/support/socket.cpp.orig 2018-08-04 22:15:48 UTC
++++ src/support/socket.cpp
+@@ -103,7 +103,7 @@ uae_socket uae_tcp_listen(const TCHAR *host, const TCH
+ }
+ }
+
+- err = bind(s, socketinfo->ai_addr, socketinfo->ai_addrlen);
++ err = ::bind(s, socketinfo->ai_addr, socketinfo->ai_addrlen);
+ if (err < 0) {
+ write_log(_T("TCP: bind() failed, %s:%s: %d\n"),
+ host, port, uae_socket_error());
Index: emulators/fs-uae/Makefile
===================================================================
--- emulators/fs-uae/Makefile
+++ emulators/fs-uae/Makefile
@@ -6,11 +6,13 @@
CATEGORIES= emulators
MASTER_SITES= http://fs-uae.net/stable/${PORTVERSION}/
-MAINTAINER= tomse@oagd.net
+MAINTAINER= johalun@FreeBSD.org
COMMENT= Amiga emulator
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
+
+CONFLICTS_INSTALL= fs-uae-devel-[0-9]*
BUILD_DEPENDS= zip:archivers/zip
LIB_DEPENDS= libpng.so:graphics/png \

File Metadata

Mime Type
text/plain
Expires
Wed, Apr 1, 7:53 AM (7 h, 46 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28238007
Default Alt Text
D20064.1775029985.diff (4 KB)

Event Timeline