1.26.18.26-1: Upstream update and first source package

3 files changed, 45 insertions, 28 deletions

diff --git a/.SRCINFO b/.SRCINFO
index aa231243c5a4..349be54b9358 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,28 @@
 # Generated by mksrcinfo v8
-# Sat Sep 24 13:39:21 UTC 2016
+# Sat Oct  1 15:18:31 UTC 2016
 pkgbase = coolvlviewer
-	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.26.18.25
+	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.26.18.26
 	pkgrel = 1
 	url = http://sldev.free.fr
 	install = coolvlviewer.install
+	arch = i686
 	arch = x86_64
 	license = custom
+	makedepends = cmake
+	makedepends = bison
+	makedepends = flex
+	makedepends = python2
+	makedepends = make
+	makedepends = bzip2
+	makedepends = glibc
+	makedepends = libx11
+	makedepends = libgl
+	makedepends = libxrender
+	makedepends = libidn
+	makedepends = libxinerama
 	depends = apr-util
-	depends = glib2>=2.32
+	depends = glib2
 	depends = libgl
 	depends = libidn
 	depends = libjpeg-turbo
@@ -26,12 +39,13 @@ pkgbase = coolvlviewer
 	optdepends = gst-plugins-bad: for video support
 	optdepends = gst-plugins-ugly: for video support
 	optdepends = lib32-freealut: for OpenAL support
-	conflicts = coolvlviewer-legacy
+	conflicts = coolvlviewer-bin
 	conflicts = coolvlviewer-experimental
-	source = http://sldev.free.fr/binaries/CoolVLViewer-1.26.18.25-Linux-x86_64-Setup
+	conflicts = coolvlviewer-experimental-bin
+	source = http://sldev.free.fr/sources/CoolVLViewer-src-1261826.tar.bz2
 	source = coolvlviewer.desktop
 	source = coolvlviewer.launcher
-	md5sums = 1a65c064ad6f95861a023faf98709595
+	md5sums = c50b66f32298091e82f714a26e8808d6
 	md5sums = 88b0bca907149f4c26389449081a13fd
 	md5sums = fd78de1f6c1333a5120ece89873515e0
 
diff --git a/PKGBUILD b/PKGBUILD
index ce53c0e0aeaa..810c6a3278f1 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,12 +1,13 @@
 # Maintainer: GordonGR <ntheo1979@gmail.com>
 
 pkgname=coolvlviewer
-pkgver=1.26.18.25
+pkgver=1.26.18.26
+_pkgver=1261826
 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 (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"
 license=('custom')
-depends=('apr-util' 'glib2>=2.32' 'libgl' 'libidn' 'libjpeg-turbo' 'mesa' 'nss' 'sdl' 'glu' 'pangox-compat')
+depends=('apr-util' 'glib2' 'libgl' 'libidn' 'libjpeg-turbo' 'mesa' 'nss' 'sdl' 'glu' 'pangox-compat')
 optdepends=(
 	'libpulse: for PulseAudio support'
 	'alsa-lib: for ALSA support'
@@ -16,23 +17,22 @@ optdepends=(
 	'gst-plugins-bad: for video support'
 	'gst-plugins-ugly: for video support'
 	'lib32-freealut: for OpenAL support')
-arch=('x86_64')
-conflicts=('coolvlviewer-legacy' 'coolvlviewer-experimental')
-install=coolvlviewer.install
-source=("http://sldev.free.fr/binaries/CoolVLViewer-${pkgver}-Linux-x86_64-Setup"
 
+makedepends=("cmake" "bison" "flex" "python2" "make" "bzip2" "glibc" "libx11" "libgl" "libxrender" "libidn" "libxinerama")
+arch=('i686' 'x86_64')
+conflicts=('coolvlviewer-bin' 'coolvlviewer-experimental' 'coolvlviewer-experimental-bin')
+install=coolvlviewer.install
+source=("http://sldev.free.fr/sources/CoolVLViewer-src-${_pkgver}.tar.bz2"
         "coolvlviewer.desktop"
         "coolvlviewer.launcher")
-md5sums=('1a65c064ad6f95861a023faf98709595'
+md5sums=('c50b66f32298091e82f714a26e8808d6'
          '88b0bca907149f4c26389449081a13fd'
          'fd78de1f6c1333a5120ece89873515e0')
 
 build() {
-cd $srcdir
-# Run the installer
-chmod +x CoolVLViewer-${pkgver}-Linux-x86_64-Setup
-./CoolVLViewer-${pkgver}-Linux-x86_64-Setup --mode silent --destination $srcdir/coolvlviewer/
 
+cd $srcdir/linden/indra
+./buildlinux.sh
 }
 
 package(){
@@ -41,7 +41,10 @@ install -D -m644 $srcdir/coolvlviewer.desktop \
 	$pkgdir/usr/share/applications/coolvlviewer.desktop
  
 # Install Icon File
-install -D -m755 $srcdir/coolvlviewer/cvlv_icon.png \
+
+#$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
@@ -49,10 +52,11 @@ install -D -m755 $srcdir/../coolvlviewer.launcher \
 	$pkgdir/usr/bin/coolvlviewer
     
 # Install License
-install -D -m644 $srcdir/coolvlviewer/licenses.txt \
+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/
     
@@ -62,5 +66,4 @@ chmod -R g+rw $pkgdir/opt/coolvlviewer
 
 # Make Binary Group-Executable
 chmod g+x $pkgdir/opt/coolvlviewer/cool_vl_viewer
-    
 }
diff --git a/coolvlviewer.install b/coolvlviewer.install
index 6983bcda2376..81e9f65bd638 100644
--- a/coolvlviewer.install
+++ b/coolvlviewer.install
@@ -11,15 +11,15 @@ echo ">>>  # gpasswd -a USERNAME games"
 echo ">>> Remember to logout and log back in for the changes to take effect."
 }
 
-#post_upgrade() {
-#echo ">> New way of selecting sound backend:"
-#echo ">> Use the AudioDisableFMODEx, AudioDisableOpenAL, MODExDisableALSA,"
-#echo ">> FMODExDisableOSS or FMODExDisablePulseAudio"
-#echo ">> Debug Settings."
+post_upgrade() {
+echo ">> New way of selecting sound backend:"
+echo ">> Use the AudioDisableFMODEx, AudioDisableOpenAL, MODExDisableALSA,"
+echo ">> FMODExDisableOSS or FMODExDisablePulseAudio"
+echo ">> Debug Settings."
 
 #echo ">>> New version of settings file is:"
 #echo ">>> ~/.secondlife/user_settings/settings_coolvlviewer_12618.xml."
-#}
+}
 
 op=$1
 shift