depends

4 files changed, 27 insertions, 37 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ba4ddc2d042d..0c505fdeb67e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,19 +1,20 @@
 pkgbase = jpcsp
 	pkgdesc = Java PSP Emulator
-	pkgver = 0.7
+	pkgver = rd24a39e
 	pkgrel = 1
 	url = http://jpcsp.org/
 	install = jpcsp.install
-	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = p7zip
-	depends = jogl
 	depends = java-runtime
 	options = !strip
-	source = jpcsp0.7.7z::http://jpcsp.googlecode.com/files/jpcsp-3262-linux-x86.7z
+	source = jpcsp-rd24a39e-linux-x86-64.7z::http://files.emunewz.net/builds/jpcsp/2017/12/04/jpcsp-rd24a39e-linux-x86-64.7z
 	source = jpcsp.sh
 	source = jpcsp.desktop
+	md5sums = SKIP
+	md5sums = SKIP
+	md5sums = SKIP
 
 pkgname = jpcsp
 
diff --git a/PKGBUILD b/PKGBUILD
index d4b299363a40..240704a16420 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,38 +1,31 @@
+# Maintainer: Ashton S. Hellwig <ahellwig.dev@gmail.com>
 # Contributor: Bug <bug2000@gmail.com>
-# Maintainer: Bug <bug2000@gmail.com>
+
 pkgname=jpcsp
-pkgver="0.7"
+pkgver="rd24a39e"
 pkgrel=1
 pkgdesc="Java PSP Emulator"
 options=('!strip')
-arch=('i686' 'x86_64')
+arch=('x86_64')
 url="http://jpcsp.org/"
 license=('GPL')
-depends=(jogl java-runtime)
+depends=('java-runtime')
 makedepends=('p7zip')
 install=jpcsp.install
-_pkgarch='x86'
-
-[ "$CARCH" = "i686" ] && {
-  md5sums=('572ac250d31949237c4e8aaf84f18d1b'
-           'd2551a7c28d10151caf535d8a035124f'
-           'cd39aad03798576eb5228ed4184885c8')
-  }
-[ "$CARCH" = "x86_64" ] && {
-  _pkgarch='amd64'
-  md5sums=('8f6e8245009356dccf0751d5014f5835'
-           'd2551a7c28d10151caf535d8a035124f'
-           'cd39aad03798576eb5228ed4184885c8')
-  }
+_pkgarch='x86_64'
+md5sums=('SKIP'
+           'SKIP'
+           'SKIP')
   
-source=(${pkgname}${pkgver}.7z::"http://jpcsp.googlecode.com/files/jpcsp-3262-linux-$_pkgarch.7z"
-jpcsp.sh
-jpcsp.desktop)
+source=("jpcsp-rd24a39e-linux-x86-64.7z::http://files.emunewz.net/builds/jpcsp/2017/12/04/jpcsp-rd24a39e-linux-x86-64.7z"
+        "jpcsp.sh"
+        "jpcsp.desktop")
 
 build() {
   cd $srcdir
-#  7z x ${pkgname}${pkgver}.7z -w$PWD
+  7z x ${pkgname}-${pkgver}-linux-x86-64.7z -w $PWD
 }
+
 package(){
   mkdir -p "$pkgdir/opt/"
   cp -a "$srcdir/jpcsp-linux-$_pkgarch/" "$pkgdir/opt/$pkgname/"
@@ -42,4 +35,4 @@ package(){
 
 }
 
-# vim:set ts=2 sw=2 et:
+# vim:set ts=2 sw=2 et:
\ No newline at end of file
diff --git a/jpcsp.install b/jpcsp.install
index d4b58001e5de..0af7a6bb6805 100644
--- a/jpcsp.install
+++ b/jpcsp.install
@@ -1,10 +1,7 @@
-## arg 1:  the new package version
 post_install() {
   update-desktop-database -q
 }
 
-## arg 1:  the new package version
-## arg 2:  the old package version
 post_upgrade() {
   post_install $1
 }
@@ -13,6 +10,4 @@ post_remove() {
   update-desktop-database -q
 }
 
-
-# vim:set ts=2 sw=2 et:
-
+# vim: set et ts=2 sw=2 ft=sh:
diff --git a/jpcsp.sh b/jpcsp.sh
index 76cfc7021d36..d840a736d0ac 100755
--- a/jpcsp.sh
+++ b/jpcsp.sh
@@ -1,10 +1,11 @@
-#!/bin/sh
+#!/bin/bash
+
 mkdir -p ~/.jpcsp
 cd ~/.jpcsp
 
-if [ `uname -m` == x86_64 ] ; then
-    export LD_LIBRARY_PATH=/opt/jpcsp/lib/linux-amd64:/opt/java/jre/lib/amd64:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64:/usr/lib/jvm/java-7-openjdk/jre/lib/amd64
-  else
-    export LD_LIBRARY_PATH=/opt/jpcsp/lib/linux-x86:/opt/java/jre/lib/i386:/usr/lib/jvm/java-6-openjdk/jre/lib/i386:/usr/lib/jvm/java-7-openjdk/jre/lib/i386
+if [[ "$(uname -m)" == x86_64 ]] ; then
+  export LD_LIBRARY_PATH=/opt/jpcsp/lib/linux-amd64:/opt/java/jre/lib/amd64:/usr/lib/jvm/java-6-openjdk/jre/lib/amd64:/usr/lib/jvm/java-7-openjdk/jre/lib/amd64
 fi
 java -jar "/opt/jpcsp/bin/jpcsp.jar"
+
+# vim: set et ts=2 sw=2 ft=sh: