[pkgsrc/trunk]: pkgsrc/emulators/vice Make the emulator work when vidmode ext...

[kristerw <kristerw%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/90f27f98f529
branches:  trunk
changeset: 478817:90f27f98f529
user:      kristerw <kristerw%pkgsrc.org@localhost>
date:      Fri Jul 30 20:32:01 2004 +0000

description:
Make the emulator work when vidmode extension cannot be used.
Bump PKGREVISION.

diffstat:

 emulators/vice/Makefile         |   4 ++--
 emulators/vice/distinfo         |   5 +++--
 emulators/vice/patches/patch-ad |  13 +++++++++++++
 emulators/vice/patches/patch-bd |  17 +++++++++++++----
 4 files changed, 31 insertions(+), 8 deletions(-)

diffs (82 lines):

diff -r 84ad1c843ff4 -r 90f27f98f529 emulators/vice/Makefile
--- a/emulators/vice/Makefile   Fri Jul 30 18:30:29 2004 +0000
+++ b/emulators/vice/Makefile   Fri Jul 30 20:32:01 2004 +0000
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.46 2004/07/26 17:22:40 dillo Exp $
+# $NetBSD: Makefile,v 1.47 2004/07/30 20:32:01 kristerw Exp $
 #
 
 DISTNAME=              vice-1.14
-PKGREVISION=           2
+PKGREVISION=           3
 CATEGORIES=            emulators
 MASTER_SITES=          ftp://ftp.funet.fi/pub/cbm/crossplatform/emulators/VICE/ \
                        http://www.nic.funet.fi/pub/cbm/crossplatform/emulators/VICE/
diff -r 84ad1c843ff4 -r 90f27f98f529 emulators/vice/distinfo
--- a/emulators/vice/distinfo   Fri Jul 30 18:30:29 2004 +0000
+++ b/emulators/vice/distinfo   Fri Jul 30 20:32:01 2004 +0000
@@ -1,15 +1,16 @@
-$NetBSD: distinfo,v 1.14 2004/07/26 17:22:40 dillo Exp $
+$NetBSD: distinfo,v 1.15 2004/07/30 20:32:01 kristerw Exp $
 
 SHA1 (vice-1.14.tar.gz) = 5f2c458533db0b41dd55732e9d9434275904ab29
 Size (vice-1.14.tar.gz) = 3794698 bytes
 SHA1 (patch-aa) = fa152c1d14aad31c0b50fe96c83b4e5cfa06de5f
 SHA1 (patch-ab) = 0be2ec8b98a50e5c879095b1d0327c802b7740e2
 SHA1 (patch-ac) = bb648b8dc668a12540eab9f1be6374aab8cda35a
+SHA1 (patch-ad) = 9f26a52a0f60658b147ad62a8cadc37ddd99fe04
 SHA1 (patch-ae) = c2ede31953ebaf033c9ae1aa1985012fb0e5f3b6
 SHA1 (patch-ba) = 8f94dd31ef10ae2acc82ed721d71cc9eb7ff13d8
 SHA1 (patch-bb) = 15b84e9f7d20b8518ab77b8ae0765227a1ad7a5d
 SHA1 (patch-bc) = d34ddf4723b45a844fb6ab96b2924e117934f8f9
-SHA1 (patch-bd) = b2f4dca0a259cdb3ffed5ea86c955f47508cdeff
+SHA1 (patch-bd) = 145ded54223b93b1ef56422a26a31219e004fbbd
 SHA1 (patch-be) = ec8308214c51a50aa948cf064865cd8cd03ee7e3
 SHA1 (patch-bf) = e19994029b10c2403b53a575bbfb7523c2966ed2
 SHA1 (patch-bg) = 3a396e3cbeddd2c99beebd26bca30e233e89e009
diff -r 84ad1c843ff4 -r 90f27f98f529 emulators/vice/patches/patch-ad
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/vice/patches/patch-ad   Fri Jul 30 20:32:01 2004 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-ad,v 1.9 2004/07/30 20:32:01 kristerw Exp $
+
+--- src/arch/unix/x11/vidmode.c.orig   Fri Jul 30 21:56:16 2004
++++ src/arch/unix/x11/vidmode.c        Fri Jul 30 21:56:33 2004
+@@ -74,7 +74,7 @@
+         &vm_modes)) {
+         log_error(vidmode_log, _("Error getting video mode information - disabling vidmode extension."));
+         vm_available = 0;
+-        return -1;
++        return 0;
+     }
+ 
+     for (i = 0; i < vm_mode_count; i++) {
diff -r 84ad1c843ff4 -r 90f27f98f529 emulators/vice/patches/patch-bd
--- a/emulators/vice/patches/patch-bd   Fri Jul 30 18:30:29 2004 +0000
+++ b/emulators/vice/patches/patch-bd   Fri Jul 30 20:32:01 2004 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-bd,v 1.1 2004/07/26 17:22:40 dillo Exp $
+$NetBSD: patch-bd,v 1.2 2004/07/30 20:32:01 kristerw Exp $
 
---- configure.orig     Fri May 14 11:30:32 2004
-+++ configure
-@@ -9127,6 +9793,379 @@ fi
+--- configure.orig     Sun Jan 25 22:06:42 2004
++++ configure  Fri Jul 30 21:58:16 2004
+@@ -9127,6 +9127,379 @@
  
  
  
@@ -382,3 +382,12 @@
  
  fi
  
+@@ -12095,7 +12468,7 @@
+ 
+ 
+ 
+-if test x"$is_win32" = "xno" -a test x"$is_riscos" = "xno"; then
++if test x"$is_win32" = "xno" -a x"$is_riscos" = "xno"; then
+ 
+ for ac_func in usleep
+ do