[pkgsrc/trunk]: pkgsrc/emulators/x16-emulator Update to x16-emulator r41.

To: pkgsrc-changes-hg%NetBSD.org@localhost
Subject: [pkgsrc/trunk]: pkgsrc/emulators/x16-emulator Update to x16-emulator r41.
From: thorpej <thorpej%pkgsrc.org@localhost>
Date: Sun, 07 Aug 2022 18:55:33 +0000
details:   https://anonhg.NetBSD.org/pkgsrc/rev/098735e85d6f
branches:  trunk
changeset: 382880:098735e85d6f
user:      thorpej <thorpej%pkgsrc.org@localhost>
date:      Sun Aug 07 17:38:08 2022 +0000

description:
Update to x16-emulator r41.

diffstat:

 emulators/x16-emulator/Makefile                       |   9 ++++---
 emulators/x16-emulator/PLIST                          |   3 +-
 emulators/x16-emulator/distinfo                       |  14 ++++++------
 emulators/x16-emulator/patches/patch-Makefile         |  20 ++++++++--------
 emulators/x16-emulator/patches/patch-main.c           |  22 -------------------
 emulators/x16-emulator/patches/patch-rendertext.c     |  13 -----------
 emulators/x16-emulator/patches/patch-src_main.c       |  22 +++++++++++++++++++
 emulators/x16-emulator/patches/patch-src_rendertext.c |  13 +++++++++++
 8 files changed, 59 insertions(+), 57 deletions(-)

diffs (183 lines):

diff -r 5fb1e061dda7 -r 098735e85d6f emulators/x16-emulator/Makefile
--- a/emulators/x16-emulator/Makefile   Sun Aug 07 17:36:52 2022 +0000
+++ b/emulators/x16-emulator/Makefile   Sun Aug 07 17:38:08 2022 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2022/03/28 10:53:06 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2022/08/07 17:38:08 thorpej Exp $
 
-DISTNAME=      x16-emulator-35
-PKGREVISION=   7
+DISTNAME=      x16-emulator-41
 CATEGORIES=    emulators
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=commanderx16/}
 GITHUB_PROJECT=        x16-emulator
@@ -12,15 +11,17 @@
 COMMENT=       Emulator for the Commander X16 computer system
 LICENSE=       2-clause-bsd
 
-DEPENDS+=      x16-rom-35{,nb*}:../../emulators/x16-rom
+DEPENDS+=      x16-rom-41{,nb*}:../../emulators/x16-rom
 MAKE_ENV+=     ROM_RELATIVE_PATH=../share/x16/
 
 USE_TOOLS+=    gmake
 
 INSTALLATION_DIRS+= bin
+INSTALLATION_DIRS+= share/x16
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/x16emu ${DESTDIR}${PREFIX}/bin
+       ${INSTALL_DATA} ${WRKSRC}/sdcard.img.zip ${DESTDIR}${PREFIX}/share/x16
 
 .include "../../devel/SDL2/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff -r 5fb1e061dda7 -r 098735e85d6f emulators/x16-emulator/PLIST
--- a/emulators/x16-emulator/PLIST      Sun Aug 07 17:36:52 2022 +0000
+++ b/emulators/x16-emulator/PLIST      Sun Aug 07 17:38:08 2022 +0000
@@ -1,2 +1,3 @@
-@comment $NetBSD: PLIST,v 1.1 2019/12/28 19:32:18 thorpej Exp $
+@comment $NetBSD: PLIST,v 1.2 2022/08/07 17:38:08 thorpej Exp $
 bin/x16emu
+share/x16/sdcard.img.zip
diff -r 5fb1e061dda7 -r 098735e85d6f emulators/x16-emulator/distinfo
--- a/emulators/x16-emulator/distinfo   Sun Aug 07 17:36:52 2022 +0000
+++ b/emulators/x16-emulator/distinfo   Sun Aug 07 17:38:08 2022 +0000
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.5 2021/10/26 10:24:15 nia Exp $
+$NetBSD: distinfo,v 1.6 2022/08/07 17:38:08 thorpej Exp $
 
