Update to fceux-2.2.3.

Release notes: http://www.fceux.com/web/pressrelease-2.2.3.html
2016-08-01 18:31:29 +00:00 · 2016-08-01 18:31:29 +00:00 · f0786e9019
commit f0786e9019
parent 65175e317b
5 changed files with 54 additions and 69 deletions
--- a/emulators/fceux/Makefile
+++ b/emulators/fceux/Makefile
@ -1,9 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2016/01/11 09:35:44 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.10 2016/08/01 18:31:29 bentley Exp $

 COMMENT =		emulator for Nintendo Entertainment System

-V =			2.2.2
-REVISION =		2
+V =			2.2.3
 DISTNAME =		fceux-${V}.src
 PKGNAME =		fceux-${V}
 CATEGORIES =		emulators games
@ -18,7 +17,7 @@ PERMIT_PACKAGE_CDROM =	Yes
 MASTER_SITES =		${MASTER_SITE_SOURCEFORGE:=fceultra/}

 WANTLIB += 		GL SDL X11 c gd gdk-x11-2.0 gdk_pixbuf-2.0 glib-2.0
-WANTLIB += 		gobject-2.0 gtk-x11-2.0 lua5.1 m pixman-1 pthread
+WANTLIB += 		gobject-2.0 gtk-x11-2.0 lua5.1 m pthread
 WANTLIB += 		stdc++ z ${MODLUA_WANTLIB}

 RUN_DEPENDS =		devel/desktop-file-utils
@ -33,6 +32,7 @@ MAKE_ENV =		CC="${CC}" \
 			CXX="${CXX}" \
 			CXXFLAGS="${CXXFLAGS} -DIOAPI_NO_64" \
 			LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib"
+MODSCONS_FLAGS =	SYSTEM_LUA=1

 CONFIGURE_STYLE =	scons

--- a/emulators/fceux/distinfo
+++ b/emulators/fceux/distinfo
@ -1,2 +1,2 @@
-SHA256 (fceux-2.2.2.src.tar.gz) = gE0RvbShlfOlgM5dLQG+h3WCdjN4Y34WGGoiRZ9f5eE=
-SIZE (fceux-2.2.2.src.tar.gz) = 9249858
+SHA256 (fceux-2.2.3.src.tar.gz) = S+bdqaNH+UGAmjxKkNIYFbUCOErf3Vlq2qey2vCIgj4=
+SIZE (fceux-2.2.3.src.tar.gz) = 9292792
--- a/emulators/fceux/patches/patch-SConstruct
+++ b/emulators/fceux/patches/patch-SConstruct
@ -1,67 +1,45 @@
-$OpenBSD: patch-SConstruct,v 1.4 2015/10/02 05:15:53 bentley Exp $
-Fix SCons install target. From upstream r3067.
--- SConstruct.orig	Thu Oct  1 22:43:24 2015
-+++ SConstruct	Thu Oct  1 22:43:25 2015
-@@ -138,9 +138,9 @@ else:
-       # Should work on any *nix
+$OpenBSD: patch-SConstruct,v 1.5 2016/08/01 18:31:29 bentley Exp $
+--- SConstruct.orig	Sun Jul 31 20:35:51 2016
+++ SConstruct	Sun Jul 31 20:36:16 2016
+@@ -128,9 +128,6 @@ else:
+     env.Append(CPPDEFINES=["_GTK3"])
+     env.Append(CCFLAGS = ["-D_GTK"])
+ 
+-  ### Just make every configuration use -ldl, it may be needed for some reason.
+-  env.Append(LIBS = ["-ldl"])
+-
+   ### Lua platform defines
+   ### Applies to all files even though only lua needs it, but should be ok
+   if env['LUA']:
+@@ -144,9 +141,9 @@ else:
       env.Append(CCFLAGS = ["-DLUA_USE_LINUX"])
     lua_available = False
-    if conf.CheckLib('lua5.1'):
-      env.Append(LINKFLAGS = ["-ldl", "-llua5.1"])
-      env.Append(CCFLAGS = ["-I/usr/include/lua5.1"])
-+    if conf.CheckLib('${MODLUA_WANTLIB}'):
-+      env.Append(LINKFLAGS = '${MODLUA_LIB}')
-+      env.Append(CCFLAGS = ["-I${MODLUA_INCL_DIR}"])
-       lua_available = True
-     elif conf.CheckLib('lua'):
-       env.Append(LINKFLAGS = ["-ldl", "-llua"])
-@@ -177,8 +177,6 @@ print "base CCFLAGS:",env['CCFLAGS']
+     if env['SYSTEM_LUA']:
+-      if conf.CheckLib('lua5.1'):
+-        env.Append(LINKFLAGS = ["-llua5.1"])
+-        env.Append(CCFLAGS = ["-I/usr/include/lua5.1"])
+      if conf.CheckLib('${MODLUA_WANTLIB}'):
+        env.Append(LINKFLAGS = ["${MODLUA_LIB}"])
+        env.Append(CCFLAGS = ["-I${MODLUA_INCL_DIR}"])
+         lua_available = True
+       elif conf.CheckLib('lua'):
+         env.Append(LINKFLAGS = ["-llua"])
+@@ -184,11 +181,6 @@ if env['FRAMESKIP']:
+ print "base CPPDEFINES:",env['CPPDEFINES']
+ print "base CCFLAGS:",env['CCFLAGS']
 
