chore: fix the compile error and update the package section

license:
- Remove the LGPL section and use upstream license file.
snes9x-git:
- Update git submodule located in shaders/SPIRV-Cross.
snes9x-gtk-git:
- Switch from autotools to Meson build system.

2 files changed, 105 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index efb2cab10cd3..4d620e3a08ae 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,44 +1,70 @@
 pkgbase = snes9x-git
-	pkgdesc = Port of the Snes9x emulator (git version). Includes Gtk version.
-	pkgver = 1.53.r451.ge8da19d
+	pkgdesc = Port of the Snes9x emulator (git version)
+	pkgver = 1.59.2.r33.gc39f769
 	pkgrel = 1
 	url = http://www.snes9x.com/
-	arch = i686
 	arch = x86_64
-	license = LGPL
+	license = custom
+	makedepends = alsa-lib
+	makedepends = cairo
+	makedepends = gdk-pixbuf2
 	makedepends = git
+	makedepends = glib2
+	makedepends = glslang
+	makedepends = gtk3
 	makedepends = intltool
-	makedepends = nasm
-	makedepends = mesa
-	makedepends = libpulse
+	makedepends = libepoxy
 	makedepends = libpng
-	makedepends = sdl
-	makedepends = gtk2
+	makedepends = libpulse
+	makedepends = libx11
+	makedepends = libxext
+	makedepends = libxml2
+	makedepends = libxrandr
 	makedepends = libxv
-	makedepends = adwaita-icon-theme
-	makedepends = autogen
+	makedepends = meson
 	makedepends = minizip
-	depends = minizip
-	source = snes9x-git::git://github.com/snes9xgit/snes9x.git
-	sha1sums = SKIP
+	makedepends = nasm
+	makedepends = portaudio
+	makedepends = sdl2
+	makedepends = zlib
+	source = git+https://github.com/snes9xgit/snes9x.git
+	source = git+https://github.com/KhronosGroup/SPIRV-Cross.git
+	sha256sums = SKIP
+	sha256sums = SKIP
 
 pkgname = snes9x-git
-	pkgdesc = A portable Emulator for the Super Nintendo Entertainment System
+	pkgdesc = portable Emulator for the Super Nintendo Entertainment System
 	depends = libpng
+	depends = libx11
 	depends = libxext
-	depends = libsm
+	depends = libxinerama
+	depends = libxv
+	depends = minizip
+	depends = zlib
 	provides = snesx
 	conflicts = snes9x
 
 pkgname = snes9x-gtk-git
-	pkgdesc = A portable Emulator for the Super Nintendo Entertainment System - GTK version
-	license = custom
-	license = LGPL
-	depends = sdl
+	pkgdesc = Portable Emulator for the Super Nintendo Entertainment System - GTK version
+	depends = alsa-lib
+	depends = cairo
+	depends = gdk-pixbuf2
+	depends = glib2
+	depends = glslang
+	depends = gtk3
+	depends = hicolor-icon-theme
+	depends = libepoxy
+	depends = libpng
 	depends = libpulse
-	depends = gtk2
+	depends = libx11
+	depends = libxext
+	depends = libxml2
+	depends = libxrandr
 	depends = libxv
-	depends = adwaita-icon-theme
+	depends = minizip
+	depends = portaudio
+	depends = sdl2
+	depends = zlib
 	provides = snes9x-gtk
 	conflicts = snes9x-gtk
 
diff --git a/PKGBUILD b/PKGBUILD
index 5bcad3240427..39de18d9e041 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,72 +1,91 @@
-# Maintainer: Michael DeGuzis <mdeguzis@gmail.com>
+# Maintainer: LIN Ruohshoei <lin dot ruohshoei+arch at gmail dot com>
+# Contributor: Michael DeGuzis <mdeguzis@gmail.com>
 
 pkgbase=snes9x-git
-pkgname=('snes9x-git' 'snes9x-gtk-git')
-pkgver=1.53.r451.ge8da19d
+_pkgbase=snes9x
+pkgname=( snes9x-git snes9x-gtk-git )
+pkgver=1.59.2.r33.gc39f769
 pkgrel=1
-pkgdesc="Port of the Snes9x emulator (git version). Includes Gtk version."
-arch=('i686' 'x86_64')
+pkgdesc="Port of the Snes9x emulator (git version)"
+arch=('x86_64')
 url="http://www.snes9x.com/"
