[arch-commits] Commit in snes9x/trunk (3 files)

[Antonio Rojas]

    Date: Thursday, October 13, 2016 @ 05:53:19
  Author: arojas
Revision: 192111

Update to 1.54

Modified:
  snes9x/trunk/PKGBUILD
Deleted:
  snes9x/trunk/snes9x-fix-crash.patch
  snes9x/trunk/snes9x-gtk2.24.diff.gz

------------------------+
 PKGBUILD               |   34 +++++++++++++---------------------
 snes9x-fix-crash.patch |   30 ------------------------------
 2 files changed, 13 insertions(+), 51 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2016-10-13 04:18:58 UTC (rev 192110)
+++ PKGBUILD	2016-10-13 05:53:19 UTC (rev 192111)
@@ -3,45 +3,37 @@
 
 pkgbase=snes9x
 pkgname=('snes9x' 'snes9x-gtk')
-pkgver=1.53
-pkgrel=11
+pkgver=1.54
+pkgrel=1
 arch=('i686' 'x86_64')
 url="https://code.google.com/p/snes9x-gtk/"
 license=('custom')
 makedepends=('intltool' 'nasm' 'mesa' 'libpulse'  'libpng' 'sdl' 'gtk2' 'libxv'
              'adwaita-icon-theme')
-source=(http://snes9x-gtk.googlecode.com/files/${pkgbase}-${pkgver}-src.tar.bz2
-        snes9x-gtk2.24.diff.gz snes9x-fix-crash.patch)
-sha1sums=('57be6480369f66b9aaaeb722789ce114f58ed1e2'
-          '680dbe0a70f1821bc7931539e72f5a1a95e3938c'
-          '995495c68ffc00d8266d10a7bd8fc74fb6c147b1')
+source=(https://github.com/snes9xgit/snes9x/archive/$pkgver.tar.gz)
+sha1sums=('54c1e396892066d747821518f7b6086e80324938')
 
-prepare() {
-  cd ${pkgbase}-${pkgver}-src
-  patch -p1 -i "${srcdir}/snes9x-gtk2.24.diff"
-  patch -p1 -i "${srcdir}/snes9x-fix-crash.patch"
-}
-
 build() {
-  cd ${pkgbase}-${pkgver}-src/unix
-  ./configure --prefix=/usr --with-sdd1-decomp --enable-netplay
+  cd ${pkgbase}-${pkgver}/unix
+  ./configure --prefix=/usr --enable-netplay
   make
 
   cd ../gtk
-  ./configure --prefix=/usr --with-sdd1-decomp --with-netplay --with-opengl
+  ./autogen.sh
+  ./configure --prefix=/usr --with-netplay --with-opengl
   make
 }
 
 package_snes9x() {
   pkgdesc="A portable Emulator for the Super Nintendo Entertainment System"
-  depends=('libpng' 'libxext' 'libsm')
+  depends=('libpng' 'libxext' 'libsm' 'libxv')
 
-  cd ${pkgbase}-${pkgver}-src/unix
+  cd ${pkgbase}-${pkgver}/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 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \
+  install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/docs/snes9x-license.txt" \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
 
@@ -50,11 +42,11 @@
   license=('custom' 'LGPL')
   depends=('sdl' 'libpulse' 'gtk2' 'libxv' 'adwaita-icon-theme')
 
-  cd ${pkgbase}-${pkgver}-src/gtk
+  cd ${pkgbase}-${pkgver}/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 "${srcdir}/${pkgbase}-${pkgver}-src/docs/snes9x-license.txt" \
+  install -D -m644 "${srcdir}/${pkgbase}-${pkgver}/docs/snes9x-license.txt" \
     "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }

Deleted: snes9x-fix-crash.patch
===================================================================
--- snes9x-fix-crash.patch	2016-10-13 04:18:58 UTC (rev 192110)
+++ snes9x-fix-crash.patch	2016-10-13 05:53:19 UTC (rev 192111)
@@ -1,30 +0,0 @@
-From 6d74746342a73cf65db215f4fdecdfb0cae66792 Mon Sep 17 00:00:00 2001
-From: Brandon Wright <bearoso at gmail.com>
-Date: Mon, 10 Feb 2014 16:28:05 -0600
-Subject: [PATCH] Fix bug caused by virtual directories.
-
----
- gtk/src/gtk_file.cpp | 7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
-
-diff --git a/gtk/src/gtk_file.cpp b/gtk/src/gtk_file.cpp
-index a0df75d..9c0e000 100644
---- a/gtk/src/gtk_file.cpp
-+++ b/gtk/src/gtk_file.cpp
-@@ -465,8 +465,11 @@ S9xOpenROMDialog (void)
-         filename = gtk_file_chooser_get_filename (GTK_FILE_CHOOSER (dialog));
-         directory =
-             gtk_file_chooser_get_current_folder (GTK_FILE_CHOOSER (dialog));
--        strncpy (gui_config->last_directory, directory, PATH_MAX);
--        g_free (directory);
-+        if (directory)
-+        {
-+            strncpy (gui_config->last_directory, directory, PATH_MAX);
-+            g_free (directory);
-+        }
-     }
- 
-     else
--- 
-1.9.3
-

Deleted: snes9x-gtk2.24.diff.gz
===================================================================
(Binary files differ)