diff options
-rw-r--r-- | .SRCINFO | 22 | ||||
-rw-r--r-- | .gitignore | 9 | ||||
-rw-r--r-- | PKGBUILD | 92 | ||||
-rw-r--r-- | gzdoom.desktop (renamed from launcher.desktop) | 0 | ||||
-rwxr-xr-x | gzdoom.sh | 2 |
5 files changed, 39 insertions, 86 deletions
@@ -1,29 +1,23 @@ pkgbase = gzdoom pkgdesc = Advanced Doom source port with OpenGL support - pkgver = 2.4.0 + pkgver = 3.0.0 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 = 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 @@ -39,15 +33,19 @@ pkgbase = gzdoom 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 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.4.0 - source = launcher.desktop + source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g3.0.0 + source = gzdoom.sh + source = gzdoom.desktop sha256sums = SKIP + sha256sums = e8b3e33972524b08460b68c5920ac5f2bff5cfb377f74a556a562b1c84cc2851 sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d pkgname = gzdoom diff --git a/.gitignore b/.gitignore index 7bb10554e78c..6f9e91a4d264 100644 --- a/.gitignore +++ b/.gitignore @@ -1,9 +1,4 @@ -gzdoom - -/*.tar.gz -/*.tar.bz2 -/*.tar.xz -/*.zip -/*.7z +/gzdoom /pkg/ /src/ +/*.pkg.tar.* @@ -1,34 +1,23 @@ # Maintainer: Jan Cholasta <grubber at grubber cz> # Contributor: Christoph Zeiler <rabyte*gmail> -# Build without fmodex: -_fmodex= -# Build with fmodex: -#_fmodex=fmodex - _name=gzdoom pkgname=${_name} -pkgver=2.4.0 +pkgver=3.0.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/-.*$//')} - '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' - 'openal' 'xdg-utils') optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data' 'chexquest3-wad: Chex Quest 3 game data' @@ -44,85 +33,54 @@ 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' 'urbanbrawl-wad: Urban Brawl: Action Doom 2 game data' 'xorg-xmessage: crash dialog (other)') source=("${_name}::git://github.com/coelckers/${_name}.git#tag=g${pkgver}" - 'launcher.desktop') + "${_name}.sh" + "${_name}.desktop") sha256sums=('SKIP' + 'e8b3e33972524b08460b68c5920ac5f2bff5cfb377f74a556a562b1c84cc2851' '59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d') 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 \ + -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 - - 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 + install -D "$srcdir"/${_name}.sh "$pkgdir"/usr/bin/$_name - 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" - - mkdir -p "${pkgdir}/usr/share/icons/hicolor" + install -d "$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 + export XDG_DATA_DIRS="$pkgdir"/usr/share + xdg-desktop-icon install --novendor \ + "$srcdir"/${_name}.desktop + xdg-icon-resource install --noupdate \ + --novendor \ + --size 48 \ + src/posix/zdoom.xpm \ + $_name ) + + install -d "$pkgdir"/usr/share/licenses + ln -s /usr/share/doc/$_name/licenses "$pkgdir"/usr/share/licenses/$pkgname } diff --git a/launcher.desktop b/gzdoom.desktop index 4de1fa826af6..4de1fa826af6 100644 --- a/launcher.desktop +++ b/gzdoom.desktop diff --git a/gzdoom.sh b/gzdoom.sh new file mode 100755 index 000000000000..4ce9012671e1 --- /dev/null +++ b/gzdoom.sh @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/lib/gzdoom/gzdoom "$@" |