summaryrefslogtreecommitdiff
path: root/emulators
diff options
context:
space:
mode:
authorkristerw <kristerw>2004-07-30 20:32:01 +0000
committerkristerw <kristerw>2004-07-30 20:32:01 +0000
commit7123888132c53566bfb4cd758ab92454000e13c0 (patch)
treee905d52c0cd2c0299f3b72a39986cb4bfc4bbf0b /emulators
parent149cc78f3ef72d4edbe83e6f73d3ed5ca32b0a5e (diff)
downloadpkgsrc-7123888132c53566bfb4cd758ab92454000e13c0.tar.gz
Make the emulator work when vidmode extension cannot be used.
Bump PKGREVISION.
Diffstat (limited to 'emulators')
-rw-r--r--emulators/vice/Makefile4
-rw-r--r--emulators/vice/distinfo5
-rw-r--r--emulators/vice/patches/patch-ad13
-rw-r--r--emulators/vice/patches/patch-bd17
4 files changed, 31 insertions, 8 deletions
diff --git a/emulators/vice/Makefile b/emulators/vice/Makefile
index 5ff695d4f15..f6db4f5caea 100644
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@@ -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 --git a/emulators/vice/distinfo b/emulators/vice/distinfo
index c596078651b..fe1c5113185 100644
--- a/emulators/vice/distinfo
+++ b/emulators/vice/distinfo
@@ -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 --git a/emulators/vice/patches/patch-ad b/emulators/vice/patches/patch-ad
new file mode 100644
index 00000000000..1694d0d100b
--- /dev/null
+++ b/emulators/vice/patches/patch-ad
@@ -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 --git a/emulators/vice/patches/patch-bd b/emulators/vice/patches/patch-bd
index 7fbb87df2d8..8c9785588a7 100644
--- a/emulators/vice/patches/patch-bd
+++ b/emulators/vice/patches/patch-bd
@@ -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 @@ $NetBSD: patch-bd,v 1.1 2004/07/26 17:22:40 dillo Exp $
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