1.30.0.15-1: upstream update

6 files changed, 64 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 5b61ef9bcdb1..0dfa6b0fce64 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = coolvlviewer-bin
-	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', binary)
-	pkgver = 1.30.0.9
+	pkgdesc = A third-party viewer for Second Life (TM) and OpenSim grids.
+	pkgver = 1.30.0.15
 	pkgrel = 1
 	url = http://sldev.free.fr
 	install = coolvlviewer.install
@@ -41,11 +41,11 @@ pkgbase = coolvlviewer-bin
 	conflicts = coolvlviewer
 	conflicts = coolvlviewer-experimental
 	conflicts = coolvlviewer-experimental-bin
-	source = http://sldev.free.fr/binaries/CoolVLViewer-1.30.0.9-Linux-x86_64-Setup
+	source = http://sldev.free.fr/binaries/CoolVLViewer-1.30.0.15-Linux-x86_64-Setup
 	source = coolvlviewer.desktop
 	source = coolvlviewer.launcher
-	sha1sums = 5cbd5af28b9dfd4dc28b30d2009ec72e7e7222bd
-	sha1sums = 76de75412aad003b680bcb58ae54e51096642b0e
+	sha1sums = c47bb62ea5e2bbf5c65d721324864c2b27d8739e
+	sha1sums = e08076db600f7dcee78c0f7b861e8e78f16a069d
 	sha1sums = 3ef1284a00a4437e4c34f809311ee0672604ef04
 
 pkgname = coolvlviewer-bin
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 b27924025e80..7719fe69f1a2 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,66 @@
 # Maintainer: Alex Tharp <alex@toastercup.io>
-
 pkgname=coolvlviewer-bin
-pkgver=1.30.0.9
+pkgver=1.30.0.15
 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', binary)"
+pkgdesc="A third-party viewer for Second Life (TM) and OpenSim grids."
 url="http://sldev.free.fr"
 license=('custom')
 depends=('apr-util' 'glib2>=2.32' 'libgl' 'libidn' 'mesa' 'sdl' 'glu' 'pangox-compat' 'gconf' 'libxss' 'libxrandr' 'libxcomposite' 'libgl' 'lib32-zlib' 'libcups' 'atk' 'lib32-libsndfile' 'lib32-util-linux' 'lib32-libidn' 'libxcursor' 'libxtst')
 optdepends=(
-	'libpulse: for PulseAudio support'
-	'alsa-lib: for ALSA support'
-	'lib32-alsa-lib: for ALSA support'
-	'nvidia-utils: for NVIDIA support'
-	'pepper-flash: for inworld Flash support'
-	'gst-plugins-good: for video support'
-	'gst-plugins-bad: for video support'
-	'gst-plugins-ugly: for video support'
-	'lib32-freealut: for OpenAL support'
-	'lib32-libidn11: for voice support'
-	'wine: for SLVoice support')
+  'libpulse: for PulseAudio support'
+  'alsa-lib: for ALSA support'
+  'lib32-alsa-lib: for ALSA support'
+  'nvidia-utils: for NVIDIA support'
+  'pepper-flash: for inworld Flash support'
+  'gst-plugins-good: for video support'
+  'gst-plugins-bad: for video support'
+  'gst-plugins-ugly: for video support'
+  'lib32-freealut: for OpenAL support'
+  'lib32-libidn11: for voice support'
+  'wine: for SLVoice support')
 arch=('x86_64')
 conflicts=('coolvlviewer' 'coolvlviewer-experimental' 'coolvlviewer-experimental-bin')
 install=coolvlviewer.install
 source=("http://sldev.free.fr/binaries/CoolVLViewer-${pkgver}-Linux-x86_64-Setup"
         "coolvlviewer.desktop"
         "coolvlviewer.launcher")
-sha1sums=('5cbd5af28b9dfd4dc28b30d2009ec72e7e7222bd'
-          '76de75412aad003b680bcb58ae54e51096642b0e'
+sha1sums=('c47bb62ea5e2bbf5c65d721324864c2b27d8739e'
+          'e08076db600f7dcee78c0f7b861e8e78f16a069d'
           '3ef1284a00a4437e4c34f809311ee0672604ef04')
 
 build() {
-	cd $srcdir
-	chmod +x CoolVLViewer-${pkgver}-Linux-x86_64-Setup
+  cd $srcdir
+  chmod +x CoolVLViewer-${pkgver}-Linux-x86_64-Setup
 
-	# Run the installer
-	./CoolVLViewer-${pkgver}-Linux-x86_64-Setup --mode silent --destination $srcdir/coolvlviewer/
+  # Run the installer
+  ./CoolVLViewer-${pkgver}-Linux-x86_64-Setup --mode silent --destination $srcdir/coolvlviewer/
 }
 
 package() {
-	# Install Desktop File
-	install -D -m644 $srcdir/coolvlviewer.desktop \
-		$pkgdir/usr/share/applications/coolvlviewer.desktop
+  # Install Desktop File
+  install -D -m644 $srcdir/coolvlviewer.desktop \
+    $pkgdir/usr/share/applications/coolvlviewer.desktop
 
-	# Install Icon File
-	install -D -m755 $srcdir/coolvlviewer/cvlv_icon.png \
-		$pkgdir/usr/share/pixmaps/clvl_icon.png
+  # Install Icon File
+  install -D -m755 $srcdir/coolvlviewer/cvlv_icon.png \
+    $pkgdir/usr/share/pixmaps/clvl_icon.png
 
-	# Install Launcher
-	install -D -m755 $srcdir/coolvlviewer.launcher \
-		$pkgdir/usr/bin/coolvlviewer
+  # Install Launcher
+  install -D -m755 $srcdir/coolvlviewer.launcher \
+    $pkgdir/usr/bin/coolvlviewer
 
-	# Install License
-	install -D -m644 $srcdir/coolvlviewer/licenses.txt \
-		$pkgdir/usr/share/licenses/$pkgname/LISENSE
+  # Install License
+  install -D -m644 $srcdir/coolvlviewer/licenses.txt \
+    $pkgdir/usr/share/licenses/$pkgname/LISENSE
 
-	# Move Data to Destination Directory
-	install -d $pkgdir/opt/
-	mv coolvlviewer/ $pkgdir/opt/
+  # Move Data to Destination Directory
+  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
+  # 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
+  # Make Binary Group-Executable
+  chmod g+x $pkgdir/opt/coolvlviewer/cool_vl_viewer
 }
diff --git a/coolvlviewer.desktop b/coolvlviewer.desktop
index f1bb976443a6..7f249a0edb6b 100644
--- a/coolvlviewer.desktop
+++ b/coolvlviewer.desktop
@@ -1,9 +1,9 @@
 [Desktop Entry]
 Version=1.0
 Type=Application
-Name=Cool VL Viewer v1.28.2
-GenericName=A third-party viewer for Second Life (C) and OpenSim grids
-Comment=A third-party viewer for Second Life (C) and OpenSim grids
+Name=Cool VL Viewer
+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 7a0ef9173d55..6a5a9a6733a3 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_1282.xml."
+echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_1300.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,7 +9,7 @@ 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_1282.xml."
+echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_1300.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."
 }