1.8.7.7642-1: Upstream update

2 files changed, 32 insertions, 60 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a3fbd794dfa3..7a77857f26be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,12 +1,11 @@
-# Generated by mksrcinfo v8
-# Fri Apr 13 11:58:11 UTC 2018
 pkgbase = singularityviewer-alpha
-	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. (alpha version)
-	pkgver = 1.8.7.6994
+	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. (nighly builds)
+	pkgver = 1.8.7.7642
 	pkgrel = 1
 	url = http://www.singularityviewer.org/
 	arch = x86_64
 	license = custom
+	depends = apr
 	depends = apr-util
 	depends = gtk2
 	depends = libgl
@@ -27,28 +26,25 @@ pkgbase = singularityviewer-alpha
 	depends = lib32-libidn
 	depends = libxcursor
 	depends = libxtst
+	depends = openal
+	depends = expat
+	depends = freealut
 	optdepends = libpulse: for PulseAudio support
 	optdepends = alsa-lib: for ALSA support
 	optdepends = lib32-alsa-lib: for ALSA support
 	optdepends = nvidia-utils: for NVIDIA support
 	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
-	optdepends = openal
 	provides = singularityviewer
 	conflicts = singularityviewer
 	conflicts = singularityviewer-test
 	replaces = singularityviewer-test
-	source = https://downloads.sourceforge.net/project/singularityview/alphas/SingularityAlpha-x86_64-1.8.7.6994.tar.bz2
+	source = http://singu.virtual-nexus.xyz/files/Singularity_Test_1_8_7_7642_x86_64.tar.xz
 	source = singularityviewer.desktop
 	source = singularityviewer.launcher
-	source = https://archive.archlinux.org/packages/h/harfbuzz/harfbuzz-1.3.4-1-x86_64.pkg.tar.xz
-	source = https://archive.archlinux.org/packages/c/cairo/cairo-1.14.10-1-x86_64.pkg.tar.xz
-	md5sums = 2420b7825a812ff6bfec48914b90a13e
+	md5sums = 8acba2e3d522716357f433a763e0c5bf
 	md5sums = ff7aa34dcd7548e3acdb3c2d44ae6604
 	md5sums = eb596f5cf7b6f2d0c55c0082fb99a905
-	md5sums = 0a3e4654c3009d740a6be09e58a2d451
-	md5sums = e6208a823c9acc653b1deb0fcf4014c7
 
 pkgname = singularityviewer-alpha
 
diff --git a/PKGBUILD b/PKGBUILD
index b1a5831109e3..34ad6e43a814 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,45 +1,49 @@
 # Maintainer: GordonGR <ntheo1979@gmail.com>
 
 pkgname=singularityviewer-alpha
-pkgver=1.8.7.6994
+pkgver=1.8.7.7642
+_pkgver=1_8_7_7642
 pkgrel=1
-_harfbuzzver=1.3.4-1
-_cairover=1.14.10-1
-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. (alpha version)"
+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. (nighly builds)"
 url="http://www.singularityviewer.org/"
 license=('custom')
 arch=('x86_64')
-depends=('apr-util' 'gtk2' 'libgl' 'libidn' 'mesa' 'sdl' 'glu' 'pangox-compat' 'gconf' 'libxss' 'libxrandr' 'libxcomposite' 'libgl' 'lib32-zlib' 'libcups' 'atk' 'lib32-util-linux' 'lib32-libidn' 'libxcursor' 'libxtst')
+depends=('apr' 'apr-util' 'gtk2' 'libgl' 'libidn' 'mesa' 'sdl' 'glu' 'pangox-compat' 'gconf' 'libxss' 'libxrandr' 'libxcomposite' 'libgl' 'lib32-zlib' 'libcups' 'atk' 'lib32-util-linux' 'lib32-libidn' 'libxcursor' 'libxtst' 'openal' 'expat' 'freealut')
 optdepends=(
 	'libpulse: for PulseAudio support'
 	'alsa-lib: for ALSA support'
 	'lib32-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'
-	'openal')
+	'gstreamer0.10: for video support, may need good, bad and ugly plugins')
 
 conflicts=("singularityviewer" "singularityviewer-test")
 replaces=("singularityviewer-test")
 provides=("singularityviewer")
 