-BLAKE2s (x16-emulator-35.tar.gz) = ce9acf3b456fa9761db64da16ac0575a19d9edd2dfc9545f479971c01e524614
-SHA512 (x16-emulator-35.tar.gz) = ec014b6ad13a7631d533b665c7544689629167261ffe0f0941c9381ea8cc6b3803a27deac0d76de7aa2fdae3dc438d8f0abbabe9f55ed0221e7fa0f0d39fbf3c
-Size (x16-emulator-35.tar.gz) = 123338 bytes
-SHA1 (patch-Makefile) = 22c6d74e46c085e361900af3f8931ebd842f87c9
-SHA1 (patch-main.c) = db0721d145546dd60ed40b8e9151cd26493e07ad
-SHA1 (patch-rendertext.c) = 81a7e50e7598827addf9aca1f05a22869f2ddeeb
+BLAKE2s (x16-emulator-41.tar.gz) = 095b9dd13b544d878dab791bb2e4ffae82ba582e72bd7d8b618b2181eceb558c
+SHA512 (x16-emulator-41.tar.gz) = 88b75589149e3c308e66fa45c2c07b497c97cea11b9c3fc9635f3e27f8f11ea47fcb55cf9089ac720742b7c96288c2286d120b07ca77879d08153ffbc7870fa1
+Size (x16-emulator-41.tar.gz) = 182076 bytes
+SHA1 (patch-Makefile) = e5029a2956a79e808d8ca9197d5db330930fa7e3
+SHA1 (patch-src_main.c) = 2d037b3b897eb7767ead3968eeb92f3fff4ac563
+SHA1 (patch-src_rendertext.c) = 2474af4dff454ddd6d4ca2c9abc4eba963c3d51e
diff -r 5fb1e061dda7 -r 098735e85d6f emulators/x16-emulator/patches/patch-Makefile
--- a/emulators/x16-emulator/patches/patch-Makefile     Sun Aug 07 17:36:52 2022 +0000
+++ b/emulators/x16-emulator/patches/patch-Makefile     Sun Aug 07 17:38:08 2022 +0000
@@ -1,24 +1,24 @@
-$NetBSD: patch-Makefile,v 1.2 2021/01/16 12:20:00 nia Exp $
+$NetBSD: patch-Makefile,v 1.3 2022/08/07 17:38:08 thorpej Exp $
 
 Honor CFLAGS/LDFLAGS.
 
 Allow the default location of the X16 ROM to be overridden.
 
---- Makefile.orig      2019-12-20 20:00:49.000000000 +0000
-+++ Makefile
-@@ -10,8 +10,8 @@ else
+--- Makefile.orig      2022-05-09 06:32:54.000000000 +0000
++++ Makefile   2022-08-07 14:43:29.476121731 +0000
+@@ -20,8 +20,8 @@ else
        SDL2CONFIG=sdl2-config
  endif
  
--CFLAGS=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Iextern/include -Iextern/src
+-CFLAGS=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Isrc/extern/include -Isrc/extern/src
 -LDFLAGS=$(shell $(SDL2CONFIG) --libs) -lm
-+CFLAGS+=-std=c99 -Wall $(shell $(SDL2CONFIG) --cflags) -Iextern/include -Iextern/src
++CFLAGS+=-std=c99 -O3 -Wall -Werror -g $(shell $(SDL2CONFIG) --cflags) -Isrc/extern/include -Isrc/extern/src
 +LDFLAGS+=$(shell $(SDL2CONFIG) --libs) -lm
  
