diff options
| -rw-r--r-- | emulators/vice/Makefile | 17 | ||||
| -rw-r--r-- | emulators/vice/PLIST | 97 | ||||
| -rw-r--r-- | emulators/vice/distinfo | 17 | ||||
| -rw-r--r-- | emulators/vice/options.mk | 7 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-aa | 4 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-ab | 185 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-ad | 15 | ||||
| -rw-r--r-- | emulators/vice/patches/patch-af | 26 |
8 files changed, 217 insertions, 151 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile index f94932c89d3..31db64004d8 100644 --- a/emulators/vice/Makefile +++ b/emulators/vice/Makefile @@ -1,15 +1,19 @@ -# $NetBSD: Makefile,v 1.83 2010/06/13 22:44:15 wiz Exp $ +# $NetBSD: Makefile,v 1.84 2010/07/24 09:44:57 wiz Exp $ # -DISTNAME= vice-1.22 -PKGREVISION= 8 +DISTNAME= vice-2.2 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.zimmers.net/anonftp/pub/cbm/crossplatform/emulators/VICE/ \ + http://www.trikaliotis.net/Download/vice/ -MAINTAINER= kristerw@NetBSD.org -HOMEPAGE= http://www.viceteam.org/ +MAINTAINER= rhialto@falu.nl +HOMEPAGE= http://vice-emu.sourceforge.net/ COMMENT= Emulator for C64, C128, CBM-II, PET, and VIC20 +LICENSE= gnu-gpl-v2 + +PATCH_SITES= http://www.students.tut.fi/~nuotio/ +PATCHFILES+= vice_2_2_netbsd.patch PKG_DESTDIR_SUPPORT= user-destdir @@ -44,6 +48,7 @@ CONFIGURE_ARGS+= --without-oss .include "../../devel/gettext-lib/buildlink3.mk" .include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" +.include "../../graphics/jpeg/buildlink3.mk" .include "../../x11/libXaw/buildlink3.mk" .include "../../x11/libXpm/buildlink3.mk" .include "../../x11/libXt/buildlink3.mk" diff --git a/emulators/vice/PLIST b/emulators/vice/PLIST index cf3904c7973..3dbe433f934 100644 --- a/emulators/vice/PLIST +++ b/emulators/vice/PLIST @@ -1,10 +1,11 @@ -@comment $NetBSD: PLIST,v 1.21 2009/06/14 17:51:09 joerg Exp $ +@comment $NetBSD: PLIST,v 1.22 2010/07/24 09:44:57 wiz Exp $ bin/c1541 bin/cartconv bin/petcat bin/vsid bin/x128 bin/x64 +bin/x64dtv bin/xcbm2 bin/xpet bin/xplus4 @@ -16,22 +17,30 @@ man/man1/vice.1 share/doc/vice/64doc.txt share/doc/vice/BUGS share/doc/vice/COPYING +share/doc/vice/CommodoreInnovationPriceSoftware2008.jpg +share/doc/vice/GP2X-Howto.txt share/doc/vice/MSDOS-Ethernet-Howto.txt share/doc/vice/MSDOS-Howto.txt +share/doc/vice/MacOSX-Build.txt +share/doc/vice/MacOSX-ResourceTree.txt share/doc/vice/Minix-Howto.txt share/doc/vice/NEWS share/doc/vice/NLS-Howto.txt +share/doc/vice/OpenVMS-Howto.txt share/doc/vice/PETdoc.txt share/doc/vice/Readme.beos share/doc/vice/Readme.dos share/doc/vice/ReadmeMacOSX.txt +share/doc/vice/ReadmeSDL.txt share/doc/vice/TODO 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 @@ -39,6 +48,8 @@ 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 +share/doc/vice/sco.html share/doc/vice/serial.txt share/doc/vice/solaris.html share/doc/vice/vice-logo.jpg @@ -59,6 +70,7 @@ 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 @@ -66,14 +78,10 @@ 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/vice/C128/ROdflt.vkm -share/vice/C128/amiga_pos.vkm -share/vice/C128/amiga_sym.vkm +share/locale/tr/LC_MESSAGES/vice.mo share/vice/C128/basic64 share/vice/C128/basichi share/vice/C128/basiclo -share/vice/C128/beos_pos.vkm -share/vice/C128/beos_sym.vkm share/vice/C128/c64hq.vpl share/vice/C128/c64s.vpl share/vice/C128/ccs64.vpl @@ -83,8 +91,6 @@ share/vice/C128/chargfr share/vice/C128/chargse share/vice/C128/default.vpl share/vice/C128/default.vrs -share/vice/C128/dos_pos.vkm -share/vice/C128/dos_sym.vkm share/vice/C128/frodo.vpl share/vice/C128/godot.vpl share/vice/C128/kernal @@ -95,22 +101,13 @@ share/vice/C128/kernalfr share/vice/C128/kernalit share/vice/C128/kernalno share/vice/C128/kernalse -share/vice/C128/os2.vkm -share/vice/C128/osx_pos.vkm -share/vice/C128/osx_sym.vkm 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/win_pos.vkm -share/vice/C128/win_sym.vkm share/vice/C128/x11_pos.vkm share/vice/C128/x11_sym.vkm -share/vice/C64/ROdflt.vkm -share/vice/C64/amiga_pos.vkm -share/vice/C64/amiga_sym.vkm share/vice/C64/basic -share/vice/C64/beos_pos.vkm -share/vice/C64/beos_sym.vkm share/vice/C64/c64hq.vpl share/vice/C64/c64mem.sym share/vice/C64/c64s.vpl @@ -118,31 +115,27 @@ share/vice/C64/ccs64.vpl share/vice/C64/chargen share/vice/C64/default.vpl share/vice/C64/default.vrs -share/vice/C64/dos_pos.vkm -share/vice/C64/dos_sym.vkm share/vice/C64/frodo.vpl share/vice/C64/godot.vpl share/vice/C64/kernal -share/vice/C64/os2.vkm -share/vice/C64/os2_sym.vkm -share/vice/C64/osx_pos.vkm -share/vice/C64/osx_sym.vkm share/vice/C64/pc64.vpl share/vice/C64/vice.vpl -share/vice/C64/win_pos.vkm -share/vice/C64/win_sym_de.vkm -share/vice/C64/win_sym_us.vkm share/vice/C64/x11_pos.vkm +share/vice/C64/x11_posger.vkm share/vice/C64/x11_sym.vkm -share/vice/CBM-II/ROdflt.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/amiga_bukp.vkm -share/vice/CBM-II/amiga_buks.vkm share/vice/CBM-II/basic.128 share/vice/CBM-II/basic.256 share/vice/CBM-II/basic.500 -share/vice/CBM-II/beos_bukp.vkm -share/vice/CBM-II/beos_buks.vkm share/vice/CBM-II/c64hq.vpl share/vice/CBM-II/c64s.vpl share/vice/CBM-II/ccs64.vpl @@ -150,14 +143,11 @@ share/vice/CBM-II/chargen.500 share/vice/CBM-II/chargen.600 share/vice/CBM-II/chargen.700 share/vice/CBM-II/default.vpl -share/vice/CBM-II/dos_bukp.vkm -share/vice/CBM-II/dos_buks.vkm share/vice/CBM-II/frodo.vpl share/vice/CBM-II/godot.vpl share/vice/CBM-II/green.vpl share/vice/CBM-II/kernal share/vice/CBM-II/kernal.500 -share/vice/CBM-II/os2.vkm share/vice/CBM-II/pc64.vpl share/vice/CBM-II/rom128h.vrs share/vice/CBM-II/rom128l.vrs @@ -165,8 +155,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/win_pos_uk.vkm -share/vice/CBM-II/win_sym_uk.vkm share/vice/CBM-II/x11_buks.vkm share/vice/DRIVES/d1541II share/vice/DRIVES/d1571cr @@ -180,20 +168,12 @@ share/vice/DRIVES/dos2031 share/vice/DRIVES/dos2040 share/vice/DRIVES/dos3040 share/vice/DRIVES/dos4040 -share/vice/PET/RObusi.vkm -share/vice/PET/ROgrph.vkm share/vice/PET/amber.vpl -share/vice/PET/amiga_bgrs.vkm -share/vice/PET/amiga_buks.vkm share/vice/PET/basic1 share/vice/PET/basic2 share/vice/PET/basic4 -share/vice/PET/beos_bgrs.vkm -share/vice/PET/beos_buks.vkm share/vice/PET/chargen share/vice/PET/chargen.de -share/vice/PET/dos_bgrs.vkm -share/vice/PET/dos_buks.vkm share/vice/PET/edit1g share/vice/PET/edit2b share/vice/PET/edit2g @@ -204,8 +184,6 @@ share/vice/PET/green.vpl share/vice/PET/kernal1 share/vice/PET/kernal2 share/vice/PET/kernal4 -share/vice/PET/os2.vkm -share/vice/PET/os2_40.vkm share/vice/PET/rom1g.vrs share/vice/PET/rom2b.vrs share/vice/PET/rom2g.vrs @@ -213,29 +191,17 @@ share/vice/PET/rom4b40.vrs share/vice/PET/rom4b80.vrs share/vice/PET/rom4g40.vrs share/vice/PET/white.vpl -share/vice/PET/win_sym_gr.vkm -share/vice/PET/win_sym_uk.vkm 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/ROdflt.vkm -share/vice/PLUS4/amiga_pos.vkm -share/vice/PLUS4/amiga_sym.vkm share/vice/PLUS4/basic -share/vice/PLUS4/beos_pos.vkm -share/vice/PLUS4/beos_sym.vkm share/vice/PLUS4/default.vpl share/vice/PLUS4/default.vrs -share/vice/PLUS4/dos_pos.vkm -share/vice/PLUS4/dos_sym.vkm share/vice/PLUS4/kernal -share/vice/PLUS4/os2.vkm share/vice/PLUS4/vice.vpl -share/vice/PLUS4/win_pos.vkm -share/vice/PLUS4/win_sym.vkm share/vice/PLUS4/x11_pos.vkm share/vice/PLUS4/x11_sym.vkm share/vice/PRINTER/cbm1526 @@ -243,21 +209,12 @@ share/vice/PRINTER/mps801 share/vice/PRINTER/mps803 share/vice/PRINTER/mps803.vpl share/vice/PRINTER/nl10-cbm -share/vice/VIC20/ROdflt.vkm -share/vice/VIC20/amiga_pos.vkm -share/vice/VIC20/amiga_sym.vkm share/vice/VIC20/basic -share/vice/VIC20/beos_pos.vkm -share/vice/VIC20/beos_sym.vkm share/vice/VIC20/chargen share/vice/VIC20/default.vpl share/vice/VIC20/default.vrs -share/vice/VIC20/dos_pos.vkm -share/vice/VIC20/dos_sym.vkm share/vice/VIC20/kernal -share/vice/VIC20/os2.vkm -share/vice/VIC20/win_pos.vkm -share/vice/VIC20/win_sym.vkm share/vice/VIC20/x11_pos.vkm share/vice/VIC20/x11_sym.vkm -share/vice/fonts/vice-cbm.pcf +share/vice/fonts/CBM.ttf +share/vice/fonts/vice-cbm.bdf diff --git a/emulators/vice/distinfo b/emulators/vice/distinfo index c1003570c2b..7137accac2e 100644 --- a/emulators/vice/distinfo +++ b/emulators/vice/distinfo @@ -1,8 +1,11 @@ -$NetBSD: distinfo,v 1.34 2010/06/05 12:29:53 wiz Exp $ +$NetBSD: distinfo,v 1.35 2010/07/24 09:44:57 wiz Exp $ -SHA1 (vice-1.22.tar.gz) = 55e0047824f64173539e03ddd2d5ab51cd581fbb -RMD160 (vice-1.22.tar.gz) = ca93fc424e617e38f27e288ebcdfbab2aa3659db -Size (vice-1.22.tar.gz) = 6088483 bytes -SHA1 (patch-aa) = 16bc2420025494bee1eb6ed64c7b746f001406f7 -SHA1 (patch-ab) = 5c480e693b3ba16d36d740d1ba56c85553d2665b -SHA1 (patch-af) = c3300ce505dfd4c92c01503ab7dbfb84f9283cd8 +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-ad) = 0ace2e00ed2f66c8669ec745b62118570187735a diff --git a/emulators/vice/options.mk b/emulators/vice/options.mk index 9fec5a606f8..a9eb3acf4dc 100644 --- a/emulators/vice/options.mk +++ b/emulators/vice/options.mk @@ -1,9 +1,7 @@ -# $NetBSD: options.mk,v 1.4 2007/05/29 08:41:29 wiz Exp $ +# $NetBSD: options.mk,v 1.5 2010/07/24 09:44:57 wiz Exp $ PKG_OPTIONS_VAR= PKG_OPTIONS.vice -# ffmpeg support for vice-1.21 needs at least ffmpeg-0.5.1 -#PKG_SUPPORTED_OPTIONS= esound ffmpeg lame gnome -PKG_SUPPORTED_OPTIONS= esound lame gnome +PKG_SUPPORTED_OPTIONS= esound ffmpeg lame gnome .include "../../mk/bsd.options.mk" @@ -15,6 +13,7 @@ CONFIGURE_ARGS+= --without-esd .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" diff --git a/emulators/vice/patches/patch-aa b/emulators/vice/patches/patch-aa index 53a55148cbc..3989328ca3c 100644 --- a/emulators/vice/patches/patch-aa +++ b/emulators/vice/patches/patch-aa @@ -1,4 +1,6 @@ -$NetBSD: patch-aa,v 1.9 2008/06/20 01:10:02 joerg Exp $ +$NetBSD: patch-aa,v 1.10 2010/07/24 09:44:57 wiz Exp $ + +Better destdir support. --- po/Makefile.in.in.orig 2008-06-18 16:02:50.000000000 +0000 +++ po/Makefile.in.in diff --git a/emulators/vice/patches/patch-ab b/emulators/vice/patches/patch-ab index d9b7b0c6581..169f3b53c0a 100644 --- a/emulators/vice/patches/patch-ab +++ b/emulators/vice/patches/patch-ab @@ -1,46 +1,157 @@ -$NetBSD: patch-ab,v 1.9 2009/07/12 22:10:59 hasso Exp $ +$NetBSD: patch-ab,v 1.10 2010/07/24 09:44:57 wiz Exp $ ---- configure.orig 2009-07-12 21:48:36 +0300 -+++ configure 2009-07-12 21:49:57 +0300 -@@ -27831,7 +27831,7 @@ _ACEOF +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 + +--- 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 + fi + elif test x"$is_win32" = "xyes" ; then +@@ -19019,7 +19019,7 @@ fi + done - case "$host_os" in -- netbsd*) -+ *) - VICEDIR="$PREFIX/share/vice"; +- if test x"$with_pulse" == "xyes"; then ++ if test x"$with_pulse" = "xyes"; then -@@ -27844,32 +27844,6 @@ else + 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 + 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 - ;; -- freebsd*) -- VICEDIR="$PREFIX/lib/vice"; -- -- --if true; then -- ALTERNATE_DOCDIR_TRUE= -- ALTERNATE_DOCDIR_FALSE='#' --else -- ALTERNATE_DOCDIR_TRUE='#' -- ALTERNATE_DOCDIR_FALSE= --fi -- -- ;; -- *) -- VICEDIR="$PREFIX/lib/vice"; -- -- --if false; then -- ALTERNATE_DOCDIR_TRUE= -- ALTERNATE_DOCDIR_FALSE='#' --else -- ALTERNATE_DOCDIR_TRUE='#' -- ALTERNATE_DOCDIR_FALSE= --fi -- -- ;; - esac + 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"; + +@@ -26250,7 +26250,7 @@ fi + 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 + cat >>confdefs.h <<\_ACEOF diff --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad new file mode 100644 index 00000000000..f62412b6b11 --- /dev/null +++ b/emulators/vice/patches/patch-ad @@ -0,0 +1,15 @@ +$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> diff --git a/emulators/vice/patches/patch-af b/emulators/vice/patches/patch-af deleted file mode 100644 index ff90a1562b3..00000000000 --- a/emulators/vice/patches/patch-af +++ /dev/null @@ -1,26 +0,0 @@ -$NetBSD: patch-af,v 1.7 2010/06/05 12:29:53 wiz Exp $ - ---- src/arch/unix/x11/video.c.orig 2007-08-04 13:24:43.000000000 +0000 -+++ src/arch/unix/x11/video.c -@@ -56,6 +56,9 @@ - #include <X11/Xutil.h> - #include <X11/Intrinsic.h> - #include <X11/cursorfont.h> -+#include <X11/extensions/Xxf86dga.h> -+#include <X11/Xmd.h> -+#include <X11/extensions/shmproto.h> - - #include <stdio.h> - #include <stdlib.h> -@@ -221,11 +224,7 @@ int video_init_cmdline_options(void) - - /* ------------------------------------------------------------------------- */ - --#if !defined(__NETBSD__) - static GC _video_gc; --#else --GC _video_gc; --#endif - static void (*_refresh_func)(); - - /* This is set to 1 if the Shared Memory Extensions can actually be used. */ |