summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Bezies2020-01-16 14:32:19 +0100
committerFrederic Bezies2020-01-16 14:32:19 +0100
commitf503fc190ac9382b527004497ae678734ca22c2a (patch)
treef9525c643d1ae44ceb5ff50d4be7ec9b9519338c
parent239d100bea3bb6c311d33314589bfd0465d68d19 (diff)
downloadaur-f503fc190ac9382b527004497ae678734ca22c2a.tar.gz
2.2.1 update
-rw-r--r--.SRCINFO9
-rw-r--r--PKGBUILD15
2 files changed, 14 insertions, 10 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f8d18dfe12f9..65cf4507dcad 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = doomsday
pkgdesc = An advanced Doom engine that supports DOOM, Heretic and Hexen.
- pkgver = 2.2.0
+ pkgver = 2.2.1
pkgrel = 1
url = http://dengine.net/
arch = i686
@@ -9,10 +9,12 @@ pkgbase = doomsday
makedepends = imagemagick
makedepends = cmake
makedepends = xorg-server-devel
+ makedepends = assimp
depends = hicolor-icon-theme
depends = qt5-x11extras
depends = sdl2_mixer
depends = fluidsynth
+ depends = lib32-fluidsynth
depends = openal
depends = libxrandr
depends = minizip
@@ -22,9 +24,8 @@ pkgbase = doomsday
optdepends = soundfont-fluid
provides = assimp
conflicts = doomsday-bin
- conflicts = assimp
- source = http://files.dengine.net/archive/doomsday-2.2.0.tar.gz
- sha256sums = 6439aede6fb304053cc9f58c376849eb215d9164cabf091e74c94d2a7ecc67dc
+ source = http://files.dengine.net/archive/doomsday-2.2.1.tar.gz
+ sha256sums = 116dad77943658097183a0b7ddb92a3354fb3c6996cddfc0517da1b15ce0e806
pkgname = doomsday
diff --git a/PKGBUILD b/PKGBUILD
index 18dfc06be443..f93032e80621 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -6,22 +6,22 @@
# Contributor: Dmitry Shilov <stormblast@land.ru>
pkgname=doomsday
-pkgver=2.2.0
+pkgver=2.2.1
pkgrel=1
pkgdesc="An advanced Doom engine that supports DOOM, Heretic and Hexen."
url="http://dengine.net/"
arch=('i686' 'x86_64')
license=('GPL2')
-conflicts=('doomsday-bin' 'assimp')
+conflicts=('doomsday-bin')
provides=('assimp')
-depends=('hicolor-icon-theme' 'qt5-x11extras' 'sdl2_mixer' 'fluidsynth' 'openal' 'libxrandr' 'minizip')
-makedepends=('imagemagick' 'cmake' 'xorg-server-devel')
+depends=('hicolor-icon-theme' 'qt5-x11extras' 'sdl2_mixer' 'fluidsynth' 'lib32-fluidsynth' 'openal' 'libxrandr' 'minizip')
+makedepends=('imagemagick' 'cmake' 'xorg-server-devel' 'assimp')
optdepends=('doom1-wad: Doom shareware',
'heretic1-wad: Heretic shareware',
'hexen1-wad: Hexen shareware'
'soundfont-fluid')
source=("http://files.dengine.net/archive/doomsday-$pkgver.tar.gz")
-sha256sums=('6439aede6fb304053cc9f58c376849eb215d9164cabf091e74c94d2a7ecc67dc')
+sha256sums=('116dad77943658097183a0b7ddb92a3354fb3c6996cddfc0517da1b15ce0e806')
build() {
@@ -38,7 +38,10 @@ build() {
package() {
cd $srcdir/$pkgname-$pkgver/$pkgname/build
- make install DESTDIR="$pkgdir"
+ make install DESTDIR="$pkgdir"
+
+ # Delete the contents of /usr/include/assimp as this package already provides it
+ rm -r $pkgdir/usr/include/assimp
# Look for WADs in /usr/share/games/doom by default
mkdir -p "${pkgdir}/etc/doomsday"