1.29.0.4-1: upstream update

4 files changed, 45 insertions, 53 deletions

diff --git a/.SRCINFO b/.SRCINFO
index bb0e5603e6d2..e0bbb754cf0b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,10 +1,9 @@
 pkgbase = coolvlviewer-experimental
 	pkgdesc = A third-party viewer for Second Life (C) (secondlife) and OpenSim (opensimulator) grids. ('VL' stands for virtual life, formerly known as 'Cool SL Viewer'; built from source)
-	pkgver = 1.28.1.9
+	pkgver = 1.29.0.4
 	pkgrel = 1
 	url = http://sldev.free.fr
 	install = coolvlviewer.install
-	arch = i686
 	arch = x86_64
 	license = custom
 	makedepends = cmake
@@ -55,12 +54,11 @@ pkgbase = coolvlviewer-experimental
 	conflicts = coolvlviewer-bin
 	conflicts = coolvlviewer
 	conflicts = coolvlviewer-experimental-bin
-	source = http://sldev.free.fr/sources/CoolVLViewer-src-12819.tar.bz2
+	source = http://sldev.free.fr/sources/CoolVLViewer-src-12904.tar.bz2
 	source = coolvlviewer.desktop
 	source = coolvlviewer.launcher
-	md5sums = 6a74ebf8dabfb9d2d1099a68a35fe082
-	md5sums = 3eec811cef6a8186d00adc5200d0f486
-	md5sums = fd78de1f6c1333a5120ece89873515e0
+	sha1sums = 1e70b1760d6f2ea6da25ac2fe4ae4e5d03fcc6e1
+	sha1sums = e294bc6af8df44320d6eddecb57f519146f53238
+	sha1sums = 3ef1284a00a4437e4c34f809311ee0672604ef04
 
 pkgname = coolvlviewer-experimental
-
diff --git a/PKGBUILD b/PKGBUILD
index 09078ef4828f..6eabfe07f9f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: GordonGR <ntheo1979@gmail.com>
+# Maintainer: Alex Tharp <alex@toastercup.io>
 
 pkgname=coolvlviewer-experimental
-pkgver=1.28.1.9
-_pkgver=12819
+pkgver=1.29.0.4
+_pkgver=12904
 pkgrel=1
 pkgdesc="A third-party viewer for Second Life (C) (secondlife) and OpenSim (opensimulator) grids. ('VL' stands for virtual life, formerly known as 'Cool SL Viewer'; built from source)"
 url="http://sldev.free.fr"
@@ -21,51 +21,47 @@ optdepends=(
 	'lib32-libidn11: for voice support'
 	'wine: for SLVoice support')
 makedepends=("cmake" "bison" "flex" "python2" "make" "bzip2" "glibc" "libx11" "libgl" "libxrender" "libidn" "libxinerama" "lib32-libxinerama")
-arch=('i686' 'x86_64')
+arch=('x86_64')
 conflicts=('coolvlviewer-bin' 'coolvlviewer' 'coolvlviewer-experimental-bin')
 install=coolvlviewer.install
 source=("http://sldev.free.fr/sources/CoolVLViewer-src-${_pkgver}.tar.bz2"
         "coolvlviewer.desktop"
         "coolvlviewer.launcher")
-md5sums=('6a74ebf8dabfb9d2d1099a68a35fe082'
-         '3eec811cef6a8186d00adc5200d0f486'
-         'fd78de1f6c1333a5120ece89873515e0')
+sha1sums=('1e70b1760d6f2ea6da25ac2fe4ae4e5d03fcc6e1'
+          'e294bc6af8df44320d6eddecb57f519146f53238'
+          '3ef1284a00a4437e4c34f809311ee0672604ef04')
 
 build() {
-
-cd $srcdir/linden/indra
-./buildlinux.sh
+	cd $srcdir/linden
+	./linux-build.sh
 }
 
