diff options
author | Jan Cholasta | 2017-01-01 20:34:57 +0100 |
---|---|---|
committer | Jan Cholasta | 2017-01-08 17:20:31 +0100 |
commit | 8899abc86570f2d9506d0969949171c35bb872bc (patch) | |
tree | ea97eb9cbfc3add6e1011dcb8e89aa2488d48fc3 | |
parent | d81579d187f28409c95b75dfc55b5e00eba32743 (diff) | |
download | aur-8899abc86570f2d9506d0969949171c35bb872bc.tar.gz |
gzdoom-2.3.0-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 | 11 | ||||
-rw-r--r-- | PKGBUILD | 31 |
2 files changed, 21 insertions, 21 deletions
@@ -1,7 +1,7 @@ pkgbase = gzdoom pkgdesc = Advanced Doom source port with OpenGL support - pkgver = 2.2.0 - pkgrel = 2 + pkgver = 2.3.0 + pkgrel = 1 url = http://www.zdoom.org/ arch = i686 arch = x86_64 @@ -14,11 +14,13 @@ pkgbase = gzdoom makedepends = desktop-file-utils makedepends = fluidsynth makedepends = git + makedepends = gtk3 makedepends = imagemagick makedepends = openal makedepends = xdg-utils - depends = gtk2 + depends = hicolor-icon-theme depends = libgl + depends = libjpeg depends = libgme depends = libsndfile depends = mpg123 @@ -30,6 +32,7 @@ pkgbase = gzdoom 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 @@ -42,7 +45,7 @@ pkgbase = gzdoom optdepends = timidity++: Timidity MIDI device optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data optdepends = xorg-xmessage: crash dialog (other) - source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g2.2.0 + source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g2.3.0 source = launcher.desktop sha256sums = SKIP sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d @@ -8,15 +8,16 @@ _fmodex= _name=gzdoom pkgname=${_name} -pkgver=2.2.0 -pkgrel=2 +pkgver=2.3.0 +pkgrel=1 pkgdesc='Advanced Doom source port with OpenGL support' 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' 'libgl' + 'libjpeg' 'libgme' 'libsndfile' 'mpg123' @@ -25,6 +26,7 @@ makedepends=('cmake' 'desktop-file-utils' 'fluidsynth' 'git' + 'gtk3' 'imagemagick' 'openal' 'xdg-utils') @@ -35,6 +37,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' @@ -73,6 +76,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 @@ -81,8 +87,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' @@ -96,22 +100,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}" - install -m644 'brightmaps.pk3' "${pkgdir}/usr/share/${_name}/" - install -m644 'lights.pk3' "${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" |