CVS commit: pkgsrc/emulators/fmsx

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/emulators/fmsx
From: "Ryo ONODERA" <ryoon%netbsd.org@localhost>
Date: Mon, 9 Apr 2018 16:19:12 +0000

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Mon Apr  9 16:19:12 UTC 2018

Modified Files:
        pkgsrc/emulators/fmsx: Makefile PLIST distinfo
        pkgsrc/emulators/fmsx/patches: patch-aa patch-ab patch-af patch-ag
Removed Files:
        pkgsrc/emulators/fmsx/patches: patch-EMULIB_FDIDisk.c
            patch-EMULIB_Floppy.c patch-EMULib_LibUnix.c patch-ae patch-ah
            patch-fMSX_MSX.c

Log Message:
Update to 5.3

* Tarball does not contain ROM files anymore
* Use pulseaudio for audio output

Changelog:
New in fMSX 5.3

    Added remaining time display during replay.
    Stopping replay when emulation reset or state loaded.
    Fixed replay rollover mechanism.
    Added shadow underneath the time display.
    Compiled fMSX-Unix with -Wall and eliminated warnings.
    Replaced -DNO_WAVE_INTERPOLATION with -DWAVE_INTERPOLATION, off by default.
    Removed old LoadSTA() and SaveSTA() code.
    Finally deprecated -DNEW_STATES.

New in fMSX 5.2

    Fixed DirectInput joysticks support in Speccy-Windows.
    Made directional pads work on XBox gamepads.

New in fMSX 5.1

    Added multiple monitor support to fMSX-Windows.
    Fixed disappearing window in fMSX-Windows.
    Fixed best full-screen mode detection in fMSX-Windows.
    Fixed window flicker that appeared after recent Win10 updates.
    Moved disk and cartridge options to "Hardware" menu in fMSX-Windows.
    Switched fMSX-Linux to using PulseAudio sound.
    Updated old PulseAudio driver for 64bit Linux.

New in fMSX 5.0

    Switched to microseconds in the AY8910 PSG emulation.
    Now updating, rendering, and playing sound every 8 scanlines.
    The PLAY "S8M90O6G" MML test works now.
    Added support for DirectInput joysticks to fMSX-Windows.
    Fixed crash when changing audio sampling rate in fMSX-Windows.

New in fMSX 4.9

    Moved input settings to the "Input" menu in fMSX-Windows.
    Added "Draw 65% Frames" option to fMSX-Windows.
    Fixed screen updates after changing scaling algorithm in fMSX-Windows.
    Fixed "Force 4:3 Screen" option in TEXT80 screen mode.
    Fixed "Load MSXDOS2 ROM" option in fMSX-Windows.
    Fixed "Hit MIDI Drums" option in fMSX-Windows.
    Now computing MIDI volume by waveform analysis.
    Corrected MIDI drums volume in AY8910 emulation.
    Fixed MIDI keyboard click in fMSX-Windows.

New in fMSX 4.8

    Fixed loading of BASIC-only cartridges (Danger X4, Crazy Bullet, etc).
    Added a hack to ignore bad writes to ASCII16 MegaROM mapper (Vaxol).
    Added "Interpolate Video | Nearest Neighbor" option to fMSX-Windows.
    fMSX-Windows will not overwrite last loaded file name with other names.
    Added "Force 4:3 Screen" option to fMSX-Windows.
    Added -4x3 command line option to fMSX-Unix.
    Fixed file associations on Windows 8+.
    Slightly rearranged Windows menus.

New in fMSX 4.7

    Added Scale2X scaling algorithm.
    Added Monochrome, Green, Amber, and Sepia CRT emulation.
    Added -scale2x and -raster command line options.
    Added -mono, -sepia, -green, and -amber command line options.
    EMULib-specific command line options now processed inside EMULib.
    Added "Scale2x Algorithm" and "LCD Raster" options on Windows.
    Renamed "Color Raster" menu to "Color Filter" on Windows.
    Deprecated -notv and -nolcd command line options.

