diff options
author | Dan Beste | 2018-05-18 22:21:01 -0500 |
---|---|---|
committer | Dan Beste | 2018-05-18 22:21:01 -0500 |
commit | a535cb1edb9c3c9791f4794c7e8278e710f9d3fc (patch) | |
tree | 9ff21a993e23df1c1064f3cb4f4bade07d257dbe | |
parent | 8dfa45fbf7a75713870a7a4d1fea2e4ed1c527b5 (diff) | |
download | aur-a535cb1edb9c3c9791f4794c7e8278e710f9d3fc.tar.gz |
upgpkg: openjk-git r3590.c3d2a806-1
PKGBUILD update
I won't have time to test until later this weekend, so please notify me
of any breakage.
-rw-r--r-- | .SRCINFO | 20 | ||||
-rw-r--r-- | .gitignore | 9 | ||||
-rw-r--r-- | PKGBUILD | 97 |
3 files changed, 67 insertions, 59 deletions
@@ -1,26 +1,20 @@ -# Generated by mksrcinfo v8 -# Wed Jun 22 20:03:55 UTC 2016 pkgbase = openjk-git pkgdesc = Open Source Jedi Knight II + III Engine - pkgver = 3303.2764ebc + pkgver = r3590.c3d2a806 pkgrel = 1 url = https://github.com/JACoders/OpenJK arch = i686 arch = x86_64 - license = GPL + license = GPL2 makedepends = cmake - makedepends = yasm makedepends = git - depends = libgl - depends = openal - depends = zlib + makedepends = libpng depends = sdl2 depends = libjpeg - depends = glu - optdepends = libpng + depends = libpng provides = openjk conflicts = openjk - source = openjk::git+https://github.com/JACoders/OpenJK.git + source = openjk-git::git+https://github.com/JACoders/OpenJK.git source = openjkmp.png source = openjksp.png source = openjkmp.desktop @@ -28,8 +22,8 @@ pkgbase = openjk-git sha256sums = SKIP sha256sums = 0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969 sha256sums = afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903 - sha256sums = 404693bbffb680430f71552822e1c6d40cbf7f62634e0e4e2ba48a4867039627 - sha256sums = 6983fc2d29dc2159963d621d55698809882fed8d20c2ef279e34344ad86f2ee7 + sha256sums = d3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc + sha256sums = d03554bd926954218c243a1a97d39ea9700d064a2374f671249a533ebd970375 pkgname = openjk-git diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000000..31f720bbee45 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +# Blacklist: +* + +# Whitelist: +!.SRCINFO +!.gitignore +!PKGBUILD +!openjk*.desktop +!openjk*.png @@ -2,78 +2,83 @@ # Contributor: Jameson Pugh <imntreal@gmail.com> # Contributor: Rene Schoebel (wesley) <schoebel.r at gmail dot com> -pkgname=openjk-git -pkgver=3479.7b5f79ad +pkgname='openjk-git' +pkgver=r3590.c3d2a806 pkgrel=1 pkgdesc="Open Source Jedi Knight II + III Engine" arch=('i686' 'x86_64') url="https://github.com/JACoders/OpenJK" -license=('GPL') -depends=('libgl' 'openal' 'zlib' 'sdl2' 'libjpeg' 'glu') -optdepends=('libpng') -makedepends=('cmake' 'yasm' 'git') -provides=(openjk) -conflicts=(openjk) -source=("openjk::git+https://github.com/JACoders/OpenJK.git" - 'openjkmp.png' - 'openjksp.png' - 'openjkmp.desktop' - 'openjksp.desktop') -sha256sums=('SKIP' - '0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969' - 'afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903' - 'd3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc' - 'd03554bd926954218c243a1a97d39ea9700d064a2374f671249a533ebd970375') - -_jkarch=i386 -[ "$CARCH" == "x86_64" ] && { - _jkarch=x86_64 -} +license=('GPL2') +depends=('sdl2' 'libjpeg' 'libpng') +makedepends=('cmake' 'git' 'libpng') +provides=('openjk') +conflicts=('openjk') +source=( + "${pkgname}::git+https://github.com/JACoders/OpenJK.git" + 'openjkmp.png' + 'openjksp.png' + 'openjkmp.desktop' + 'openjksp.desktop') +sha256sums=( + 'SKIP' + '0e82e720777eeb2043c2c25cdbce702c6d4ca077543aedfe51e5c4e96cf03969' + 'afb2c1a757720c70798e7f7218f823297a43bc61e0cb192e9443df67c2963903' + 'd3ad7dd270e57d36a22caef21bff17f2eb4acb0ad9087f6a17ca4a0bf9c566fc' + 'd03554bd926954218c243a1a97d39ea9700d064a2374f671249a533ebd970375' +) pkgver() { - cd openjk - echo $(git rev-list --count HEAD).$(git rev-parse --short HEAD) + cd "${pkgname}" + + printf "r%s.%s" \ + "$(git rev-list --count HEAD)" \ + "$(git rev-parse --short HEAD)" } build() { - cd "${srcdir}/openjk" + cd "${pkgname}" - mkdir -p build - cd build - cmake ../ \ - -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_INSTALL_PREFIX=/opt/${pkgname} \ - -DCMAKE_SIZEOF_VOID_P=4 - make + mkdir -p build + cd build + cmake .. \ + -DCMAKE_BUILD_TYPE=Release \ + -DCMAKE_INSTALL_PREFIX="/opt/${pkgname/-git}" + make } package() { - cd "${srcdir}/openjk/build" + cd "${pkgname}/build" - make DESTDIR="${pkgdir}" install + _jkarch="${CARCH}" + echo "${_jkarch}" - mkdir -p "${pkgdir}/usr/bin" - cat > ${pkgdir}/usr/bin/openjk << EOF + make DESTDIR="${pkgdir}" install + + install -m 755 -d "${pkgdir}/usr/bin" + + cat > "${pkgdir}/usr/bin/openjk" << EOF #!/bin/bash cd /opt/${pkgname}/JediAcademy exec ./openjk.${_jkarch} $@ EOF - chmod +x ${pkgdir}/usr/bin/openjk - cat > ${pkgdir}/usr/bin/openjk_sp << EOF + chmod +x "${pkgdir}/usr/bin/openjk" + + cat > "${pkgdir}/usr/bin/openjk_sp" << EOF #!/bin/bash cd /opt/${pkgname}/JediAcademy exec ./openjk_sp.${_jkarch} \$@ EOF - chmod +x ${pkgdir}/usr/bin/openjk_sp - cat > ${pkgdir}/usr/bin/openjkded << EOF + chmod +x "${pkgdir}/usr/bin/openjk_sp" + + cat > "${pkgdir}/usr/bin/openjkded" << EOF #!/bin/bash cd /opt/${pkgname}/JediAcademy exec ./openjkded.${_jkarch} \$@ EOF - chmod +x ${pkgdir}/usr/bin/openjkded + chmod +x ${pkgdir}/usr/bin/openjkded - install -Dm755 "${srcdir}/openjkmp.png" "${pkgdir}/usr/share/pixmaps/openjkmp.png" - install -Dm755 "${srcdir}/openjksp.png" "${pkgdir}/usr/share/pixmaps/openjksp.png" - install -Dm755 "${srcdir}/openjkmp.desktop" "${pkgdir}/usr/share/applications/openjkmp.desktop" - install -Dm755 "${srcdir}/openjksp.desktop" "${pkgdir}/usr/share/applications/openjksp.desktop" + install -Dm755 "${srcdir}/openjkmp.png" "${pkgdir}/usr/share/pixmaps/openjkmp.png" + install -Dm755 "${srcdir}/openjksp.png" "${pkgdir}/usr/share/pixmaps/openjksp.png" + install -Dm755 "${srcdir}/openjkmp.desktop" "${pkgdir}/usr/share/applications/openjkmp.desktop" + install -Dm755 "${srcdir}/openjksp.desktop" "${pkgdir}/usr/share/applications/openjksp.desktop" } |