summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlex Tharp2025-02-27 17:24:30 -0500
committerAlex Tharp2025-02-27 17:24:30 -0500
commit8e6f697666cbaa36b7c79f5ebb99157faa27af79 (patch)
tree1e8b66682ee2a6f76071fcf3af8efc89cf784180
parent2f31d66bd532d934854dca00d402212949eba057 (diff)
downloadaur-coolvlviewer.tar.gz
chore: bump to v1.32.2.37; refactors
-rw-r--r--.SRCINFO32
-rw-r--r--PKGBUILD137
-rw-r--r--coolvlviewer.launcher5
3 files changed, 86 insertions, 88 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 23a24f9d274b..729258db85d2 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,24 +1,24 @@
pkgbase = coolvlviewer
- pkgdesc = A third-party viewer for Second Life and OpenSim grids. (built from source)
- pkgver = 1.32.2.9
+ pkgdesc = A third-party viewer for Second Life and OpenSim grids (built from source)
+ pkgver = 1.32.2.37
pkgrel = 1
url = http://sldev.free.fr
install = coolvlviewer.install
arch = x86_64
- license = GPL-2.0-only
- makedepends = cmake
+ license = GPL-2.0-or-later
makedepends = bison
- makedepends = flex
- makedepends = python
- makedepends = make
makedepends = bzip2
+ makedepends = cmake
+ makedepends = flex
makedepends = glibc
- makedepends = libx11
+ makedepends = lib32-libxinerama
makedepends = libgl
- makedepends = libxrender
makedepends = libidn
+ makedepends = libx11
makedepends = libxinerama
- makedepends = lib32-libxinerama
+ makedepends = libxrender
+ makedepends = make
+ makedepends = python
depends = apr-util
depends = atk
depends = gconf
@@ -30,9 +30,9 @@ pkgbase = coolvlviewer
depends = lib32-zlib
depends = libcups
depends = libgl
- depends = libgl
depends = libidn
depends = libxcomposite
+ depends = libxcrypt-compat
depends = libxcursor
depends = libxrandr
depends = libxss
@@ -52,12 +52,10 @@ pkgbase = coolvlviewer
optdepends = pepper-flash: for inworld Flash support
optdepends = wine: for SLVoice support
provides = coolvlviewer
- conflicts = coolvlviewer-bin
- source = http://sldev.free.fr/sources/CoolVLViewer-src-13229.tar.bz2
+ conflicts = coolvlviewer
+ source = http://sldev.free.fr/sources/CoolVLViewer-src-132237.tar.bz2
source = coolvlviewer.desktop
- source = coolvlviewer.launcher
- sha1sums = 5670b4b808d77e85b7692c6709df178b6e01c5ee
- sha1sums = 6336a03697c321495c3c9aacc57274b4a054f08a
- sha1sums = 3ef1284a00a4437e4c34f809311ee0672604ef04
+ sha1sums = 1506f08d562db77a13b6088fff3f335f9fe0d81b
+ sha1sums = 314763ee16ca2e2224c402ec18bf5b24157ce8b8
pkgname = coolvlviewer
diff --git a/PKGBUILD b/PKGBUILD
index 252f6fe146a4..54691b59e0ac 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,94 +1,99 @@
# Maintainer: Alex Tharp <alex at toastercup dot io>
-pkgname=coolvlviewer
-pkgver=1.32.2.29
+_appname="coolvlviewer"
+pkgname="${_appname}"
+provides=("${_appname}")
+conflicts=("${_appname}")
+pkgver=1.32.2.37
pkgrel=1
pkgdesc="A third-party viewer for Second Life and OpenSim grids (built from source)"
url="http://sldev.free.fr"
-license=('GPL-2.0-or-later')
+license=("GPL-2.0-or-later")
+arch=("x86_64")
depends=(
- 'apr-util'
- 'atk'
- 'gconf'
- 'glib2>=2.32'
- 'glu'
- 'lib32-libidn'
- 'lib32-libsndfile'
- 'lib32-util-linux'
- 'lib32-zlib'
- 'libcups'
- 'libgl'
- 'libidn'
- 'libxcomposite'
- 'libxcursor'
- 'libxrandr'
- 'libxss'
- 'libxtst'
- 'mesa'
- 'pangox-compat'
- 'sdl'
+ "apr-util"
+ "atk"
+ "gconf"
+ "glib2>=2.32"
+ "glu"
+ "lib32-libidn"
+ "lib32-libsndfile"
+ "lib32-util-linux"
+ "lib32-zlib"
+ "libcups"
+ "libgl"
+ "libidn"
+ "libxcomposite"
+ "libxcrypt-compat"
+ "libxcursor"
+ "libxrandr"
+ "libxss"
+ "libxtst"
+ "mesa"
+ "pangox-compat"
+ "sdl"
)
optdepends=(
- 'alsa-lib: for ALSA support'
- 'gst-plugins-bad: for video support'
- 'gst-plugins-good: for video support'
- 'gst-plugins-ugly: for video support'
- 'lib32-alsa-lib: for ALSA support'
- 'lib32-freealut: for OpenAL support'
- 'lib32-libidn11: for voice support'
- 'libpulse: for PulseAudio support'
- 'nvidia-utils: for NVIDIA support'
- 'pepper-flash: for inworld Flash support'
- 'wine: for SLVoice support'
+ "alsa-lib: for ALSA support"
+ "gst-plugins-bad: for video support"
+ "gst-plugins-good: for video support"
+ "gst-plugins-ugly: for video support"
+ "lib32-alsa-lib: for ALSA support"
+ "lib32-freealut: for OpenAL support"
+ "lib32-libidn11: for voice support"
+ "libpulse: for PulseAudio support"
+ "nvidia-utils: for NVIDIA support"
+ "pepper-flash: for inworld Flash support"
+ "wine: for SLVoice support"
)
makedepends=(
- 'cmake'
- 'bison'
- 'flex'
- 'python'
- 'make'
- 'bzip2'
- 'glibc'
- 'libx11'
- 'libgl'
- 'libxrender'
- 'libidn'
- 'libxinerama'
- 'lib32-libxinerama'
+ "bison"
+ "bzip2"
+ "cmake"
+ "flex"
+ "glibc"
+ "lib32-libxinerama"
+ "libgl"
+ "libidn"
+ "libx11"
+ "libxinerama"
+ "libxrender"
+ "make"
+ "python"
)
-arch=('x86_64')
-conflicts=('coolvlviewer-bin')
-provides=('coolvlviewer')
-install=coolvlviewer.install
+install="${_appname}.install"
source=(
"http://sldev.free.fr/sources/CoolVLViewer-src-${pkgver//./}.tar.bz2"
- "coolvlviewer.desktop"
- "coolvlviewer.launcher"
+ "${_appname}.desktop"
)
sha1sums=(
- 'eb476ffddc6759c672093a1ab1b82b6051ebb2be'
- '314763ee16ca2e2224c402ec18bf5b24157ce8b8'
- '3ef1284a00a4437e4c34f809311ee0672604ef04'
+ "1506f08d562db77a13b6088fff3f335f9fe0d81b"
+ "314763ee16ca2e2224c402ec18bf5b24157ce8b8"
)
build() {
- cd $srcdir/linden
+ cd "${srcdir}/linden"
+
+ # TODO: Investigate optimizations, e.g. --tune --usesystemlib --lto
+ # See what can be gleaned from e.g. https://github.com/secondlife/viewer/blob/88a2e54/.github/workflows/build.yaml
./linux-build.sh
}
package() {
- install -D -m755 $srcdir/coolvlviewer.launcher $pkgdir/usr/bin/coolvlviewer
- install -D -m644 $srcdir/coolvlviewer.desktop $pkgdir/usr/share/applications/coolvlviewer.desktop
- 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 -D -m644 $srcdir/linden/indra/viewer-linux-x86_64-release/newview/CoolVLViewer-x86_64-$pkgver/licenses.txt $pkgdir/usr/share/licenses/$pkgname/LICENSE
+ install -D -m644 "${srcdir}/${_appname}.desktop" "${pkgdir}/usr/share/applications/${_appname}.desktop"
+ 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 -D -m644 "${srcdir}/linden/indra/viewer-linux-x86_64-release/newview/CoolVLViewer-x86_64-${pkgver}/licenses.txt" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
# Move Data to Destination Directory
- install -d $pkgdir/opt/
- mv coolvlviewer/ $pkgdir/opt/
+ install -d "${pkgdir}/opt/"
+ mv "${_appname}/" "${pkgdir}/opt/"
# Change Permissions of files to root:games
- chown -R root:games $pkgdir/opt/coolvlviewer
- chmod -R g+rw $pkgdir/opt/coolvlviewer
+ chown -R root:games "${pkgdir}/opt/${_appname}"
+ chmod -R g+rw "${pkgdir}/opt/${_appname}"
# Make Binary Group-Executable
- chmod g+x $pkgdir/opt/coolvlviewer/cool_vl_viewer
+ chmod g+x "${pkgdir}/opt/${_appname}/cool_vl_viewer"
+
+ install -d "${pkgdir}/usr/bin"
+ ln -s "/opt/${_appname}/cool_vl_viewer" "${pkgdir}/usr/bin/${_appname}"
}
diff --git a/coolvlviewer.launcher b/coolvlviewer.launcher
deleted file mode 100644
index 798d3a045861..000000000000
--- a/coolvlviewer.launcher
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/bin/sh
-
-cd "/opt/coolvlviewer/"
-./cool_vl_viewer $*
-exit $?