New in fMSX 4.6

    Enabled magnified sprites (Jawbreaker, Stray Cat, F-Zeru, Triumph).
    Fixed sprite collision detection, especially in BASIC games.
    Added collision detection even on transparent sprites.
    Now stopping collision detection when Y=216 in SCREEN 4-8.
    Now setting lower VDPStatus bits to the last tested sprite.

New in fMSX 4.5

    Changed VDP VRAM access logic to comply with TMS9918 datasheet.

New in fMSX 4.4

    Added special effects simulating individual pixel components.
    Added EPX and EAGLE image scaling algorithms.
    Merged scanline options into "Simulate Scanlines" in fMSX-Windows.
    Merged scaling options into "Interpolate Video" in fMSX-Windows.
    Added "Clear File Associations" option to fMSX-Windows.
    Added "Play Sound When Inactive" option to fMSX-Windows.
    Added "Apply Color Raster" submenu to fMSX-Windows.
    Added -rgb and -cmy command line options.
    Added -epx and -eagle command line options.

New in fMSX 4.3

    Added instant replay function (press [F8]) that "rewinds" gameplay.
    Switched to the new state saving code.
    Built-in menu now available when pressing [F10].
    Built-in debugger now available when pressing [CTRL]+[F10].
    Fixed a memory corruption bug in the instant replay recorder.
    Fixed instant replay not recording the first state.

New in fMSX 4.2

    Added Cheat Hunter tool, press F8 and select "Search Cheats".
    Removed waveform interpolation for more realistic sound.
    Changed PSG noise to be more realistic.
    Switched fMSX-Windows to Direct3D textures-based rendering.
    Added -lcd and -nolcd command line options.
    Added "Video | Stretch Full Screen" option to fMSX-Windows.
    Added "Hardware | Debugger" option to fMSX-Windows.
    Added "Help | MSX.ORG Site" option to fMSX-Windows.
    Added "Help | MSX.ORG Forums" option to fMSX-Windows.

New in fMSX 4.0

    Added custom palettes. To make a custom palette for Game.rom, create Game.pal containing 16 #RRGGBB values, one per line. This palette file will be loaded automatically.
    Added cheat codes. To make cheat codes for Game.rom, create Game.cht containing codes in 00AAAAAA-DD and 00AAAAAA-DDDD formats, one per line. The cheat file will be loaded automatically.
    AAAAAA is the ROM address and DD is the value to write there. For 16bit values, use DDDD.
    To enable cheat codes, select "Hardware | Cheats" in fMSX-Windows, or press F8 and select "Cheats | Enable".
    To edit cheat codes, press F8 and select "Cheats".

New in fMSX 3.9

    Majorly improved AY8910 PSG emulation.
    Added support for .MX1/.MX2 ROM files.
    Set precise CPU, VDP, and PSG frequences.
    Switched to table-based PSG envelopes.
    Switched to logarithmic PSG volumes.
    Fixed white noise frequency computation.
    Adjusted noise to be 50% of the melodic volume.
    Adjusted PSG envelopes length.
    Fixed recognition of multiple file extensions.

New in fMSX 3.8

    Added support for tape images, supplied in *.CAS files.
    Implemented 5th/9th sprite fields in the VDP status register.
    No longer clearing VRAM address latch when reading VDP status.
    Added tape operations to the built-in menu.
    Added "Simulate LCD Scanlines" menu option to fMSX-Windows.
    Added "Load Tape Image" menu option to fMSX-Windows.
    Added "Rewind Tape" menu option to fMSX-Windows.
    Fixed "Documentation" menu option to fMSX-Windows.

