summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorJan Cholasta2017-05-02 13:38:52 +0200
committerJan Cholasta2017-05-02 21:46:13 +0200
commite940aab5043322eb17cd26c5af574e9c312fe155 (patch)
tree585965433ad78fdea6f3040b3fc67c914a215eaf
parentbf91f85d08418db9ac07f4f06709d9f161496d19 (diff)
downloadaur-e940aab5043322eb17cd26c5af574e9c312fe155.tar.gz
gzdoom-git-3.0pre+101+g43fc5633a-1
* update pkgver() * use the provided XPM icon file * remove cruft
-rw-r--r--.SRCINFO20
-rw-r--r--.gitignore9
-rw-r--r--PKGBUILD92
-rw-r--r--gzdoom.desktop (renamed from launcher.desktop)0
-rwxr-xr-xgzdoom.sh2
5 files changed, 34 insertions, 89 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 4fc9cb51600..fc84c693180 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,29 +1,23 @@
pkgbase = gzdoom-git
pkgdesc = Advanced Doom source port with OpenGL support (git version)
- pkgver = 2.4pre.58.ge188047d7
+ pkgver = 3.0pre+101+g43fc5633a
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,7 +33,9 @@ pkgbase = gzdoom-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
@@ -48,8 +44,10 @@ pkgbase = gzdoom-git
provides = gzdoom
conflicts = gzdoom
source = gzdoom::git://github.com/coelckers/gzdoom.git
- source = launcher.desktop
+ source = gzdoom.sh
+ source = gzdoom.desktop
sha256sums = SKIP
+ sha256sums = e8b3e33972524b08460b68c5920ac5f2bff5cfb377f74a556a562b1c84cc2851
sha256sums = 59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d
pkgname = gzdoom-git
diff --git a/.gitignore b/.gitignore
index 7bb10554e78..6f9e91a4d26 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,9 +1,4 @@
-gzdoom
-
-/*.tar.gz
-/*.tar.bz2
-/*.tar.xz
-/*.zip
-/*.7z
+/gzdoom
/pkg/
/src/
+/*.pkg.tar.*
diff --git a/PKGBUILD b/PKGBUILD
index ffbd8742c1a..b493e1225f9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,23 @@
# Maintainer: Jan Cholasta <grubber at grubber cz>
-# Build without fmodex:
-_fmodex=
-# Build with fmodex:
-#_fmodex=fmodex
-
_name=gzdoom
pkgname=${_name}-git
-pkgver=2.4pre.58.ge188047d7
+pkgver=3.0pre+101+g43fc5633a
pkgrel=1
pkgdesc='Advanced Doom source port with OpenGL support (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'
- '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'
@@ -43,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'
@@ -52,85 +43,44 @@ optdepends=('blasphemer-wad: Blasphemer (free Heretic) game data'
provides=("${_name}")
conflicts=("${_name}")
source=("${_name}::git://github.com/coelckers/${_name}.git"
- 'launcher.desktop')
+ "${_name}.sh"
+ "${_name}.desktop")
sha256sums=('SKIP'
+ 'e8b3e33972524b08460b68c5920ac5f2bff5cfb377f74a556a562b1c84cc2851'
'59122e670f72aa2531aff370e7aaab2d886a7642e79e91f27a533d3b4cad4f6d')
pkgver() {
cd $_name
- git describe --long --tags --match '[Gg]*' | sed -r 's/^[Gg]//;s/([^-]*-g)/\1/;s/-/./g'
+ git describe --tags --match '[Gg]*' | sed -r 's/^[Gg]//;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 \
+ -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
-
- mkdir -p "$pkgdir"/usr/share/licenses
- ln -s /usr/share/doc/$_name/licenses "$pkgdir"/usr/share/licenses/$pkgname
+ install -D "$srcdir"/${_name}.sh "$pkgdir"/usr/bin/$_name
- desktop-file-install --dir="${pkgdir}/usr/share/applications" "${_name}.desktop"
+ 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/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
- )
+ 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 4de1fa826af..4de1fa826af 100644
--- a/launcher.desktop
+++ b/gzdoom.desktop
diff --git a/gzdoom.sh b/gzdoom.sh
new file mode 100755
index 00000000000..4ce9012671e
--- /dev/null
+++ b/gzdoom.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec /usr/lib/gzdoom/gzdoom "$@"