pkgsrc-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[pkgsrc/trunk]: pkgsrc/emulators emulators: Remove arnold.



details:   https://anonhg.NetBSD.org/pkgsrc/rev/b7f31cfae0a5
branches:  trunk
changeset: 412426:b7f31cfae0a5
user:      nia <nia%pkgsrc.org@localhost>
date:      Fri Mar 06 12:24:26 2020 +0000

description:
emulators: Remove arnold.

Failing to build, non-redistributable, and no updates since 2004.

Try caprice32 instead.

diffstat:

 emulators/Makefile                                       |    3 +-
 emulators/arnold/DESCR                                   |    3 -
 emulators/arnold/Makefile                                |   55 ----
 emulators/arnold/PLIST                                   |   17 -
 emulators/arnold/distinfo                                |   13 -
 emulators/arnold/patches/patch-aa                        |   34 --
 emulators/arnold/patches/patch-ab                        |   49 ---
 emulators/arnold/patches/patch-src_cpc_amsdos.c          |   19 -
 emulators/arnold/patches/patch-src_cpc_debugger_gdebug.c |   16 -
 emulators/arnold/patches/patch-src_cpc_render5.c         |   90 -------
 emulators/arnold/patches/patch-src_unix_display__sdl.c   |   13 -
 emulators/arnold/patches/patch-src_unix_gtkui.c          |  184 ---------------
 12 files changed, 1 insertions(+), 495 deletions(-)

diffs (truncated from 554 to 300 lines):

diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/Makefile
--- a/emulators/Makefile        Fri Mar 06 12:23:13 2020 +0000
+++ b/emulators/Makefile        Fri Mar 06 12:24:26 2020 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.313 2020/03/06 12:23:01 nia Exp $
+# $NetBSD: Makefile,v 1.314 2020/03/06 12:24:26 nia Exp $
 #
 
 COMMENT=       Emulators for other operating systems
@@ -17,7 +17,6 @@
 SUBDIR+=       applyppf
 SUBDIR+=       aranym
 SUBDIR+=       arcem