- if env['DEBUG']:
-   env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
+-if env['DEBUG']:
+-  env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g', '-O0'])
 -else:
 -  env.Append(CCFLAGS = ['-O2'])
- 
+-
 if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin' and env['CREATE_AVI']:
   env.Append(CPPDEFINES=["CREATE_AVI"])
-@@ -205,7 +203,6 @@ fceux_net_server_dst = 'bin/fceux-net-server' + exe_su
- 
- auxlib_src = 'src/auxlib.lua'
- auxlib_dst = 'bin/auxlib.lua'
-auxlib_inst_dst = prefix + '/share/fceux/auxlib.lua'
- 
- fceux_h_src = 'output/fceux.chm'
- fceux_h_dst = 'bin/fceux.chm'
-@@ -217,25 +214,17 @@ env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst, 
- 
- man_src = 'documentation/fceux.6'
- man_net_src = 'documentation/fceux-net-server.6'
-man_dst = prefix + '/share/man/man6/fceux.6'
-man_net_dst = prefix + '/share/man/man6/fceux-net-server.6'
- 
- share_src = 'output/'
-share_dst = prefix + '/share/fceux/'
- 
- image_src = 'fceux.png'
-image_dst = prefix + '/share/pixmaps'
- 
- desktop_src = 'fceux.desktop'
-desktop_dst = prefix + '/share/applications/'
- 
-env.Install(prefix + "/bin/", fceux)
-env.Install(prefix + "/bin/", "fceux-net-server")
-# TODO:  Where to put auxlib on "scons install?"
-env.Alias('install', env.Command(auxlib_inst_dst, auxlib_src, [Copy(auxlib_inst_dst, auxlib_src)]))
-env.Alias('install', env.Command(share_dst, share_src, [Copy(share_dst, share_src)]))
-env.Alias('install', env.Command(man_dst, man_src, [Copy(man_dst, man_src)]))
-env.Alias('install', env.Command(man_net_dst, man_net_src, [Copy(man_net_dst, man_net_src)]))
-env.Alias('install', env.Command(image_dst, image_src, [Copy(image_dst, image_src)]))
-env.Alias('install', env.Command(desktop_dst, desktop_src, [Copy(desktop_dst, desktop_src)]))
-env.Alias('install', (prefix + "/bin/"))
-+env.Install(prefix + "/bin/", [fceux, fceux_net_server_src])
-+env.InstallAs(prefix + '/share/fceux/', share_src)
-+env.Install(prefix + '/share/fceux/', auxlib_src)
-+env.Install(prefix + '/share/pixmaps/', image_src)
-+env.Install(prefix + '/share/applications/', desktop_src)
+ else:
+@@ -237,5 +229,5 @@ env.InstallAs(prefix + '/share/fceux/', share_src)
+ env.Install(prefix + '/share/fceux/', auxlib_src)
+ env.Install(prefix + '/share/pixmaps/', image_src)
+ env.Install(prefix + '/share/applications/', desktop_src)
+-env.Install(prefix + "/share/man/man6/", [man_src, man_net_src])
 +env.Install(prefix + "/man/man6/", [man_src, man_net_src])
-+env.Alias('install', prefix)
+ env.Alias('install', prefix)
--- a/emulators/fceux/patches/patch-fceux_desktop
+++ b/emulators/fceux/patches/patch-fceux_desktop
@ -1,6 +1,6 @@
-$OpenBSD: patch-fceux_desktop,v 1.2 2015/10/02 05:15:53 bentley Exp $
--- fceux.desktop.orig	Thu Oct  1 22:43:24 2015
-+++ fceux.desktop	Thu Oct  1 22:44:13 2015
+$OpenBSD: patch-fceux_desktop,v 1.3 2016/08/01 18:31:29 bentley Exp $
+--- fceux.desktop.orig	Sun Jul 31 20:26:29 2016
+++ fceux.desktop	Sun Jul 31 20:31:12 2016
@@ -5,8 +5,8 @@ Name=Fceux
 GenericName=NES/Famicom emulator
 NoDisplay=false
--- a/emulators/fceux/pkg/PLIST
+++ b/emulators/fceux/pkg/PLIST
@ -1,4 +1,4 @@
-@comment $OpenBSD: PLIST,v 1.3 2014/04/10 06:04:42 bentley Exp $
+@comment $OpenBSD: PLIST,v 1.4 2016/08/01 18:31:29 bentley Exp $
@bin bin/fceux
@bin bin/fceux-net-server
@man man/man6/fceux-net-server.6
@ -78,6 +78,13 @@ share/fceux/palettes/BMF_final3.pal
 share/fceux/palettes/FCEU-13-default_nitsuja.pal
 share/fceux/palettes/FCEU-15-nitsuja_new.pal
 share/fceux/palettes/FCEUX.pal
+share/fceux/palettes/RP2C03.pal
+share/fceux/palettes/RP2C04_0001.pal
+share/fceux/palettes/RP2C04_0002.pal
+share/fceux/palettes/RP2C04_0003.pal
+share/fceux/palettes/RP2C04_0004.pal
+share/fceux/palettes/SONY_CXA2025AS_US.pal
+share/fceux/palettes/Unsaturated-V6.pal
 share/fceux/palettes/nestopia_rgb.pal
 share/fceux/palettes/nestopia_yuv.pal
 share/fceux/taseditor.chm