[arch-commits] Commit in snes9x/trunk (PKGBUILD snes9x-buildflags.patch)

[Maxime Gauduin]

    Date: Saturday, June 9, 2018 @ 09:21:49
  Author: alucryd
Revision: 342153

upgpkg: snes9x 1.56.1-1

Modified:
  snes9x/trunk/PKGBUILD
Deleted:
  snes9x/trunk/snes9x-buildflags.patch

-------------------------+
 PKGBUILD                |   77 +++++++++++++++++++++++++---------------------
 snes9x-buildflags.patch |   54 --------------------------------
 2 files changed, 43 insertions(+), 88 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-09 08:56:16 UTC (rev 342152)
+++ PKGBUILD	2018-06-09 09:21:49 UTC (rev 342153)
@@ -1,61 +1,70 @@
 # $Id$
 # Maintainer: Eric Bélanger <eric at archlinux.org>
+# Maintainer: Maxime Gauduin <alucryd at archlinux.org>
 
 pkgbase=snes9x
 pkgname=('snes9x' 'snes9x-gtk')
-pkgver=1.55
-pkgrel=2
+pkgver=1.56.1
+pkgrel=1
+pkgdesc='Portable Super Nintendo Entertainment System (TM) emulator'
 arch=('x86_64')
-url="http://www.snes9x.com/"
+url='http://www.snes9x.com/'
 license=('custom')
-makedepends=('intltool' 'nasm' 'mesa' 'libpulse'  'libpng' 'sdl' 'gtk2' 'libxv'
-             'adwaita-icon-theme' 'minizip')
-source=(https://github.com/snes9xgit/snes9x/archive/$pkgver.tar.gz snes9x-buildflags.patch)
-sha1sums=('366d14f77f70e6eb7b4fac24cde6d79fcfc0add3'
-          'a1b68aaa710ee261a3e9ee1a80e9a82864f14374')
+makedepends=(
+  'alsa-lib' 'cairo' 'gdk-pixbuf2' 'glib2' 'gtk3' 'intltool' 'libepoxy'
+  'libpng' 'libpulse' 'libx11' 'libxext' 'libxml2' 'libxrandr' 'libxv'
+  'minizip' 'nasm' 'sdl2' 'zlib'
+)
+source=("https://github.com/snes9xgit/snes9x/archive/${pkgver}.tar.gz")
+sha1sums=('af118ba7f5ebc152a1a43bb372bdfcd60e2ca87f')
 
 prepare() {
-  cd $pkgbase-$pkgver
-  # Respect build flags (rmpfusion)
-  patch -p1 -i ../snes9x-buildflags.patch
-  cd unix
-  autoreconf -vi
+  cd snes9x-${pkgver}/gtk
+
+  autoreconf -vif
 }
 
+
 build() {
-  cd ${pkgbase}-${pkgver}/unix
-  ./configure --prefix=/usr --enable-netplay
+  cd snes9x-${pkgver}/unix
+
+  ./configure \
+    --prefix='/usr' \
+    --enable-netplay
   make
 
   cd ../gtk
   ./autogen.sh
-  ./configure --prefix=/usr --with-netplay --with-opengl
+  ./configure \
+    --prefix='/usr' \
+    --with-netplay \
+    --with-opengl
   make
 }
 
 package_snes9x() {
-  pkgdesc="A portable Emulator for the Super Nintendo Entertainment System"
-  depends=('libpng' 'libxext' 'libsm' 'libxv' 'minizip')
+  depends=('libpng' 'libx11' 'libxext' 'libxinerama' 'libxv' 'minizip' 'zlib')
 
-  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}/docs/snes9x-license.txt" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  cd snes9x-${pkgver}/unix
+
+  install -Dm 755 snes9x -t "${pkgdir}"/usr/bin/
+  install -Dm 644 ../docs/{snes9x.conf.default,control-inputs.txt,controls.txt,snapshots.txt} -t "${pkgdir}"/usr/share/doc/snes9x
+  install -Dm 644 ../LICENSE "${pkgdir}"/usr/share/licenses/snes9x/LICENSE
+
 }
 
 package_snes9x-gtk() {
-  pkgdesc="A portable Emulator for the Super Nintendo Entertainment System - GTK version"
-  license=('custom' 'LGPL')
-  depends=('sdl' 'libpulse' 'gtk2' 'libxv' 'adwaita-icon-theme' 'minizip')
+  depends=(
+    'alsa-lib' 'cairo' 'gdk-pixbuf2' 'glib2' 'gtk3' 'hicolor-icon-theme'
+    'libepoxy' 'libpng' 'libpulse' 'libx11' 'libxext' 'libxml2' 'libxrandr'
+    'libxv' 'minizip' 'sdl2' 'zlib'
+  )
 
-  cd ${pkgbase}-${pkgver}/gtk
+  cd snes9x-${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}/docs/snes9x-license.txt" \
-    "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+  install -Dm 644 ../docs/{snes9x.conf.default,control-inputs.txt,controls.txt,snapshots.txt} -t "${pkgdir}"/usr/share/doc/snes9x-gtk
+  install -Dm 644 ../LICENSE "${pkgdir}"/usr/share/licenses/snes9x-gtk/LICENSE
 }