-SUBDIR+=       arnold
 SUBDIR+=       atari800
 SUBDIR+=       b-em
 SUBDIR+=       blastem
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/DESCR
--- a/emulators/arnold/DESCR    Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,3 +0,0 @@
-Arnold is an Amstrad CPC, Amstrad CPC+ and KC Compact emulator.
-Arnold is accurate and emulates the Amstrad systems to the cycle
-level. It also emulates 99% of all demo effects.
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/Makefile
--- a/emulators/arnold/Makefile Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,55 +0,0 @@
-# $NetBSD: Makefile,v 1.29 2019/07/06 09:48:43 nia Exp $
-#
-
-DISTNAME=              arnsrc04012004
-PKGNAME=               arnold-20040111
-CATEGORIES=            emulators
-MASTER_SITES=          http://arnold.emuunlim.com/download/
-EXTRACT_SUFX=          .zip
-
-MAINTAINER=            pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=              http://arnold.emuunlim.com/
-COMMENT=               Amstrad CPC, Amstrad CPC+ and KC Compact emulator
-
-RESTRICTED=            ROM image copyright is questionable.
-NO_BIN_ON_CDROM=       ${RESTRICTED}
-NO_BIN_ON_FTP=         ${RESTRICTED}
-NO_SRC_ON_CDROM=       ${RESTRICTED}
-NO_SRC_ON_FTP=         ${RESTRICTED}
-
-WRKSRC=                        ${WRKDIR}/arnold
-GNU_CONFIGURE=         yes
-CONFIGURE_DIRS=                src
-BUILD_DIRS=            ${CONFIGURE_DIRS}
-BUILD_TARGET=          arnold
-MAKE_FLAGS+=           LFLAGS2=#none, especially not -s
-
-SHAREDIR=              ${PREFIX}/share/arnold
-MAKE_ENV+=             SHAREDIR=${SHAREDIR}
-AUTO_MKDIRS=           yes
-
-USE_TOOLS+=            gmake pax
-
-post-extract:
-       cd ${WRKSRC} && ${FIND} . -type d -name CVS -print | ${XARGS} ${RM} -rf
-
-do-install:
-       ${INSTALL_PROGRAM} ${WRKSRC}/arnold ${DESTDIR}${PREFIX}/bin
-       cd ${WRKSRC}/src/roms && pax -wr * ${DESTDIR}${SHAREDIR}/roms/
-       cd ${DESTDIR}${SHAREDIR}/roms && \
-               ${FIND} . -type f -print | ${XARGS} ${CHMOD} ${SHAREMODE} && \
-               ${FIND} . -type d -print | ${XARGS} ${CHMOD} ${PKGDIRMODE}
-       cd ${WRKSRC} && ${INSTALL_DATA} readme.* \
-               ${DESTDIR}${PREFIX}/share/doc/arnold
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${X11_TYPE} == "modular"
-CONFIGURE_ARGS+=       --x-includes=${PREFIX}/include
-CONFIGURE_ARGS+=       --x-libraries=${PREFIX}/lib
-.endif
-
-.include "../../mk/oss.buildlink3.mk"
-.include "../../devel/SDL/buildlink3.mk"
-.include "../../x11/gtk/buildlink3.mk"
-.include "../../mk/bsd.pkg.mk"
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/PLIST
--- a/emulators/arnold/PLIST    Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,17 +0,0 @@
-@comment $NetBSD: PLIST,v 1.4 2018/04/09 15:03:22 ryoon Exp $
-bin/arnold
-share/arnold/roms/ARNOR/PROTEXT.ROM
-share/arnold/roms/ARNOR/UTOPIA.ROM
-share/arnold/roms/amsdose/amsdos.rom
-share/arnold/roms/cpc464e/basic.rom
-share/arnold/roms/cpc464e/os.rom
-share/arnold/roms/cpc6128e/basic.rom
-share/arnold/roms/cpc6128e/os.rom
-share/arnold/roms/cpc664e/basic.rom
-share/arnold/roms/cpc664e/os.rom
-share/arnold/roms/cpcplus/system.cpr
-share/arnold/roms/kcc/kccbas.rom
-share/arnold/roms/kcc/kccos.rom
-share/arnold/roms/parados.rom
-share/doc/arnold/readme.linux
-share/doc/arnold/readme.txt
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/distinfo
--- a/emulators/arnold/distinfo Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: distinfo,v 1.6 2018/04/09 15:03:22 ryoon Exp $
-
-SHA1 (arnsrc04012004.zip) = 7020aa50d80f55cd10bf280fc3a8fdc0ef44e7c3
-RMD160 (arnsrc04012004.zip) = 9e9cce2b1a869769af10f951b1bdc0ca5d3b6461
-SHA512 (arnsrc04012004.zip) = a9503325cd7972294b80e715c3ff270544b210403acb5b9d69e56eec7aa4a4d10a54bfe0ad353bd5715c7213cd68212636d06520147b25abc9e38cce50ead02b
-Size (arnsrc04012004.zip) = 1082107 bytes
-SHA1 (patch-aa) = 7e576715cd16cbeaed1b87d51b2bc04d291716e2
-SHA1 (patch-ab) = 89d03d691f93aa5e48072c2d93579a1ddbe148ec
-SHA1 (patch-src_cpc_amsdos.c) = 9edeca19e486c24826222e5bb0950ba8a90d10d8
-SHA1 (patch-src_cpc_debugger_gdebug.c) = 3303e9779b9a7dc95fc02d07e339ecacaef476d7
-SHA1 (patch-src_cpc_render5.c) = 8c9150e424caed46079869576adbbc5645f1c855
-SHA1 (patch-src_unix_display__sdl.c) = b43d5f61cffee6f16d61d65b7a56f68390f612b9
-SHA1 (patch-src_unix_gtkui.c) = 847c4809707873a7b7769891866ae332e121f071
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/patches/patch-aa
--- a/emulators/arnold/patches/patch-aa Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,34 +0,0 @@
-$NetBSD: patch-aa,v 1.3 2018/04/09 15:03:22 ryoon Exp $
-
---- src/Makefile.in.orig       2004-01-04 05:18:40.000000000 +0000
-+++ src/Makefile.in
-@@ -25,7 +25,7 @@ SDLINC = @SDL_CFLAGS@
- SDLLIB = @SDL_LIBS@
- 
- #-Wall for max warnings!
--CFLAGS = @CPPFLAGS@ @CFLAGS@ $(GTKINC) $(SDLINC) @DEFS@ $(X11INC) -I. -DUNIX -Wall -Wno-unused
-+CFLAGS = @CPPFLAGS@ @CFLAGS@ $(GTKINC) $(SDLINC) @DEFS@ $(X11INC) -I. -DUNIX -DCPC_LSB_FIRST -Wall -Wno-unused
- #-g3 -pg -dm -dp -a
- LFLAGS1 = @LDFLAGS@ @LIBS@ $(GTKLIB) $(SDLLIB) $(X11LIBS)
- #debug
-@@ -39,17 +39,17 @@ TARGET_CPU = @target_cpu@
- CPC_O=        cpc/arnold.o cpc/asic.o cpc/audioevent.o cpc/bmp.o cpc/cpc.o \
-       cpc/crtc.o cpc/dumpym.o cpc/fdc.o cpc/fdd.o cpc/fdi.o \
-       cpc/garray.o cpc/multface.o cpc/printer.o cpc/psgplay.o \
--      cpc/psg.o cpc/render.o cpc/render5.o cpc/scrsnap.o \
-+      cpc/psg.o cpc/render.o cpc/render5.o \
-       cpc/snapshot.o cpc/sampload.o cpc/spo256.o cpc/pal.o \
-       cpc/voc.o cpc/tzxold.o cpc/wav.o cpc/westpha.o cpc/yiq.o \
-       cpc/z8536.o cpc/csw.o cpc/cassette.o cpc/amsdos.o \
-       cpc/debugger/gdebug.o cpc/debugger/breakpt.o \
-       cpc/diskimage/diskimg.o cpc/ramrom.o \
-       cpc/diskimage/dsk.o cpc/diskimage/extdsk.o \
--      cpc/diskimage/iextdsk.o cpc/diskimage/maketrk.o \
-+      cpc/diskimage/iextdsk.o \
-       cpc/z80/z80.o cpc/debugger/memdump.o \
-       cpc/riff.o cpc/snapv3.o \
--      cpc/cheatsys.o cpc/cpcdbg.o cpc/messages.o
-+      cpc/messages.o
- 
- UNIX_O= unix/main.o unix/host.o unix/global.o \
-       unix/display.o unix/display_sdl.o unix/gtkui.o unix/sdlsound.o \
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/patches/patch-ab
--- a/emulators/arnold/patches/patch-ab Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,49 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2018/04/09 15:03:22 ryoon Exp $
-
---- src/unix/main.c.orig       2004-01-04 05:10:54.000000000 +0000
-+++ src/unix/main.c
-@@ -145,7 +145,7 @@ int main(int argc, char *argv[])
- 
-       init_main(argc, argv);
-       
--      GenericInterface_Finish();
-+//    GenericInterface_Finish();
- 
- //    DirStuff_Finish();
- 
-@@ -207,7 +207,7 @@ void init_main(int argc, char *argv[]) {
-       do {
-               int this_option_optind = optind ? optind : 1;
-               int option_index = 0;
--              c = getopt_long_only (argc, argv, "",
-+              c = getopt_long (argc, argv, "",
-                       long_options, &option_index);
-               printf("c: %i %c\n", c, c);
-               switch(c) {
-@@ -281,7 +281,7 @@ void init_main(int argc, char *argv[]) {
-       /* fprintf(stderr,"%s\n",LocalDirectory); */
- 
- 
--      GenericInterface_Initialise();
-+      //GenericInterface_Initialise();
- 
-   /* initialise cpc hardware */
-       CPC_Initialise();
-@@ -297,7 +297,7 @@ void init_main(int argc, char *argv[]) {
-               ConfigCPC6128();
- 
-               if (tape) {
--                      if (!TapeImage_InsertFromFile(tape)) {
-+                      if (!GenericInterface_InsertTape(tape)) {
-                               printf(Messages[73], tape);
-                       }
-               }
-@@ -381,7 +381,7 @@ void init_main(int argc, char *argv[]) {
-               }
- 
-               if (snapshot) {
--                      if (!Snapshot_Load(snapshot)) {
-+                      if (!GenericInterface_LoadSnapshot(snapshot)) {
-                               printf(Messages[78],
-                                       snapshot);
-                       }
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/patches/patch-src_cpc_amsdos.c
--- a/emulators/arnold/patches/patch-src_cpc_amsdos.c   Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,19 +0,0 @@
-$NetBSD: patch-src_cpc_amsdos.c,v 1.1 2018/04/09 15:03:22 ryoon Exp $
-
---- src/cpc/amsdos.c.orig      2004-01-03 23:22:58.000000000 +0000
-+++ src/cpc/amsdos.c
-@@ -559,11 +559,11 @@ int AMSDOS_GetPrefixPriority(const char 
- 
-               /* default prefixes in order searched for by AMSDOS */
-               /* assign higher priority to order prefixes are used */
--              if (stricmp(pExtension,"   ")==0)
-+              if (strcmp(pExtension,"   ")==0)
-                       return 3;
--              if (stricmp(pExtension,"BAS")==0)
-+              if (strcmp(pExtension,"BAS")==0)
-                       return 2;
--              if (stricmp(pExtension,"BIN")==0)
-+              if (strcmp(pExtension,"BIN")==0)
-                       return 1;
-       }
- 
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/patches/patch-src_cpc_debugger_gdebug.c
--- a/emulators/arnold/patches/patch-src_cpc_debugger_gdebug.c  Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_cpc_debugger_gdebug.c,v 1.1 2018/04/09 15:03:22 ryoon Exp $
-
-Fix segfault on quit
-https://github.com/rofl0r/arnold/commit/08915c467477ad2316cd5a8997a3538738be8945
-
---- src/cpc/debugger/gdebug.c.orig     2004-01-03 01:02:20.000000000 +0000
-+++ src/cpc/debugger/gdebug.c
-@@ -2757,7 +2757,7 @@ void    Debug_DeleteComparisonList(DEBUG
-                 pNode = pList->Dummy.pNext;
- 
-                 /* traverse as long as node isn't the dummy node */
--                while (pNode!=&pList->Dummy)
-+                while (pNode && pNode!=&pList->Dummy)
-                 {
-                         DEBUG_CMP_LIST_NODE *pNext;
- 
diff -r ae8fcb89b990 -r b7f31cfae0a5 emulators/arnold/patches/patch-src_cpc_render5.c
--- a/emulators/arnold/patches/patch-src_cpc_render5.c  Fri Mar 06 12:23:13 2020 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,90 +0,0 @@
-$NetBSD: patch-src_cpc_render5.c,v 1.1 2018/04/09 15:03:22 ryoon Exp $
-
-Fix segfault on quit
-https://github.com/rofl0r/arnold/commit/08915c467477ad2316cd5a8997a3538738be8945
-
---- src/cpc/render5.c.orig     2004-01-02 06:00:40.000000000 +0000
-+++ src/cpc/render5.c
-@@ -57,14 +57,16 @@ static int Render_CPCRenderHeight, Rende
- static int Render_CPCXOffset, Render_CPCYOffset;
- 
- 
--static void   Render_SetColourNULL(RGBCOLOUR *pColour,/*int Red, int Green, int Blue,*/ int Index);
-+static void   Render_SetColourNULL(const RGBCOLOUR *pColour,/*int Red, 
-+int Green, int Blue,*/ int Index);
- static void Render_PutDataWordNULL(int, unsigned long, int);
- static void Render_PutSyncNULL(int, int);
- static void Render_PutBorderNULL(int, int);
- static void Render_PutDataWordPLUSNULL(int HorizontalCount,unsigned long GraphicsData, int Line, unsigned long Mask, int *pPixels);
- 
- static void (*pRender_DumpScreen)(void) = NULL;
--static void (*pRender_SetColour)(RGBCOLOUR *pColour,/*int, int, int,*/ int)=Render_SetColourNULL;
-+static void (*pRender_SetColour)(const RGBCOLOUR *pColour,/*int, int, 
-+int,*/ int)=Render_SetColourNULL;
- static void (*pRender_PutDataWord)(int, unsigned long, int)=Render_PutDataWordNULL;
- static void (*pRender_PutSync)(int, int)=Render_PutSyncNULL;
- static void (*pRender_PutBorder)(int, int)=Render_PutBorderNULL;
-@@ -95,7 +97,8 @@ static PALETTE_ENTRY_RGB888    UnConvert
- static unsigned long    ConvertedColourTable[32];
- 
- /* TrueColour RGB version of set colour */
--static void Render_TrueColourRGB_SetColour(RGBCOLOUR *pColour, /*int, int, int,*/int);
-+static void Render_TrueColourRGB_SetColour(const RGBCOLOUR *pColour, 
-+/*int, int, int,*/int);
- static void Render_TrueColourRGB_Setup(void);
- 
- /* **** PALETTE stuff **** */
-@@ -115,7 +118,8 @@ static PALETTE_ENTRY    CPCPalette[256];
- /* palette we build up */
- 
- /* Paletted version of set colour */
--static void Render_Paletted_SetColour(RGBCOLOUR *pColour, /*int,int,int,*/int);



Home | Main Index | Thread Index | Old Index