-package(){
-# Install Desktop File
-install -D -m644 $srcdir/coolvlviewer.desktop \
-	$pkgdir/usr/share/applications/coolvlviewer.desktop
- 
-# Install Icon File
-
-#$srcdir/linden/indra/viewer-linux-i686-release/newview/CoolVLViewer-i686-$pkgver/
-
-install -D -m755 $srcdir/linden/indra/viewer-linux-i686-release/newview/CoolVLViewer-i686-$pkgver/cvlv_icon.png \
-	$pkgdir/usr/share/pixmaps/clvl_icon.png
-
-# Install Launcher
-install -D -m755 $srcdir/../coolvlviewer.launcher \
-	$pkgdir/usr/bin/coolvlviewer
-    
-# Install License
-install -D -m644 $srcdir/linden/indra/viewer-linux-i686-release/newview/CoolVLViewer-i686-$pkgver/licenses.txt \
-	$pkgdir/usr/share/licenses/$pkgname/LISENSE
-    
-# Move Data to Destination Directory
-mv $srcdir/linden/indra/viewer-linux-i686-release/newview/CoolVLViewer-i686-$pkgver/ $srcdir/coolvlviewer
-install -d $pkgdir/opt/
-mv coolvlviewer/ $pkgdir/opt/
-    
-# Change Permissions of files to root:games
-chown -R root:games $pkgdir/opt/coolvlviewer
-chmod -R g+rw $pkgdir/opt/coolvlviewer
-
-# Make Binary Group-Executable
-chmod g+x $pkgdir/opt/coolvlviewer/cool_vl_viewer
+package() {
+	# Install Desktop File
+	install -D -m644 $srcdir/coolvlviewer.desktop \
+		$pkgdir/usr/share/applications/coolvlviewer.desktop
+	
+	# Install Icon File
+	install -D -m755 $srcdir/linden/indra/viewer-linux-x86_64-release/newview/CoolVLViewer-x86_64-$pkgver/cvlv_icon.png \
+		$pkgdir/usr/share/pixmaps/clvl_icon.png
+	
+	# Install Launcher
+	install -D -m755 $srcdir/coolvlviewer.launcher \
+		$pkgdir/usr/bin/coolvlviewer
+	
+	# Install License
+	install -D -m644 $srcdir/linden/indra/viewer-linux-x86_64-release/newview/CoolVLViewer-x86_64-$pkgver/licenses.txt \
+		$pkgdir/usr/share/licenses/$pkgname/LISENSE
+	
+	# Move Data to Destination Directory
+	mv $srcdir/linden/indra/viewer-linux-x86_64-release/newview/CoolVLViewer-x86_64-$pkgver/ $srcdir/coolvlviewer
+	install -d $pkgdir/opt/
+	mv coolvlviewer/ $pkgdir/opt/
+	
+	# Change Permissions of files to root:games
+	chown -R root:games $pkgdir/opt/coolvlviewer
+	chmod -R g+rw $pkgdir/opt/coolvlviewer
+	
+	# Make Binary Group-Executable
+	chmod g+x $pkgdir/opt/coolvlviewer/cool_vl_viewer
 }
diff --git a/coolvlviewer.desktop b/coolvlviewer.desktop
index 1dece8e8769c..dd5fa4eb7fde 100644
--- a/coolvlviewer.desktop
+++ b/coolvlviewer.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Cool VL Viewer v1.28.1
+Name=Cool VL Viewer
 GenericName=A third-party viewer for Second Life (C) and OpenSim grids
 Comment=A third-party viewer for Second Life (C) and OpenSim grids
 Exec=/usr/bin/coolvlviewer
diff --git a/coolvlviewer.install b/coolvlviewer.install
index 1b54a473ff63..5929142ae59e 100644
--- a/coolvlviewer.install
+++ b/coolvlviewer.install
@@ -1,6 +1,6 @@
 post_install() {
 echo ">>> The version of settings file is:"
-echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_1281.xml."
+echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_1290.xml."
 echo ">>> You must also add your user to the 'games' group."
 echo ">>>  # gpasswd -a USERNAME games"
 echo ">>> Remember to logout and log back in for the changes to take effect."
@@ -9,8 +9,6 @@ echo ">>> To use SLVoice, please make sure Wine is installed on your system and
 
 post_upgrade() {
 echo ">>> New version of settings file is:"
-echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_1281.xml."
+echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_1290.xml."
 echo ">>> To use SLVoice, please make sure Wine is installed on your system and then simply run the script "install-wine-SLVoice.sh" to setup everything for the viewer."
 }
-
-