diff options
| -rw-r--r-- | .SRCINFO | 19 | ||||
| -rw-r--r-- | .gitignore | 9 | ||||
| -rw-r--r-- | PKGBUILD | 89 | ||||
| -rw-r--r-- | qzdoom.desktop (renamed from launcher.desktop) | 0 |
4 files changed, 26 insertions, 91 deletions
@@ -1,30 +1,23 @@ pkgbase = qzdoom-git pkgdesc = Advanced Doom source port with true color renderer (git version) - pkgver = 1.3pre.182.g3f8e5d26b + pkgver = 1.4.0.2pre.229.gcdb68f159 pkgrel = 1 url = http://www.zdoom.org/ arch = i686 arch = x86_64 license = BSD - license = custom:BUILD - license = custom:doom license = custom:dumb - license = LGPL + license = GPL3 + license = LGPL3 makedepends = cmake makedepends = desktop-file-utils makedepends = fluidsynth makedepends = git makedepends = gtk3 - makedepends = imagemagick - makedepends = llvm - makedepends = openal - makedepends = xdg-utils depends = hicolor-icon-theme depends = libgl depends = libjpeg depends = libgme - depends = libsndfile - depends = mpg123 depends = sdl2 optdepends = blasphemer-wad: Blasphemer (free Heretic) game data optdepends = chexquest3-wad: Chex Quest 3 game data @@ -40,7 +33,9 @@ pkgbase = qzdoom-git 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 = libsndfile: WAV/FLAC/OGG audio support + optdepends = mpg123: MP3 audio support + 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 @@ -49,7 +44,7 @@ pkgbase = qzdoom-git provides = qzdoom conflicts = qzdoom source = qzdoom::git://github.com/raa-eruanna/qzdoom.git - 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,35 +1,23 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> -# Build without fmodex: -_fmodex= -# Build with fmodex: -#_fmodex=fmodex - _name=qzdoom pkgname=${_name}-git -pkgver=1.3pre.182.g3f8e5d26b +pkgver=1.4.0.2pre.229.gcdb68f159 pkgrel=1 pkgdesc='Advanced Doom source port with true color renderer (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/-.*$//')} - 'hicolor-icon-theme' +license=('BSD' 'custom:dumb' 'GPL3' 'LGPL3') +depends=('hicolor-icon-theme' 'libgl' 'libjpeg' 'libgme' - 'libsndfile' - 'mpg123' 'sdl2') makedepends=('cmake' 'desktop-file-utils' 'fluidsynth' 'git' - 'gtk3' - 'imagemagick' - 'llvm' - 'openal' - 'xdg-utils') + 'gtk3') optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data' 'chexquest3-wad: Chex Quest 3 game data' 'doom1-wad: Doom shareware game data' @@ -44,7 +32,9 @@ 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' + 'libsndfile: WAV/FLAC/OGG audio support' + 'mpg123: MP3 audio support' + 'openal: in-game sound' 'strife0-wad: Strife shareware game data' 'square1-wad: The Adventures of Square, Episode 1 game data' 'timidity++: Timidity MIDI device' @@ -53,7 +43,7 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data' provides=("${_name}") conflicts=("${_name}") source=("${_name}::git://github.com/raa-eruanna/${_name}.git" - 'launcher.desktop') + "${_name}.desktop") sha256sums=('SKIP' '0b3bcbe2cdebda2fed887b796f4ff0fa51f3d544e80cab16b3b1cbd7813b7e04') @@ -66,72 +56,27 @@ pkgver() { 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}" \ - -DFORCE_INTERNAL_GME=OFF \ - -DCMAKE_C_FLAGS="$CFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \ - -DCMAKE_CXX_FLAGS="$CXXFLAGS -DSHARE_DIR=\\\"/usr/share/${_name}\\\"" \ + cmake -DCMAKE_BUILD_TYPE=Release \ + -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 |