vice, bump version, disable for now (#3706)

This commit is contained in:
Schrijvers Luc
2019-11-23 10:06:59 +01:00
committed by GitHub
parent edcb8176d2
commit fb9e9fcf5f
2 changed files with 209 additions and 0 deletions

View File

@@ -0,0 +1,50 @@
From 9fda6bfa915d55a7b1b584690eb5168c81389248 Mon Sep 17 00:00:00 2001
From: begasus <begasus@gmail.com>
Date: Thu, 21 Mar 2019 17:03:52 +0100
Subject: fix build
diff --git a/src/arch/sdl/archdep_beos.h b/src/arch/sdl/archdep_beos.h
index 4e64ea4..7ede0ec 100644
--- a/src/arch/sdl/archdep_beos.h
+++ b/src/arch/sdl/archdep_beos.h
@@ -109,6 +109,23 @@
#define archdep_signals_pipe_set()
#define archdep_signals_pipe_unset()
+#ifdef MACOSX_SUPPORT
+#define MAKE_SO_NAME_VERSION_PROTO(name, version) "lib" #name "." #version ".dylib"
+#else
+#define MAKE_SO_NAME_VERSION_PROTO(name, version) "lib" #name ".so." #version
+#endif
+
+/* add second level macro to allow expansion and stringification */
+#define ARCHDEP_MAKE_SO_NAME_VERSION(n, v) MAKE_SO_NAME_VERSION_PROTO(n, v)
+
+#ifdef MACOSX_SUPPORT
+#define ARCHDEP_OPENCBM_SO_NAME "libopencbm.dylib"
+#define ARCHDEP_LAME_SO_NAME "libmp3lame.dylib"
+#else
+#define ARCHDEP_OPENCBM_SO_NAME "libopencbm.so"
+#define ARCHDEP_LAME_SO_NAME "libmp3lame.so"
+#endif
+
/* what to use to return an error when a socket error happens */
#define ARCHDEP_SOCKET_ERROR errno
diff --git a/src/arch/sdl/dynlib.c b/src/arch/sdl/dynlib.c
index 47e7cab..4b7b959 100644
--- a/src/arch/sdl/dynlib.c
+++ b/src/arch/sdl/dynlib.c
@@ -28,7 +28,7 @@
#ifdef HAVE_DYNLIB_SUPPORT
-#ifdef UNIX_COMPILE
+#if defined UNIX_COMPILE || defined __HAIKU__
#include "dynlib-unix.c"
#endif
--
2.19.1

View File

@@ -0,0 +1,159 @@
SUMMARY="An emulator for the Commodore64 computers"
DESCRIPTION="VICE is a program that runs on a Unix, MS-DOS, Win32, OS/2, \
BeOS, Haiku, QNX 4.x, QNX 6.x, Amiga, Syllable or Mac OS X machine and \
executes programs intended for the old 8-bit computers. The current version \
emulates the C64, the C64DTV, the C128, the VIC20, practically all PET \
models, the PLUS4 and the CBM-II (aka C610/C510). An extra emulator is \
provided for C64 expanded with the CMD SuperCPU."
HOMEPAGE="http://vice-emu.sourceforge.net/"
COPYRIGHT="2005-2018 Marco van den Heuvel
2007-2018 Fabrizio Gennari
2009-2018 Groepaz
2010-2018 Olaf Seibert
2011-2018 Marcus Sutton
2011-2018 Kajtar Zsolt
2016-2018 AreaScout
2016-2018 Bas Wassink
2017-2018 Michael C. Martin
1999-2017 Martin Pottendorfer
2011-2016 Stefan Haubenthal
2015-2016 BSzili
1999-2016 Andreas Matthies
2007-2015 Daniel Kahlin
2009-2015 Errol Smith
2012-2014 Benjamin 'BeRo' Rosseaux
2011-2014 Ulrich Schulz
2011-2014 Thomas Giesel
2009-2014 Ingo Korb
2008-2014 Antti S. Lankila
2006-2014 Christian Vogelgsang
1998-2014 Dag Lem
2000-2011 Spiro Trikaliotis
2007-2011 Hannu Nuotio
1998-2010 Andreas Boose
1998-2010 Tibor Biczo
2007-2010 M. Kiesel
1999-2007 Andreas Dehmel
2003-2005 David Hansel
2000-2004 Markus Brenner
1999-2004 Thomas Bretz
1997-2001 Daniel Sladic
1996-2001 André Fachat
1996-1999 Ettore Perazzoli
1993-1994, 1997-1999 Teemu Rantanen
1993-1996 Jouko Valta
1993-1994 Jarkko Sonninen
"
LICENSE="GNU GPL v2"
REVISION="1"
SOURCE_URI="https://downloads.sourceforge.net/vice-emu/vice-$portVersion.tar.gz"
CHECKSUM_SHA256="1a55b38cc988165b077808c07c52a779d181270b28c14b5c9abf4e569137431d"
PATCHES="vice-$portVersion.patchset"
ARCHITECTURES="!x86_gcc2 ?x86_64"
SECONDARY_ARCHITECTURES="?x86"
commandSuffix=$secondaryArchSuffix
commandBinDir=$binDir
if [ "$targetArchitecture" = x86_gcc2 ]; then
commandSuffix=
commandBinDir=$prefix/bin
fi
GLOBAL_WRITABLE_FILES="
settings/VICE directory keep-old
"
PROVIDES="
vice$secondaryArchSuffix = $portVersion
cmd:c1541$commandSuffix
cmd:cartconv$commandSuffix
cmd:petcat$commandSuffix
cmd:vsid$commandSuffix
cmd:x128$commandSuffix
cmd:x64$commandSuffix
cmd:x64dtv$commandSuffix
cmd:x64sc$commandSuffix
cmd:xcbm2$commandSuffix
cmd:xcbm5x0$commandSuffix
cmd:xpet$commandSuffix
cmd:xplus4$commandSuffix
cmd:xscpu64$commandSuffix
cmd:xvic$commandSuffix
"
REQUIRES="
haiku$secondaryArchSuffix
lib:libFLAC$secondaryArchSuffix
lib:libgif$secondaryArchSuffix
lib:libglib_2.0$secondaryArchSuffix
lib:libiconv$secondaryArchSuffix
lib:libjpeg$secondaryArchSuffix
lib:libmp3lame$secondaryArchSuffix
lib:libmpg123$secondaryArchSuffix
lib:libogg$secondaryArchSuffix
lib:libpng16$secondaryArchSuffix
lib:libSDL2_2.0$secondaryArchSuffix
lib:libvorbisfile$secondaryArchSuffix
lib:libz$secondaryArchSuffix
"
BUILD_REQUIRES="
haiku${secondaryArchSuffix}_devel
devel:libFLAC$secondaryArchSuffix
devel:libgif$secondaryArchSuffix
devel:libglib_2.0$secondaryArchSuffix
devel:libiconv$secondaryArchSuffix
devel:libjpeg$secondaryArchSuffix
devel:libmp3lame$secondaryArchSuffix
devel:libmpg123$secondaryArchSuffix
devel:libpng16$secondaryArchSuffix
devel:libSDL2_2.0$secondaryArchSuffix
devel:libvorbisfile$secondaryArchSuffix
devel:libz$secondaryArchSuffix
"
BUILD_PREREQUIRES="
cmd:aclocal
cmd:autoconf
cmd:autoheader
cmd:automake
cmd:awk
cmd:bison
cmd:find
cmd:flex
cmd:gcc$secondaryArchSuffix
cmd:ld$secondaryArchSuffix
cmd:make
cmd:makeinfo
cmd:pkg_config$secondaryArchSuffix
cmd:xa
"
BUILD()
{
./autogen.sh
runConfigure --omit-dirs sbinDir ./configure \
--sbindir=$commandBinDir
make $jobArgs
}
INSTALL()
{
make bindist
mkdir -p $settingsDir/VICE $commandBinDir $docDir
mv $sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/html \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/doc \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/Readme-SDL2.txt \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/README \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/NEWS \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/FEEDBACK \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/COPYING \
$docDir
mv $sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/x* \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/vsid \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/petcat \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/cartconv \
$sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/c1541 \
$commandBinDir/
mv $sourceDir/SDL2VICE-$effectiveTargetArchitecture-haiku-3.3/* $settingsDir/VICE
}