Attachment 197662 Details for Bug 231845 – svn diff for update of port emulators/dosbox to v0.74-2

[patch] svn diff for update of port emulators/dosbox to v0.74-2

update_dosbox-0.74-2.diff (text/plain), 10.85 KB, created by hardy.schumacher on 2018-10-01 09:48:04 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: hardy.schumacher

Created: 2018-10-01 09:48:04 UTC

Size: 10.85 KB

patch

obsolete

>Index: Makefile
>===================================================================
>--- Makefile	(revision 481019)
>+++ Makefile	(working copy)
>@@ -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 @@
> 
> DESKTOP_ENTRIES="DOSBox" "${COMMENT}" \
> 		"${PREFIX}/share/pixmaps/dosbox.ico" "dosbox" \
>-		"System;Emulator;" "true"
>+		"System;Emulator;" true
> 
> OPTIONS_DEFINE=	DOCS
> OPTIONS_RADIO=	DEBUGGER
>Index: distinfo
>===================================================================
>--- distinfo	(revision 481019)
>+++ distinfo	(working copy)
>@@ -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
>Index: files/patch-include-dos_inc.h
>===================================================================
>--- files/patch-include-dos_inc.h	(revision 481019)
>+++ files/patch-include-dos_inc.h	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-include-dos_inc.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-include-setup.h
>===================================================================
>--- files/patch-include-setup.h	(revision 481019)
>+++ files/patch-include-setup.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- include/setup.h.orig	2011-10-18 12:06:07.227092555 -0400
>-+++ include/setup.h	2011-10-18 12:06:26.200853712 -0400
>-@@ -21,6 +21,8 @@
>- #ifndef DOSBOX_SETUP_H
>- #define DOSBOX_SETUP_H
>- 
>-+#include <stdio.h>
>-+
>- #ifdef _MSC_VER
>- #pragma warning ( disable : 4786 )
>- #pragma warning ( disable : 4290 )
>
>Property changes on: files/patch-include-setup.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-include_setup.h
>===================================================================
>--- files/patch-include_setup.h	(nonexistent)
>+++ files/patch-include_setup.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- include/setup.h.orig	2018-10-01 08:56:22 UTC
>++++ include/setup.h
>+@@ -21,6 +21,8 @@
>+ #ifndef DOSBOX_SETUP_H
>+ #define DOSBOX_SETUP_H
>+ 
>++#include <stdio.h>
>++
>+ #ifdef _MSC_VER
>+ #pragma warning ( disable : 4786 )
>+ #pragma warning ( disable : 4290 )
>
>Property changes on: files/patch-include_setup.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src-cpu_core_dynrec_risc_x64.h
>===================================================================
>--- files/patch-src-cpu_core_dynrec_risc_x64.h	(revision 481019)
>+++ files/patch-src-cpu_core_dynrec_risc_x64.h	(nonexistent)
>@@ -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));
>
>Property changes on: files/patch-src-cpu_core_dynrec_risc_x64.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src-fpu-fpu_instructions_x86.h
>===================================================================
>--- files/patch-src-fpu-fpu_instructions_x86.h	(revision 481019)
>+++ files/patch-src-fpu-fpu_instructions_x86.h	(nonexistent)
>@@ -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);
>- }
>
>Property changes on: files/patch-src-fpu-fpu_instructions_x86.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_cpu_core__dyn__x86_risc__x86.h
>===================================================================
>--- files/patch-src_cpu_core__dyn__x86_risc__x86.h	(nonexistent)
>+++ files/patch-src_cpu_core__dyn__x86_risc__x86.h	(working copy)
>@@ -0,0 +1,11 @@
>+--- src/cpu/core_dyn_x86/risc_x86.h.orig	2018-10-01 09:03:42 UTC
>++++ src/cpu/core_dyn_x86/risc_x86.h
>+@@ -138,7 +138,7 @@ return_address:
>+ 		"run_return_adress:					\n"
>+ 		"popl %%ebp							\n"
>+ 		:"=a" (retval), "=c" (tempflags)
>+-		:"r" (tempflags),"r" (code)
>++		:"a" (tempflags),"r" (code)
>+ 		:"%edx","%ebx","%edi","%esi","cc","memory"
>+ 	);
>+ 	reg_flags=(reg_flags & ~FMASK_TEST) | (tempflags & FMASK_TEST);
>
>Property changes on: files/patch-src_cpu_core__dyn__x86_risc__x86.h
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property
>Index: files/patch-src_cpu_core_dyn_x86_risc_x86.h
>===================================================================
>--- files/patch-src_cpu_core_dyn_x86_risc_x86.h	(revision 481019)
>+++ files/patch-src_cpu_core_dyn_x86_risc_x86.h	(nonexistent)
>@@ -1,11 +0,0 @@
>---- src/cpu/core_dyn_x86/risc_x86.h.orig	2014-12-31 12:59:53.015190887 +0000
>-+++ src/cpu/core_dyn_x86/risc_x86.h	2014-12-31 13:00:30.953180886 +0000
>-@@ -138,7 +138,7 @@
>- 		"run_return_adress:					\n"
>- 		"popl %%ebp							\n"
>- 		:"=a" (retval), "=c" (tempflags)
>--		:"r" (tempflags),"r" (code)
>-+		:"a" (tempflags),"r" (code)
>- 		:"%edx","%ebx","%edi","%esi","cc","memory"
>- 	);
>- 	reg_flags=(reg_flags & ~FMASK_TEST) | (tempflags & FMASK_TEST);
>
>Property changes on: files/patch-src_cpu_core_dyn_x86_risc_x86.h
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_gui_sdlmain.cpp
>===================================================================
>--- files/patch-src_gui_sdlmain.cpp	(revision 481019)
>+++ files/patch-src_gui_sdlmain.cpp	(nonexistent)
>@@ -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
>
>Property changes on: files/patch-src_gui_sdlmain.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property
>Index: files/patch-src_ints_int10_vesa.cpp
>===================================================================
>--- files/patch-src_ints_int10_vesa.cpp	(revision 481019)
>+++ files/patch-src_ints_int10_vesa.cpp	(nonexistent)
>@@ -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)
>
>Property changes on: files/patch-src_ints_int10_vesa.cpp
>___________________________________________________________________
>Deleted: fbsd:nokeywords
>## -1 +0,0 ##
>-yes
>\ No newline at end of property
>Deleted: svn:eol-style
>## -1 +0,0 ##
>-native
>\ No newline at end of property
>Deleted: svn:mime-type
>## -1 +0,0 ##
>-text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 231845: 197662