- OUTPUT=x16emu
- 
-@@ -48,6 +48,9 @@ ifneq ("$(wildcard ./rom_labels.h)","")
- HEADERS+=rom_labels.h
+ ODIR = build
+ SDIR = src
+@@ -66,6 +66,9 @@ ifneq ("$(wildcard ./src/rom_labels.h)",
+ HEADERS+=src/rom_labels.h
  endif
  
 +ifdef ROM_RELATIVE_PATH
diff -r 5fb1e061dda7 -r 098735e85d6f emulators/x16-emulator/patches/patch-main.c
--- a/emulators/x16-emulator/patches/patch-main.c       Sun Aug 07 17:36:52 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,22 +0,0 @@
-$NetBSD: patch-main.c,v 1.1 2019/12/28 19:32:18 thorpej Exp $
-
-Allow the default location of the X16 ROM to be overridden.
-
---- main.c.orig        2019-12-28 19:00:35.000000000 +0000
-+++ main.c
-@@ -436,9 +436,13 @@ main(int argc, char **argv)
- 
-       char *base_path = SDL_GetBasePath();
- 
--      // This causes the emulator to load ROM data from the executable's directory when
--      // no ROM file is specified on the command line.
-+      // This causes the emulator to load ROM data from the executable's
-+      // directory (or somewhere nearby if ROM_RELATIVE_PATH is specified)
-+      // when no ROM file is specified on the command line.
-       memcpy(rom_path, base_path, strlen(base_path) + 1);
-+#ifdef ROM_RELATIVE_PATH
-+      strncpy(rom_path + strlen(rom_path), ROM_RELATIVE_PATH, PATH_MAX - strlen(rom_path));
-+#endif
-       strncpy(rom_path + strlen(rom_path), rom_filename, PATH_MAX - strlen(rom_path));
- 
-       argc--;
diff -r 5fb1e061dda7 -r 098735e85d6f emulators/x16-emulator/patches/patch-rendertext.c
--- a/emulators/x16-emulator/patches/patch-rendertext.c Sun Aug 07 17:36:52 2022 +0000
+++ /dev/null   Thu Jan 01 00:00:00 1970 +0000
@@ -1,13 +0,0 @@
-$NetBSD: patch-rendertext.c,v 1.1 2020/04/18 22:04:18 joerg Exp $
-
---- rendertext.c.orig  2020-04-17 21:39:18.771500194 +0000
-+++ rendertext.c
-@@ -22,7 +22,7 @@ int textureInitialized = 0;
- //
- char *ltrim(char *s)
- {
--      while(isspace(*s)) s++;
-+      while(isspace((unsigned char)*s)) s++;
-       return s;
- }
- 
diff -r 5fb1e061dda7 -r 098735e85d6f emulators/x16-emulator/patches/patch-src_main.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/x16-emulator/patches/patch-src_main.c   Sun Aug 07 17:38:08 2022 +0000
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_main.c,v 1.1 2022/08/07 17:38:08 thorpej Exp $
+
+Allow the default location of the X16 ROM to be overridden.
+
+--- src/main.c.orig    2022-08-07 02:13:20.524132103 +0000
++++ src/main.c 2022-08-07 02:17:36.561192332 +0000
+@@ -491,9 +491,13 @@ main(int argc, char **argv)
+ 
+       char *base_path = SDL_GetBasePath();
+ 
+-      // This causes the emulator to load ROM data from the executable's directory when
+-      // no ROM file is specified on the command line.
++      // This causes the emulator to load ROM data from the executable's
++      // directory ((or somewhere nearby if ROM_RELATIVE_PATH is specified)
++      // when no ROM file is specified on the command line.
+       memcpy(rom_path, base_path, strlen(base_path) + 1);
++#ifdef ROM_RELATIVE_PATH
++      strncpy(rom_path + strlen(rom_path), ROM_RELATIVE_PATH, PATH_MAX - strlen(rom_path));
++#endif
+       strncpy(rom_path + strlen(rom_path), rom_filename, PATH_MAX - strlen(rom_path));
+ 
+       argc--;
diff -r 5fb1e061dda7 -r 098735e85d6f emulators/x16-emulator/patches/patch-src_rendertext.c
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/emulators/x16-emulator/patches/patch-src_rendertext.c     Sun Aug 07 17:38:08 2022 +0000
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_rendertext.c,v 1.1 2022/08/07 17:38:08 thorpej Exp $
+
+--- src/rendertext.c.orig      2022-08-07 02:20:35.066620319 +0000
++++ src/rendertext.c   2022-08-07 02:22:17.485680282 +0000
+@@ -23,7 +23,7 @@ int textureInitialized = 0;
+ //
+ char *ltrim(char *s)
+ {
+-      while(isspace(*s)) s++;
++      while(isspace((unsigned char)*s)) s++;
+       return s;
+ }
+
Prev by Date: [pkgsrc/trunk]: pkgsrc/doc Updated emulators/x16-rom to 41
Next by Date: [pkgsrc/trunk]: pkgsrc/www/firefox102 firefox102: Sync fixes with www/firefox
Previous by Thread: [pkgsrc/trunk]: pkgsrc/doc Updated emulators/x16-rom to 41
Next by Thread: [pkgsrc/trunk]: pkgsrc/www/firefox102 firefox102: Sync fixes with www/firefox
Indexes:
Home | Main Index | Thread Index | Old Index