diff options
author | Jan Cholasta | 2017-01-01 20:34:57 +0100 |
---|---|---|
committer | Jan Cholasta | 2017-01-08 17:08:58 +0100 |
commit | a108fd43e07668db89a62ebbf9af573ce3b623de (patch) | |
tree | 9720f1fd222a106f4003ff1193c9fd86329b7761 | |
parent | bdcd333fec3b1d77d1b6fa0b3724ea485a56f92d (diff) | |
download | aur-a108fd43e07668db89a62ebbf9af573ce3b623de.tar.gz |
zdoom-git-2.9pre.2175.g4f21ff275-1
* Add optional dependency on gtk3, remove dependency on gtk2
* Add missing libjpeg dependency
* Add missing hicolor-icon-theme dependency
* Use `make install` in package()
-rw-r--r-- | .SRCINFO | 7 | ||||
-rw-r--r-- | PKGBUILD | 27 |
2 files changed, 18 insertions, 16 deletions
@@ -1,6 +1,6 @@ pkgbase = zdoom-git pkgdesc = Advanced Doom source port (git version) - pkgver = 2.9pre.2174.g625e97dfd + pkgver = 2.9pre.2175.g4f21ff275 pkgrel = 1 url = http://www.zdoom.org/ arch = i686 @@ -14,10 +14,12 @@ pkgbase = zdoom-git makedepends = desktop-file-utils makedepends = fluidsynth makedepends = git + makedepends = gtk3 makedepends = imagemagick makedepends = openal makedepends = xdg-utils - depends = gtk2 + depends = hicolor-icon-theme + depends = libjpeg depends = libgme depends = libsndfile depends = mpg123 @@ -29,6 +31,7 @@ pkgbase = zdoom-git optdepends = freedm: FreeDM game data optdepends = freedoom1: Freedoom: Phase 1 game data optdepends = freedoom2: Freedoom: Phase 2 game data + optdepends = gtk3: IWAD selection dialog optdepends = gxmessage: crash dialog (GNOME) optdepends = hacx-wad: HacX game data optdepends = harmony-wad: Harmony game data @@ -7,14 +7,15 @@ _fmodex= _name=zdoom pkgname=${_name}-git -pkgver=2.9pre.2174.g625e97dfd +pkgver=2.9pre.2175.g4f21ff275 pkgrel=1 pkgdesc='Advanced Doom source port (git version)' arch=('i686' 'x86_64') url='http://www.zdoom.org/' license=('BSD' 'custom:BUILD' 'custom:doom' 'custom:dumb' 'LGPL') depends=(${_fmodex:+$(LC_ALL=C pacman -Q $_fmodex | sed -r 's/ /=/;s/-.*$//')} - 'gtk2' + 'hicolor-icon-theme' + 'libjpeg' 'libgme' 'libsndfile' 'mpg123' @@ -23,6 +24,7 @@ makedepends=('cmake' 'desktop-file-utils' 'fluidsynth' 'git' + 'gtk3' 'imagemagick' 'openal' 'xdg-utils') @@ -33,6 +35,7 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data' 'freedm: FreeDM game data' 'freedoom1: Freedoom: Phase 1 game data' 'freedoom2: Freedoom: Phase 2 game data' + 'gtk3: IWAD selection dialog' 'gxmessage: crash dialog (GNOME)' 'hacx-wad: HacX game data' 'harmony-wad: Harmony game data' @@ -79,6 +82,9 @@ build() { -DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \ -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \ -DCMAKE_EXE_LINKER_FLAGS="$LDFLAGS -Wl,-z,noexecstack" \ + -DCMAKE_INSTALL_PREFIX=/usr \ + -DINSTALL_PATH=lib/$_name \ + -DINSTALL_PK3_PATH=share/$_name \ . make @@ -87,8 +93,6 @@ build() { exec /usr/lib/${_name}/${_name} "\$@" EOF - sed -n '/\*\*-/,/\*\*-/p' 'src/version.h' >'bsd.txt' - cp "${srcdir}/launcher.desktop" "${_name}.desktop" mkdir -p 'icons' @@ -102,20 +106,15 @@ package() { install -D "${_name}.sh" "${pkgdir}/usr/bin/${_name}" - mkdir -p "${pkgdir}/usr/lib/${_name}" - install "${_name}" "${pkgdir}/usr/lib/${_name}/" - install -m644 "${_name}.pk3" "${pkgdir}/usr/lib/${_name}/" + make install DESTDIR="$pkgdir" + + ln -s /usr/share/$_name/${_name}.pk3 "$pkgdir"/usr/lib/$_name/${_name}.pk3 if [[ -n "${_fmodex}" ]]; then install 'liboutput_sdl.so' "${pkgdir}/usr/lib/${_name}/" fi - mkdir -p "${pkgdir}/usr/share/${_name}" - - mkdir -p "${pkgdir}/usr/share/licenses/${pkgname}" - install -m644 'bsd.txt' "${pkgdir}/usr/share/licenses/${pkgname}/bsd.txt" - install -m644 'docs/BUILDLIC.TXT' "${pkgdir}/usr/share/licenses/${pkgname}/buildlic.txt" - install -m644 'docs/doomlic.txt' "${pkgdir}/usr/share/licenses/${pkgname}/doomlic.txt" - install -m644 'dumb/licence.txt' "${pkgdir}/usr/share/licenses/${pkgname}/dumb.txt" + mkdir -p "$pkgdir"/usr/share/licenses + ln -s /usr/share/doc/$_name/licenses "$pkgdir"/usr/share/licenses/$pkgname desktop-file-install --dir="${pkgdir}/usr/share/applications" "${_name}.desktop" |