mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-21 04:06:46 +00:00
Code Issues Releases Activity

- Update to 0.74.2

Browse Source 
- Fix DESKTOP_ENTRIES

PR:	231845
Submitted by:	hardy.schumacher@gmx.de
Approved by:	Tom Carrick <knyght@gmail.com> (maintainer)
This commit is contained in:
Alex Kozlov 2018-10-01 19:44:57 +00:00
parent 123f93dab0
commit 4b9a10d3ab
Notes: svn2git 2021-03-31 03:12:20 +00:00 
svn path=/head/; revision=481058
8 changed files with 7 additions and 90 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emulators/dosbox/Makefile
View File

@ -3,9 +3,10 @@
PORTNAME= dosbox
PORTVERSION= 0.74
PORTREVISION= 11
PORTREVISION= 12
CATEGORIES= emulators
MASTER_SITES= SF
MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTVERSION}-2
DISTNAME= ${PORTNAME}-${PORTVERSION}-2
MAINTAINER= knyght@gmail.com
COMMENT= Emulator of a PC with DOS
@ -25,7 +26,7 @@ CONFIGURE_ARGS+= --enable-core-inline
DESKTOP_ENTRIES="DOSBox" "${COMMENT}" \
"${PREFIX}/share/pixmaps/dosbox.ico" "dosbox" \
"System;Emulator;" "true"
"System;Emulator;" true
OPTIONS_DEFINE= DOCS
OPTIONS_RADIO= DEBUGGER

5
emulators/dosbox/distinfo
View File

@ -1,2 +1,3 @@
SHA256 (dosbox-0.74.tar.gz) = 13f74916e2d4002bad1978e55727f302ff6df3d9be2f9b0e271501bd0a938e05
SIZE (dosbox-0.74.tar.gz) = 1265711
TIMESTAMP = 1538386904
SHA256 (dosbox-0.74-2.tar.gz) = 7077303595bedd7cd0bb94227fa9a6b5609e7c90a3e6523af11bc4afcb0a57cf
SIZE (dosbox-0.74-2.tar.gz) = 1324059

11
emulators/dosbox/files/patch-include-dos_inc.h
View File

@ -1,11 +0,0 @@
--- include/dos_inc.h.orig 2010-05-10 13:43:54.000000000 -0400
+++ include/dos_inc.h 2011-10-18 12:05:51.186449095 -0400
@@ -28,6 +28,8 @@
#include "mem.h"
#endif
+#include <stddef.h>
+
#ifdef _MSC_VER
#pragma pack (1)
#endif

0
emulators/dosbox/files/patch-include-setup.h → emulators/dosbox/files/patch-include_setup.h
View File

14
emulators/dosbox/files/patch-src-cpu_core_dynrec_risc_x64.h
View File

@ -1,14 +0,0 @@
Index: src/cpu/core_dynrec/risc_x64.h
===================================================================
--- src/cpu/core_dynrec/risc_x64.h (revision 3775)
+++ src/cpu/core_dynrec/risc_x64.h (working copy)
@@ -85,7 +85,8 @@
static INLINE void gen_reg_memaddr(HostReg reg,void* data) {
Bit64s diff = (Bit64s)data-((Bit64s)cache.pos+5);
- if ((diff<0x80000000LL) && (diff>-0x80000000LL)) {
+ if ((Bit64u)diff<0x0000000080000000ULL ||
+ (Bit64u)diff>0xffffffff80000000ULL) {
cache_addb(0x05+(reg<<3));
// RIP-relative addressing is offset after the instruction
cache_addd((Bit32u)(((Bit64u)diff)&0xffffffffLL));

24
emulators/dosbox/files/patch-src-fpu-fpu_instructions_x86.h
View File

@ -1,24 +0,0 @@
Index: src/fpu/fpu_instructions_x86.h
@@ -1162,12 +1162,12 @@
static void FPU_FLD_I16(PhysPt addr,Bitu store_to) {
fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
- FPUD_LOAD(fild,WORD,)
+ FPUD_LOAD(fild,WORD,s)
}
static void FPU_FLD_I16_EA(PhysPt addr) {
fpu.p_regs[8].m1 = (Bit32u)mem_readw(addr);
- FPUD_LOAD_EA(fild,WORD,)
+ FPUD_LOAD_EA(fild,WORD,s)
}
static void FPU_FLD_I32(PhysPt addr,Bitu store_to) {
@@ -1212,7 +1212,7 @@
}
static void FPU_FST_I16(PhysPt addr) {
- FPUD_STORE(fistp,WORD,)
+ FPUD_STORE(fistp,WORD,s)
mem_writew(addr,(Bit16u)fpu.p_regs[8].m1);
}

25
emulators/dosbox/files/patch-src_gui_sdlmain.cpp
View File

@ -1,25 +0,0 @@
*** src/gui/sdlmain.cpp.orig Mon Mar 6 03:02:24 2017
--- src/gui/sdlmain.cpp Mon Mar 6 03:03:21 2017
***************
*** 1134,1143 ****
#endif
const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
if(gl_ext && *gl_ext){
! sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") > 0);
! sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") > 0);
#if defined(NVIDIA_PixelDataRange)
! sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") >0 ) &&
glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
sdl.opengl.pixel_data_range = 0;
#endif
--- 1134,1143 ----
#endif
const char * gl_ext = (const char *)glGetString (GL_EXTENSIONS);
if(gl_ext && *gl_ext){
! sdl.opengl.packed_pixel=(strstr(gl_ext,"EXT_packed_pixels") != 0);
! sdl.opengl.paletted_texture=(strstr(gl_ext,"EXT_paletted_texture") != 0);
#if defined(NVIDIA_PixelDataRange)
! sdl.opengl.pixel_data_range=(strstr(gl_ext,"GL_NV_pixel_data_range") != 0 ) &&
glPixelDataRangeNV && db_glAllocateMemoryNV && db_glFreeMemoryNV;
sdl.opengl.pixel_data_range = 0;
#endif

11
emulators/dosbox/files/patch-src_ints_int10_vesa.cpp
View File

@ -1,11 +0,0 @@
--- src/ints/int10_vesa.cpp.orig 2018-01-28 08:20:24.891924000 -0800
+++ src/ints/int10_vesa.cpp 2018-01-28 08:20:38.015119000 -0800
@@ -39,7 +39,7 @@ static struct {
static char string_oem[]="S3 Incorporated. Trio64";
static char string_vendorname[]="DOSBox Development Team";
static char string_productname[]="DOSBox - The DOS Emulator";
-static char string_productrev[]="DOSBox "VERSION;
+static char string_productrev[]="DOSBox " VERSION;
#ifdef _MSC_VER
#pragma pack (1)