New in fMSX 3.7

    fMSX-Windows is now free!
    Added accurate R register emulation, many protected boot loaders run now.
    Added accurate LDIR/LDDR emulation, more protected boot loaders run now.
    Added undocumented opcode 71h to the Z80 emulation.
    Added more realistic "LD R,A" opcode to the Z80 emulation.
    Added cartridge type lookup by its SHA1 checksum, as listed in the CARTS.SHA file.
    Updated EMULib to a newer, more stable version.
    Switched fMSX-Windows version to use Direct3D in full-screen mode.
    Added proper Windows joystick support.
    Now properly restoring full-screen mode in fMSX-Windows.
    Fixed a bug in fMSX-Unix that corrupted memory on most platforms but, for some reason, not on Ubuntu Linux.
    Added a separate Rules.Solaris make rules file. Include this file into your Makefile instead of Rules.Unix to compile for Solaris and don't forget about removing -DLSB_FIRST on SPARC hardware.
    Fixed compilation warnings when compiling fMSX with CLANG.


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/emulators/fmsx/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/emulators/fmsx/PLIST
cvs rdiff -u -r1.9 -r1.10 pkgsrc/emulators/fmsx/distinfo
cvs rdiff -u -r1.1 -r0 pkgsrc/emulators/fmsx/patches/patch-EMULIB_FDIDisk.c \
    pkgsrc/emulators/fmsx/patches/patch-EMULIB_Floppy.c \
    pkgsrc/emulators/fmsx/patches/patch-EMULib_LibUnix.c \
    pkgsrc/emulators/fmsx/patches/patch-ae \
    pkgsrc/emulators/fmsx/patches/patch-ah \
    pkgsrc/emulators/fmsx/patches/patch-fMSX_MSX.c
cvs rdiff -u -r1.5 -r1.6 pkgsrc/emulators/fmsx/patches/patch-aa \
    pkgsrc/emulators/fmsx/patches/patch-ab
cvs rdiff -u -r1.1 -r1.2 pkgsrc/emulators/fmsx/patches/patch-af \
    pkgsrc/emulators/fmsx/patches/patch-ag

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/emulators/fmsx/Makefile
diff -u pkgsrc/emulators/fmsx/Makefile:1.31 pkgsrc/emulators/fmsx/Makefile:1.32
--- pkgsrc/emulators/fmsx/Makefile:1.31 Tue Mar  1 20:16:52 2016
+++ pkgsrc/emulators/fmsx/Makefile      Mon Apr  9 16:19:12 2018
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.31 2016/03/01 20:16:52 joerg Exp $
+# $NetBSD: Makefile,v 1.32 2018/04/09 16:19:12 ryoon Exp $
 
-DISTNAME=      fMSX351
-PKGNAME=       fmsx-3.5.1
-PKGREVISION=   1
+DISTNAME=      fMSX53
+PKGNAME=       fmsx-5.3
 CATEGORIES=    emulators x11
 MASTER_SITES=  http://fms.komkon.org/fMSX/
 EXTRACT_SUFX=  .zip
@@ -11,14 +10,14 @@ MAINTAINER= pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      http://fms.komkon.org/fMSX/
 COMMENT=       MSX (Z80-based computer) emulator
 
-RESTRICTED=            ROM image copyright is questionable
+RESTRICTED=            The binary based on modified source code is not redistributable
 NO_BIN_ON_CDROM=       ${RESTRICTED}
 NO_BIN_ON_FTP=         ${RESTRICTED}
-NO_SRC_ON_CDROM=       ${RESTRICTED}
-NO_SRC_ON_FTP=         ${RESTRICTED}
 
 WRKSRC=        ${WRKDIR}
 
+USE_TOOLS+=    gmake
+
 BUILD_DIRS=    fMSX/Unix
 
 .include "../../mk/bsd.prefs.mk"
@@ -27,23 +26,7 @@ BUILD_DIRS=  fMSX/Unix
 .if ${OPSYS} == "NetBSD"
 DEFS+=         -D_KERNTYPES
 .endif
