From 4de1ebc400a63ac2a95267fcd20d79ede486b531 Mon Sep 17 00:00:00 2001 From: adam Date: Sat, 24 Mar 2007 20:10:08 +0000 Subject: Changes 1.51: ---------- - Rejoice for finally having 224 lines and them being shown properly in all cases. - IRQ and timing fixes (fixes Chrono Trigger issues, Super Mario World, and others). - Fixed bug with certain commandline parameters permanently overwriting config file settings. - Fixed bug with loading new ZMVs of a different version. - Loading ZMV with ROM mismatch prints a message. - Movie menu now has tabs and only shows proper options when available. - Slight improvement to the Custom Res functionality. - Keep4_3Ratio option now only shows when necessary. - PNG files now use extended height in extended height mode. - Pausing, rewinding, and fast fowarding are disabled during movie dumping. - You can now force a movie dump length shorter or longer than the actual ZMV length. - Fixed Bilinear Filtering on startup. - More... --- emulators/zsnes/Makefile | 27 +++++++++++---------------- emulators/zsnes/distinfo | 17 ++++++++--------- emulators/zsnes/patches/patch-aa | 30 ++++++++++-------------------- emulators/zsnes/patches/patch-ab | 37 +++++++++++++++++++++---------------- emulators/zsnes/patches/patch-ac | 8 ++++---- emulators/zsnes/patches/patch-ad | 18 ++++++++---------- emulators/zsnes/patches/patch-af | 23 ----------------------- 7 files changed, 62 insertions(+), 98 deletions(-) delete mode 100644 emulators/zsnes/patches/patch-af (limited to 'emulators') diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile index b2c411e91dc..6bd3ff01ed2 100644 --- a/emulators/zsnes/Makefile +++ b/emulators/zsnes/Makefile @@ -1,29 +1,24 @@ -# $NetBSD: Makefile,v 1.35 2006/06/12 16:28:07 wiz Exp $ -# +# $NetBSD: Makefile,v 1.36 2007/03/24 20:10:08 adam Exp $ -DISTNAME= zsnes142src -PKGNAME= zsnes-1.42 -PKGREVISION= 6 -CATEGORIES= emulators -MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsnes/} +DISTNAME= zsnes151src +PKGNAME= zsnes-1.51 +CATEGORIES= emulators +MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=zsnes/} +EXTRACT_SUFX= .tar.bz2 -MAINTAINER= pkgsrc-users@NetBSD.org -HOMEPAGE= http://www.zsnes.com/ -COMMENT= Super NES emulator +MAINTAINER= pkgsrc-users@NetBSD.org +HOMEPAGE= http://www.zsnes.com/ +COMMENT= Super NES emulator BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm ONLY_FOR_PLATFORM= *-*-i386 -BUILD_TARGET= zsnes - -WRKSRC= ${WRKDIR}/zsnes_1_42/src -GNU_CONFIGURE= yes +WRKSRC= ${WRKDIR}/zsnes_1_51/src USE_LANGUAGES= c c++ USE_TOOLS+= gmake +GNU_CONFIGURE= yes .include "../../devel/SDL/buildlink3.mk" -.include "../../devel/zlib/buildlink3.mk" .include "../../graphics/png/buildlink3.mk" - .include "../../mk/bsd.pkg.mk" diff --git a/emulators/zsnes/distinfo b/emulators/zsnes/distinfo index 376856aa457..26d53401625 100644 --- a/emulators/zsnes/distinfo +++ b/emulators/zsnes/distinfo @@ -1,11 +1,10 @@ -$NetBSD: distinfo,v 1.11 2006/12/26 20:13:30 wiz Exp $ +$NetBSD: distinfo,v 1.12 2007/03/24 20:10:08 adam Exp $ -SHA1 (zsnes142src.tar.gz) = d38ca8c1b4168edc5bb5815f504b52654100bc4b -RMD160 (zsnes142src.tar.gz) = d794c69e876265715e141c26ecb6ed1802ffc27d -Size (zsnes142src.tar.gz) = 1102840 bytes -SHA1 (patch-aa) = 8394e0888dea04ba69ed513cd5b8e7fafd074dbe -SHA1 (patch-ab) = d3c00a1e77fc8edc132f3040a1219ae4a4d87967 -SHA1 (patch-ac) = 76e640aec3816eb4cbbfbe0dff1fcd2fa52f7876 -SHA1 (patch-ad) = 3c79a4c3ffe65151cd4d299b9837c6d20c8f8522 +SHA1 (zsnes151src.tar.bz2) = 03df35490870c9950d7010747d0546c8525c0362 +RMD160 (zsnes151src.tar.bz2) = 337407bf7e5516bcd7bf310c7b17d6d12a948750 +Size (zsnes151src.tar.bz2) = 1071712 bytes +SHA1 (patch-aa) = 7e0f57c3208c5717c44c1ee9ccac6b5b5feebf9a +SHA1 (patch-ab) = 2fa2fd6c4eb721d6588b9a72eb0dbf41c265c739 +SHA1 (patch-ac) = 451e3a56da55d6d58ecc2c335b804ba374ed31e5 +SHA1 (patch-ad) = 6244778c7f5c3c5d8c4f040760f8243161ae886d SHA1 (patch-ae) = 81236ed52fe7095f6317f655374234ce17cf30dd -SHA1 (patch-af) = a0a4da051a7370671c17160bca91a12e630cdb6a diff --git a/emulators/zsnes/patches/patch-aa b/emulators/zsnes/patches/patch-aa index a22f5f86c82..4373ee67d1e 100644 --- a/emulators/zsnes/patches/patch-aa +++ b/emulators/zsnes/patches/patch-aa @@ -1,23 +1,13 @@ -$NetBSD: patch-aa,v 1.5 2006/12/26 20:13:30 wiz Exp $ +$NetBSD: patch-aa,v 1.6 2007/03/24 20:10:08 adam Exp $ ---- configure.orig 2005-01-20 03:21:54.000000000 +0100 +--- configure.orig 2007-01-25 01:51:21.000000000 +0100 +++ configure -@@ -2909,6 +2909,10 @@ case "$target" in - CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__" - NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -DELF -f elf" - ;; -+ *-*-dragonfly*) -+ CFLAGS="$CFLAGS -D__LINUX__ -D__FreeBSD__" -+ NFLAGS="$NFLAGS -D__LINUX__ -D__FreeBSD__ -DELF -f elf" -+ ;; - *-*-cygwin* | *-*-*ming*) - CFLAGS="$CFLAGS -D__LINUX__" - NFLAGS="$NFLAGS -D__LINUX__ -f win32" -@@ -4115,7 +4119,6 @@ else - echo "$as_me:$LINENO: result: no" >&5 - echo "${ECHO_T}no" >&6 - -- CFLAGS="$CFLAGS -O3 -ffast-math -fomit-frame-pointer -fexpensive-optimizations -s" - NFLAGS="$NFLAGS -O1" - ZSNESEXE="zsnes" +@@ -5233,7 +5233,7 @@ echo "$as_me: WARNING: If you intend to + CFLAGS="$CFLAGS -O3 -fomit-frame-pointer -fprefetch-loop-arrays -fforce-addr $STRIP -D__RELEASE__" + NFLAGS="$NFLAGS -O99999999 -D__RELEASE__" + else +- CFLAGS="$CFLAGS -O3 -fomit-frame-pointer $STRIP" ++ CFLAGS="$CFLAGS $STRIP" + NFLAGS="$NFLAGS -O1" + fi fi diff --git a/emulators/zsnes/patches/patch-ab b/emulators/zsnes/patches/patch-ab index 1d107bb80e4..aeb3c9f6fd9 100644 --- a/emulators/zsnes/patches/patch-ab +++ b/emulators/zsnes/patches/patch-ab @@ -1,19 +1,24 @@ -$NetBSD: patch-ab,v 1.5 2006/12/26 18:04:28 adam Exp $ +$NetBSD: patch-ab,v 1.6 2007/03/24 20:10:08 adam Exp $ ---- gblhdr.h.orig 2005-01-14 14:10:39.000000000 +0100 +--- gblhdr.h.orig 2006-12-27 11:47:05.000000000 +0100 +++ gblhdr.h -@@ -105,6 +105,8 @@ Foundation, Inc., 675 Mass Ave, Cambridg - #include - #include - #include -+ #undef FALSE -+ #undef TRUE - #include - #include - #include -@@ -122,4 +124,4 @@ Foundation, Inc., 675 Mass Ave, Cambridg - #endif - #endif +@@ -109,6 +109,8 @@ however it's a static value that we can + #include + #include + #include ++#undef FALSE ++#undef TRUE + #include + #include + #include +@@ -122,9 +124,9 @@ however it's a static value that we can + #ifdef linux + #include + #else +-#include + #endif + #endif -- -+ #include ++#include + + #endif diff --git a/emulators/zsnes/patches/patch-ac b/emulators/zsnes/patches/patch-ac index f339a3832b3..4c11b1f7753 100644 --- a/emulators/zsnes/patches/patch-ac +++ b/emulators/zsnes/patches/patch-ac @@ -1,9 +1,9 @@ -$NetBSD: patch-ac,v 1.3 2005/01/20 00:43:15 xtraeme Exp $ +$NetBSD: patch-ac,v 1.4 2007/03/24 20:10:08 adam Exp $ ---- zip/unzip.c.orig 2005-01-20 01:32:47.000000000 +0100 -+++ zip/unzip.c 2005-01-20 01:33:03.000000000 +0100 +--- zip/unzip.c.orig 2005-08-14 15:49:35.000000000 +0200 ++++ zip/unzip.c @@ -15,6 +15,10 @@ - #include "zlib.h" + #include "zunzip.h" +#ifndef OF diff --git a/emulators/zsnes/patches/patch-ad b/emulators/zsnes/patches/patch-ad index 0c1063d2441..0ec101fca10 100644 --- a/emulators/zsnes/patches/patch-ad +++ b/emulators/zsnes/patches/patch-ad @@ -1,16 +1,14 @@ -$NetBSD: patch-ad,v 1.4 2005/01/20 00:43:15 xtraeme Exp $ +$NetBSD: patch-ad,v 1.5 2007/03/24 20:10:08 adam Exp $ ---- linux/sw_draw.c.orig 2005-01-14 14:11:18.000000000 +0100 -+++ linux/sw_draw.c 2005-01-20 01:34:10.000000000 +0100 -@@ -124,6 +124,11 @@ +--- linux/sw_draw.c.orig 2007-01-18 17:52:16.000000000 +0100 ++++ linux/sw_draw.c +@@ -139,6 +139,9 @@ extern unsigned char prevKeep4_3Ratio; void sw_drawwin() { +#ifdef _PTH_PTHREAD_H_ -+ pthread_yield_np(); ++ pthread_yield_np(); +#endif -+ -+ - NGNoTransp = 0; // Set this value to 1 within the appropriate - // video mode if you want to add a custom - // transparency routine or hardware + NGNoTransp = 0; // Set this value to 1 within the appropriate + // video mode if you want to add a custom + // transparency routine or hardware diff --git a/emulators/zsnes/patches/patch-af b/emulators/zsnes/patches/patch-af deleted file mode 100644 index 757dbcc3806..00000000000 --- a/emulators/zsnes/patches/patch-af +++ /dev/null @@ -1,23 +0,0 @@ -$NetBSD: patch-af,v 1.1 2006/05/21 17:09:53 joerg Exp $ - ---- linux/zfilew.c.orig 2005-01-14 14:11:19.000000000 +0100 -+++ linux/zfilew.c -@@ -471,14 +471,17 @@ void obtaindir() - { - char *homedir = 0; - DIR *tmp; -+ int getenvSuccess = 0; - - if ((homedir = (char *)getenv("HOME")) == 0) - { - homedir = (char *)malloc(ZCFG_DIR_LEN); - getcwd(homedir, ZCFG_DIR_LEN); -+ getenvSuccess = 1; - } - strcpy(zcfgdir, homedir); -- free(homedir); -+ if (getenvSuccess == 1) -+ free(homedir); - strcat(zcfgdir, ZCFG_DIR); - tmp = opendir(zcfgdir); - if (tmp == NULL) -- cgit v1.2.3