Date: Wed, 5 Dec 2012 16:37:43 GMT From: Green Dog <fiziologus@gmail.com> To: freebsd-gnats-submit@FreeBSD.org Subject: ports/174153: [emulators/fceux] update to 2.2.0 Message-ID: <201212051637.qB5GbhT9066224@red.freebsd.org> Resent-Message-ID: <201212051640.qB5Ge0eo029963@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 174153 >Category: ports >Synopsis: [emulators/fceux] update to 2.2.0 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Wed Dec 05 16:40:00 UTC 2012 >Closed-Date: >Last-Modified: >Originator: Green Dog >Release: FreeBSD-9.0 >Organization: >Environment: >Description: [emulators/fceux] update to 2.2.0 take maintainership edit WWW >How-To-Repeat: >Fix: Patch attached with submission follows: diff -ruN fceux.orig/Makefile fceux/Makefile --- fceux.orig/Makefile 2012-11-23 18:38:34.000000000 +0400 +++ fceux/Makefile 2012-12-05 20:33:53.000000000 +0400 @@ -6,39 +6,116 @@ # PORTNAME= fceux -PORTVERSION= 2.1.5 +PORTVERSION= 2.2.0 CATEGORIES= emulators -MASTER_SITES= SF/fceultra/Source%20Code/2.1.5%20src/ +MASTER_SITES= SF/fceultra/Source%20Code/${PORTVERSION}%20src/ DISTNAME= ${PORTNAME}-${PORTVERSION}.src -MAINTAINER= davide.italiano@gmail.com +MAINTAINER= fiziologus@gmail.com COMMENT= A portable NES/Famicom emulator based on Bero's original FCE -USE_BZIP2= yes +USE_PKGCONFIG= build USE_SCONS= yes +SCONS_BUILDENV= CC="${CC}" CXX="${CXX}" \ + CFLAGS="${CFLAGS}" CXXFLAGS="${CXXFLAGS}" \ + CPPFLAGS="${CPPFLAGS} -I${LOCALBASE}/include" \ + LDFLAGS="${LDFLAGS} -L${LOCALBASE}/lib" +SCONS_ARGS+= --prefix="${PREFIX}" USE_SDL= sdl USE_DOS2UNIX= yes + +WRKSRC= ${WRKDIR}/${PORTNAME} + +RUN_DEPENDS+= zenity:${PORTSDIR}/x11/zenity + +MAN6= fceux.6 fceux-net-server.6 + +OPTIONS_DEFINE= FRAMESKIP OPENGL DEBUG LUA CREATE_AVI LOGO +OPTIONS_SINGLE= GUI +OPTIONS_SINGLE_GUI= GTK2 GTK3 +OPTIONS_DEFAULT= FRAMESKIP OPENGL LUA NEWPPU CREATE_AVI LOGO GTK2 + +FRAMESKIP_DESC= Enable frameskipping +LUA_DESC= Enable Lua support +CREATE_AVI_DESC= Enable avi creation support (SDL) +LOGO_DESC= Enable a logoscreen when creating avis (SDL) +GTK2_DESC= Enable GTK2 GUI (SDL) +GTK3_DESC= Enable GTK3 GUI (SDL) + +.include <bsd.port.options.mk> + +.if ${PORT_OPTIONS:MFRAMESKIP} +SCONS_ARGS+= FRAMESKIP=1 +.else +SCONS_ARGS+= FRAMESKIP=0 +.endif + +.if ${PORT_OPTIONS:MGTK2} +SCONS_ARGS+= GTK=1 +USE_GNOME+= gtk20 +.else +SCONS_ARGS+= GTK=0 +.endif + +.if ${PORT_OPTIONS:MGTK3} +SCONS_ARGS+= GTK3=1 +USE_GNOME+= gtk30 +.else +SCONS_ARGS+= GTK3=0 +.endif + +.if ${PORT_OPTIONS:MLUA} +SCONS_ARGS+= LUA=1 SYSTEM_LUA=1 USE_LUA= yes +.else +SCONS_ARGS+= LUA=0 +.endif -WRKSRC= ${WRKDIR}/fceu${PORTVERSION} +.if ${PORT_OPTIONS:MLOGO} +SCONS_ARGS+= LOGO=1 CREATE_AVI=1 +LIB_DEPENDS+= gd:${PORTSDIR}/graphics/gd +.else +SCONS_ARG+= LOGO=0 +.endif -BUILD_DEPENDS+= zenity:${PORTSDIR}/x11/zenity +.if ${PORT_OPTIONS:MOPENGL} +SCONS_ARGS+= OPENGL=1 +USE_GL= gl +.else +SCONS_ARGS+= OPENGL=0 +.endif -MAN6= fceux.6 +.if ${PORT_OPTIONS:MCREATE_AVI} +SCONS_ARGS+= CREATE_AVI=1 +.else +SCONS_ARGS+= CREATE_AVI=0 +.endif -.include <bsd.port.pre.mk> +.if ${PORT_OPTIONS:MDEBUG} +SCONS_ARGS+= DEBUG=1 +.else +SCONS_ARGS+= DEBUG=0 +.endif post-extract: ${REINPLACE_CMD} -e 's/[[:cntrl:]]*$$//' \ ${WRKSRC}/src/drivers/common/vidblit.cpp - @${MV} ${WRKSRC}/documentation/fceux.6 ${WRKSRC}/ -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/fceux ${PREFIX}/bin - ${INSTALL_MAN} ${WRKSRC}/fceux.6 ${PREFIX}/man/man6 -.if !defined(NOPORTDOCS) +post-patch: + ${REINPLACE_CMD} -e 's|%%PKGCONFIG%%|${LOCALBASE}/bin/pkg-config|g' \ + -e 's|%%SDLCONFIG%%|${LOCALBASE}/bin/sdl-config|g' \ + ${WRKSRC}/SConstruct + ${REINPLACE_CMD} -e 's|usr|usr/local|g' ${WRKSRC}/fceux.desktop + +post-install: +.if ${PORT_OPTIONS:MDOCS} @${MKDIR} ${DOCSDIR} - cd ${WRKSRC}/documentation && ${COPYTREE_SHARE} . ${DOCSDIR}/ +.for file in TODO-PROJECT Videolog.txt cheat.html faq fcs.txt fm2.txt protocol.txt snes9x-lua.html + @${CP} ${WRKSRC}/documentation/${file} ${DOCSDIR} +.endfor + @${MV} ${WRKSRC}/documentation/tech ${DOCSDIR} .endif + @${CP} ${WRKSRC}/fceux.desktop ${LOCALBASE}/share/applications + @${CP} ${WRKSRC}/fceux.png ${LOCALBASE}/share/pixmaps -.include <bsd.port.post.mk> +.include <bsd.port.mk> diff -ruN fceux.orig/distinfo fceux/distinfo --- fceux.orig/distinfo 2012-11-23 18:38:34.000000000 +0400 +++ fceux/distinfo 2012-12-05 12:01:04.000000000 +0400 @@ -1,2 +1,2 @@ -SHA256 (fceux-2.1.5.src.tar.bz2) = ee6b1ee6a0347e325032f6655a5caa289e2b0458f7fccddccd5137f1cd63bf9f -SIZE (fceux-2.1.5.src.tar.bz2) = 7322199 +SHA256 (fceux-2.2.0.src.tar.gz) = 31ad7b478d5c0911a67a4eaeae9de915d44fc95844148a135114e27d7fd1a694 +SIZE (fceux-2.2.0.src.tar.gz) = 8852228 diff -ruN fceux.orig/files/patch-SConstruct fceux/files/patch-SConstruct --- fceux.orig/files/patch-SConstruct 2012-11-23 18:38:34.000000000 +0400 +++ fceux/files/patch-SConstruct 2012-12-05 17:35:30.000000000 +0400 @@ -1,15 +1,96 @@ ---- SConstruct.bak 2012-09-30 14:49:24.000000000 -0500 -+++ SConstruct 2012-09-30 14:50:46.000000000 -0500 -@@ -56,9 +56,9 @@ - else: - conf = Configure(env) - assert conf.CheckLibWithHeader('z', 'zlib.h', 'C', 'inflate;', 1), "please install: zlib" -- if not conf.CheckLib('SDL'): -- print 'Did not find libSDL or SDL.lib, exiting!' -- Exit(1) -+ ###if not conf.CheckLib('SDL'): -+ ### print 'Did not find libSDL or SDL.lib, exiting!' -+ ### Exit(1) +--- SConstruct.orig 2012-12-05 17:14:58.000000000 +0400 ++++ SConstruct 2012-12-05 17:35:18.000000000 +0400 +@@ -17,7 +17,7 @@ + BoolVariable('FRAMESKIP', 'Enable frameskipping', 1), + BoolVariable('OPENGL', 'Enable OpenGL support', 1), + BoolVariable('LSB_FIRST', 'Least signficant byte first (non-PPC)', 1), +- BoolVariable('DEBUG', 'Build with debugging symbols', 1), ++ BoolVariable('DEBUG', 'Build with debugging symbols', 0), + BoolVariable('LUA', 'Enable Lua support', 1), + BoolVariable('SYSTEM_LUA','Use system lua instead of static lua provided with fceux', 1), + BoolVariable('NEWPPU', 'Enable new PPU core', 1), +@@ -33,8 +33,8 @@ + env = Environment(options = opts) + + #### Uncomment this for a public release ### +-env.Append(CPPDEFINES=["PUBLIC_RELEASE"]) +-env['DEBUG'] = 0 ++#env.Append(CPPDEFINES=["PUBLIC_RELEASE"]) ++#env['DEBUG'] = 0 + ############################################ - if env['GTK']: + # LSB_FIRST must be off for PPC to compile +@@ -92,12 +92,12 @@ + print 'Could not find libgtk-2.0, exiting!' + Exit(1) + # Add compiler and linker flags from pkg-config +- env.ParseConfig('pkg-config --cflags --libs gtk+-2.0') ++ env.ParseConfig('%%PKGCONFIG%% --cflags --libs gtk+-2.0') + env.Append(CPPDEFINES=["_GTK2"]) + env.Append(CCFLAGS = ["-D_GTK"]) + if env['GTK3']: # Add compiler and linker flags from pkg-config +- env.ParseConfig('pkg-config --cflags --libs gtk+-3.0') ++ env.ParseConfig('%%PKG_CONFIG%% --cflags --libs gtk+-3.0') + env.Append(CPPDEFINES=["_GTK3"]) + env.Append(CCFLAGS = ["-D_GTK"]) + +@@ -113,11 +113,11 @@ + # Should work on any *nix + env.Append(CCFLAGS = ["-DLUA_USE_LINUX"]) + lua_available = False +- if conf.CheckLib('lua5.1'): +- env.Append(LINKFLAGS = ["-ldl", "-llua5.1"]) ++ if conf.CheckLib('lua-5.1'): ++ env.ParseConfig('%%PKGCONFIG%% --cflags --libs lua-5.1') + lua_available = True + elif conf.CheckLib('lua'): +- env.Append(LINKFLAGS = ["-ldl", "-llua"]) ++ env.Append(LINKFLAGS = ["-llua"]) + lua_available = True + if lua_available == False: + print 'Could not find liblua, exiting!' +@@ -135,9 +135,10 @@ + + if env['OPENGL'] and conf.CheckLibWithHeader('GL', 'GL/gl.h', 'c', autoadd=1): + conf.env.Append(CCFLAGS = "-DOPENGL") ++ env.ParseConfig('%%PKGCONFIG%% --cflags --libs gl') + conf.env.Append(CPPDEFINES = ['PSS_STYLE=1']) + # parse SDL cflags/libs +- env.ParseConfig('sdl-config --cflags --libs') ++ env.ParseConfig('%%SDLCONFIG%% --cflags --libs') + + env = conf.Finish() + +@@ -154,6 +155,7 @@ + env.Append(CPPDEFINES=["_DEBUG"], CCFLAGS = ['-g']) + else: + env.Append(CCFLAGS = ['-O2']) ++ env.Append(CPPDEFINES=["PUBLIC_RELEASE"]) + + if env['PLATFORM'] != 'win32' and env['PLATFORM'] != 'cygwin' and env['CREATE_AVI']: + env.Append(CPPDEFINES=["CREATE_AVI"]) +@@ -181,18 +183,18 @@ + auxlib_dst = 'bin/auxlib.lua' + auxlib_inst_dst = prefix + '/share/fceux/auxlib.lua' + +-fceux_h_src = 'src/drivers/win/help/fceux.chm' +-fceux_h_dst = 'bin/fceux.chm' ++#fceux_h_src = 'src/drivers/win/help/fceux.chm' ++#fceux_h_dst = 'bin/fceux.chm' + +-env.Command(fceux_h_dst, fceux_h_src, [Copy(fceux_h_dst, fceux_h_src)]) ++#env.Command(fceux_h_dst, fceux_h_src, [Copy(fceux_h_dst, fceux_h_src)]) + env.Command(fceux_dst, fceux_src, [Copy(fceux_dst, fceux_src)]) + env.Command(fceux_net_server_dst, fceux_net_server_src, [Copy(fceux_net_server_dst, fceux_net_server_src)]) + env.Command(auxlib_dst, auxlib_src, [Copy(auxlib_dst, auxlib_src)]) + + 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' ++man_dst = prefix + '/man/man6/fceux.6' ++man_net_dst = prefix + '/man/man6/fceux-net-server.6' + + share_src = 'output/' + share_dst = prefix + '/share/fceux/' diff -ruN fceux.orig/files/patch-file.c fceux/files/patch-file.c --- fceux.orig/files/patch-file.c 2012-11-23 18:38:34.000000000 +0400 +++ fceux/files/patch-file.c 1970-01-01 03:00:00.000000000 +0300 @@ -1,10 +0,0 @@ ---- src/file.cpp.bak 2012-09-30 18:58:51.000000000 -0500 -+++ src/file.cpp 2012-09-30 18:59:15.000000000 -0500 -@@ -310,7 +310,7 @@ - if(magic==0x088b1f) { - // maybe gzip... - -- void* gzfile = gzopen(fileToOpen.c_str(),"rb"); -+ gzFile gzfile = gzopen(fileToOpen.c_str(),"rb"); - if(gzfile) { - delete fp; diff -ruN fceux.orig/pkg-descr fceux/pkg-descr --- fceux.orig/pkg-descr 2009-11-26 03:36:45.000000000 +0300 +++ fceux/pkg-descr 2012-12-05 19:27:06.000000000 +0400 @@ -9,4 +9,4 @@ FCE Ultra currently supports the following iNES mappers(many partially): -WWW: http://fceultra.sourceforge.net/ +WWW: http://www.fceux.com/ diff -ruN fceux.orig/pkg-plist fceux/pkg-plist --- fceux.orig/pkg-plist 2009-11-05 19:32:38.000000000 +0300 +++ fceux/pkg-plist 2012-12-05 19:58:12.000000000 +0400 @@ -1,30 +1,107 @@ bin/fceux -%%PORTDOCS%%%%DOCSDIR%%/snes9x-lua.html -%%PORTDOCS%%%%DOCSDIR%%/fcs.txt -%%PORTDOCS%%%%DOCSDIR%%/protocol.txt -%%PORTDOCS%%%%DOCSDIR%%/todo +bin/fceux-net-server +share/applications/fceux.desktop +share/pixmaps/fceux.png +%%DATADIR%%/auxlib.lua +%%DATADIR%%/luaScripts/AVI-HeadsUpDisplay.lua +%%DATADIR%%/luaScripts/BoulderDash_AmoebaAI.lua +%%DATADIR%%/luaScripts/BugsBunnyBirthdayBlowout.lua +%%DATADIR%%/luaScripts/ButtonCount.lua +%%DATADIR%%/luaScripts/CustomLagIndicator_RvT.lua +%%DATADIR%%/luaScripts/Excitingbike-speedometeronly.lua +%%DATADIR%%/luaScripts/Excitingbike.lua +%%DATADIR%%/luaScripts/FRKfunctions.lua +%%DATADIR%%/luaScripts/GUI-iup_button.lua +%%DATADIR%%/luaScripts/GUI-iup_example.lua +%%DATADIR%%/luaScripts/Galaxian.lua +%%DATADIR%%/luaScripts/Gradius-BulletHell.lua +%%DATADIR%%/luaScripts/Luabot.lua +%%DATADIR%%/luaScripts/Machrider.lua +%%DATADIR%%/luaScripts/MegamanII-LaserEyes.lua +%%DATADIR%%/luaScripts/MemoryWatch.lua +%%DATADIR%%/luaScripts/Multitrack.lua +%%DATADIR%%/luaScripts/Multitrack2.lua +%%DATADIR%%/luaScripts/NightmareElmStreet-4Player.lua +%%DATADIR%%/luaScripts/PunchOutChallenge.lua +%%DATADIR%%/luaScripts/PunchOutStats.lua +%%DATADIR%%/luaScripts/PunchOutTraining.lua +%%DATADIR%%/luaScripts/RBIBaseball.lua +%%DATADIR%%/luaScripts/Registerfind(CheatSearch).lua +%%DATADIR%%/luaScripts/Rewinder.lua +%%DATADIR%%/luaScripts/SMB-AreaScrambler.lua +%%DATADIR%%/luaScripts/SMB-CompetitionRecorder.lua +%%DATADIR%%/luaScripts/SMB-HitBoxes.lua +%%DATADIR%%/luaScripts/SMB-Jetpack.lua +%%DATADIR%%/luaScripts/SMB-Lives&HPDisplay.lua +%%DATADIR%%/luaScripts/SMB-Mouse.lua +%%DATADIR%%/luaScripts/SMB-Snow.lua +%%DATADIR%%/luaScripts/SMB2U.lua +%%DATADIR%%/luaScripts/SMB3-RainbowRiding.lua +%%DATADIR%%/luaScripts/ShowPalette.lua +%%DATADIR%%/luaScripts/SoundDisplay.lua +%%DATADIR%%/luaScripts/SoundDisplay2.lua +%%DATADIR%%/luaScripts/Subtitler.lua +%%DATADIR%%/luaScripts/TeenageMutantNinjaTurtles.lua +%%DATADIR%%/luaScripts/UsingLuaBot-Documentation.txt +%%DATADIR%%/luaScripts/UsingLuaScripting-Documentation.txt +%%DATADIR%%/luaScripts/UsingLuaScripting-ListofFunctions.txt +%%DATADIR%%/luaScripts/ZapperDisplay.lua +%%DATADIR%%/luaScripts/ZapperFun.lua +%%DATADIR%%/luaScripts/luabot_framework.lua +%%DATADIR%%/luaScripts/m_utils.lua +%%DATADIR%%/luaScripts/shapedefs.lua +%%DATADIR%%/luaScripts/taseditor/InputDisplay_for_Selection.lua +%%DATADIR%%/luaScripts/taseditor/InvertSelection.lua +%%DATADIR%%/luaScripts/taseditor/RecordBackwards.lua +%%DATADIR%%/luaScripts/taseditor/ShowNotes.lua +%%DATADIR%%/luaScripts/taseditor/Swap1P2P.lua +%%DATADIR%%/luaScripts/taseditor/TrackNoise.lua +%%DATADIR%%/luaScripts/tetris.lua +%%DATADIR%%/luaScripts/vnb.lua +%%DATADIR%%/luaScripts/x_functions.lua +%%DATADIR%%/luaScripts/x_interface.lua +%%DATADIR%%/luaScripts/x_smb1enemylist.lua +%%DATADIR%%/palettes/ASQ_realityA.pal +%%DATADIR%%/palettes/ASQ_realityB.pal +%%DATADIR%%/palettes/BMF_final2.pal +%%DATADIR%%/palettes/BMF_final3.pal +%%DATADIR%%/palettes/FCEU-13-default_nitsuja.pal +%%DATADIR%%/palettes/FCEU-15-nitsuja_new.pal +%%DATADIR%%/palettes/FCEUX.pal +%%DATADIR%%/palettes/nestopia_rgb.pal +%%DATADIR%%/palettes/nestopia_yuv.pal +%%DATADIR%%/taseditor.chm +%%DATADIR%%/tools/taseditor_patterns.txt +%%PORTDOCS%%%%DOCSDIR%%/TODO-PROJECT %%PORTDOCS%%%%DOCSDIR%%/Videolog.txt -%%PORTDOCS%%%%DOCSDIR%%/fm2.txt -%%PORTDOCS%%%%DOCSDIR%%/porting.txt %%PORTDOCS%%%%DOCSDIR%%/cheat.html -%%PORTDOCS%%%%DOCSDIR%%/tech/readme.now -%%PORTDOCS%%%%DOCSDIR%%/tech/exp/vrcvii.txt +%%PORTDOCS%%%%DOCSDIR%%/faq +%%PORTDOCS%%%%DOCSDIR%%/fcs.txt +%%PORTDOCS%%%%DOCSDIR%%/fm2.txt +%%PORTDOCS%%%%DOCSDIR%%/protocol.txt +%%PORTDOCS%%%%DOCSDIR%%/snes9x-lua.html +%%PORTDOCS%%%%DOCSDIR%%/tech/cpu/4017.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/cpu/dmc.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/cpu/nessound-4th.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/cpu/nessound.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/exp/mmc5-e.txt %%PORTDOCS%%%%DOCSDIR%%/tech/exp/smb2j.txt %%PORTDOCS%%%%DOCSDIR%%/tech/exp/tengen.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/exp/mmc5-e.txt %%PORTDOCS%%%%DOCSDIR%%/tech/exp/vrcvi.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/cpu/nessound.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/cpu/4017.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/cpu/nessound-4th.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/cpu/dmc.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/exp/vrcvii.txt %%PORTDOCS%%%%DOCSDIR%%/tech/nsfspec.txt -%%PORTDOCS%%%%DOCSDIR%%/tech/readme.sound -%%PORTDOCS%%%%DOCSDIR%%/tech/ppu/loopy2.txt %%PORTDOCS%%%%DOCSDIR%%/tech/ppu/2c02 technical operation.txt %%PORTDOCS%%%%DOCSDIR%%/tech/ppu/loopy1.txt -%%PORTDOCS%%%%DOCSDIR%%/faq +%%PORTDOCS%%%%DOCSDIR%%/tech/ppu/loopy2.txt +%%PORTDOCS%%%%DOCSDIR%%/tech/readme.now +%%PORTDOCS%%%%DOCSDIR%%/tech/readme.sound +@dirrm %%DATADIR%%/tools +@dirrm %%DATADIR%%/palettes +@dirrm %%DATADIR%%/luaScripts/taseditor +@dirrm %%DATADIR%%/luaScripts +@dirrm %%DATADIR%% %%PORTDOCS%%@dirrm %%DOCSDIR%%/tech/ppu -%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech/cpu %%PORTDOCS%%@dirrm %%DOCSDIR%%/tech/exp +%%PORTDOCS%%@dirrm %%DOCSDIR%%/tech/cpu %%PORTDOCS%%@dirrm %%DOCSDIR%%/tech %%PORTDOCS%%@dirrm %%DOCSDIR%% >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201212051637.qB5GbhT9066224>