-license=('LGPL')
-makedepends=('git' 'intltool' 'nasm' 'mesa' 'libpulse'  'libpng' 'sdl' 'gtk2' 'libxv'
-             'adwaita-icon-theme' 'autogen' 'minizip')
-depends=('minizip')
-source=("$pkgname"::'git://github.com/snes9xgit/snes9x.git')
-sha1sums=('SKIP')
+license=('custom')
+makedepends=( alsa-lib cairo gdk-pixbuf2 git glib2 glslang 
+  gtk3 intltool libepoxy libpng libpulse libx11 libxext libxml2
+  libxrandr libxv meson minizip nasm portaudio sdl2 zlib
+)
+source=(
+  git+https://github.com/snes9xgit/snes9x.git
+  git+https://github.com/KhronosGroup/SPIRV-Cross.git
+)
+sha256sums=('SKIP'
+            'SKIP')
 
 pkgver() {
+  cd ${_pkgbase}
+  git describe --long --tags | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
 
-  cd "$srcdir/$pkgname"
-  git describe --long | sed -E 's/([^-]*-g)/r\1/;s/-/./g'
-
+}
+prepare() {
+  cd ${_pkgbase}
+  for submodule in shaders/SPIRV-Cross; do
+    git submodule init ${submodule}
+    git config submodule.${submodule}.url ../${submodule#*/}
+    git submodule update ${submodule}
+  done
+
+  cd unix
+  autoreconf -fiv
 }
 
 build() {
+  cd ${_pkgbase}/unix
 
-  cd ${pkgbase}/unix
-  # work around problems with automake & cvs
-  touch configure
-  ./configure --prefix=/usr --enable-netplay
-  make
-
-  cd ../gtk
-  ./autogen.sh
-  ./configure --prefix=/usr --with-netplay --with-opengl
+  ./configure \
+    --prefix='/usr' \
+    --enable-netplay
   make
 
+  cd ${srcdir}
+  arch-meson snes9x/gtk build
+  ninja -C build
 }
 
 package_snes9x-git() {
 
-  pkgdesc="A portable Emulator for the Super Nintendo Entertainment System"
-  depends=('libpng' 'libxext' 'libsm')
+  pkgdesc="portable Emulator for the Super Nintendo Entertainment System"
+  depends=(libpng libx11 libxext libxinerama libxv minizip zlib)
+
   conflicts=('snes9x')
   provides=('snesx')
 
-  cd ${pkgbase}/unix
-  install -D -m755 snes9x "${pkgdir}/usr/bin/snes9x"
+  cd ${_pkgbase}
+  install -D -m755 unix/snes9x -t "${pkgdir}"/usr/bin/
   install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \
+  install -D -m644  {unix/snes9x.conf.default,docs/{control-inputs,controls,snapshots}.txt} \
     "${pkgdir}/usr/share/doc/${pkgname}/"
-  install -D -m644 ../docs/snes9x-license.txt \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -vDm644  LICENSE -t \
+    "${pkgdir}"/usr/share/licenses/"${pkgname}"
 
 }
 
 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')
+  pkgdesc="Portable Emulator for the Super Nintendo Entertainment System - GTK version"
+  depends=(alsa-lib cairo gdk-pixbuf2 glib2 glslang gtk3 hicolor-icon-theme libepoxy libpng
+  libpulse libx11 libxext libxml2 libxrandr libxv minizip portaudio sdl2 zlib)
+
   conflicts=('snes9x-gtk')
   provides=('snes9x-gtk')
 
-  cd ${pkgbase}/gtk
-  make DESTDIR="${pkgdir}" install
+  DESTDIR="${pkgdir}" ninja -C build install
+
+  cd ${_pkgbase}
+
   install -d "${pkgdir}/usr/share/doc/${pkgname}"
-  install -D -m644 ../docs/{snes9x.conf.default,{control-inputs,controls,snapshots}.txt} \
+  install -Dm644 {unix/snes9x.conf.default,docs/{control-inputs,controls,snapshots}.txt}  \
     "${pkgdir}/usr/share/doc/${pkgname}/"
-  install -D -m644 ../docs/snes9x-license.txt \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -vDm644 LICENSE -t \
+    "${pkgdir}/usr/share/licenses/${pkgname}"
 
 }