fceux: update to 2.2.2. closes #964

5 files changed, 38 insertions, 44 deletions

diff --git a/abs/extra/fceux/PKGBUILD b/abs/extra/fceux/PKGBUILD
index 3d18d67..f27f3d5 100644
--- a/abs/extra/fceux/PKGBUILD
+++ b/abs/extra/fceux/PKGBUILD
@@ -1,45 +1,44 @@
-# $Id: PKGBUILD 57567 2011-10-30 20:09:10Z arodseth $
+# $Id$
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
-# Contributor: Eric Belanger <eric@archlinux.org>
+# Contriutor: Eric Belanger <eric@archlinux.org>
 # Contributor: Jo Christian Bergskås <jcberg@gmail.com>
+
 pkgname=fceux
-pkgver=2.1.5
-pkgrel=3
+pkgver=2.2.2
+pkgrel=1
+url='http://www.fceux.com/'
+pkgdesc='Fast and ultra-compatible NES/Famicom emulator'
 arch=('x86_64' 'i686')
-url="http://fceux.com/"
-pkgdesc="Fast and ultra-compatible NES/Famicom emulator"
 license=('GPL')
-depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils')
-makedepends=('scons' 'mesa' 'lua')
-optdepends=('xchm: for viewing the manual')
-provides=('fceu' 'gfceux')
-replaces=('fceu' 'gfceux')
-install=fceux.install
-source=("http://downloads.sourceforge.net/fceultra/$pkgname-$pkgver.src.tar.bz2"
-        "fceux.desktop"
-        "fceux.png")
+depends=('sdl' 'gtk2' 'gd' 'desktop-file-utils' 'lua' 'libgl' 'shared-mime-info')
+makedepends=('scons' 'mesa' 'glu')
+install='fceux.install'
+source=("https://downloads.sourceforge.net/project/fceultra/Source%20Code/$pkgver%20src/$pkgname-$pkgver.src.tar.gz")
+sha256sums=('804d11bdb4a195f3a580ce5d2d01be877582763378637e16186a22459f5fe5e1')
 
 build() {
-  cd "$srcdir/fceu${pkgver}"
+  cd "$pkgname-$pkgver"
 
-  sed -i "s|/usr/local|$pkgdir/usr|" SConstruct
-  scons OPENGL=0 install
+  scons
 }
 
 package() {
-  cd "$srcdir/fceu${pkgver}"
-
-  install -Dm644 bin/$pkgname.chm \
-    "$pkgdir/usr/share/doc/$pkgname/$pkgname.chm"
-  install -Dm644 $srcdir/fceux.desktop \
-    "$pkgdir/usr/share/applications/fceux.desktop"
-  install -Dm644 $srcdir/fceux.png \
-    "$pkgdir/usr/share/pixmaps/fceux.png"
-  install -Dm644 COPYING \
-    "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+  cd "$pkgname-$pkgver"
+
+  scons install -i --prefix="$pkgdir/usr"
+
+  # scons install creates usr/share/pixmaps as a regular file, wtf?
+  rm -f "$pkgdir/usr/share/pixmaps"
+
+  install -d "$pkgdir/usr/share/doc/$pkgname"
+  cp -r documentation/* "$pkgdir/usr/share/doc/$pkgname/"
+  install -Dm644 changelog.txt "$pkgdir/usr/share/doc/$pkgname/"
+
+  # desktop shortcut
+  install -Dm644 "$pkgname.desktop" \
+    "$pkgdir/usr/share/applications/$pkgname.desktop"
+  install -Dm644 "$pkgname.png" \
+    "$pkgdir/usr/share/pixmaps/$pkgname.png"
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('e8b20e62bbbb061b1a59d51b47c827bd'
-         '3c6a259d88825ff1b9387d191a6c970e'
-         '3fe753731ac46b5fee528b1f73abd3e3')
diff --git a/abs/extra/fceux/__changelog b/abs/extra/fceux/__changelog
new file mode 100644
index 0000000..135adfc
--- /dev/null
+++ b/abs/extra/fceux/__changelog
@@ -0,0 +1,2 @@
+- PKGBUILD: change dep lua51 to lua
+- PKGBUILD: change makedep mesa-libgl to mesa
diff --git a/abs/extra/fceux/fceux.desktop b/abs/extra/fceux/fceux.desktop
deleted file mode 100644
index c20271a..0000000
--- a/abs/extra/fceux/fceux.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Fceux
-GenericName=NES/Famicom emulator
-Exec=fceux
-Icon=fceux
-Type=Application
-Categories=Game;Emulator;
-Encoding=UTF-8
-MimeType=application/x-nes;application/x-nes-rom
diff --git a/abs/extra/fceux/fceux.install b/abs/extra/fceux/fceux.install
index ad97d7b..6af331e 100644
--- a/abs/extra/fceux/fceux.install
+++ b/abs/extra/fceux/fceux.install
@@ -1,13 +1,15 @@
-post_upgrade() {
+post_install() {
   update-desktop-database -q
+  update-mime-database usr/share/mime &> /dev/null
+#  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
-post_install() {
-  post_upgrade
+post_upgrade() {
+  post_install
 }
 
 post_remove() {
-  post_upgrade
+  post_install
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/abs/extra/fceux/fceux.png b/abs/extra/fceux/fceux.png
deleted file mode 100644
index 1cf27b1..0000000
--- a/abs/extra/fceux/fceux.png
+++ /dev/null