Permalink
Browse files

fixed Makefile typo, added optdepend for worldwind

  • Loading branch information...
1 parent 210cc90 commit 529611e454103e7ba2a0613770a10d8b15bd6f6f @floft committed Jan 19, 2012
Showing with 11 additions and 7 deletions.
  1. +1 −1 Makefile
  2. +10 −6 worldwind/PKGBUILD
View
2 Makefile
@@ -6,5 +6,5 @@ all:
clean:
find -mindepth 1 -maxdepth 2 -type d \( -name pkg -o -name src \) -exec rm -rf {} +
- find -mindepth 1 -maxdepth 2 -type f \( -name '*.tar.[gx]z' -o '*.zip' -o -name '*.bz2' \) -delete
+ find -mindepth 1 -maxdepth 2 -type f \( -name '*.tar.[gx]z' -o -name '*.zip' -o -name '*.bz2' \) -delete
find -name '*~' -delete
View
16 worldwind/PKGBUILD
@@ -1,23 +1,27 @@
# Maintainer: Garrett <floft.net/contact>
pkgname=worldwind
pkgver=0.5.0
-pkgrel=1
+pkgrel=4
pkgdesc="Open 3D earth viewer with GPS support"
url="http://sourceforge.net/projects/nasa-exp/"
license=("GPL")
arch=('i686' 'x86_64')
depends=('jogl')
+optdepends=('libtxc_dxtn: radeon and nouveau support')
makedepends=()
-source=(http://sourceforge.net/projects/nasa-exp/files/World%20Wind%20Java/$pkgver/worldwind-release.$pkgver.zip/download)
+source=(http://downloads.sourceforge.net/project/nasa-exp/World%20Wind%20Java/$pkgver/worldwind-release.$pkgver.zip)
md5sums=('6efb29a4720c98503bcabb18810f7d2b')
build() {
cd "$srcdir"
- echo "#!/bin/bash" > worldwind
- echo "cd '/usr/share/worldwind/'; java -Xmx512m -Dsun.java2d.noddraw=true -classpath ./src:./classes:./worldwind.jar:./jogl.jar:./gluegen-rt.jar gov.nasa.worldwind.examples.ApplicationTemplate" >> worldwind
+ cat > worldwind <<EOF
+#!/bin/bash
+cd '/usr/share/worldwind/';
+java -Xmx512m -Dsun.java2d.noddraw=true -classpath ./src:./classes:./worldwind.jar:./jogl.jar:./gluegen-rt.jar gov.nasa.worldwind.examples.ApplicationTemplate
+EOF
mkdir -p "$pkgdir/usr/share/worldwind/"
- cp -r * "$pkgdir/usr/share/worldwind"
+ cp -r * "$pkgdir/usr/share/worldwind"
+
mkdir -p "$pkgdir/usr/bin/"
install -Dm755 worldwind "$pkgdir/usr/bin/"
}
-

0 comments on commit 529611e

Please sign in to comment.