diff options
| -rw-r--r-- | .SRCINFO | 28 | ||||
| -rw-r--r-- | .gitignore | 5 | ||||
| -rw-r--r-- | PKGBUILD | 70 | ||||
| -rw-r--r-- | firestorm-beta.desktop (renamed from firestorm.desktop) | 6 | ||||
| -rw-r--r-- | firestorm-beta.install (renamed from firestorm.install) | 0 | ||||
| -rwxr-xr-x | firestorm-beta.launcher | 4 | ||||
| -rwxr-xr-x | firestorm.launcher | 5 |
7 files changed, 58 insertions, 60 deletions
@@ -1,23 +1,25 @@ pkgbase = firestorm-beta-bin - pkgdesc = Firestorm is a feature-packed third-party viewer for Second Life. This is the beta release that currently features the Environmental Enhancement Project (EEP). - pkgver = 6.4.5.60799 + pkgdesc = [ALPHA] Firestorm is a feature-packed third-party viewer for Second Life. This is the *alpha* release that currently features PBR support. **USE AT YOUR OWN RISK** + pkgver = 7.1.1.72630 pkgrel = 1 - url = https://www.firestormviewer.org/ - install = firestorm.install + url = http://www.firestormviewer.org/ + install = firestorm-beta.install arch = x86_64 license = GPL + depends = apr-util depends = dbus-glib - depends = gconf depends = glu depends = gtk2 depends = lib32-libidn depends = lib32-libsndfile depends = lib32-util-linux depends = lib32-zlib + depends = libbsd depends = libgl depends = libidn depends = libjpeg-turbo depends = libpng + depends = libxcrypt-compat depends = libxss depends = libxml2 depends = mesa @@ -36,15 +38,11 @@ pkgbase = firestorm-beta-bin optdepends = mesa-libgl: For Intel, Radeon, Nouveau support optdepends = nvidia-libgl: for NVIDIA support optdepends = nvidia-utils: for NVIDIA support - conflicts = firestorm - conflicts = firestorm-bin - conflicts = firestorm-nightly - source = https://downloads.firestormviewer.org/linux/Phoenix_Firestorm-Betax64_x86_64_6.4.5.60799.tar.xz - source = firestorm.desktop - source = firestorm.launcher - md5sums = a81c456113de1fd2ba4fb52671dded42 - md5sums = 6b22ac512adc9b226fd91a23f7fe9921 - md5sums = 2be5ef0f27414638a81003aa2f2ea6f1 + source = https://downloads.firestormviewer.org/test/linux/Phoenix-Firestorm-Alphax64-7-1-1-72630.tar.xz + source = firestorm-beta.desktop + source = firestorm-beta.launcher + md5sums = 0051a964c93d0985aee532e87efb6f5c + md5sums = 7ff5bb5e5d5ff8f4a77656bac520c6d3 + md5sums = a83a8c77f8619f06d23dd73b79e4703e pkgname = firestorm-beta-bin - diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..556aaf13d534 --- /dev/null +++ b/.gitignore @@ -0,0 +1,5 @@ +*.src.tar* +*.xz +*.pkg.tar* +pkg +src @@ -1,15 +1,16 @@ # Maintainer: Alex Tharp <alex@toastercup.io> -# Based on firestorm-bin PKGBUILD by: Mike Swanson <mikeonthecomputer@gmail.com> -pkgname=firestorm-beta-bin -pkgver=6.4.5.60799 +_appname=firestorm-beta +pkgname="${_appname}-bin" +pkgver=7.1.1.72630 pkgrel=1 -pkgdesc="Firestorm is a feature-packed third-party viewer for Second Life. This is the beta release that currently features the Environmental Enhancement Project (EEP)." -url="https://www.firestormviewer.org/" +pkgdesc="[ALPHA] Firestorm is a feature-packed third-party viewer for Second Life. This is the *alpha* release that currently features PBR support. **USE AT YOUR OWN RISK**" +url="http://www.firestormviewer.org/" license=('GPL') arch=('x86_64') -depends=(dbus-glib gconf glu gtk2 lib32-libidn lib32-libsndfile - lib32-util-linux lib32-zlib libgl libidn libjpeg-turbo libpng - libxss libxml2 mesa nss openal sdl vlc zlib) +depends=(apr-util dbus-glib glu gtk2 lib32-libidn lib32-libsndfile + lib32-util-linux lib32-zlib libbsd libgl libidn libjpeg-turbo + libpng libxcrypt-compat libxss libxml2 mesa nss openal sdl + vlc zlib) optdepends=( 'alsa-lib: for ALSA support' 'pepper-flash: for inworld Flash support' @@ -21,19 +22,17 @@ optdepends=( 'mesa-libgl: For Intel, Radeon, Nouveau support' 'nvidia-libgl: for NVIDIA support' 'nvidia-utils: for NVIDIA support') -conflicts=('firestorm' 'firestorm-bin' 'firestorm-nightly') -install=firestorm.install -source=("https://downloads.firestormviewer.org/linux/Phoenix_Firestorm-Betax64_x86_64_$pkgver.tar.xz" - firestorm.desktop - firestorm.launcher) -md5sums=('a81c456113de1fd2ba4fb52671dded42' - '6b22ac512adc9b226fd91a23f7fe9921' - '2be5ef0f27414638a81003aa2f2ea6f1') +install="${_appname}.install" +tardir="Phoenix-Firestorm-Alphax64-${pkgver//./-}" +source=("https://downloads.firestormviewer.org/test/linux/${tardir}.tar.xz" + "${_appname}.desktop" + "${_appname}.launcher") +md5sums=('0051a964c93d0985aee532e87efb6f5c' + '7ff5bb5e5d5ff8f4a77656bac520c6d3' + 'a83a8c77f8619f06d23dd73b79e4703e') prepare() { - mv "$srcdir/Phoenix_Firestorm-Betax64_x86_64_$pkgver" "$srcdir/firestorm" - - cd "firestorm" + cd "${srcdir}/${tardir}" for patch in ../*.patch; do if [ ! -f "$patch" ]; then break; @@ -44,27 +43,24 @@ prepare() { } package() { - cd "$srcdir/firestorm" + install -d "${pkgdir}/usr/lib" + cp -a "${srcdir}/${tardir}" "${pkgdir}/usr/lib/${_appname}" + cd "${pkgdir}/usr/lib/${_appname}" - # File modes fix. - find -type d -execdir chmod 755 "{}" \; - find -type f -execdir chmod 644 "{}" \; - chmod 755 bin/* firestorm etc/* + find app_settings skins -type f -execdir chmod 644 "{}" + - # Install Desktop File - install -D -m644 ../firestorm.desktop \ - "$pkgdir"/usr/share/applications/firestorm.desktop + # find and remove broken symlinks + find -L . -type l -delete - # Install Icon File - install -D -m644 firestorm_icon.png \ - "$pkgdir"/usr/share/pixmaps/firestorm_icon.png + # Install desktop file + install -D -m644 "${srcdir}/${_appname}.desktop" \ + "$pkgdir/usr/share/applications/${_appname}.desktop" - # Install Launcher - install -D -m755 ../firestorm.launcher \ - "$pkgdir"/usr/bin/firestorm + # Install icon file + install -D -m644 firestorm_icon.png \ + "$pkgdir/usr/share/pixmaps/${_appname}.png" - # Move Data to Destination Directory - cd .. - install -d "$pkgdir"/opt - mv firestorm/ "$pkgdir"/opt + # Install launcher + install -D -m755 "${srcdir}/${_appname}.launcher" \ + "$pkgdir/usr/bin/${_appname}" } diff --git a/firestorm.desktop b/firestorm-beta.desktop index 1295f3bd1f94..cf143b88e041 100644 --- a/firestorm.desktop +++ b/firestorm-beta.desktop @@ -1,9 +1,9 @@ [Desktop Entry] Version=1.0 Type=Application -Name=Firestorm Second Life viewer +Name=ALPHA Firestorm Second Life viewer Comment=Second Life is a 3-D virtual world entirely built and owned by its residents -Exec=/usr/bin/firestorm -Icon=/usr/share/pixmaps/firestorm_icon.png +Exec=/usr/bin/firestorm-beta +Icon=firestorm-beta Terminal=false Categories=Game diff --git a/firestorm.install b/firestorm-beta.install index 32976b962eba..32976b962eba 100644 --- a/firestorm.install +++ b/firestorm-beta.install diff --git a/firestorm-beta.launcher b/firestorm-beta.launcher new file mode 100755 index 000000000000..ef5420ac48d9 --- /dev/null +++ b/firestorm-beta.launcher @@ -0,0 +1,4 @@ +#!/bin/sh + +cd "/usr/lib/firestorm-beta/" +exec ./firestorm $* diff --git a/firestorm.launcher b/firestorm.launcher deleted file mode 100755 index 94987c07abd9..000000000000 --- a/firestorm.launcher +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/sh - -cd "/opt/firestorm/" -./firestorm $* -exit $? |