vice: upgrade 3.4 -> 3.5
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
This commit is contained in:
@@ -1,43 +0,0 @@
|
|||||||
From 7570ff1980acb288e11ae91221b89bfdc5b396d5 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
|
||||||
Date: Mon, 7 Sep 2020 21:06:16 +0200
|
|
||||||
Subject: [PATCH] use extern for the declarations
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37520/]
|
|
||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
||||||
---
|
|
||||||
src/arch/gtk3/widgets/base/carthelpers.h | 14 +++++++-------
|
|
||||||
1 file changed, 7 insertions(+), 7 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/arch/gtk3/widgets/base/carthelpers.h b/src/arch/gtk3/widgets/base/carthelpers.h
|
|
||||||
index 1de1d40..cfee67a 100644
|
|
||||||
--- a/src/arch/gtk3/widgets/base/carthelpers.h
|
|
||||||
+++ b/src/arch/gtk3/widgets/base/carthelpers.h
|
|
||||||
@@ -31,13 +31,13 @@
|
|
||||||
#include "vice.h"
|
|
||||||
#include <gtk/gtk.h>
|
|
||||||
|
|
||||||
-int (*carthelpers_save_func)(int type, const char *filename);
|
|
||||||
-int (*carthelpers_flush_func)(int type);
|
|
||||||
-int (*carthelpers_is_enabled_func)(int type);
|
|
||||||
-int (*carthelpers_enable_func)(int type);
|
|
||||||
-int (*carthelpers_disable_func)(int type);
|
|
||||||
-int (*carthelpers_can_save_func)(int type);
|
|
||||||
-int (*carthelpers_can_flush_func)(int type);
|
|
||||||
+extern int (*carthelpers_save_func)(int type, const char *filename);
|
|
||||||
+extern int (*carthelpers_flush_func)(int type);
|
|
||||||
+extern int (*carthelpers_is_enabled_func)(int type);
|
|
||||||
+extern int (*carthelpers_enable_func)(int type);
|
|
||||||
+extern int (*carthelpers_disable_func)(int type);
|
|
||||||
+extern int (*carthelpers_can_save_func)(int type);
|
|
||||||
+extern int (*carthelpers_can_flush_func)(int type);
|
|
||||||
|
|
||||||
|
|
||||||
void carthelpers_set_functions(
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
||||||
@@ -1,46 +0,0 @@
|
|||||||
From 1936dac13d3019ecb2fc07fb7b61106f5164cac4 Mon Sep 17 00:00:00 2001
|
|
||||||
From: =?UTF-8?q?Andreas=20M=C3=BCller?= <schnitzeltony@gmail.com>
|
|
||||||
Date: Mon, 7 Sep 2020 21:22:32 +0200
|
|
||||||
Subject: [PATCH] two more fixes to fix -fno-common compiliation, patch #217
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Type: text/plain; charset=UTF-8
|
|
||||||
Content-Transfer-Encoding: 8bit
|
|
||||||
|
|
||||||
Upstream-Status: Accepted[https://sourceforge.net/p/vice-emu/code/37527/]
|
|
||||||
|
|
||||||
Signed-off-by: Andreas Müller <schnitzeltony@gmail.com>
|
|
||||||
---
|
|
||||||
src/c128/z80.c | 3 ++-
|
|
||||||
src/rs232drv/rs232.h | 2 +-
|
|
||||||
2 files changed, 3 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/c128/z80.c b/src/c128/z80.c
|
|
||||||
index 3a7eba3..f53f55d 100644
|
|
||||||
--- a/src/c128/z80.c
|
|
||||||
+++ b/src/c128/z80.c
|
|
||||||
@@ -444,7 +444,8 @@ static const uint8_t SZP[256] = {
|
|
||||||
|
|
||||||
/* ------------------------------------------------------------------------- */
|
|
||||||
|
|
||||||
-z80_regs_t z80_regs;
|
|
||||||
+/* This struct variable is exported by ../c64/cart/cpmcart.c */
|
|
||||||
+/* z80_regs_t z80_regs; */
|
|
||||||
|
|
||||||
static void import_registers(void)
|
|
||||||
{
|
|
||||||
diff --git a/src/rs232drv/rs232.h b/src/rs232drv/rs232.h
|
|
||||||
index 1c5e6ff..e21fbaf 100644
|
|
||||||
--- a/src/rs232drv/rs232.h
|
|
||||||
+++ b/src/rs232drv/rs232.h
|
|
||||||
@@ -78,7 +78,7 @@ extern int rs232_cmdline_options_init(void);
|
|
||||||
#define RS232_NUM_DEVICES 4
|
|
||||||
|
|
||||||
extern char *rs232_devfile[RS232_NUM_DEVICES];
|
|
||||||
-int rs232_useip232[RS232_NUM_DEVICES];
|
|
||||||
+extern int rs232_useip232[RS232_NUM_DEVICES];
|
|
||||||
|
|
||||||
/* the "ip232" protocol used by tcpser
|
|
||||||
|
|
||||||
--
|
|
||||||
2.26.2
|
|
||||||
|
|
||||||
@@ -9,8 +9,6 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=c93c0550bd3173f4504b2cbd8991e50b"
|
|||||||
SRC_URI = " \
|
SRC_URI = " \
|
||||||
${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
|
${SOURCEFORGE_MIRROR}/vice-emu/${BPN}-${PV}.tar.gz \
|
||||||
file://0001-fix-autoreconfig.patch \
|
file://0001-fix-autoreconfig.patch \
|
||||||
file://0002-use-extern-for-the-declarations.patch \
|
|
||||||
file://0003-two-more-fixes-to-fix-fno-common-compiliation-patch-.patch \
|
|
||||||
file://c64_16.png \
|
file://c64_16.png \
|
||||||
file://c64_32.png \
|
file://c64_32.png \
|
||||||
file://c64_48.png \
|
file://c64_48.png \
|
||||||
@@ -18,8 +16,7 @@ SRC_URI = " \
|
|||||||
file://vice_64dtv.desktop \
|
file://vice_64dtv.desktop \
|
||||||
file://vice_64sc.desktop \
|
file://vice_64sc.desktop \
|
||||||
"
|
"
|
||||||
SRC_URI[md5sum] = "24d83f692910f5d87de19857e8095f0b"
|
SRC_URI[sha256sum] = "56b978faaeb8b2896032bd604d03c3501002187eef1ca58ceced40f11a65dc0e"
|
||||||
SRC_URI[sha256sum] = "4bd00c1c63d38cd1fe01b90032834b52f774bc29e4b67eeb1e525b14fee07aeb"
|
|
||||||
|
|
||||||
inherit autotools pkgconfig gtk-icon-cache features_check
|
inherit autotools pkgconfig gtk-icon-cache features_check
|
||||||
|
|
||||||
@@ -30,6 +27,7 @@ DEPENDS = " \
|
|||||||
bdftopcf-native \
|
bdftopcf-native \
|
||||||
mkfontdir-native \
|
mkfontdir-native \
|
||||||
mkfontscale-native \
|
mkfontscale-native \
|
||||||
|
dos2unix-native \
|
||||||
xa-native \
|
xa-native \
|
||||||
bison-native \
|
bison-native \
|
||||||
glew \
|
glew \
|
||||||
@@ -54,6 +52,7 @@ EXTRA_OECONF = " \
|
|||||||
--enable-parsid \
|
--enable-parsid \
|
||||||
--enable-native-gtk3ui \
|
--enable-native-gtk3ui \
|
||||||
--without-oss \
|
--without-oss \
|
||||||
|
--disable-pdf-docs \
|
||||||
--libdir=${libdir} \
|
--libdir=${libdir} \
|
||||||
--enable-x64 \
|
--enable-x64 \
|
||||||
"
|
"
|
||||||
Reference in New Issue
Block a user