update and modernize

3 files changed, 78 insertions, 35 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d37549aff7d2..c6a0c781717f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,34 +1,42 @@
+# Generated by mksrcinfo v8
+# Sun Sep 11 01:52:12 UTC 2016
 pkgbase = snes9x-git
-	pkgdesc = A GTK+ port of the Snes9x emulator (git version)
-	pkgver = 1.53.r230.gdfc6227
+	pkgdesc = Port of the Snes9x emulator (git version). Includes Gtk version.
+	pkgver = 1.53.r301.gf388fac
 	pkgrel = 1
 	url = http://www.snes9x.com/
-	install = snes9x-git.install
 	arch = i686
 	arch = x86_64
 	license = LGPL
 	makedepends = intltool
 	makedepends = nasm
 	makedepends = mesa
-	makedepends = git
-	makedepends = autogen
-	depends = zlib
-	depends = libpng
-	depends = sdl
-	depends = alsa-lib
-	depends = libglade
-	depends = libxv
-	depends = gcc-libs
-	depends = libxext
-	depends = libsm
-	depends = libgl
-	depends = gtk3
+	makedepends = libpulse
+	makedepends = libpng
+	makedepends = sdl
+	makedepends = gtk2
+	makedepends = libxv
+	makedepends = adwaita-icon-theme
 	provides = snes9x
 	provides = snes9x-gtk
 	conflicts = snes9x
 	conflicts = snes9x-gtk
 	source = snes9x-git::git://github.com/snes9xgit/snes9x.git
-	md5sums = SKIP
+	sha1sums = SKIP
 
 pkgname = snes9x-git
+	pkgdesc = A portable Emulator for the Super Nintendo Entertainment System
+	depends = libpng
+	depends = libxext
+	depends = libsm
+
+pkgname = snes9x-gtk-git
+	pkgdesc = A portable Emulator for the Super Nintendo Entertainment System - GTK version
+	license = custom
+	license = LGPL
+	depends = sdl
+	depends = libpulse
+	depends = gtk2
+	depends = libxv
+	depends = adwaita-icon-theme
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..05c6d4d4c97b
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*
+!.gitignore
+!.SRCINFO
+!PKGBUILD
diff --git a/PKGBUILD b/PKGBUILD
index ec7c52ce3af8..cd653ee2581e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,36 +1,67 @@
-# Maintainer: Boohbah <boohbah at gmail.com>
-# Contributor: bzt <unmacaque at gmail.com>
+# Maintainer: Michael DeGuzis <mdeguzis@gmail.com>
 
-pkgname=snes9x-git
-_gitname=snes9x
-pkgver=1.53.r230.gdfc6227
+pkgbase=snes9x-git
+pkgname=('snes9x-git' 'snes9x-gtk-git')
+pkgver=1.53.r301.gf388fac
 pkgrel=1
-pkgdesc="A GTK+ port of the Snes9x emulator (git version)"
+pkgdesc="Port of the Snes9x emulator (git version). Includes Gtk version."
 arch=('i686' 'x86_64')
 url="http://www.snes9x.com/"
 license=('LGPL')
-depends=('zlib' 'libpng' 'sdl' 'alsa-lib' 'libglade' 'libxv' 'gcc-libs' 
-         'libxext' 'libsm' 'libgl' 'gtk3')
-makedepends=('intltool' 'nasm' 'mesa' 'git' 'autogen')
-provides=('snes9x' 'snes9x-gtk')
-conflicts=('snes9x' 'snes9x-gtk')
-install=snes9x-git.install
+makedepends=('intltool' 'nasm' 'mesa' 'libpulse'  'libpng' 'sdl' 'gtk2' 'libxv'
+             'adwaita-icon-theme')
+provides=('snes9x' 'snes9x-gtk') 
+conflicts=('snes9x' 'snes9x-gtk') 
 source=("$pkgname"::'git://github.com/snes9xgit/snes9x.git')
-md5sums=('SKIP')
+sha1sums=('SKIP')
 
 pkgver() {
+
   cd "$srcdir/$pkgname"
   git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
+
 }
 
 build() {
-  cd "$srcdir/$pkgname/gtk"
+
+  cd ${pkgbase}/unix
+  ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay
+  make
+
+  cd ../gtk
   ./autogen.sh
-  ./configure --prefix=/usr --with-netplay --with-gtk3
+  ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl
   make
+
+}
+
+package_snes9x-git() {
+
+  pkgdesc="A portable Emulator for the Super Nintendo Entertainment System"
+  depends=('libpng' 'libxext' 'libsm')
+
+  cd ${pkgbase}/unix
+  install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x"
+  install -d "${pkgdir}/usr/share/doc/${pkgname}"
+  install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \
+    "${pkgdir}/usr/share/doc/${pkgname}/"
+  install -D -m644 ../docs/snes9x-license.txt \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
 }
 
-package() {
-  cd "$srcdir/$pkgname/gtk"
-  make DESTDIR="$pkgdir" install
+package_snes9x-gtk-git() {
+
+  pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version"
+  license=('custom' 'LGPL')
+  depends=('sdl' 'libpulse' 'gtk2' 'libxv' 'adwaita-icon-theme')
+
+  cd ${pkgbase}/gtk
+  make DESTDIR="${pkgdir}" install
+  install -d "${pkgdir}/usr/share/doc/${pkgname}"
+  install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \
+    "${pkgdir}/usr/share/doc/${pkgname}/"
+  install -D -m644 ../docs/snes9x-license.txt \
+    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+
 }