summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorwiz <wiz@pkgsrc.org>2011-04-04 13:42:08 +0000
committerwiz <wiz@pkgsrc.org>2011-04-04 13:42:08 +0000
commita8b40672d3094018ca57212d7656322a26a9fe20 (patch)
tree8acb125fd1b4e31f91bcab35289c504b3e9928d0 /emulators
parentb24c1888326f88f9538fbd50e603bfc805ab805b (diff)
downloadpkgsrc-a8b40672d3094018ca57212d7656322a26a9fe20.tar.gz
Update to 2.3, provided by Olaf 'Rhialto' Seibert in PR 44820, with a
slight fix. * Changes in VICE 2.3 ====================== ** General ---------- - Added x64sc, the accurate C64 emulator: * VIC-II emulation rewritten from scratch using results from extensive testing with newly written test programs on real hardware. * Emulation is done on a cycle by cycle basis combined with pixel exact dot clock domain handling. * Accurate handling of all possible in-line splits of VIC-II registers and graphics data. * C64 model and even individual chip revisions can be selected for very detailed emulation of their differences. * Equally accurate PAL, NTSC and PAL-N emulation. We believe x64sc is one of the most accurate C64 emulators at the moment. - Drive improvements, including weak bit emulation. - Major reSID overhaul: * Emulation of all known pipeline delays for full cycle accuracy. * New shift register model based on revectorized die photograps. * Accurate DAC models based on revectorized die photograps. * Emulation of floating waveform DAC input for waveform 0. * Advanced 6581 transistor level filter model based on revectorized die photograps, yielding unprecedented accuracy. - CRT Emulation (former "PAL emulation") is now available regardless of video mode or -chip and works in all emulators. NOTE: Color gamma range changed. You may need to set to 2.200 manually. (ColorGamma=2200) - Added "True aspect ratio" option. - Sound buffer overflows reduced and the error replaced with a warning. - Various monitor improvements (io details, expansion port status ...) - Removed little used Emulator ID feature. - VIA wrap handling rewritten to fix problems with timer 2. - Added autostart option to do LOAD ,8 instead of ,8,1. - RESTORE key presses are now distributed randomly across a frame. - Improved accuracy of CIA interrupts. (6526/6526A selectable) ** C64/C128 changes ------------------- - Cartridge emulation improvements. Many broken cartridges fixed, and the following ones added: * Action Replay 2 * Action Replay 3 * Capture * Diashow Maker * EXOS * Final Cartridge Plus * Freeze Frame * Freeze Machine * Game Killer * MACH 5 * Magic Voice * MMC Replay * Prophet 64 * Snapshot 64 * Super Explode V5 * Super Snapshot - Added emulation of the passthrough port of MMC64, Magic Voice and IEEE488 cartridges. - CIA TOD 50/60 Hz toggle emulation fixed. - Improved 1351/paddles port MUX emulation. ** C64 changes -------------- - Added Drean (PAL-N) emulation. - Fixed bug with autostart mode Inject-to-RAM. It now writes to RAM under I/O correctly. ** C128 changes --------------- - Fixed a bug with autostarting t64 images. ** VIC20 changes ---------------- - Added Vic Flash Plugin cartridge emulation. - Fixed video cache & reverse bug. - Fixed bug in attaching 4kB cartridges. - Fixed autostarting bug, mostly seen with tape images. ** PLUS4 changes ---------------- - Fixed crashes in NTSC mode. - Added v364 speech emulation. ** PET changes -------------- - Added DWW emulation. - Added userport DAC emulation. ** CBM2 changes --------------- - Split 5x0 and 6x0/7x0 settings in the configuration file. ** Unix changes --------------- - (Xaw) The menus can now be operated without holding the mouse button down. Keyboard control is also available (Shift-Alt-Z for left menu, Shift-Alt-X for right menu). - (Xaw) Lightpen/gun support added. - (GTK+) Fixed aspect ratio option added. ** SDL UI changes ----------------- - Added vsid UI, FFMPEG and printer menus. The UI is complete.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/vice/DESCR10
-rw-r--r--emulators/vice/Makefile26
-rw-r--r--emulators/vice/PLIST38
-rw-r--r--emulators/vice/PLIST.sdl18
-rw-r--r--emulators/vice/PLIST.x1138
-rw-r--r--emulators/vice/distinfo17
-rw-r--r--emulators/vice/options.mk78
-rw-r--r--emulators/vice/patches/patch-aa28
-rw-r--r--emulators/vice/patches/patch-ab173
-rw-r--r--emulators/vice/patches/patch-ac39
-rw-r--r--emulators/vice/patches/patch-ad15
11 files changed, 185 insertions, 295 deletions
diff --git a/emulators/vice/DESCR b/emulators/vice/DESCR
index 0d0e2b1b80d..886c0419a48 100644
--- a/emulators/vice/DESCR
+++ b/emulators/vice/DESCR
@@ -1,8 +1,8 @@
VICE is the one and only Versatile Commodore Emulator. It provides
-emulation of the Commodore 64, 128, VIC20 and PET 8-bit computers
-within a single package. The emulators run as separate programs, but
-have the same user interface, share the same settings and support the
-same file formats.
+emulation of the Commodore 64, 128, VIC20, PET, Plus/4 and C16 8-bit
+computers within a single package. The emulators run as separate
+programs, but have the same user interface, share the same settings and
+support the same file formats.
All the emulators provide an accurate 6502/6510 emulator, with
emulation of all the opcodes (both documented and undocumented ones)
@@ -14,4 +14,4 @@ Please do not expect the VIC20, C128 and PET emulators to be as good
as the C64 one, as they are still under construction.
The current version emulates the C64, the C128, the VIC20, the CBM-II
-line (B128, B256), and all the PET models.
+line (B128, B256), Plus/4 and C16, and all the PET models.
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index b478c94f050..f47b85649e4 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -1,21 +1,17 @@
-# $NetBSD: Makefile,v 1.88 2011/01/13 13:37:37 wiz Exp $
+# $NetBSD: Makefile,v 1.89 2011/04/04 13:42:08 wiz Exp $
#
-DISTNAME= vice-2.2
-PKGREVISION= 3
+DISTNAME= vice-2.3
CATEGORIES= emulators
-MASTER_SITES= ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/ \
- http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \
- http://www.trikaliotis.net/Download/vice/
+MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=vice-emu:Q}/
+MASTER_SITES+= ftp://ftp.zimmers.net/pub/cbm/crossplatform/emulators/VICE/
+MASTER_SITES+= http://www.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/
MAINTAINER= rhialto@falu.nl
HOMEPAGE= http://vice-emu.sourceforge.net/
-COMMENT= Emulator for C64, C128, CBM-II, PET, and VIC20
+COMMENT= Emulator for C64, C128, CBM-II, PET, VIC20, Plus4 and C16
LICENSE= gnu-gpl-v2
-PATCH_SITES= http://www.students.tut.fi/~nuotio/
-PATCHFILES+= vice_2_2_netbsd.patch
-
PKG_DESTDIR_SUPPORT= user-destdir
RESTRICTED= ROM image copyright is questionable.
@@ -28,15 +24,17 @@ EXTRACT_ONLY= ${DISTNAME}${EXTRACT_SUFX}
USE_PKGLOCALEDIR= YES
USE_TOOLS+= bdftopcf gmake mkfontdir msgfmt
+USE_TOOLS+= pkg-config
USE_LANGUAGES= c c++
GNU_CONFIGURE= YES
-CONFIGURE_ARGS+= --enable-fullscreen
INFO_FILES= YES
FONTS_DIRS.x11= ${PREFIX}/share/vice/fonts
REQD_DIRS+= ${PREFIX}/share/vice/fonts
REQD_DIRS+= ${PREFIX}/share/vice
+PLIST_SRC+= PLIST
+
.include "options.mk"
.include "../../mk/bsd.prefs.mk"
@@ -50,10 +48,4 @@ CONFIGURE_ARGS+= --without-oss
.include "../../devel/zlib/buildlink3.mk"
.include "../../graphics/png/buildlink3.mk"
.include "../../mk/jpeg.buildlink3.mk"
-.include "../../x11/libXaw/buildlink3.mk"
-.include "../../x11/libXpm/buildlink3.mk"
-.include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXrandr/buildlink3.mk"
-.include "../../x11/libXxf86dga/buildlink3.mk"
-.include "../../x11/libXxf86vm/buildlink3.mk"
.include "../../mk/bsd.pkg.mk"
diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST
index 3dbe433f934..41c5e6912af 100644
--- a/emulators/vice/PLIST
+++ b/emulators/vice/PLIST
@@ -1,21 +1,24 @@
-@comment $NetBSD: PLIST,v 1.22 2010/07/24 09:44:57 wiz Exp $
+@comment $NetBSD: PLIST,v 1.23 2011/04/04 13:42:08 wiz Exp $
bin/c1541
bin/cartconv
bin/petcat
-bin/vsid
bin/x128
bin/x64
bin/x64dtv
+bin/x64sc
bin/xcbm2
bin/xpet
bin/xplus4
bin/xvic
info/vice.info
+info/vice.pdf
+info/vice.txt
man/man1/c1541.1
man/man1/petcat.1
man/man1/vice.1
share/doc/vice/64doc.txt
share/doc/vice/BUGS
+share/doc/vice/CIA-README.txt
share/doc/vice/COPYING
share/doc/vice/CommodoreInnovationPriceSoftware2008.jpg
share/doc/vice/GP2X-Howto.txt
@@ -33,19 +36,20 @@ share/doc/vice/Readme.dos
share/doc/vice/ReadmeMacOSX.txt
share/doc/vice/ReadmeSDL.txt
share/doc/vice/TODO
+share/doc/vice/VIC-Addendum.txt
+share/doc/vice/VIC-Article.txt
+share/doc/vice/VIC-Artikel.txt
share/doc/vice/Walkthrough-Howto.txt
share/doc/vice/Win32-Cygwin-HOWTO.txt
share/doc/vice/Win32-Howto.txt
share/doc/vice/amigaos.html
share/doc/vice/beos.html
-share/doc/vice/cartconv.txt
share/doc/vice/cbm_basic_tokens.txt
share/doc/vice/coding-guidelines.txt
share/doc/vice/drive_info.txt
share/doc/vice/iec-bus.txt
share/doc/vice/index.html
share/doc/vice/macosx.html
-share/doc/vice/mon.txt
share/doc/vice/new.gif
share/doc/vice/openGLsync-howto.txt
share/doc/vice/qnx.html
@@ -70,15 +74,6 @@ share/doc/vice/vice_7.html
share/doc/vice/vice_8.html
share/doc/vice/vice_9.html
share/doc/vice/vice_toc.html
-share/locale/da/LC_MESSAGES/vice.mo
-share/locale/de/LC_MESSAGES/vice.mo
-share/locale/fr/LC_MESSAGES/vice.mo
-share/locale/hu/LC_MESSAGES/vice.mo
-share/locale/it/LC_MESSAGES/vice.mo
-share/locale/nl/LC_MESSAGES/vice.mo
-share/locale/pl/LC_MESSAGES/vice.mo
-share/locale/sv/LC_MESSAGES/vice.mo
-share/locale/tr/LC_MESSAGES/vice.mo
share/vice/C128/basic64
share/vice/C128/basichi
share/vice/C128/basiclo
@@ -105,8 +100,6 @@ share/vice/C128/pc64.vpl
share/vice/C128/vdc_comp.vpl
share/vice/C128/vdc_deft.vpl
share/vice/C128/vice.vpl
-share/vice/C128/x11_pos.vkm
-share/vice/C128/x11_sym.vkm
share/vice/C64/basic
share/vice/C64/c64hq.vpl
share/vice/C64/c64mem.sym
@@ -120,18 +113,12 @@ share/vice/C64/godot.vpl
share/vice/C64/kernal
share/vice/C64/pc64.vpl
share/vice/C64/vice.vpl
-share/vice/C64/x11_pos.vkm
-share/vice/C64/x11_posger.vkm
-share/vice/C64/x11_sym.vkm
-share/vice/C64/x11_symger.vkm
share/vice/C64DTV/basic
share/vice/C64DTV/c64mem.sym
share/vice/C64DTV/chargen
share/vice/C64DTV/default.vrs
share/vice/C64DTV/dtvrom.bin
share/vice/C64DTV/kernal
-share/vice/C64DTV/x11_pos.vkm
-share/vice/C64DTV/x11_sym.vkm
share/vice/CBM-II/amber.vpl
share/vice/CBM-II/basic.128
share/vice/CBM-II/basic.256
@@ -155,7 +142,6 @@ share/vice/CBM-II/rom256h.vrs
share/vice/CBM-II/rom256l.vrs
share/vice/CBM-II/rom500.vrs
share/vice/CBM-II/white.vpl
-share/vice/CBM-II/x11_buks.vkm
share/vice/DRIVES/d1541II
share/vice/DRIVES/d1571cr
share/vice/DRIVES/dos1001
@@ -191,10 +177,6 @@ share/vice/PET/rom4b40.vrs
share/vice/PET/rom4b80.vrs
share/vice/PET/rom4g40.vrs
share/vice/PET/white.vpl
-share/vice/PET/x11_bdep.vkm
-share/vice/PET/x11_bdes.vkm
-share/vice/PET/x11_bgrs.vkm
-share/vice/PET/x11_buks.vkm
share/vice/PLUS4/3plus1hi
share/vice/PLUS4/3plus1lo
share/vice/PLUS4/basic
@@ -202,8 +184,6 @@ share/vice/PLUS4/default.vpl
share/vice/PLUS4/default.vrs
share/vice/PLUS4/kernal
share/vice/PLUS4/vice.vpl
-share/vice/PLUS4/x11_pos.vkm
-share/vice/PLUS4/x11_sym.vkm
share/vice/PRINTER/cbm1526
share/vice/PRINTER/mps801
share/vice/PRINTER/mps803
@@ -214,7 +194,5 @@ share/vice/VIC20/chargen
share/vice/VIC20/default.vpl
share/vice/VIC20/default.vrs
share/vice/VIC20/kernal
-share/vice/VIC20/x11_pos.vkm
-share/vice/VIC20/x11_sym.vkm
share/vice/fonts/CBM.ttf
share/vice/fonts/vice-cbm.bdf
diff --git a/emulators/vice/PLIST.sdl b/emulators/vice/PLIST.sdl
new file mode 100644
index 00000000000..8392cb6a875
--- /dev/null
+++ b/emulators/vice/PLIST.sdl
@@ -0,0 +1,18 @@
+@comment $NetBSD: PLIST.sdl,v 1.1 2011/04/04 13:42:08 wiz Exp $
+share/vice/C128/sdl_sym.vkm
+share/vice/C64/sdl_sym.vkm
+share/vice/C64/sdl_sym_da.vkm
+share/vice/C64/sdl_sym_de.vkm
+share/vice/C64/sdl_sym_fi.vkm
+share/vice/C64/sdl_sym_no.vkm
+share/vice/C64DTV/sdl_sym.vkm
+share/vice/C64DTV/sdl_sym_da.vkm
+share/vice/C64DTV/sdl_sym_de.vkm
+share/vice/C64DTV/sdl_sym_fi.vkm
+share/vice/C64DTV/sdl_sym_no.vkm
+share/vice/CBM-II/sdl_buks.vkm
+share/vice/PET/sdl_bgrs.vkm
+share/vice/PET/sdl_buks.vkm
+share/vice/PLUS4/sdl_sym.vkm
+share/vice/VIC20/sdl_pos_fi.vkm
+share/vice/VIC20/sdl_sym.vkm
diff --git a/emulators/vice/PLIST.x11 b/emulators/vice/PLIST.x11
new file mode 100644
index 00000000000..47b27cbae75
--- /dev/null
+++ b/emulators/vice/PLIST.x11
@@ -0,0 +1,38 @@
+@comment $NetBSD: PLIST.x11,v 1.1 2011/04/04 13:42:08 wiz Exp $
+bin/vsid
+share/locale/da/LC_MESSAGES/vice.mo
+share/locale/de/LC_MESSAGES/vice.mo
+share/locale/fr/LC_MESSAGES/vice.mo
+share/locale/hu/LC_MESSAGES/vice.mo
+share/locale/it/LC_MESSAGES/vice.mo
+share/locale/nl/LC_MESSAGES/vice.mo
+share/locale/pl/LC_MESSAGES/vice.mo
+share/locale/sv/LC_MESSAGES/vice.mo
+share/locale/tr/LC_MESSAGES/vice.mo
+share/vice/C128/x11_pos.vkm
+share/vice/C128/x11_sym.vkm
+share/vice/C64/x11_pos.vkm
+share/vice/C64/x11_posger.vkm
+share/vice/C64/x11_sym.vkm
+share/vice/C64/x11_symger.vkm
+share/vice/C64DTV/x11_pos.vkm
+share/vice/C64DTV/x11_sym.vkm
+share/vice/CBM-II/x11_buks.vkm
+share/vice/CBM-II/x11_buks_de.vkm
+share/vice/PET/x11_bdep.vkm
+share/vice/PET/x11_bdep_de.vkm
+share/vice/PET/x11_bdes.vkm
+share/vice/PET/x11_bdes_de.vkm
+share/vice/PET/x11_bgrp.vkm
+share/vice/PET/x11_bgrp_de.vkm
+share/vice/PET/x11_bgrs.vkm
+share/vice/PET/x11_bgrs_de.vkm
+share/vice/PET/x11_bukp.vkm
+share/vice/PET/x11_bukp_de.vkm
+share/vice/PET/x11_buks.vkm
+share/vice/PET/x11_buks_de.vkm
+share/vice/PLUS4/x11_pos.vkm
+share/vice/PLUS4/x11_sym.vkm
+share/vice/PLUS4/x11_sym_de.vkm
+share/vice/VIC20/x11_pos.vkm
+share/vice/VIC20/x11_sym.vkm
diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index 93d853e3aa6..aac7d4ecf1c 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -1,12 +1,7 @@
-$NetBSD: distinfo,v 1.37 2011/01/24 14:58:41 wiz Exp $
+$NetBSD: distinfo,v 1.38 2011/04/04 13:42:08 wiz Exp $
-SHA1 (vice-2.2.tar.gz) = 88ec1f4fefc708957b242805a28ca9b26a3e2738
-RMD160 (vice-2.2.tar.gz) = d3fb33deb776ffcae297df413849437fb4e49840
-Size (vice-2.2.tar.gz) = 9597027 bytes
-SHA1 (vice_2_2_netbsd.patch) = fd6ca57372efde9d467da221f4b5b8454b8062fc
-RMD160 (vice_2_2_netbsd.patch) = 26cd48aa79eae7976f41f4dacf972d81c5da788e
-Size (vice_2_2_netbsd.patch) = 4437 bytes
-SHA1 (patch-aa) = 08ac51c0674fde12ff0032a69f7c301464c1b408
-SHA1 (patch-ab) = 982424905a9fb8eb011d19b3ec649b5d7a01ca83
-SHA1 (patch-ac) = 25589b1d59b891ec7205490e7d892ca9df765972
-SHA1 (patch-ad) = 0ace2e00ed2f66c8669ec745b62118570187735a
+SHA1 (vice-2.3.tar.gz) = 5e7e1a375a4ca8c4895dc1552162955fdffce296
+RMD160 (vice-2.3.tar.gz) = 056e48ffedfaecd470892c73b97af89c1e002ff9
+Size (vice-2.3.tar.gz) = 11602378 bytes
+SHA1 (patch-aa) = 7ecda5911a2dd0e7ef8676959d9dc021323d393f
+SHA1 (patch-ab) = 095839b7f234f803d01296dc72c37ec9909bcbce
diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk
index a9eb3acf4dc..879dbfb20af 100644
--- a/emulators/vice/options.mk
+++ b/emulators/vice/options.mk
@@ -1,28 +1,72 @@
-# $NetBSD: options.mk,v 1.5 2010/07/24 09:44:57 wiz Exp $
+# $NetBSD: options.mk,v 1.6 2011/04/04 13:42:08 wiz Exp $
PKG_OPTIONS_VAR= PKG_OPTIONS.vice
-PKG_SUPPORTED_OPTIONS= esound ffmpeg lame gnome
+PKG_SUPPORTED_OPTIONS= ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
+PKG_OPTIONS_REQUIRED_GROUPS = gui
+PKG_OPTIONS_GROUP.gui = xaw gnome sdl
+PKG_SUGGESTED_OPTIONS= ffmpeg lame vice-fullscreen vice-hwscaling vice-ethernet
+PKG_SUGGESTED_OPTIONS+= xaw
.include "../../mk/bsd.options.mk"
-.if !empty(PKG_OPTIONS:Mesound)
-.include "../../audio/esound/buildlink3.mk"
-.else
-CONFIGURE_ARGS+= --without-esd
+.if !empty(PKG_OPTIONS:Mxaw)
+. include "../../x11/libXt/buildlink3.mk"
+. include "../../x11/libXmu/buildlink3.mk"
+. include "../../x11/libXaw/buildlink3.mk"
+. include "../../x11/libXpm/buildlink3.mk"
+PLIST_SRC += PLIST.x11
.endif
-.if !empty(PKG_OPTIONS:Mffmpeg)
-CONFIGURE_ARGS+= --enable-ffmpeg
-USE_TOOLS+= pkg-config
-.include "../../multimedia/ffmpeg/buildlink3.mk"
-. if !empty(PKG_OPTIONS:Mlame)
-. include "../../audio/lame/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mgnome)
+CONFIGURE_ARGS+= --enable-gnomeui
+PLIST_SRC+= PLIST.x11
+. include "../../x11/gtk2/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Msdl)
+CONFIGURE_ARGS+= --enable-sdlui
+PLIST_SRC+= PLIST.sdl
+. include "../../devel/SDL/buildlink3.mk"
+.endif
+
+.if !empty(PKG_OPTIONS:Mvice-fullscreen)
+CONFIGURE_ARGS+= --enable-fullscreen
+. if !empty(PKG_OPTIONS:Mxaw)
+. include "../../x11/libXrandr/buildlink3.mk"
+. include "../../x11/libXxf86vm/buildlink3.mk"
+. endif
+. if !empty(PKG_OPTIONS:Mgnome)
+. include "../../x11/libXrandr/buildlink3.mk"
+. include "../../x11/libXxf86vm/buildlink3.mk"
+. endif
+. if !empty(PKG_OPTIONS:Msdl)
. endif
.endif
-.if !empty(PKG_OPTIONS:Mgnome)
-CONFIGURE_ARGS+= --enable-gnomeui
-USE_TOOLS+= pkg-config
-.include "../../x11/gtk2/buildlink3.mk"
-.include "../../devel/libgnomeui/buildlink3.mk"
+.if !empty(PKG_OPTIONS:Mvice-hwscaling)
+. if !empty(PKG_OPTIONS:Mxaw)
+. include "../../x11/libXv/buildlink3.mk"
+. endif
+. if !empty(PKG_OPTIONS:Mgnome)
+. include "../../graphics/gtkglext/buildlink3.mk"
+. endif
+. if !empty(PKG_OPTIONS:Msdl)
+. endif
+.endif
+
+.if !empty(PKG_OPTIONS:Mvice-ethernet)
+CONFIGURE_ARGS+= --enable-ethernet
+. include "../../net/libpcap/buildlink3.mk"
+.endif
+
+# If desired, ffmpeg and lame can be build-time-only dependencies,
+# since they are loaded dynamically only.
+.if !empty(PKG_OPTIONS:Mffmpeg)
+#BUILDLINK_DEPMETHOD.ffmpeg?= build
+CONFIGURE_ARGS+= --enable-ffmpeg
+. include "../../multimedia/ffmpeg/buildlink3.mk"
+.endif
+.if !empty(PKG_OPTIONS:Mlame)
+#BUILDLINK_DEPMETHOD.lame?= build
+. include "../../audio/lame/buildlink3.mk"
.endif
diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa
index 3989328ca3c..1903b286188 100644
--- a/emulators/vice/patches/patch-aa
+++ b/emulators/vice/patches/patch-aa
@@ -1,27 +1,21 @@
-$NetBSD: patch-aa,v 1.10 2010/07/24 09:44:57 wiz Exp $
+$NetBSD: patch-aa,v 1.11 2011/04/04 13:42:08 wiz Exp $
-Better destdir support.
+Bring back DESTDIR support which is somehow patched out by pkgsrc.
+ localedir = $(DESTDIR)$(datadir)/locale
+is changed to
+ localedir = /usr/pkg/share/locale
+and the same for gnulocaledir.
---- po/Makefile.in.in.orig 2008-06-18 16:02:50.000000000 +0000
-+++ po/Makefile.in.in
-@@ -116,16 +116,16 @@ install-data: install-data-@USE_NLS@
- install-data-no: all
- install-data-yes: all
- if test -r "$(MKINSTALLDIRS)"; then \
-- $(MKINSTALLDIRS) $(datadir); \
-+ $(MKINSTALLDIRS) ${DESTDIR}$(datadir); \
- else \
-- $(SHELL) $(top_srcdir)/mkinstalldirs $(datadir); \
-+ $(SHELL) $(top_srcdir)/mkinstalldirs ${DESTDIR}$(datadir); \
- fi
- @catalogs='$(CATALOGS)'; \
+--- po/Makefile.in.in.dist 2011-02-27 00:39:47.000000000 +0100
++++ po/Makefile.in.in 2011-02-27 01:11:12.000000000 +0100
+@@ -126,8 +126,8 @@
for cat in $$catalogs; do \
cat=`basename $$cat`; \
case "$$cat" in \
- *.gmo) destdir=$(gnulocaledir);; \
- *) destdir=$(localedir);; \
-+ *.gmo) destdir=${DESTDIR}$(gnulocaledir);; \
-+ *) destdir=${DESTDIR}$(localedir);; \
++ *.gmo) destdir=$(DESTDIR)$(gnulocaledir);; \
++ *) destdir=$(DESTDIR)$(localedir);; \
esac; \
lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \
dir=$$destdir/$$lang/LC_MESSAGES; \
diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab
index 169f3b53c0a..3efdeea5796 100644
--- a/emulators/vice/patches/patch-ab
+++ b/emulators/vice/patches/patch-ab
@@ -1,157 +1,42 @@
-$NetBSD: patch-ab,v 1.10 2010/07/24 09:44:57 wiz Exp $
+$NetBSD: patch-ab,v 1.11 2011/04/04 13:42:08 wiz Exp $
1. dynamic lib support does not depend on the existence of libdl
-2. fix test(1) == (only supported by bash)
-3. fix png detection, was looking for symbol that is a #define
- in png>=1.4
+2. patch out error message about --without-iconv-base
---- configure.orig 2009-12-14 19:40:01.000000000 +0000
-+++ configure
-@@ -12642,6 +12642,7 @@ fi
- echo "${ECHO_T}$ac_cv_lib_dl_dlopen" >&6; }
- if test $ac_cv_lib_dl_dlopen = yes; then
- DYNLIB_LIBS="-ldl";
-+fi
-
- cat >>confdefs.h <<\_ACEOF
- #define HAVE_DYNLIB_SUPPORT
-@@ -12649,7 +12650,6 @@ _ACEOF
-
- dynlib_support=yes
-
--fi
-
+--- configure.orig 2011-02-26 19:07:06.000000000 +0100
++++ configure 2011-02-27 13:56:52.000000000 +0100
+@@ -3381,7 +3381,7 @@
+ ;;
+ esac
+ if test x"$argvalid" = "xno"; then
+- as_fn_error $? "invalid option: $argcheck" "$LINENO" 5
++ echo "WARNING: invalid option: $argcheck"
fi
- elif test x"$is_win32" = "xyes" ; then
-@@ -19019,7 +19019,7 @@ fi
done
+@@ -10381,13 +10381,13 @@
-- if test x"$with_pulse" == "xyes"; then
-+ if test x"$with_pulse" = "xyes"; then
-
- for ac_header in pulse/simple.h
- do
-@@ -26103,10 +26103,10 @@ fi
-
- if test x"$ac_cv_header_png_h" = "xyes" ; then
-- unset ac_cv_lib_png_png_check_sig
-- { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
--echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
--if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
-+ unset ac_cv_lib_png_png_sig_cmp
-+ { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
-+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+ if test x"$ac_cv_header_dlfcn_h" = "xyes" ; then
+- { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
+-$as_echo_n "checking for dlopen in -ldl... " >&6; }
++ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen" >&5
++$as_echo_n "checking for dlopen... " >&6; }
+ if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+ $as_echo_n "(cached) " >&6
else
ac_check_lib_save_LIBS=$LIBS
-@@ -26124,11 +26124,11 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char png_check_sig ();
-+char png_sig_cmp ();
- int
- main ()
- {
--return png_check_sig ();
-+return png_sig_cmp ();
- ;
- return 0;
- }
-@@ -26151,21 +26151,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-- ac_cv_lib_png_png_check_sig=yes
-+ ac_cv_lib_png_png_sig_cmp=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_png_png_check_sig=no
-+ ac_cv_lib_png_png_sig_cmp=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
--if test $ac_cv_lib_png_png_check_sig = yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; }
-+if test $ac_cv_lib_png_png_sig_cmp = yes; then
- GFXOUTPUT_LIBS="-lpng $GFXOUTPUT_LIBS";
- GFXOUTPUT_DRIVERS="$GFXOUTPUT_DRIVERS pngdrv.o";
-
-@@ -26175,11 +26175,11 @@ _ACEOF
-
- fi
-
-- if test "$ac_cv_lib_png_png_check_sig" = "no"; then
-- unset ac_cv_lib_png_png_check_sig
-- { echo "$as_me:$LINENO: checking for png_check_sig in -lpng" >&5
--echo $ECHO_N "checking for png_check_sig in -lpng... $ECHO_C" >&6; }
--if test "${ac_cv_lib_png_png_check_sig+set}" = set; then
-+ if test "$ac_cv_lib_png_png_sig_cmp" = "no"; then
-+ unset ac_cv_lib_png_png_sig_cmp
-+ { echo "$as_me:$LINENO: checking for png_sig_cmp in -lpng" >&5
-+echo $ECHO_N "checking for png_sig_cmp in -lpng... $ECHO_C" >&6; }
-+if test "${ac_cv_lib_png_png_sig_cmp+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
-@@ -26197,11 +26197,11 @@ cat >>conftest.$ac_ext <<_ACEOF
- #ifdef __cplusplus
- extern "C"
- #endif
--char png_check_sig ();
-+char png_sig_cmp ();
- int
- main ()
- {
--return png_check_sig ();
-+return png_sig_cmp ();
- ;
- return 0;
- }
-@@ -26224,21 +26224,21 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
- test ! -s conftest.err
- } && test -s conftest$ac_exeext &&
- $as_test_x conftest$ac_exeext; then
-- ac_cv_lib_png_png_check_sig=yes
-+ ac_cv_lib_png_png_sig_cmp=yes
- else
- echo "$as_me: failed program was:" >&5
- sed 's/^/| /' conftest.$ac_ext >&5
-
-- ac_cv_lib_png_png_check_sig=no
-+ ac_cv_lib_png_png_sig_cmp=no
- fi
-
- rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
- conftest$ac_exeext conftest.$ac_ext
- LIBS=$ac_check_lib_save_LIBS
- fi
--{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_check_sig" >&5
--echo "${ECHO_T}$ac_cv_lib_png_png_check_sig" >&6; }
--if test $ac_cv_lib_png_png_check_sig = yes; then
-+{ echo "$as_me:$LINENO: result: $ac_cv_lib_png_png_sig_cmp" >&5
-+echo "${ECHO_T}$ac_cv_lib_png_png_sig_cmp" >&6; }
-+if test $ac_cv_lib_png_png_sig_cmp = yes; then
- GFXOUTPUT_LIBS="-lpng -lz $GFXOUTPUT_LIBS";
- GFXOUTPUT_DRIVERS="$GFXOUTPUT_DRIVERS pngdrv.o";
+-LIBS="-ldl $LIBS"
++#LIBS="-ldl $LIBS"
+ cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+ /* end confdefs.h. */
-@@ -26250,7 +26250,7 @@ fi
+@@ -10418,7 +10418,7 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
+ $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
+ if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+- DYNLIB_LIBS="-ldl";
++ DYNLIB_LIBS="";
- fi
- fi
-- if test x"$ac_cv_lib_png_png_check_sig" != "xyes"; then
-+ if test x"$ac_cv_lib_png_png_sig_cmp" != "xyes"; then
- if test x"$with_zlib" != "xno" ; then
+ $as_echo "#define HAVE_DYNLIB_SUPPORT /**/" >>confdefs.h
- cat >>confdefs.h <<\_ACEOF
diff --git a/emulators/vice/patches/patch-ac b/emulators/vice/patches/patch-ac
deleted file mode 100644
index 518899f2a43..00000000000
--- a/emulators/vice/patches/patch-ac
+++ /dev/null
@@ -1,39 +0,0 @@
-$NetBSD: patch-ac,v 1.19 2011/01/24 14:58:41 wiz Exp $
-
-Fix build with png-1.5.
-https://sourceforge.net/tracker/index.php?func=detail&aid=3164781&group_id=223021&atid=1057617
-
---- src/gfxoutputdrv/pngdrv.c.orig 2009-08-09 17:23:44.000000000 +0000
-+++ src/gfxoutputdrv/pngdrv.c
-@@ -31,6 +31,7 @@
- #include <stdlib.h>
-
- #include <png.h>
-+#include <zlib.h>
-
- #include "archdep.h"
- #include "gfxoutput.h"
-@@ -76,7 +77,7 @@ static int pngdrv_open(screenshot_t *scr
- return -1;
- }
-
-- if (setjmp(screenshot->gfxoutputdrv_data->png_ptr->jmpbuf)) {
-+ if (setjmp(png_jmpbuf(screenshot->gfxoutputdrv_data->png_ptr))) {
- png_destroy_write_struct(&(screenshot->gfxoutputdrv_data->png_ptr),
- &(screenshot->gfxoutputdrv_data->info_ptr));
- lib_free(sdata);
-@@ -99,10 +100,10 @@ static int pngdrv_open(screenshot_t *scr
- png_init_io(sdata->png_ptr, sdata->fd);
- png_set_compression_level(sdata->png_ptr, Z_BEST_COMPRESSION);
-
-- sdata->info_ptr->width = screenshot->width;
-- sdata->info_ptr->height= screenshot->height;
-- sdata->info_ptr->bit_depth = 8;
-- sdata->info_ptr->color_type = PNG_COLOR_TYPE_RGB_ALPHA;
-+ png_set_IHDR(sdata->png_ptr, sdata->info_ptr, screenshot->width,
-+ screenshot->height, 8, PNG_COLOR_TYPE_RGB_ALPHA,
-+ PNG_INTERLACE_NONE, PNG_COMPRESSION_TYPE_DEFAULT,
-+ PNG_FILTER_TYPE_DEFAULT);
-
- png_write_info(sdata->png_ptr, sdata->info_ptr);
-
diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
deleted file mode 100644
index f62412b6b11..00000000000
--- a/emulators/vice/patches/patch-ad
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-ad,v 1.14 2010/07/24 09:44:57 wiz Exp $
-
-Fix build with current X headers.
-
---- src/arch/unix/x11/xaw/x11video.c.orig 2009-10-21 16:46:45.000000000 +0000
-+++ src/arch/unix/x11/xaw/x11video.c
-@@ -59,6 +59,8 @@
- #include <X11/Xutil.h>
- #include <X11/Intrinsic.h>
- #include <X11/cursorfont.h>
-+#include <X11/Xmd.h>
-+#include <X11/extensions/shmproto.h>
-
- #include <stdio.h>
- #include <stdlib.h>
generated by cgit v1.2.3 (git 2.39.1) at 2024-07-03 04:39:15 +0000