pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
CVS commit: pkgsrc/emulators/x16-emulator
Module Name: pkgsrc
Committed By: thorpej
Date: Tue May 16 06:01:45 UTC 2023
Modified Files:
pkgsrc/emulators/x16-emulator: Makefile distinfo
Added Files:
pkgsrc/emulators/x16-emulator/patches: patch-src_debugger.c
patch-src_glue.h patch-src_serial.c
Log Message:
Make this build with "Apple clang version 14.0.3 (clang-1403.0.22.14.1)"
(the compiler included with Xcode 14.3).
To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/emulators/x16-emulator/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/emulators/x16-emulator/distinfo
cvs rdiff -u -r0 -r1.1 \
pkgsrc/emulators/x16-emulator/patches/patch-src_debugger.c \
pkgsrc/emulators/x16-emulator/patches/patch-src_glue.h \
pkgsrc/emulators/x16-emulator/patches/patch-src_serial.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: pkgsrc/emulators/x16-emulator/Makefile
diff -u pkgsrc/emulators/x16-emulator/Makefile:1.12 pkgsrc/emulators/x16-emulator/Makefile:1.13
--- pkgsrc/emulators/x16-emulator/Makefile:1.12 Sat May 6 19:09:16 2023
+++ pkgsrc/emulators/x16-emulator/Makefile Tue May 16 06:01:45 2023
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2023/05/06 19:09:16 ryoon Exp $
+# $NetBSD: Makefile,v 1.13 2023/05/16 06:01:45 thorpej Exp $
DISTNAME= x16-emulator-41
-PKGREVISION= 3
+PKGREVISION= 4
CATEGORIES= emulators
MASTER_SITES= ${MASTER_SITE_GITHUB:=commanderx16/}
GITHUB_PROJECT= x16-emulator
Index: pkgsrc/emulators/x16-emulator/distinfo
diff -u pkgsrc/emulators/x16-emulator/distinfo:1.6 pkgsrc/emulators/x16-emulator/distinfo:1.7
--- pkgsrc/emulators/x16-emulator/distinfo:1.6 Sun Aug 7 17:38:08 2022
+++ pkgsrc/emulators/x16-emulator/distinfo Tue May 16 06:01:45 2023
@@ -1,8 +1,11 @@
-$NetBSD: distinfo,v 1.6 2022/08/07 17:38:08 thorpej Exp $
+$NetBSD: distinfo,v 1.7 2023/05/16 06:01:45 thorpej Exp $
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_debugger.c) = ab309e1ece277a3c0bb6c1a3fc230efbc95c325e
+SHA1 (patch-src_glue.h) = 377c592090c9853d604953896480ea4d6526bf47
SHA1 (patch-src_main.c) = 2d037b3b897eb7767ead3968eeb92f3fff4ac563
SHA1 (patch-src_rendertext.c) = 2474af4dff454ddd6d4ca2c9abc4eba963c3d51e
+SHA1 (patch-src_serial.c) = fc80458efe6fd3b9f78071e31d44bada1788219b
Added files:
Index: pkgsrc/emulators/x16-emulator/patches/patch-src_debugger.c
diff -u /dev/null pkgsrc/emulators/x16-emulator/patches/patch-src_debugger.c:1.1
--- /dev/null Tue May 16 06:01:45 2023
+++ pkgsrc/emulators/x16-emulator/patches/patch-src_debugger.c Tue May 16 06:01:45 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_debugger.c,v 1.1 2023/05/16 06:01:45 thorpej Exp $
+
+Squelch "passing arguments to 'DEBUGRenderCmdLine' without a prototype is
+deprecated in all versions of C and is not supported in C2x" error
+thrown by Apple clang version 14.0.3 (clang-1403.0.22.14.1) (Xcode 14.3).
+
+--- src/debugger.c.orig 2023-05-16 05:55:48
++++ src/debugger.c 2023-05-16 05:56:11
+@@ -36,7 +36,7 @@ static void DEBUGRenderCmdLine();
+ static void DEBUGRenderVRAM(int y, int data);
+ static void DEBUGRenderCode(int lines,int initialPC);
+ static void DEBUGRenderStack(int bytesCount);
+-static void DEBUGRenderCmdLine();
++static void DEBUGRenderCmdLine(int x, int width, int height);
+ static bool DEBUGBuildCmdLine(SDL_Keycode key);
+ static void DEBUGExecCmd();
+
Index: pkgsrc/emulators/x16-emulator/patches/patch-src_glue.h
diff -u /dev/null pkgsrc/emulators/x16-emulator/patches/patch-src_glue.h:1.1
--- /dev/null Tue May 16 06:01:45 2023
+++ pkgsrc/emulators/x16-emulator/patches/patch-src_glue.h Tue May 16 06:01:45 2023
@@ -0,0 +1,17 @@
+$NetBSD: patch-src_glue.h,v 1.1 2023/05/16 06:01:45 thorpej Exp $
+
+Squelch "passing arguments to 'machine_paste' without a prototype is
+deprecated in all versions of C and is not supported in C2x" error
+thrown by Apple clang version 14.0.3 (clang-1403.0.22.14.1) (Xcode 14.3).
+
+--- src/glue.h.orig 2023-05-16 05:38:54
++++ src/glue.h 2023-05-16 05:39:19
+@@ -63,7 +63,7 @@ extern void machine_paste();
+
+ extern void machine_dump();
+ extern void machine_reset();
+-extern void machine_paste();
++extern void machine_paste(char *);
+ extern void machine_toggle_warp();
+ extern void init_audio();
+
Index: pkgsrc/emulators/x16-emulator/patches/patch-src_serial.c
diff -u /dev/null pkgsrc/emulators/x16-emulator/patches/patch-src_serial.c:1.1
--- /dev/null Tue May 16 06:01:45 2023
+++ pkgsrc/emulators/x16-emulator/patches/patch-src_serial.c Tue May 16 06:01:45 2023
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_serial.c,v 1.1 2023/05/16 06:01:45 thorpej Exp $
+
+Squelch "passing arguments to 'xxxxx' without a prototype is
+deprecated in all versions of C and is not supported in C2x" error
+thrown by Apple clang version 14.0.3 (clang-1403.0.22.14.1) (Xcode 14.3).
+
+In this instance, passing the argument is incorrect, since UNLSN() and
+UNTLK() don't actually take one.
+
+--- src/serial.c.orig 2022-05-09 06:32:54
++++ src/serial.c 2023-05-16 05:53:45
+@@ -203,7 +203,7 @@ serial_step(int clocks)
+ switch (byte & 0x60) {
+ case 0x20:
+ if (byte == 0x3f) {
+- int ret = UNLSN(byte);
++ int ret = UNLSN();
+ fnf = ret == 2;
+ listening = false;
+ } else {
+@@ -213,7 +213,7 @@ serial_step(int clocks)
+ break;
+ case 0x40:
+ if (byte == 0x5f) {
+- UNTLK(byte);
++ UNTLK();
+ talking = false;
+ } else {
+ TALK(byte);
Home |
Main Index |
Thread Index |
Old Index