mednafen: 0.8.D.3

4 files changed, 57 insertions, 24 deletions

diff --git a/abs/extra/mednafen/ChangeLog b/abs/extra/mednafen/ChangeLog
new file mode 100644
index 0000000..54b01d5
--- /dev/null
+++ b/abs/extra/mednafen/ChangeLog
@@ -0,0 +1,9 @@
+2012-02-23 Allan McRae <allan@archlinux.org>
+    * Rebuild for libcdio soname bumps
+
+2011-05-17 Angel Velasquez <angvp@archlinux.org>
+    * Updated to 0.8.D.3
+	* Removed fix_build patch
+	* Cleaned PKGBUILD
+	* Adding ChangeLog
+
diff --git a/abs/extra/mednafen/PKGBUILD b/abs/extra/mednafen/PKGBUILD
index 7a8060e..802249f 100755..100644
--- a/abs/extra/mednafen/PKGBUILD
+++ b/abs/extra/mednafen/PKGBUILD
@@ -1,23 +1,30 @@
-# Maintainer: Daenyth <Daenyth+Arch [at] gmail [dot] com>
-# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
+# Maintainer: Angel Velasquez <angvp@archlinux.org> 
+# Contributor: Daenyth <Daenyth+Arch [at] gmail [dot] com>
 # Contributor: kagan <juanynie@mi.madritel.es>
+
 pkgname=mednafen
-pkgver=0.8.D
-pkgrel=1
+pkgver=0.8.D.3
+pkgrel=2
 pkgdesc="A command-line multi-system gaming emulator"
 url="http://mednafen.sourceforge.net/"
-license=(GPL)
+license=('GPL')
 arch=('i686' 'x86_64')
-depends=('libcdio>=0.82' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib')
+depends=('libcdio' 'libsamplerate' 'libogg' 'libvorbis' 'sdl' 'sdl_net' 'libsndfile' 'zlib')
 makedepends=('pkgconfig' 'mesa')
-source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2 fix_build.diff)
-md5sums=('4c3f337f80bf54d2df0f3a0f24203141'
-         '0f44ef41b0220b66579626548d044f15')
+changelog=ChangeLog
+source=(http://downloads.sourceforge.net/mednafen/$pkgname-$pkgver.tar.bz2
+        mednafen-0.8.13.3-zlib-1.2.6.patch)
+md5sums=('57d22805071becd81858b0c088a275e5'
+         '450bb5aa7552db5b8f6d6713bdb725ce')
 
 build() {
   cd $srcdir/$pkgname
-  patch -Np1 -i $srcdir/fix_build.diff || return 1
-  ./configure --prefix=/usr || return 1
-  make || return 1
+  patch -Np1 -i $srcdir/mednafen-0.8.13.3-zlib-1.2.6.patch
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname
   make DESTDIR=$pkgdir install
 }
diff --git a/abs/extra/mednafen/fix_build.diff b/abs/extra/mednafen/fix_build.diff
deleted file mode 100644
index d91a6fa..0000000
--- a/abs/extra/mednafen/fix_build.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN mednafen.orig//src/pcfx/soundbox.cpp mednafen/src/pcfx/soundbox.cpp
---- mednafen.orig//src/pcfx/soundbox.cpp	2010-06-05 09:35:40.000000000 -0400
-+++ mednafen/src/pcfx/soundbox.cpp	2010-06-05 09:35:55.000000000 -0400
-@@ -416,7 +416,7 @@
-   int rolloff = (int)((double)0.90 * 21477272 * 2 / 1365 / (1 << SampleFreq) ) / 2;
-   for(int ch = 0; ch < 2; ch++)
-    for(int lr = 0; lr < 2; lr++)
--    ADPCMSynth[ch][lr].treble_eq(blip_eq_t::blip_eq_t(-1000, rolloff, FSettings.SndRate));
-+    ADPCMSynth[ch][lr].treble_eq(blip_eq_t(-1000, rolloff, FSettings.SndRate));
-   LSampleFreq = SampleFreq;
-  }
- }
diff --git a/abs/extra/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch b/abs/extra/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch
new file mode 100644
index 0000000..9437f76
--- /dev/null
+++ b/abs/extra/mednafen/mednafen-0.8.13.3-zlib-1.2.6.patch
@@ -0,0 +1,29 @@
+--- mednafen.orig/src/file.cpp
++++ mednafen/src/file.cpp
+@@ -229,7 +229,7 @@
+    goto doret;
+   }
+ 
+-  while((howmany = gzread(tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0)
++  while((howmany = gzread((gzFile)tz, tmp->data + cur_size, cur_alloced - cur_size)) > 0)
+   {
+    cur_size += howmany;
+    cur_alloced <<= 1;
+@@ -282,7 +282,7 @@
+  }
+  else if(type == MDFN_FILETYPE_GZIP)
+  {
+-  gzclose(tz);
++  gzclose((gzFile)tz);
+  }
+  else if(type == MDFN_FILETYPE_ZIP)
+  {
+@@ -444,7 +444,7 @@
+ 
+    if(!(fceufp = MakeMemWrap(t, 1)))
+    {
+-    gzclose(t);
++    gzclose((gzFile)t);
+     return(0);
+    }
+