Patch isinf

3 files changed, 28 insertions, 7 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f24d4c955597..3da0f24ac076 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,9 @@
+# Generated by mksrcinfo v8
+# Sat Apr 23 02:18:32 UTC 2016
 pkgbase = dosbox-x-git
 	pkgdesc = x86 emulator with builtin DOS, with patches with more features
-	pkgver = 1553.d29853c
-	pkgrel = 3
+	pkgver = 1842.dbc9bd4
+	pkgrel = 2
 	url = http://dosbox.sourceforge.net
 	arch = i686
 	arch = x86_64
@@ -31,9 +33,11 @@ pkgbase = dosbox-x-git
 	source = dosbox::git://github.com/joncampbell123/dosbox-x.git
 	source = dosbox.png
 	source = dosbox.desktop
+	source = isinf.patch
 	md5sums = SKIP
 	md5sums = 3dcfe45c5ed0433316eaea51e3620b36
 	md5sums = 77b693e82f9dd018d1ec763a3c60ec4f
+	md5sums = e96d9658dae0135a2d1ad58c2416c560
 
 pkgname = dosbox-x-git
 
diff --git a/PKGBUILD b/PKGBUILD
index e48ff76e818e..e08bfe61e555 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Mantainer: Franco Tortoriello
 
 pkgname=dosbox-x-git
-pkgver=1553.d29853c
-pkgrel=3
+pkgver=1842.dbc9bd4
+pkgrel=2
 pkgdesc="x86 emulator with builtin DOS, with patches with more features"
 arch=(i686 x86_64)
 url="http://dosbox.sourceforge.net"
@@ -13,16 +13,21 @@ provides=(dosbox dosbox-svn dosbox-svn-patched dosbox-debug bin32-dosbox bin32-d
 conflicts=(dosbox dosbox-svn dosbox-svn-patched dosbox-debug bin32-dosbox bin32-dosbox-svn bin32-dosbox-svn-patched)
 source=(dosbox::git://github.com/joncampbell123/dosbox-x.git
 	dosbox.png
-	dosbox.desktop)
+	dosbox.desktop
+  isinf.patch)
 
 pkgver() {
   cd "$SRCDEST/dosbox"
   echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
+prepare() {
+  patch -p1 < ${srcdir}/isinf.patch
+}
+
 build() {
   cd "$srcdir/dosbox"
-
+  
   ./autogen.sh
   ./configure --prefix=/usr --sysconfdir=/etc/dosbox
   make
@@ -39,4 +44,6 @@ package() {
 
 md5sums=('SKIP'
          '3dcfe45c5ed0433316eaea51e3620b36'
-         '77b693e82f9dd018d1ec763a3c60ec4f')
+         '77b693e82f9dd018d1ec763a3c60ec4f'
+         'e96d9658dae0135a2d1ad58c2416c560')
+
diff --git a/isinf.patch b/isinf.patch
new file mode 100644
index 000000000000..462a8dd9ef80
--- /dev/null
+++ b/isinf.patch
@@ -0,0 +1,10 @@
+--- src/dosbox/src/fpu/fpu_instructions.h	2016-04-22 22:09:06.159430638 -0400
++++ src/dosbox/src/fpu/fpu_instructions.h	2016-04-22 22:09:50.657045747 -0400
+@@ -282,6 +282,7 @@ static void FPU_FBST(PhysPt addr) {
+ # include <math.h>
+ # include <cmath>
+ # define isdenormal(x) (!std::isnormal(x))
++# define isinf(x) (std::isinf(x))
+ #endif
+ 
+ static void FPU_FADD(Bitu op1, Bitu op2){