haikuprojects/haikuports
1
0
Fork 0
mirror of https://github.com/yann64/haikuports.git synced 2026-04-22 11:40:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

DOSBox: bump version

Browse Source
This commit is contained in:
Sergei Reznikov
2018-11-20 18:05:30 +03:00
parent 55c33cb3ed
commit 147340e87b
2 changed files with 27 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
games-emulation/dosbox/dosbox-0.74.recipe
View File

@@ -10,12 +10,14 @@ You can re-live the good old days with the help of DOSBox, it can run plenty \
of the old classics that don't run on your new computer!
DOSBox is totally free of charge and OpenSource."
HOMEPAGE="https://www.dosbox.com/"
COPYRIGHT="2002-2013 The DosBox Team"
COPYRIGHT="2002-2018 The DOSBox Team"
LICENSE="GNU GPL v2"
REVISION="6"
REVISION="7"
portVersion="0.74-2"
SOURCE_URI="http://sourceforge.net/projects/dosbox/files/dosbox/$portVersion/dosbox-$portVersion.tar.gz"
CHECKSUM_SHA256="13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05"
PATCHES="dosbox-$portVersion.patchset"
SOURCE_DIR="dosbox-$portVersion"
CHECKSUM_SHA256="7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf"
PATCHES="dosbox-0.74.patchset"
ADDITIONAL_FILES="dosbox.rdef"
ARCHITECTURES="!x86_gcc2 x86_64"
@@ -75,8 +77,11 @@ INSTALL()
{
make install
strip $binDir/dosbox
mkdir $appsDir
mv $binDir/dosbox $appsDir/DOSBox
rm -rf $binDir
strip $appsDir/DOSBox
addResourcesToBinaries $portDir/additional-files/dosbox.rdef $binDir/dosbox
addAppDeskbarSymlink $binDir/dosbox "DOSBox"
addResourcesToBinaries $portDir/additional-files/dosbox.rdef $appsDir/DOSBox
addAppDeskbarSymlink $appsDir/DOSBox
}

30
games-emulation/dosbox/patches/dosbox-0.74.patchset
View File

@@ -1,14 +1,14 @@
From ebaa74537eb7c7d2f10fe213d4d96b66ec6ba07b Mon Sep 17 00:00:00 2001
From d2f4b5839e76dc1dc26faca879f22f643a8d6c0a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Zolt=C3=A1n=20Mizsei?= <zmizsei@extrowerk.com>
Date: Sun, 18 Jun 2017 10:23:41 +0200
Subject: Config file location
diff --git a/configure.in b/configure.in
index 016ea95..9e7e399 100644
--- a/configure.in
+++ b/configure.in
@@ -470,6 +470,10 @@ case "$host" in
diff --git a/configure.ac b/configure.ac
index a723222..01a2382 100644
--- a/configure.ac
+++ b/configure.ac
@@ -516,6 +516,10 @@ case "$host" in
AC_DEFINE(LINUX, 1, [Compiling on GNU/Linux])
AC_DEFINE(C_DIRECTSERIAL, 1, [ Define to 1 if you want serial passthrough support (Win32, Posix and OS/2).])
;;
@@ -20,10 +20,10 @@ index 016ea95..9e7e399 100644
dnl Disabled directserial for now. It doesn't do anything without
dnl specifying an extra ifdef in directserial_posix.*
diff --git a/src/gui/sdlmain.cpp b/src/gui/sdlmain.cpp
index 6bbc24c..17df96b 100644
index a7710dd..f72a74d 100644
--- a/src/gui/sdlmain.cpp
+++ b/src/gui/sdlmain.cpp
@@ -117,6 +117,8 @@ struct private_hwdata {
@@ -113,6 +113,8 @@ struct private_hwdata {
#define DEFAULT_CONFIG_FILE "/dosbox.conf"
#elif defined(MACOSX)
#define DEFAULT_CONFIG_FILE "/Library/Preferences/DOSBox Preferences"
@@ -33,7 +33,7 @@ index 6bbc24c..17df96b 100644
#define DEFAULT_CONFIG_FILE "/.dosboxrc"
#endif
diff --git a/src/hardware/serialport/libserial.cpp b/src/hardware/serialport/libserial.cpp
index 5d66851..90f29d2 100644
index eb5be94..3eb6828 100644
--- a/src/hardware/serialport/libserial.cpp
+++ b/src/hardware/serialport/libserial.cpp
@@ -254,7 +254,7 @@ bool SERIAL_setCommParameters(COMPORT port,
@@ -46,7 +46,7 @@ index 5d66851..90f29d2 100644
#include <string.h> // strlen
#include <stdlib.h>
diff --git a/src/misc/cross.cpp b/src/misc/cross.cpp
index bc4557e..92747b6 100644
index bc4557e..8f430de 100644
--- a/src/misc/cross.cpp
+++ b/src/misc/cross.cpp
@@ -62,6 +62,9 @@ void Cross::GetPlatformConfigDir(std::string& in) {
@@ -71,10 +71,10 @@ index bc4557e..92747b6 100644
in = "~/.dosbox";
ResolveHomedir(in);
--
2.16.2
2.19.1
From 623a2ef7d956508f8982e04eefc88a60945f7226 Mon Sep 17 00:00:00 2001
From e599901a8a86279be532b91da79036ec9afb8ffc Mon Sep 17 00:00:00 2001
From: Sergei Reznikov <diver@gelios.net>
Date: Wed, 21 Mar 2018 16:02:17 +0300
Subject: Disable usescancodes on Haiku
@@ -83,10 +83,10 @@ Subject: Disable usescancodes on Haiku
that these keycodes are different from one platform to another.
diff --git a/src/gui/sdl_mapper.cpp b/src/gui/sdl_mapper.cpp
index c905c05..bd83cd3 100644
index 5d32c4b..411751c 100644
--- a/src/gui/sdl_mapper.cpp
+++ b/src/gui/sdl_mapper.cpp
@@ -2403,6 +2403,8 @@ void MAPPER_StartUp(Section * sec) {
@@ -2400,6 +2400,8 @@ void MAPPER_StartUp(Section * sec) {
/* Note: table has to be tested/updated for various OSs */
#if defined (MACOSX)
/* nothing */
@@ -96,5 +96,5 @@ index c905c05..bd83cd3 100644
sdlkey_map[0x61]=SDLK_UP;
sdlkey_map[0x66]=SDLK_DOWN;
--
2.16.2
2.19.1