From d9176f48a4856b3978efc9ca778dfb3e9f9c5d06 Mon Sep 17 00:00:00 2001 From: nia Date: Fri, 10 Jan 2020 11:11:36 +0000 Subject: emulators: Remove zsnes. 32-bit x86 only due to use of 32-bit assembly code, but fails to build on i386 due to problems with atomics. No upstream release for 12 years and numerous accuracy problems and security problems with untrusted ROMs unfixed - use emulators/snes9x. --- emulators/Makefile | 3 +-- emulators/zsnes/DESCR | 1 - emulators/zsnes/Makefile | 35 --------------------------- emulators/zsnes/PLIST | 3 --- emulators/zsnes/distinfo | 15 ------------ emulators/zsnes/patches/patch-aa | 22 ----------------- emulators/zsnes/patches/patch-ab | 24 ------------------ emulators/zsnes/patches/patch-ac | 15 ------------ emulators/zsnes/patches/patch-ad | 14 ----------- emulators/zsnes/patches/patch-ae | 15 ------------ emulators/zsnes/patches/patch-af | 34 -------------------------- emulators/zsnes/patches/patch-makefilein | 15 ------------ emulators/zsnes/patches/patch-tools_strutil.h | 14 ----------- emulators/zsnes/patches/patch-zip_zpng.c | 14 ----------- 14 files changed, 1 insertion(+), 223 deletions(-) delete mode 100644 emulators/zsnes/DESCR delete mode 100644 emulators/zsnes/Makefile delete mode 100644 emulators/zsnes/PLIST delete mode 100644 emulators/zsnes/distinfo delete mode 100644 emulators/zsnes/patches/patch-aa delete mode 100644 emulators/zsnes/patches/patch-ab delete mode 100644 emulators/zsnes/patches/patch-ac delete mode 100644 emulators/zsnes/patches/patch-ad delete mode 100644 emulators/zsnes/patches/patch-ae delete mode 100644 emulators/zsnes/patches/patch-af delete mode 100644 emulators/zsnes/patches/patch-makefilein delete mode 100644 emulators/zsnes/patches/patch-tools_strutil.h delete mode 100644 emulators/zsnes/patches/patch-zip_zpng.c (limited to 'emulators') diff --git a/emulators/Makefile b/emulators/Makefile index 69dae409e01..7603eb1f60e 100644 --- a/emulators/Makefile +++ b/emulators/Makefile @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.309 2019/12/28 19:32:47 thorpej Exp $ +# $NetBSD: Makefile,v 1.310 2020/01/10 11:11:36 nia Exp $ # COMMENT= Emulators for other operating systems @@ -406,6 +406,5 @@ SUBDIR+= xtrs SUBDIR+= xyame SUBDIR+= yabause SUBDIR+= z26 -SUBDIR+= zsnes .include "../mk/misc/category.mk" diff --git a/emulators/zsnes/DESCR b/emulators/zsnes/DESCR deleted file mode 100644 index 2704baf6418..00000000000 --- a/emulators/zsnes/DESCR +++ /dev/null @@ -1 +0,0 @@ -Play Super Nintendo games on your Intel x86 or compatible PC. diff --git a/emulators/zsnes/Makefile b/emulators/zsnes/Makefile deleted file mode 100644 index dc286c60987..00000000000 --- a/emulators/zsnes/Makefile +++ /dev/null @@ -1,35 +0,0 @@ -# $NetBSD: Makefile,v 1.46 2015/04/25 14:20:48 tnn Exp $ - -DISTNAME= zsnes151src -PKGNAME= zsnes-1.51 -PKGREVISION= 4 -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 -LICENSE= gnu-gpl-v2 - -BUILD_DEPENDS+= nasm-[0-9]*:../../devel/nasm - -# Makes heavy use of 32-bit x86 assembler. -ONLY_FOR_PLATFORM= *-*-i386 -# Theoretically we can build a 32-bit binary on amd64 NetBSD, but we'd -# need 32-bit SDL and png and pkgsrc doesn't currently have -# infrastructure for that. -#ONLY_FOR_PLATFORM+= NetBSD-*-x86_64 - -WRKSRC= ${WRKDIR}/zsnes_1_51/src -USE_LANGUAGES= c c++ -USE_TOOLS+= gmake -GNU_CONFIGURE= yes -LDFLAGS+= ${COMPILER_RPATH_FLAG}${PREFIX}/lib - -BUILDLINK_API_DEPENDS.zlib+= zlib>=1.2.3 - -.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/PLIST b/emulators/zsnes/PLIST deleted file mode 100644 index 987c3f99088..00000000000 --- a/emulators/zsnes/PLIST +++ /dev/null @@ -1,3 +0,0 @@ -@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:54:33 zuntum Exp $ -bin/zsnes -man/man1/zsnes.1 diff --git a/emulators/zsnes/distinfo b/emulators/zsnes/distinfo deleted file mode 100644 index ac16c549ad4..00000000000 --- a/emulators/zsnes/distinfo +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: distinfo,v 1.18 2015/11/03 20:31:10 agc Exp $ - -SHA1 (zsnes151src.tar.bz2) = 03df35490870c9950d7010747d0546c8525c0362 -RMD160 (zsnes151src.tar.bz2) = 337407bf7e5516bcd7bf310c7b17d6d12a948750 -SHA512 (zsnes151src.tar.bz2) = 2cec9ad7762fc7a257c6b1d3e190b0ed53565dbafe42e1dee9eb182644392b7dd2c57faa846f63cd30ac079e5c05354d26ce0612d20481a1f54d760d62d95353 -Size (zsnes151src.tar.bz2) = 1071712 bytes -SHA1 (patch-aa) = f564e61b3105594d935e4fb46c41f3d5d21f254e -SHA1 (patch-ab) = 2fa2fd6c4eb721d6588b9a72eb0dbf41c265c739 -SHA1 (patch-ac) = 451e3a56da55d6d58ecc2c335b804ba374ed31e5 -SHA1 (patch-ad) = 6244778c7f5c3c5d8c4f040760f8243161ae886d -SHA1 (patch-ae) = 81236ed52fe7095f6317f655374234ce17cf30dd -SHA1 (patch-af) = 971ec4850936f24c5a519095e18ba79a39fe9653 -SHA1 (patch-makefilein) = d75b9b99888106bfbc7c5d12b311527103ceaccd -SHA1 (patch-tools_strutil.h) = 18302bd76b325b2654a354282e3bf9ab8e9d8a0c -SHA1 (patch-zip_zpng.c) = bee7b0635afa9f22a05910b86c4f742296e1f78f diff --git a/emulators/zsnes/patches/patch-aa b/emulators/zsnes/patches/patch-aa deleted file mode 100644 index 7b955eb30f4..00000000000 --- a/emulators/zsnes/patches/patch-aa +++ /dev/null @@ -1,22 +0,0 @@ -$NetBSD: patch-aa,v 1.7 2007/04/16 16:06:32 joerg Exp $ - ---- configure.orig 2007-01-25 00:51:21.000000000 +0000 -+++ configure -@@ -3422,7 +3422,7 @@ case x$target in - CFLAGS="$CFLAGS -D__BEOS__" - NFLAGS="$NFLAGS -D__BEOS__ -f elf -DELF" - ;; -- *-*-*bsd*) -+ *-*-*bsd* | *-*-dragonfly*) - CFLAGS="$CFLAGS -D__BSDSDL__" - NFLAGS="$NFLAGS -D__BSDSDL__ -f elf -DELF" - ;; -@@ -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 deleted file mode 100644 index aeb3c9f6fd9..00000000000 --- a/emulators/zsnes/patches/patch-ab +++ /dev/null @@ -1,24 +0,0 @@ -$NetBSD: patch-ab,v 1.6 2007/03/24 20:10:08 adam Exp $ - ---- gblhdr.h.orig 2006-12-27 11:47:05.000000000 +0100 -+++ gblhdr.h -@@ -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 - - #endif diff --git a/emulators/zsnes/patches/patch-ac b/emulators/zsnes/patches/patch-ac deleted file mode 100644 index 4c11b1f7753..00000000000 --- a/emulators/zsnes/patches/patch-ac +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ac,v 1.4 2007/03/24 20:10:08 adam Exp $ - ---- zip/unzip.c.orig 2005-08-14 15:49:35.000000000 +0200 -+++ zip/unzip.c -@@ -15,6 +15,10 @@ - - #include "zunzip.h" - -+#ifndef OF -+# define OF(args) args -+#endif -+ - #ifdef STDC - # include - # include diff --git a/emulators/zsnes/patches/patch-ad b/emulators/zsnes/patches/patch-ad deleted file mode 100644 index 0ec101fca10..00000000000 --- a/emulators/zsnes/patches/patch-ad +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-ad,v 1.5 2007/03/24 20:10:08 adam Exp $ - ---- 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(); -+#endif - 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-ae b/emulators/zsnes/patches/patch-ae deleted file mode 100644 index a745ccc48c2..00000000000 --- a/emulators/zsnes/patches/patch-ae +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-ae,v 1.1 2005/01/20 00:43:15 xtraeme Exp $ - ---- zip/zunzip.h.orig 2005-01-20 01:37:57.000000000 +0100 -+++ zip/zunzip.h 2005-01-20 01:38:09.000000000 +0100 -@@ -41,6 +41,10 @@ - #ifndef _unz_H - #define _unz_H - -+#ifndef OF -+# define OF(args) args -+#endif -+ - #ifdef __cplusplus - extern "C" { - #endif diff --git a/emulators/zsnes/patches/patch-af b/emulators/zsnes/patches/patch-af deleted file mode 100644 index 17e4c10c7ec..00000000000 --- a/emulators/zsnes/patches/patch-af +++ /dev/null @@ -1,34 +0,0 @@ -$NetBSD: patch-af,v 1.4 2013/06/12 01:57:24 dholland Exp $ - -- use standard headers -- the type of main() does not involve size_t - ---- tools/depbuild.cpp.orig 2006-12-27 11:04:05.000000000 +0000 -+++ tools/depbuild.cpp -@@ -24,6 +24,8 @@ This program generates dependencies for - #include - #include - #include -+#include -+#include - using namespace std; - - #include "fileutil.h" -@@ -183,7 +185,7 @@ void dependency_calculate(const char *fi - } - } - --int main(size_t argc, const char *const *const argv) -+int main(int argc, const char *const *const argv) - { - if (argc < 5) - { -@@ -209,7 +211,7 @@ int main(size_t argc, const char *const - else - { - struct stat unused; -- for (size_t i = 5; i < argc; i++) -+ for (int i = 5; i < argc; i++) - { - dependency_calculate(argv[i], unused); - } diff --git a/emulators/zsnes/patches/patch-makefilein b/emulators/zsnes/patches/patch-makefilein deleted file mode 100644 index 32190d92d27..00000000000 --- a/emulators/zsnes/patches/patch-makefilein +++ /dev/null @@ -1,15 +0,0 @@ -$NetBSD: patch-makefilein,v 1.1 2007/06/06 22:05:45 rillig Exp $ - -When linking a program, the linking flags are needed. - ---- Makefile.in.orig 2007-01-24 21:54:12.000000000 +0100 -+++ Makefile.in 2007-06-06 23:59:19.000000000 +0200 -@@ -104,7 +104,7 @@ main: makefile.dep $(Z_OBJS) - rm -f version.o - - $(PSR): parsegen.cpp -- @CXX@ @CXXFLAGS@ -o $@ $< -lz -+ @CXX@ @CXXFLAGS@ -o $@ $< @LDFLAGS@ @LIBS@ -lz - - TOOLSEXE=$(TOOL_D)/archopt $(TOOL_D)/cutrtype $(TOOL_D)/extraext\ - $(TOOL_D)/macroll $(TOOL_D)/minwhite $(TOOL_D)/nreplace\ diff --git a/emulators/zsnes/patches/patch-tools_strutil.h b/emulators/zsnes/patches/patch-tools_strutil.h deleted file mode 100644 index 1ef34d8e555..00000000000 --- a/emulators/zsnes/patches/patch-tools_strutil.h +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-tools_strutil.h,v 1.1 2012/12/17 03:37:20 dholland Exp $ - -add for strcasecmp. - ---- tools/strutil.h~ 2006-12-27 11:04:05.000000000 +0000 -+++ tools/strutil.h -@@ -23,6 +23,7 @@ This is part of a toolkit used to assist - #define STRUTIL_H - - #include -+#include - #include - #include - diff --git a/emulators/zsnes/patches/patch-zip_zpng.c b/emulators/zsnes/patches/patch-zip_zpng.c deleted file mode 100644 index 7d4db385985..00000000000 --- a/emulators/zsnes/patches/patch-zip_zpng.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-zip_zpng.c,v 1.1 2011/03/15 11:46:09 obache Exp $ - -* direct access is not allowed with png-1.5, but already set color_type. - ---- zip/zpng.c.orig 2007-01-15 23:06:29.000000000 +0000 -+++ zip/zpng.c -@@ -129,7 +129,6 @@ int Png_Dump(const char *filename, unsig - png_set_IHDR(png_ptr, info_ptr, width, height, 8, - PNG_COLOR_TYPE_RGB, PNG_INTERLACE_NONE, - PNG_COMPRESSION_TYPE_DEFAULT, PNG_FILTER_TYPE_DEFAULT); -- info_ptr->color_type = PNG_COLOR_TYPE_RGB; - - //Allocate an array of scanline pointers - row_pointers = (png_bytep*)malloc(height*sizeof(png_bytep)); -- cgit v1.2.3