+
+# vim: ts=2 sw=2 et:

Deleted: snes9x-buildflags.patch
===================================================================
--- snes9x-buildflags.patch	2018-06-09 08:56:16 UTC (rev 342152)
+++ snes9x-buildflags.patch	2018-06-09 09:21:49 UTC (rev 342153)
@@ -1,54 +0,0 @@
-diff -durN snes9x-1.54.1.orig/unix/configure.ac snes9x-1.54.1/unix/configure.ac
---- snes9x-1.54.1.orig/unix/configure.ac	2016-10-15 02:20:34.000000000 +0200
-+++ snes9x-1.54.1/unix/configure.ac	2017-02-04 18:52:33.297396407 +0100
-@@ -55,50 +55,6 @@
- # *****************************
- # *** Execution begins here ***
- # *****************************
--
--# Remove -g and -O2 flags manually.
--
--if test "x$CFLAGS" != "x"; then
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-g//'`"
--	CFLAGS="`echo \"$CFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--if test "x$CXXFLAGS" != "x"; then
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-g//'`"
--	CXXFLAGS="`echo \"$CXXFLAGS\" | sed -e 's/-O2//'`"
--fi
--
--# Test what compiler flags we should use.
--
--AC_ARG_ENABLE([debug],
--	[AS_HELP_STRING([--enable-debug],
--		[leave debug information in the final binary (default: no)])],
--	[], [enable_debug="no"])
--
--if test "x$enable_debug" = "xyes"; then
--	AC_S9X_COMPILER_FLAG([-g],  [g])
--	AC_S9X_COMPILER_FLAG([-O0], [o0])
--else
--	AC_S9X_COMPILER_FLAG([-O3], [o3], [
--		AC_S9X_COMPILER_FLAG([-O2], [o2], [
--			AC_S9X_COMPILER_FLAG([-O1], [o1])])])
--	AC_S9X_COMPILER_FLAG([-fomit-frame-pointer], [omit_frame_pointer])
--fi
--
--AC_ARG_ENABLE([mtune],
--	[AS_HELP_STRING([--enable-mtune],
--		[use the specified value for the -mtune/-mcpu flag (default: no)])],
--	[], [enable_mtune="no"])
--
--if test "x$enable_mtune" != "xno"; then
--	AC_S9X_COMPILER_FLAG([-mtune="$enable_mtune"], [mtune],
--	[
--		AC_MSG_WARN([-mtune failed, trying -mcpu...])
--		AC_S9X_COMPILER_FLAG([-mcpu="$enable_mtune"], [mcpu],
--			[AC_MSG_ERROR([Please specify a working value for --enable-mtune.])])
--	])
--fi
--
- AC_S9X_COMPILER_FLAG([-fno-exceptions],       [no_exceptions])
- AC_S9X_COMPILER_FLAG([-fno-rtti],             [no_rtti])
- AC_S9X_COMPILER_FLAG([-pedantic],             [pedantic])