1.30.1.16-1: Upstream update

6 files changed, 35 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index e0bbb754cf0b..a510872152e5 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 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.29.0.4
+	pkgver = 1.30.1.16
 	pkgrel = 1
 	url = http://sldev.free.fr
 	install = coolvlviewer.install
@@ -9,7 +9,7 @@ pkgbase = coolvlviewer-experimental
 	makedepends = cmake
 	makedepends = bison
 	makedepends = flex
-	makedepends = python2
+	makedepends = python
 	makedepends = make
 	makedepends = bzip2
 	makedepends = glibc
@@ -54,11 +54,11 @@ pkgbase = coolvlviewer-experimental
 	conflicts = coolvlviewer-bin
 	conflicts = coolvlviewer
 	conflicts = coolvlviewer-experimental-bin
-	source = http://sldev.free.fr/sources/CoolVLViewer-src-12904.tar.bz2
+	source = http://sldev.free.fr/sources/CoolVLViewer-src-130116.tar.bz2
 	source = coolvlviewer.desktop
 	source = coolvlviewer.launcher
-	sha1sums = 1e70b1760d6f2ea6da25ac2fe4ae4e5d03fcc6e1
-	sha1sums = e294bc6af8df44320d6eddecb57f519146f53238
+	sha1sums = 6029636790f783d741ce866ff45d35e1fe27ecc7
+	sha1sums = e08076db600f7dcee78c0f7b861e8e78f16a069d
 	sha1sums = 3ef1284a00a4437e4c34f809311ee0672604ef04
 
 pkgname = coolvlviewer-experimental
diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 000000000000..8484116e62a8
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,9 @@
+root = true
+
+[*]
+indent_style = space
+indent_size = 2
+end_of_line = lf
+insert_final_newline = true
+charset = utf-8
+trim_trailing_whitespace = true
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..20ecb6977ed4
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,6 @@
+*-Setup
+*.src.tar*
+*.xz
+*.pkg.tar*
+pkg
+src
diff --git a/PKGBUILD b/PKGBUILD
index 6eabfe07f9f1..b50704d82c61 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Alex Tharp <alex@toastercup.io>
 
 pkgname=coolvlviewer-experimental
-pkgver=1.29.0.4
-_pkgver=12904
+pkgver=1.30.1.16
+_pkgver=130116
 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"
@@ -20,15 +20,15 @@ optdepends=(
 	'lib32-freealut: for OpenAL support'
 	'lib32-libidn11: for voice support'
 	'wine: for SLVoice support')
-makedepends=("cmake" "bison" "flex" "python2" "make" "bzip2" "glibc" "libx11" "libgl" "libxrender" "libidn" "libxinerama" "lib32-libxinerama")
+makedepends=("cmake" "bison" "flex" "python" "make" "bzip2" "glibc" "libx11" "libgl" "libxrender" "libidn" "libxinerama" "lib32-libxinerama")
 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")
-sha1sums=('1e70b1760d6f2ea6da25ac2fe4ae4e5d03fcc6e1'
-          'e294bc6af8df44320d6eddecb57f519146f53238'
+sha1sums=('6029636790f783d741ce866ff45d35e1fe27ecc7'
+          'e08076db600f7dcee78c0f7b861e8e78f16a069d'
           '3ef1284a00a4437e4c34f809311ee0672604ef04')
 
 build() {
@@ -40,28 +40,28 @@ 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 dd5fa4eb7fde..7f249a0edb6b 100644
--- a/coolvlviewer.desktop
+++ b/coolvlviewer.desktop
@@ -2,8 +2,8 @@
 Version=1.0
 Type=Application
 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
+GenericName=A third-party viewer for Second Life (TM) and OpenSim grids
+Comment=A third-party viewer for Second Life (TM) and OpenSim grids
 Exec=/usr/bin/coolvlviewer
 Icon=/opt/coolvlviewer/cvlv_icon.png
 Terminal=false
diff --git a/coolvlviewer.install b/coolvlviewer.install
index 5929142ae59e..d88789a4cfdd 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_1290.xml."
+echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_1301.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,6 +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_1290.xml."
+echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_1301.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."
 }