Updated

6 files changed, 20 insertions, 66 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5bfa6e183a9b..48565df2f90e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,27 @@
 # Generated by mksrcinfo v8
-# Fri Aug 18 01:26:45 UTC 2017
+# Fri Aug 18 01:28:24 UTC 2017
 pkgbase = dosbox-x-git
 	pkgdesc = x86 emulator with builtin DOS, with patches with more features
-	pkgver = 1893.014b5f9
-	pkgrel = 2
+	pkgver = 2124.721f08f5
+	pkgrel = 1
 	url = http://dosbox.sourceforge.net
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
 	makedepends = glu
+	makedepends = fluidsynth
 	depends = sdl_net
 	depends = sdl_sound
 	depends = libpng
 	depends = mesa
+	optdepends = fluidsynth
 	source = dosbox::git://github.com/joncampbell123/dosbox-x.git
-	source = dosbox.png
-	source = dosbox.desktop
-	source = isinf.patch
-	source = sdl.patch
+	source = dosbox-x.png
+	source = dosbox-x.desktop
 	md5sums = SKIP
 	md5sums = 3dcfe45c5ed0433316eaea51e3620b36
-	md5sums = 77b693e82f9dd018d1ec763a3c60ec4f
-	md5sums = SKIP
-	md5sums = SKIP
+	md5sums = 615228a51b52d4788c73940602f1dc97
 
 pkgname = dosbox-x-git
 
diff --git a/PKGBUILD b/PKGBUILD
index cc376d33be98..d8d9795c16e7 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,50 +1,42 @@
 # Mantainer: Franco Tortoriello
 
 pkgname=dosbox-x-git
-pkgver=1893.014b5f9
-pkgrel=2
+pkgver=2124.721f08f5
+pkgrel=1
 pkgdesc="x86 emulator with builtin DOS, with patches with more features"
 arch=(i686 x86_64)
 url="http://dosbox.sourceforge.net"
 license=(GPL)
 depends=(sdl_net sdl_sound libpng mesa)
-makedepends=(git glu)
+makedepends=(git glu fluidsynth)
+optdepends=(fluidsynth)
 source=(dosbox::git://github.com/joncampbell123/dosbox-x.git
-	dosbox.png
-	dosbox.desktop
-  isinf.patch
-  sdl.patch)
+	dosbox-x.png
+	dosbox-x.desktop)
 
 pkgver() {
   cd "$SRCDEST/dosbox"
   echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD)
 }
 
-prepare() {
-  patch -p1 < ${srcdir}/isinf.patch
-  patch -l -p0 <  ${srcdir}/sdl.patch
-}
-
 build() {
   cd "$srcdir/dosbox"
   
   ./autogen.sh
-  ./configure --prefix=/usr --sysconfdir=/etc/dosbox
+  ./configure --prefix=/usr --sysconfdir=/etc/dosbox-x
   make
 }
 
 package() {
   cd "$srcdir/dosbox"
   make DESTDIR="$pkgdir" install
-  install -Dm644 "$srcdir/dosbox.png" \
-	"$pkgdir/usr/share/pixmaps/dosbox.png"
-  install -Dm644 "$srcdir/dosbox.desktop" \
-	"$pkgdir/usr/share/applications/dosbox.desktop"
+  install -Dm644 "$srcdir/dosbox-x.png" \
+	"$pkgdir/usr/share/pixmaps/dosbox-x.png"
+  install -Dm644 "$srcdir/dosbox-x.desktop" \
+	"$pkgdir/usr/share/applications/dosbox-x.desktop"
 }
 
 md5sums=('SKIP'
          '3dcfe45c5ed0433316eaea51e3620b36'
-         '77b693e82f9dd018d1ec763a3c60ec4f'
-         'SKIP'
-         'SKIP')
+	 '615228a51b52d4788c73940602f1dc97')
 
diff --git a/dosbox.desktop b/dosbox.desktop
deleted file mode 100644
index bbc0f89dd998..000000000000
--- a/dosbox.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=DOSBox
-GenericName=DOS Emulator
-GenericName[es]=Emulador de DOS
-Comment=Run DOS games and apps
-Comment[es]=Ejecuta juegos y aplicaciones DOS
-Exec=dosbox
-Icon=dosbox
-Terminal=false
-Categories=Game;Emulator
diff --git a/dosbox.png b/dosbox.png
deleted file mode 100644
index 56ce3a8f6b96..000000000000
--- a/dosbox.png
+++ /dev/null
diff --git a/isinf.patch b/isinf.patch
deleted file mode 100644
index 462a8dd9ef80..000000000000
--- a/isinf.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- 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){
diff --git a/sdl.patch b/sdl.patch
deleted file mode 100644
index 6389a23b3dbd..000000000000
--- a/sdl.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- dosbox/src/gui/sdlmain.cpp  2016-10-08 00:26:46.634598790 -0400
-+++ dosbox/src/gui/sdlmain.cpp  2016-10-08 00:34:18.071285934 -0400
-@@ -1042,10 +1042,6 @@
-    //if (!(flags&GFX_CAN_32) || (flags & GFX_RGBONLY)) goto dosurface;
-    // SDLScreen_Reset();
-    int texsize=2 << int_log2(width > height ? width : height);
--   if (texsize>sdl.opengl.max_texsize) {
--       LOG_MSG("SDL:OPENGL:No support for texturesize of %d, falling back to surface",texsize);
--       goto dosurface;
--   }
-    SDL_GL_SetAttribute( SDL_GL_DOUBLEBUFFER, 1 );
- #if SDL_VERSION_ATLEAST(1, 2, 11)
-    Section_prop * sec=static_cast<Section_prop *>(control->GetSection("vsync"));
-
-