diff options
author | Jan Cholasta | 2017-05-02 13:38:52 +0200 |
---|---|---|
committer | Jan Cholasta | 2017-05-09 09:25:25 +0200 |
commit | 94c7371dc802f6fd7a107cdc89666df96fa2f133 (patch) | |
tree | 1c32ce55bc3684117411e177493c21e288d22851 | |
parent | f5350ad5ba6f8ebf9da84e47dd2c5d7f1f8ce1e8 (diff) | |
download | aur-94c7371dc802f6fd7a107cdc89666df96fa2f133.tar.gz |
qzdoom-1.3.0.1-2
* drop fmodex support
* remove unused llvm make dependency
* use the provided XPM icon file
* remove cruft
-rw-r--r-- | .SRCINFO | 9 | ||||
-rw-r--r-- | .gitignore | 9 | ||||
-rw-r--r-- | PKGBUILD | 82 | ||||
-rw-r--r-- | qzdoom.desktop (renamed from launcher.desktop) | 0 |
4 files changed, 20 insertions, 80 deletions
@@ -1,7 +1,7 @@ pkgbase = qzdoom pkgdesc = Advanced Doom source port with true color renderer pkgver = 1.3.0.1 - pkgrel = 1 + pkgrel = 2 url = http://www.zdoom.org/ arch = i686 arch = x86_64 @@ -15,10 +15,7 @@ pkgbase = qzdoom makedepends = fluidsynth makedepends = git makedepends = gtk3 - makedepends = imagemagick - makedepends = llvm makedepends = openal - makedepends = xdg-utils depends = hicolor-icon-theme depends = libgl depends = libjpeg @@ -40,14 +37,14 @@ pkgbase = qzdoom optdepends = heretic1-wad: Heretic shareware game data optdepends = hexen1-wad: Hexen demo game data optdepends = kdialog: crash dialog (KDE) - optdepends = openal: OpenAL sound backend + optdepends = openal: in-game sound optdepends = strife0-wad: Strife shareware game data optdepends = square1-wad: The Adventures of Square, Episode 1 game data optdepends = timidity++: Timidity MIDI device optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data optdepends = xorg-xmessage: crash dialog (other) source = qzdoom::git://github.com/raa-eruanna/qzdoom.git#tag=q1.3.0.1 - source = launcher.desktop + source = qzdoom.desktop sha256sums = SKIP sha256sums = 0b3bcbe2cdebda2fed887b796f4ff0fa51f3d544e80cab16b3b1cbd7813b7e04 diff --git a/.gitignore b/.gitignore index d1345b55fae9..4e07c7492d45 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,4 @@ -qzdoom - -/*.tar.gz -/*.tar.bz2 -/*.tar.xz -/*.zip -/*.7z +/qzdoom /pkg/ /src/ +/*.pkg.tar.* @@ -1,20 +1,14 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> -# Build without fmodex: -_fmodex= -# Build with fmodex: -#_fmodex=fmodex - _name=qzdoom pkgname=${_name} pkgver=1.3.0.1 -pkgrel=1 +pkgrel=2 pkgdesc='Advanced Doom source port with true color renderer' 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/-.*$//')} - 'hicolor-icon-theme' +depends=('hicolor-icon-theme' 'libgl' 'libjpeg' 'libgme' @@ -26,10 +20,7 @@ makedepends=('cmake' 'fluidsynth' 'git' 'gtk3' - 'imagemagick' - 'llvm' - 'openal' - 'xdg-utils') + 'openal') optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data' 'chexquest3-wad: Chex Quest 3 game data' 'doom1-wad: Doom shareware game data' @@ -44,85 +35,42 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data' 'heretic1-wad: Heretic shareware game data' 'hexen1-wad: Hexen demo game data' 'kdialog: crash dialog (KDE)' - 'openal: OpenAL sound backend' + 'openal: in-game sound' 'strife0-wad: Strife shareware game data' 'square1-wad: The Adventures of Square, Episode 1 game data' 'timidity++: Timidity MIDI device' 'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data' 'xorg-xmessage: crash dialog (other)') source=("${_name}::git://github.com/raa-eruanna/${_name}.git#tag=q${pkgver}" - 'launcher.desktop') + "${_name}.desktop") sha256sums=('SKIP' '0b3bcbe2cdebda2fed887b796f4ff0fa51f3d544e80cab16b3b1cbd7813b7e04') build() { cd $_name - local _nofmod _fmodincdir _fmodlib - - if [[ -n "${_fmodex}" ]]; then - _nofmod=OFF - _fmodincdir=$(LC_ALL=C pacman -Ql $_fmodex | grep -Eo '/usr/include/fmodex[^/]*/$') - _fmodlib=$(LC_ALL=C pacman -Ql $_fmodex | grep -Eo '/usr/lib/libfmodex-[^/]*\.so$') - else - _nofmod=ON - fi - - cmake -DNO_FMOD=${_nofmod} \ - -DGME_INCLUDE_DIR='/usr/include/gme' \ - -DFMOD_INCLUDE_DIR="${_fmodincdir}" \ - -DFMOD_LIBRARY="${_fmodlib}" \ - -DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \ + cmake -DCMAKE_BUILD_TYPE=Release \ + -DNO_FMOD=ON \ + -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_PATH=bin \ -DINSTALL_PK3_PATH=share/$_name \ . make - - cat >"${_name}.sh" <<EOF -#!/bin/sh -exec /usr/lib/${_name}/${_name} "\$@" -EOF - - cp "${srcdir}/launcher.desktop" "${_name}.desktop" - - mkdir -p 'icons' - convert 'src/win32/icon1.ico[2]' 'icons/48.png' - convert 'src/win32/icon1.ico[3]' 'icons/32.png' - convert 'src/win32/icon1.ico[4]' 'icons/16.png' } package() { cd $_name - install -D "${_name}.sh" "${pkgdir}/usr/bin/${_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 + desktop-file-install --dir="$pkgdir"/usr/share/applications \ + "$srcdir"/${_name}.desktop + install -D -m644 src/posix/zdoom.xpm \ + "$pkgdir"/usr/share/icons/hicolor/48x48/apps/${_name}.xpm - mkdir -p "$pkgdir"/usr/share/licenses + install -d "$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" - - mkdir -p "${pkgdir}/usr/share/icons/hicolor" - ( - cd 'icons' - export XDG_DATA_DIRS="${pkgdir}/usr/share" - - local _file - for _file in *.png; do - xdg-icon-resource install --noupdate \ - --novendor \ - --size "${_file%.png}" \ - "${_file}" \ - "${_name}" - done - ) } diff --git a/launcher.desktop b/qzdoom.desktop index 11a74a277144..11a74a277144 100644 --- a/launcher.desktop +++ b/qzdoom.desktop |