-.if ${OPSYS} == "NetBSD" || ${OPSYS} == "SunOS"
-USE_SUN_AUDIO?=        YES
-.else
-USE_SUN_AUDIO?=        NO
-.endif
-DEFS+=         -DRomDir=\"${PREFIX:Q}/share/fmsx\"
-.if ${USE_SUN_AUDIO} == "YES"
-DEFS+=         -DSUN_AUDIO
-.else
-.  include "../../mk/oss.buildlink3.mk"
-
-SUBST_CLASSES+=                devdsp
-SUBST_STAGE.devdsp=    pre-build
-SUBST_FILES.devdsp=    EMULib/SndUnix.c
-SUBST_SED.devdsp=      -e 's|/dev/dsp|${DEVOSSSOUND}|g'
 
-.endif
 .if ${MACHINE_ENDIAN} == "big"
 DEFS+=         -DMSB_FIRST
 .elif ${MACHINE_ENDIAN} == "little"
@@ -54,15 +37,14 @@ BROKEN=             "Unknown endian"
 
 MAKE_ENV+=     DEFS=${DEFS:Q}
 
-INSTALLATION_DIRS=     bin share/fmsx share/doc
+INSTALLATION_DIRS=     bin share/doc
 
 # Makefile of fMSX doesn't have install target.
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/fMSX/Unix/fmsx ${DESTDIR}${PREFIX}/bin
-       ${INSTALL_DATA} ${WRKSRC}/fMSX/ROMs/*.ROM ${DESTDIR}${PREFIX}/share/fmsx
-       ${INSTALL_DATA} ${WRKSRC}/fMSX/ROMs/*.FNT ${DESTDIR}${PREFIX}/share/fmsx
        ${INSTALL_DATA} ${WRKSRC}/fMSX/fMSX.html ${DESTDIR}${PREFIX}/share/doc
 
+.include "../../audio/pulseaudio/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../x11/libXext/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"

Index: pkgsrc/emulators/fmsx/PLIST
diff -u pkgsrc/emulators/fmsx/PLIST:1.3 pkgsrc/emulators/fmsx/PLIST:1.4
--- pkgsrc/emulators/fmsx/PLIST:1.3     Thu Jan  7 08:38:43 2010
+++ pkgsrc/emulators/fmsx/PLIST Mon Apr  9 16:19:12 2018
@@ -1,17 +1,3 @@
-@comment $NetBSD: PLIST,v 1.3 2010/01/07 08:38:43 obache Exp $
+@comment $NetBSD: PLIST,v 1.4 2018/04/09 16:19:12 ryoon Exp $
 bin/fmsx
 share/doc/fMSX.html
-share/fmsx/CYRILLIC.FNT
-share/fmsx/DISK.ROM
-share/fmsx/FMPAC.ROM
-share/fmsx/FMPAC16.ROM
-share/fmsx/ITALIC.FNT
-share/fmsx/KANJI.ROM
-share/fmsx/MSX.ROM
-share/fmsx/MSX2.ROM
-share/fmsx/MSX2EXT.ROM
-share/fmsx/MSX2P.ROM
-share/fmsx/MSX2PEXT.ROM
-share/fmsx/MSXDOS2.ROM
-share/fmsx/PAINTER.ROM
-share/fmsx/RS232.ROM

Index: pkgsrc/emulators/fmsx/distinfo
diff -u pkgsrc/emulators/fmsx/distinfo:1.9 pkgsrc/emulators/fmsx/distinfo:1.10
--- pkgsrc/emulators/fmsx/distinfo:1.9  Thu Mar 23 17:06:49 2017
+++ pkgsrc/emulators/fmsx/distinfo      Mon Apr  9 16:19:12 2018
@@ -1,16 +1,10 @@
-$NetBSD: distinfo,v 1.9 2017/03/23 17:06:49 joerg Exp $
+$NetBSD: distinfo,v 1.10 2018/04/09 16:19:12 ryoon Exp $
 
-SHA1 (fMSX351.zip) = d28d2bf3bc2a1ae273899c80bbbe9bdf4dd98767
-RMD160 (fMSX351.zip) = be16d466f5ff29265d0faebd186a701a96ba81f6
-SHA512 (fMSX351.zip) = 7d994523ca825ce29cbcf232e1c6dcbef8d0e95031be0ca9d73b886d315af13b152055ff065a8e1baedb9a466d0a51c4b21c76b85dc9146e443f581ce6470555
-Size (fMSX351.zip) = 515112 bytes
-SHA1 (patch-EMULIB_FDIDisk.c) = d74b7d5d1217297cfa54a1085f85ae4a3db9b635
-SHA1 (patch-EMULIB_Floppy.c) = 4b8874cac9c58839bbb107bf8cb8c59915873cac
-SHA1 (patch-EMULib_LibUnix.c) = b598795252f20992499ed72986e124592ef9470f
-SHA1 (patch-aa) = 80191e7d1ff6b36cc1cf97174162e179d743b149
-SHA1 (patch-ab) = 7bff0051685efd22e678c66ffa4075830143e6d6
-SHA1 (patch-ae) = 7168f963dac8686200119b297af3bcf8f8203c4c
-SHA1 (patch-af) = df2dd22ae51558497e1691a13cfaf4556562f483
-SHA1 (patch-ag) = 2a1f29485ffe0d51eeaf093de434e9a49a4b8f48
-SHA1 (patch-ah) = eb44189e26a485b9bc50462127b7b74b8d161734
-SHA1 (patch-fMSX_MSX.c) = ac35bfcad37954234d60a61c28208d5c9b77089b
+SHA1 (fMSX53.zip) = c7b49a4b819f6976af963fe5e08e88d4228c4833
+RMD160 (fMSX53.zip) = f7b2f497efef3d5d1df2ab680ba8547a7eb15c85
+SHA512 (fMSX53.zip) = 2bffea62a3def432ac375e1cafd628f225201f2f0a25a4da920a2c39ef554a979563813eb855905468007a84b9559fa53309d9b4aaf3983d5e2443a7a1a34c19
+Size (fMSX53.zip) = 261422 bytes
+SHA1 (patch-aa) = 10ab1e2fee67260f0989f37b183ca8fa87bc8eab
+SHA1 (patch-ab) = 6a5a0b8854747c085cd48ef54d92e7934ecdfa33
+SHA1 (patch-af) = ef4579c245fcf515c7f38bc8174634cc5e02c283
+SHA1 (patch-ag) = 8775adce25593f11941a4c43584b384f43d47150

Index: pkgsrc/emulators/fmsx/patches/patch-aa
diff -u pkgsrc/emulators/fmsx/patches/patch-aa:1.5 pkgsrc/emulators/fmsx/patches/patch-aa:1.6
--- pkgsrc/emulators/fmsx/patches/patch-aa:1.5  Thu Jan  7 08:38:43 2010
+++ pkgsrc/emulators/fmsx/patches/patch-aa      Mon Apr  9 16:19:12 2018
@@ -1,16 +1,17 @@
-$NetBSD: patch-aa,v 1.5 2010/01/07 08:38:43 obache Exp $
+$NetBSD: patch-aa,v 1.6 2018/04/09 16:19:12 ryoon Exp $
 
---- fMSX/Unix/Makefile.orig    2008-01-28 19:29:59.000000000 +0000
+--- fMSX/Unix/Makefile.orig    2018-03-24 09:31:06.000000000 +0000
 +++ fMSX/Unix/Makefile
-@@ -1,6 +1,6 @@
- include ../../EMULib/Rules.Unix
+@@ -2,7 +2,7 @@ include ../../EMULib/Rules.Unix
  
--DEFINES+= -DFMSX -DLSB_FIRST -DBPP16 -DCONDEBUG -DDEBUG
-+DEFINES+= -DFMSX -DBPP16 -DCONDEBUG -DDEBUG $(DEFS)
- CFLAGS += -I$(LIBZ80)
- OBJECTS+= $(EMUUNIX) $(FLOPPY) $(FDIDISK) \
+ # Depending on your CPU endianess, use either -DLSB_FIRST or -DMSB_FIRST.
+ # Depending on your X11 display mode, use -DBPP8, -DBPP16, or -DBPP32.
+-DEFINES+= -DFMSX -DLSB_FIRST -DCONDEBUG -DDEBUG
++DEFINES+= -DFMSX -DCONDEBUG -DDEBUG $(DEFS)
+ CFLAGS += -Wall -I$(LIBZ80)
+ OBJECTS+= $(SHA1) $(FLOPPY) $(FDIDISK) $(MCF) $(HUNT) \
          $(Z80) $(I8255) $(YM2413) $(AY8910) $(SCC) $(WD1793) \
-@@ -10,7 +10,7 @@ OBJECTS+= $(EMUUNIX) $(FLOPPY) $(FDIDISK
+@@ -12,7 +12,7 @@ OBJECTS+= $(SHA1) $(FLOPPY) $(FDIDISK) $
  all:    fmsx
  
  fmsx: Makefile $(OBJECTS)
Index: pkgsrc/emulators/fmsx/patches/patch-ab
diff -u pkgsrc/emulators/fmsx/patches/patch-ab:1.5 pkgsrc/emulators/fmsx/patches/patch-ab:1.6
--- pkgsrc/emulators/fmsx/patches/patch-ab:1.5  Thu Jan  7 08:38:43 2010
+++ pkgsrc/emulators/fmsx/patches/patch-ab      Mon Apr  9 16:19:12 2018
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.5 2010/01/07 08:38:43 obache Exp $
+$NetBSD: patch-ab,v 1.6 2018/04/09 16:19:12 ryoon Exp $
 
---- EMULib/SndUnix.c.orig      2007-12-30 16:01:34.000000000 +0000
-+++ EMULib/SndUnix.c
-@@ -30,7 +30,9 @@
+--- EMULib/Unix/SndUnix.c.orig 2018-03-24 08:47:36.000000000 +0000
++++ EMULib/Unix/SndUnix.c
+@@ -38,7 +38,9 @@
  
  #include <sys/audioio.h>
  #include <sys/conf.h>
@@ -10,9 +10,9 @@ $NetBSD: patch-ab,v 1.5 2010/01/07 08:38
  #include <stropts.h>
 +#endif
  
- #define AUDIO_CONV(A) (ULAW[0xFF&(128+(A))])
- 
-@@ -84,6 +86,10 @@ static const unsigned char ULAW[256] =
+ static const unsigned char ULAW[256] =
+ {
+@@ -82,6 +84,10 @@ static const unsigned char ULAW[256] =
  #include <sys/soundcard.h>
  #endif
  
@@ -20,15 +20,15 @@ $NetBSD: patch-ab,v 1.5 2010/01/07 08:38
 +#include <sys/soundcard.h>
 +#endif
 +
- #define AUDIO_CONV(A) (128+(A))
- 
- #endif /* !SUN_AUDIO */
-@@ -224,7 +230,7 @@ void TrashAudio(void)
-   if(SoundFD>=0)
-   {
- #ifndef SUN_AUDIO
+ #ifdef __NetBSD__
+ #include <soundcard.h>
+ #endif
+@@ -285,7 +291,7 @@ void TrashAudio(void)
+ #elif defined(SUN_AUDIO)
+     close(SoundFD);
+ #else
 -    ioctl(SoundFD,SNDCTL_DSP_RESET);
 +    ioctl(SoundFD,SNDCTL_DSP_RESET, 1);
- #endif
      close(SoundFD);
-   }  
+ #endif
+   }

