1.8.7.6861-1: Upstream update

3 files changed, 32 insertions, 31 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 125d15293530..a82bf3d37abb 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,10 @@
+# Generated by mksrcinfo v8
+# Fri Jun 17 12:36:26 UTC 2016
 pkgbase = singularityviewer
-	pkgdesc = An exciting client for Second Life (secondlife) and OpenSim (opensimulator), which combines the look and feel of Viewer 1.23 with the latest and greatest of available technology.
-	pkgver = 1.8.6.6157
-	pkgrel = 2
+	pkgdesc = A Second Life (secondlife) protocol compatible client application, used to access its service as well as a number of other such as those based upon OpenSim platform
+	pkgver = 1.8.7.6861
+	pkgrel = 1
 	url = http://www.singularityviewer.org/
-	arch = i686
 	arch = x86_64
 	license = custom
 	depends = apr-util
@@ -22,18 +23,14 @@ pkgbase = singularityviewer
 	optdepends = flashplugin: for inworld Flash support
 	optdepends = gstreamer0.10: for video support, may need good, bad and ugly plugins
 	optdepends = lib32-freealut: for OpenAL support
-	source_i686 = http://bitbucket.org/SingularityViewer/singularityviewer/downloads/Singularity-i686-1.8.6.6157.tar.bz2
-	source_i686 = singularityviewer.desktop
-	source_i686 = singularityviewer.launcher
-	md5sums_i686 = d2ef47e3a52b92afa0a979dfbe2d9966
-	md5sums_i686 = 21b1e68507a1dd851da8ef7d766afe58
-	md5sums_i686 = eb596f5cf7b6f2d0c55c0082fb99a905
-	source_x86_64 = http://bitbucket.org/SingularityViewer/singularityviewer/downloads/Singularity-x86_64-1.8.6.6157.tar.bz2
+	source_x86_64 = http://67.170.30.149/Singularity_1_8_7_6861_.tar.xz
 	source_x86_64 = singularityviewer.desktop
 	source_x86_64 = singularityviewer.launcher
-	md5sums_x86_64 = 5fec78052e9f1a99c0d192658137ee8c
+	source_x86_64 = http://dl.dropboxusercontent.com/u/4361965/singularityviewer.png
+	md5sums_x86_64 = 225e6594f206d3c733e4ed0f704373f1
 	md5sums_x86_64 = 21b1e68507a1dd851da8ef7d766afe58
 	md5sums_x86_64 = eb596f5cf7b6f2d0c55c0082fb99a905
+	md5sums_x86_64 = 0c825fe422dadd0cac9010e7ff152cfa
 
 pkgname = singularityviewer
 
diff --git a/PKGBUILD b/PKGBUILD
index 77da99d39eed..e8511034aed1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,41 +1,46 @@
 # Maintainer: GordonGR <ntheo1979@gmail.com>
 
 pkgname=singularityviewer
-pkgver=1.8.6.6157
-pkgrel=2
-pkgdesc="An exciting client for Second Life (secondlife) and OpenSim (opensimulator), which combines the look and feel of Viewer 1.23 with the latest and greatest of available technology."
+pkgver=1.8.7.6861
+_pkgver=1_8_7_6861
+pkgrel=1
+pkgdesc="A Second Life (secondlife) protocol compatible client application, used to access its service as well as a number of other such as those based upon OpenSim platform"
 url="http://www.singularityviewer.org/"
 license=('custom')
-arch=('i686' 'x86_64')
+arch=('x86_64')
 depends=('apr-util' 'gtk2' 'libgl' 'libidn' 'libjpeg-turbo' 'mesa' 'nss' 'sdl' 'glu' 'pangox-compat')
 optdepends=('libpulse: for PulseAudio support' 'alsa-lib: for ALSA support' 'nvidia-utils: for NVIDIA support' 'flashplugin: for inworld Flash support' 'gstreamer0.10: for video support, may need good, bad and ugly plugins' 'lib32-freealut: for OpenAL support')
-source_i686=("http://bitbucket.org/SingularityViewer/singularityviewer/downloads/Singularity-i686-$pkgver.tar.bz2"
-	"singularityviewer.desktop"
-	"singularityviewer.launcher")
-md5sums_i686=('d2ef47e3a52b92afa0a979dfbe2d9966'
-	'21b1e68507a1dd851da8ef7d766afe58'
-	'eb596f5cf7b6f2d0c55c0082fb99a905')
-source_x86_64=("http://bitbucket.org/SingularityViewer/singularityviewer/downloads/Singularity-x86_64-$pkgver.tar.bz2"
+#source_i686=("http://bitbucket.org/SingularityViewer/singularityviewer/downloads/Singularity-i686-$pkgver.tar.bz2"
+#	"singularityviewer.desktop"
+#	"singularityviewer.launcher")
+
+#source_x86_64=("http://bitbucket.org/SingularityViewer/singularityviewer/downloads/Singularity-x86_64-$pkgver.tar.bz2"
+#	"singularityviewer.desktop"
+#	"singularityviewer.launcher")
+
+source_x86_64=("http://67.170.30.149/Singularity_${_pkgver}_$CARCH.tar.xz"
 	"singularityviewer.desktop"
-	"singularityviewer.launcher")
-md5sums_x86_64=('5fec78052e9f1a99c0d192658137ee8c'
-	'21b1e68507a1dd851da8ef7d766afe58'
-	'eb596f5cf7b6f2d0c55c0082fb99a905')
+	"singularityviewer.launcher"
+        "http://dl.dropboxusercontent.com/u/4361965/singularityviewer.png")
+md5sums_x86_64=('225e6594f206d3c733e4ed0f704373f1'
+                '21b1e68507a1dd851da8ef7d766afe58'
+                'eb596f5cf7b6f2d0c55c0082fb99a905'
+                '0c825fe422dadd0cac9010e7ff152cfa')
 
 
 package() {
 cd $srcdir
   
 # Rename Data Directory
-mv Singularity-$CARCH-${pkgver} singularityviewer
+mv Singularity_${_pkgver}_$CARCH singularityviewer
   
 # Install Desktop File
 install -D -m644 $srcdir/singularityviewer.desktop \
     $pkgdir/usr/share/applications/singularityviewer.desktop
   
 # Install Icon File
-install -D -m644 $srcdir/singularityviewer/singularity_icon.png \
-    $pkgdir/usr/share/pixmaps/singularityviewer.png
+install -D -m644 $srcdir/singularityviewer.png \
+  $pkgdir/usr/share/pixmaps/singularityviewer_icon.png
   
 # Install Launcher
 install -D -m755 $srcdir/singularityviewer.launcher \
@@ -58,6 +63,5 @@ chmod g+x $pkgdir/opt/singularityviewer/singularity
  
 # Do not re-register the application with the desktop system at every launch, saves from locally installed desktop files.
 sed -i 's|./refresh_desktop_app_entry.sh|#./refresh_desktop_app_entry.sh|' $pkgdir/opt/singularityviewer/singularity
-rm $pkgdir/opt/singularityviewer/refresh_desktop_app_entry.sh
     
 }
diff --git a/singularityviewer.png b/singularityviewer.png
new file mode 100644
index 000000000000..ae3d64aa3340
--- /dev/null
+++ b/singularityviewer.png