diff options
author | Mike Swanson | 2016-05-31 03:27:49 -0700 |
---|---|---|
committer | Mike Swanson | 2016-05-31 03:46:52 -0700 |
commit | 4b8d17d7304925976182b9b33b761e59d3c94496 (patch) | |
tree | 5fd3795b567f0658ebe23e57a3f385f05f3e32e8 | |
parent | 1c4fca8e66f793e765d42182ddfeabebec59d9e6 (diff) | |
download | aur-4b8d17d7304925976182b9b33b761e59d3c94496.tar.gz |
Fix DRI path (again), make it actually games-group-only.
-rw-r--r-- | .SRCINFO | 6 | ||||
-rw-r--r-- | 0001-firestorm-libgl-path.patch | 16 | ||||
-rw-r--r-- | PKGBUILD | 38 |
3 files changed, 44 insertions, 16 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Mar 18 02:49:26 UTC 2016 +# mar Maj 31 10:27:43 UTC 2016 pkgbase = firestorm-bin pkgdesc = Firestorm is a feature-packed third-party viewer for Second Life. pkgver = 4.7.7.48706 - pkgrel = 1 + pkgrel = 2 url = http://www.firestormviewer.org/ install = firestorm.install arch = i686 @@ -33,10 +33,12 @@ pkgbase = firestorm-bin optdepends = nvidia-libgl: for NVIDIA support optdepends = nvidia-utils: for NVIDIA support source = http://downloads.firestormviewer.org/linux/Phoenix_FirestormOS-Releasex64_x86_64_4.7.7.48706.tar.xz + source = 0001-firestorm-libgl-path.patch source = firestorm.install source = firestorm.desktop source = firestorm.launcher sha256sums = e90877eba293266701590e4c528ebf8684f751932307b14cf30da578246eae00 + sha256sums = 619153f3540ad48ec31c702086883a6adccacc70b384b300edaa6f7957f27232 sha256sums = ed579cd61cadda55956e5dd8063a34f3c02b8263372e52e9312966a2bf79b55c sha256sums = 6dffebc474fd98d23bf8d9f4a7592795642dbddf3a0b585f89d25ff11ae15cc1 sha256sums = b2ce32d268f76f4324807d50c4098a3480b489ec447133ce8d9b9c4a7bc05530 diff --git a/0001-firestorm-libgl-path.patch b/0001-firestorm-libgl-path.patch new file mode 100644 index 000000000000..fb42de3241f2 --- /dev/null +++ b/0001-firestorm-libgl-path.patch @@ -0,0 +1,16 @@ +diff --git a/firestorm b/firestorm +index ece2cf2..1ebf9ad 100755 +--- a/firestorm ++++ b/firestorm +@@ -85,9 +85,9 @@ exportMutliArchDRIPath "i386" + exportMutliArchDRIPath "amd64" + if [ -z ${LIBGL_DRIVERS_PATH} ] + then +- export LIBGL_DRIVERS_PATH="/usr/lib64/dri:/usr/lib32/dri:/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/x86_64-linux-gnu/dri" ++ export LIBGL_DRIVERS_PATH="/usr/lib64/dri:/usr/lib32/dri:/usr/lib32/xorg/modules/dri:/usr/lib64/xorg/modules/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/x86_64-linux-gnu/dri" + else +- export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH}:/usr/lib64/dri:/usr/lib32/dri:/usr/lib/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/x86_64-linux-gnu/dri" ++ export LIBGL_DRIVERS_PATH="${LIBGL_DRIVERS_PATH}:/usr/lib64/dri:/usr/lib32/dri:/usr/lib32/xorg/modules/dri:/usr/lib64/xorg/modules/dri:/usr/lib/i386-linux-gnu/dri:/usr/lib/x86_64-linux-gnu/dri" + fi + echo "LIBGL_DRIVERS_PATH is ${LIBGL_DRIVERS_PATH}" + @@ -1,7 +1,7 @@ # Maintainer: Mike Swanson <mikeonthecomputer@gmail.com> pkgname=firestorm-bin pkgver=4.7.7.48706 -pkgrel=1 +pkgrel=2 pkgdesc="Firestorm is a feature-packed third-party viewer for Second Life." url="http://www.firestormviewer.org/" license=('GPL') @@ -20,19 +20,23 @@ optdepends=( install=firestorm.install if [ "$CARCH" = "i686" ]; then source=("http://downloads.firestormviewer.org/linux/Phoenix_FirestormOS-Release_i686_$pkgver.tar.xz" + 0001-firestorm-libgl-path.patch firestorm.install firestorm.desktop firestorm.launcher) sha256sums=(b826d89dd2b98e90f26fd0ec7b63351c30e55d17dda7e68188f1258b725737a3 + 619153f3540ad48ec31c702086883a6adccacc70b384b300edaa6f7957f27232 ed579cd61cadda55956e5dd8063a34f3c02b8263372e52e9312966a2bf79b55c 6dffebc474fd98d23bf8d9f4a7592795642dbddf3a0b585f89d25ff11ae15cc1 b2ce32d268f76f4324807d50c4098a3480b489ec447133ce8d9b9c4a7bc05530) else source=("http://downloads.firestormviewer.org/linux/Phoenix_FirestormOS-Releasex64_x86_64_$pkgver.tar.xz" + 0001-firestorm-libgl-path.patch firestorm.install firestorm.desktop firestorm.launcher) sha256sums=(e90877eba293266701590e4c528ebf8684f751932307b14cf30da578246eae00 + 619153f3540ad48ec31c702086883a6adccacc70b384b300edaa6f7957f27232 ed579cd61cadda55956e5dd8063a34f3c02b8263372e52e9312966a2bf79b55c 6dffebc474fd98d23bf8d9f4a7592795642dbddf3a0b585f89d25ff11ae15cc1 b2ce32d268f76f4324807d50c4098a3480b489ec447133ce8d9b9c4a7bc05530) @@ -44,38 +48,44 @@ prepare() { else mv "$srcdir/Phoenix_FirestormOS-Releasex64_x86_64_$pkgver" "$srcdir/firestorm" fi + + cd "firestorm" + for patch in ../*.patch; do + if [ ! -f "$patch" ]; then + break; + else + patch -p1 -i "$patch" + fi + done } package() { - cd "$srcdir" - - # Fix fontconfig >= 2.9.0 issue - ln -s libfontconfig.so.1.4.4 firestorm/lib/libfontconfig.so.1 + cd "$srcdir/firestorm" # File modes fix. - find firestorm -type d -execdir chmod 755 "{}" \; - find firestorm -type f -execdir chmod 644 "{}" \; - chmod 755 firestorm/bin/* firestorm/firestorm + find -type d -execdir chmod 755 "{}" \; + find -type f -execdir chmod 644 "{}" \; + chmod 754 bin/* firestorm # Install Desktop File - install -D -m644 "$srcdir"/firestorm.desktop \ + install -D -m644 -g games ../firestorm.desktop \ "$pkgdir"/usr/share/applications/firestorm.desktop # Install Icon File - install -D -m644 "$srcdir"/firestorm/firestorm_icon.png \ + install -D -m644 -g games firestorm_icon.png \ "$pkgdir"/usr/share/pixmaps/firestorm_icon.png # Install Launcher - install -D -m755 "$srcdir"/firestorm.launcher \ + install -D -m754 -g games ../firestorm.launcher \ "$pkgdir"/usr/bin/firestorm # Move Data to Destination Directory - install -d "$pkgdir"/opt/ - mv firestorm/ "$pkgdir"/opt/ + cd .. + install -d "$pkgdir"/opt + mv firestorm/ "$pkgdir"/opt # Change Permissions of files to root:games chown -R root:games "$pkgdir"/opt/firestorm - chmod -R g+r "$pkgdir"/opt/firestorm # Make Binary Group-Executable chmod g+x "$pkgdir"/opt/firestorm/firestorm |