Index: pkgsrc/emulators/fmsx/patches/patch-af
diff -u pkgsrc/emulators/fmsx/patches/patch-af:1.1 pkgsrc/emulators/fmsx/patches/patch-af:1.2
--- pkgsrc/emulators/fmsx/patches/patch-af:1.1  Thu Jan  7 08:38:44 2010
+++ pkgsrc/emulators/fmsx/patches/patch-af      Mon Apr  9 16:19:12 2018
@@ -1,12 +1,16 @@
-$NetBSD: patch-af,v 1.1 2010/01/07 08:38:44 obache Exp $
+$NetBSD: patch-af,v 1.2 2018/04/09 16:19:12 ryoon Exp $
 
---- EMULib/Rules.Unix.orig     2008-01-28 19:48:23.000000000 +0000
+--- EMULib/Rules.Unix.orig     2017-10-21 03:04:46.000000000 +0000
 +++ EMULib/Rules.Unix
-@@ -1,5 +1,5 @@
+@@ -6,7 +6,8 @@
+ 
  include ../../EMULib/Rules.gcc
  
--CFLAGS += -I/usr/X11R6/include
-+CFLAGS += -I${X11BASE}/include
- DEFINES+= -DUNIX -DMITSHM
--LIBS   += -lX11 -lXext
-+LIBS   += ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib -lX11 -lXext
+-CFLAGS += -I$(EMULIB)/Unix -I/usr/X11R6/include
+-DEFINES+= -DUNIX -DMITSHM -DBPS16 -DPULSE_AUDIO
+-LIBS   += -lX11 -lXext -lpulse-simple
++CFLAGS += -I$(EMULIB)/Unix -I${X11BASE}/include
++DEFINES+= -DUNIX -DMITSHM -DBPS16 -DPULSE_AUDIO
++LIBS   += ${COMPILER_RPATH_FLAG}${X11BASE}/lib -L${X11BASE}/lib
++LIBS   += -lX11 -lXext -lpulse-simple
+ OBJECTS+= $(EMUUNIX)
Index: pkgsrc/emulators/fmsx/patches/patch-ag
diff -u pkgsrc/emulators/fmsx/patches/patch-ag:1.1 pkgsrc/emulators/fmsx/patches/patch-ag:1.2
--- pkgsrc/emulators/fmsx/patches/patch-ag:1.1  Thu Jan  7 08:38:44 2010
+++ pkgsrc/emulators/fmsx/patches/patch-ag      Mon Apr  9 16:19:12 2018
@@ -1,17 +1,16 @@
-$NetBSD: patch-ag,v 1.1 2010/01/07 08:38:44 obache Exp $
+$NetBSD: patch-ag,v 1.2 2018/04/09 16:19:12 ryoon Exp $
 