-source=("https://downloads.sourceforge.net/project/singularityview/alphas/SingularityAlpha-x86_64-${pkgver}.tar.bz2"
+source=("http://singu.virtual-nexus.xyz/files/Singularity_Test_${_pkgver}_x86_64.tar.xz"
 	"singularityviewer.desktop"
-	"singularityviewer.launcher"
-	"https://archive.archlinux.org/packages/h/harfbuzz/harfbuzz-${_harfbuzzver}-x86_64.pkg.tar.xz"
-	"https://archive.archlinux.org/packages/c/cairo/cairo-${_cairover}-x86_64.pkg.tar.xz")
-md5sums=('2420b7825a812ff6bfec48914b90a13e'
+	"singularityviewer.launcher")
+md5sums=('8acba2e3d522716357f433a763e0c5bf'
          'ff7aa34dcd7548e3acdb3c2d44ae6604'
-         'eb596f5cf7b6f2d0c55c0082fb99a905'
-         '0a3e4654c3009d740a6be09e58a2d451'
-         'e6208a823c9acc653b1deb0fcf4014c7')
-
+         'eb596f5cf7b6f2d0c55c0082fb99a905')
+         
 package() {
 cd $srcdir
-  
+
 # Rename Data Directory
-mv SingularityAlpha-$CARCH-${pkgver} singularityviewer
+mv Singularity_Test_${_pkgver}_x86_64 singularityviewer
+
+# Remove old libraries
+#cd $srcdir
+cd singularityviewer/
+cd lib64/
+rm *SDL*
+rm *openal*
+rm *freetype*
+rm *expat*
+rm *apr*
+rm *alut*
   
 # Install Desktop File
 install -D -m644 $srcdir/singularityviewer.desktop \
@@ -58,6 +62,7 @@ install -D -m755 $srcdir/singularityviewer/licenses.txt \
   $pkgdir/usr/share/licenses/$pkgname/LICENSE
     
 # Move Data to Destination Directory
+cd $srcdir
 install -d $pkgdir/opt
 mv singularityviewer $pkgdir/opt/
   
@@ -71,33 +76,4 @@ 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|./etc/refresh_desktop_app_entry.sh|#./etc/refresh_desktop_app_entry.sh|' $pkgdir/opt/singularityviewer/singularity
 
-# Install harfbuzz binaries
-cd $srcdir/usr/lib/
-cp *harfbuzz.so* $pkgdir/opt/singularityviewer/lib64/
-
-# Install cairo binaries
-#cd $srcir/usr/lib/
-#cp *libcairo*.so* $pkgdir/opt/singularityviewer/lib64/
-#cp cairo/*cairo*.so* $pkgdir/opt/singularityviewer/lib64/
-
-cp cairo/cairo-fdr.so $pkgdir/opt/singularityviewer/lib64/
-cp cairo/cairo-fdr.so.0 $pkgdir/opt/singularityviewer/lib64/
-cp cairo/cairo-fdr.so.0.0.0 $pkgdir/opt/singularityviewer/lib64/
-cp cairo/cairo-sphinx.so $pkgdir/opt/singularityviewer/lib64/
-cp cairo/cairo-sphinx.so.0 $pkgdir/opt/singularityviewer/lib64/
-cp cairo/cairo-sphinx.so.0.0.0 $pkgdir/opt/singularityviewer/lib64/
-cp cairo/libcairo-trace.so $pkgdir/opt/singularityviewer/lib64/
-cp cairo/libcairo-trace.so.0 $pkgdir/opt/singularityviewer/lib64/
-cp cairo/libcairo-trace.so.0.0.0 $pkgdir/opt/singularityviewer/lib64/
-cp libcairo-gobject.so $pkgdir/opt/singularityviewer/lib64/
-cp libcairo-gobject.so.2 $pkgdir/opt/singularityviewer/lib64/
-cp libcairo-gobject.so.2.11400.10 $pkgdir/opt/singularityviewer/lib64/
-cp libcairo-script-interpreter.so $pkgdir/opt/singularityviewer/lib64/
-cp libcairo-script-interpreter.so.2 $pkgdir/opt/singularityviewer/lib64/
-cp libcairo-script-interpreter.so.2.11400.10 $pkgdir/opt/singularityviewer/lib64/
-cp libcairo.so $pkgdir/opt/singularityviewer/lib64/
-cp libcairo.so.2 $pkgdir/opt/singularityviewer/lib64/
-cp libcairo.so.2.11400.10 $pkgdir/opt/singularityviewer/lib64/
-
-
 }