[arch-commits] Commit in desmume/repos/community-i686 (5 files)

[Jakob Gruber]

    Date: Friday, November 29, 2013 @ 08:04:19
  Author: schuay
Revision: 101610

archrelease: copy trunk to community-i686

Added:
  desmume/repos/community-i686/PKGBUILD
    (from rev 101609, desmume/trunk/PKGBUILD)
  desmume/repos/community-i686/desmume.install
    (from rev 101609, desmume/trunk/desmume.install)
  desmume/repos/community-i686/glx_3Demu.patch
    (from rev 101609, desmume/trunk/glx_3Demu.patch)
Deleted:
  desmume/repos/community-i686/PKGBUILD
  desmume/repos/community-i686/desmume.install

-----------------+
 PKGBUILD        |   93 ++++++++++++++++++++++++++++--------------------------
 desmume.install |   22 ++++++------
 glx_3Demu.patch |   25 ++++++++++++++
 3 files changed, 85 insertions(+), 55 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-11-29 07:04:07 UTC (rev 101609)
+++ PKGBUILD	2013-11-29 07:04:19 UTC (rev 101610)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: schuay <jakob.gruber at gmail.com>
-# Contributor: Jonathan Conder <jonno dot conder at gmail dot com>
-# Contributor: Brad Fanella <bradfanella at archlinux.us>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Nathan Jones <nathanj at insightbb.com>
-# Contributor: Javier "Phrodo_00" Aravena <phrodo.00 at gmail dot com>
-# Contributor: angvp <angvp at archlinux dot us>
-# Contributor: Allan <mcrae_allan at hotmail dot com>
-# Contributor: w0rm <w0rmtux at gmail dot com>
-# Contributor: vEX <vex at niechift dot com>
-# Contributor: Asher256 <achrafcherti at gmail dot com>
-
-pkgname=desmume
-pkgver=0.9.9
-pkgrel=2
-pkgdesc="Nintendo DS emulator"
-arch=('i686' 'x86_64')
-url="http://desmume.org/"
-license=('GPL')
-depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap'
-         'soundtouch' 'alsa-lib' 'zziplib' 'glu')
-makedepends=('intltool' 'mesa')
-install=desmume.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # See https://bugs.archlinux.org/task/35086 and
-  # https://sourceforge.net/tracker/?func=detail&aid=3612768&group_id=164579&atid=832291
-  sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in
-
-  ./configure --prefix=/usr --enable-wifi
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir/" install
-}
-
-md5sums=('458b5f8b3dbb38a47e6d0518f97aa82a')

Copied: desmume/repos/community-i686/PKGBUILD (from rev 101609, desmume/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-11-29 07:04:19 UTC (rev 101610)
@@ -0,0 +1,49 @@
+# $Id$
+# Maintainer: schuay <jakob.gruber at gmail.com>
+# Contributor: Jonathan Conder <jonno dot conder at gmail dot com>
+# Contributor: Brad Fanella <bradfanella at archlinux.us>
+# Contributor: Arkham <arkham at archlinux dot us>
+# Contributor: Nathan Jones <nathanj at insightbb.com>
+# Contributor: Javier "Phrodo_00" Aravena <phrodo.00 at gmail dot com>
+# Contributor: angvp <angvp at archlinux dot us>
+# Contributor: Allan <mcrae_allan at hotmail dot com>
+# Contributor: w0rm <w0rmtux at gmail dot com>
+# Contributor: vEX <vex at niechift dot com>
+# Contributor: Asher256 <achrafcherti at gmail dot com>
+
+pkgname=desmume
+pkgver=0.9.10
+pkgrel=1
+pkgdesc="Nintendo DS emulator"
+arch=('i686' 'x86_64')
+url="http://desmume.org/"
+license=('GPL')
+depends=('agg' 'gtkglext' 'libglade' 'desktop-file-utils' 'libpcap'
+         'soundtouch' 'alsa-lib' 'zziplib' 'glu')
+makedepends=('intltool' 'mesa')
+install=desmume.install
+source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.tar"
+        "glx_3Demu.patch")
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # http://sourceforge.net/p/desmume/code/4907/
+  patch -Np2 < "$srcdir"/glx_3Demu.patch
+
+  # See https://bugs.archlinux.org/task/35086 and
+  # https://sourceforge.net/tracker/?func=detail&aid=3612768&group_id=164579&atid=832291
+  sed -i 's/@GETTEXT_PACKAGE@/desmume/' po/Makefile.in.in
+
+  ./configure --prefix=/usr --enable-wifi
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+}
+
+md5sums=('a6aedfe5d6437d481aa9ac5fb5aebbea'
+         '352ea0ffa109f68da2fb79f30d2c85e2')

Deleted: desmume.install
===================================================================
--- desmume.install	2013-11-29 07:04:07 UTC (rev 101609)
+++ desmume.install	2013-11-29 07:04:19 UTC (rev 101610)
@@ -1,11 +0,0 @@
-post_install() {
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}

Copied: desmume/repos/community-i686/desmume.install (from rev 101609, desmume/trunk/desmume.install)
===================================================================
--- desmume.install	                        (rev 0)
+++ desmume.install	2013-11-29 07:04:19 UTC (rev 101610)
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}

Copied: desmume/repos/community-i686/glx_3Demu.patch (from rev 101609, desmume/trunk/glx_3Demu.patch)
===================================================================
--- glx_3Demu.patch	                        (rev 0)
+++ glx_3Demu.patch	2013-11-29 07:04:19 UTC (rev 101610)
@@ -0,0 +1,25 @@
+--- src/desmume-0.9.10/src/gtk/glx_3Demu.cpp	2013-11-28 01:36:53.712615822 +0100
++++ glx_3Demu.cpp	2013-11-28 22:08:52.762390897 +0100
+@@ -41,11 +41,7 @@
+         glXDestroyContext(dpy, ctx);
+ 
+         XCloseDisplay(dpy);
+-
+-        return true;
+     }
+-
+-    return false;
+ }
+ 
+ int init_glx_3Demu(void) 
+--- src/desmume-0.9.10/src/gtk/glx_3Demu.cpp	2013-11-28 01:36:53.712615822 +0100
++++ glx_3Demu.cpp	2013-11-28 22:14:34.529740137 +0100
+@@ -31,7 +31,7 @@
+ static GLXContext ctx;
+ static GLXPbuffer pbuf;
+ 
+-void deinit_glx_3Demu(void)
++int deinit_glx_3Demu(void)
+ {
+     Display *dpy = glXGetCurrentDisplay();
+