---- EMULib/Rules.gcc.orig      2008-01-28 19:17:27.000000000 +0000
+--- EMULib/Rules.gcc.orig      2018-03-18 11:12:20.000000000 +0000
 +++ EMULib/Rules.gcc
-@@ -8,9 +8,10 @@ PRIVATE       = $(BASEDIR)/Private
- 
- CC    = gcc
+@@ -12,9 +12,9 @@ CC   = gcc
  CPP   = cpp
--CFLAGS        = -O3 -pthread -I.. -I$(EMULIB)
-+CFLAGS        = -O3 $(PTHREAD_CFLAGS) -fomit-frame-pointer -I.. -I$(EMULIB)
+ MOC   = moc
+ SDT2GAS       = perl $(EMULIB)/Tools/sdt2gas.pl
+-CFLAGS        = -O2 -pthread -I. -I.. -I$(EMULIB)
++CFLAGS        = -O2 ${PTHREAD_CFLAGS} -I. -I.. -I$(EMULIB)
  DEFINES = -DZLIB
 -LIBS    = -lz -lpthread
-+LIBS    = -lz $(PTHREAD_LIBS) $(LIBOSSAUDIO)
-+LDFLAGS       = $(PTHREAD_LDFLAGS)
++LIBS    = -lz ${PTHREAD_CFLAGS}
  
  # EMULib sound, console, and other utility functions 
- OBJECTS       = $(EMULIB)/EMULib.o $(EMULIB)/Console.o $(EMULIB)/Sound.o \
+ OBJECTS       = $(EMULIB)/EMULib.o $(EMULIB)/Sound.o   \

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index