summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2017-05-02 13:38:52 +0200
committerJan Cholasta2017-05-09 10:24:31 +0200
commit103c9f392a4859c09fc52a8e82a2d0d871209a0a (patch)
tree5c6d45cde26fa8d9564a84ba27965066810467f9
parenta108fd43e07668db89a62ebbf9af573ce3b623de (diff)
downloadaur-103c9f392a4859c09fc52a8e82a2d0d871209a0a.tar.gz
zdoom-git-2.9pre+2175+g4f21ff275-1
* drop fmodex support * update pkgver() * use the provided XPM icon file * remove cruft
-rw-r--r--.SRCINFO8
-rw-r--r--.gitignore9
-rw-r--r--PKGBUILD84
-rw-r--r--zdoom.desktop (renamed from launcher.desktop)0
4 files changed, 21 insertions, 80 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 50ed248370a..dc45d8b02ac 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = zdoom-git
pkgdesc = Advanced Doom source port (git version)
- pkgver = 2.9pre.2175.g4f21ff275
+ pkgver = 2.9pre+2175+g4f21ff275
pkgrel = 1
url = http://www.zdoom.org/
arch = i686
@@ -15,9 +15,7 @@ pkgbase = zdoom-git
makedepends = fluidsynth
makedepends = git
makedepends = gtk3
- makedepends = imagemagick
makedepends = openal
- makedepends = xdg-utils
depends = hicolor-icon-theme
depends = libjpeg
depends = libgme
@@ -38,7 +36,7 @@ pkgbase = zdoom-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 = 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
@@ -47,7 +45,7 @@ pkgbase = zdoom-git
provides = zdoom
conflicts = zdoom
source = zdoom::git://github.com/rheit/zdoom.git
- source = launcher.desktop
+ source = zdoom.desktop
sha256sums = SKIP
sha256sums = e8932a559baf30ecbfc062546ca014c6dfb70f76d1570549654209d39157e350
diff --git a/.gitignore b/.gitignore
index 66c5968f0c1..f55ec71eded 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,4 @@
-zdoom
-
-/*.tar.gz
-/*.tar.bz2
-/*.tar.xz
-/*.zip
-/*.7z
+/zdoom
/pkg/
/src/
+/*.pkg.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index b3b58478449..5a85234ac05 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,20 +1,14 @@
# Maintainer: Jan Cholasta <grubber at grubber cz>
-# Build without fmodex:
-_fmodex=
-# Build with fmodex:
-#_fmodex=fmodex
-
_name=zdoom
pkgname=${_name}-git
-pkgver=2.9pre.2175.g4f21ff275
+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/-.*$//')}
- 'hicolor-icon-theme'
+depends=('hicolor-icon-theme'
'libjpeg'
'libgme'
'libsndfile'
@@ -25,9 +19,7 @@ makedepends=('cmake'
'fluidsynth'
'git'
'gtk3'
- 'imagemagick'
- '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'
@@ -42,7 +34,7 @@ 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'
@@ -51,85 +43,41 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
provides=("${_name}")
conflicts=("${_name}")
source=("${_name}::git://github.com/rheit/${_name}.git"
- 'launcher.desktop')
+ "${_name}.desktop")
sha256sums=('SKIP'
'e8932a559baf30ecbfc062546ca014c6dfb70f76d1570549654209d39157e350')
pkgver() {
cd $_name
- git describe --long --tags | sed -r 's/([^-]*-g)/\1/;s/-/./g'
+ git describe --tags | sed -r 's/-/+/g'
}
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 \
+ -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/zdoom.desktop
index ab8906650d8..ab8906650d8 100644
--- a/launcher.desktop
+++ b/zdoom.desktop