summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO5
-rw-r--r--PKGBUILD10
2 files changed, 11 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 137c611bc5ea..8befb7f48710 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = gzdoom
pkgdesc = Advanced Doom source port with OpenGL support
- pkgver = 3.6.0
+ pkgver = 3.7.0
pkgrel = 1
url = http://www.zdoom.org/
arch = i686
@@ -14,6 +14,7 @@ pkgbase = gzdoom
makedepends = fluidsynth
makedepends = git
makedepends = gtk3
+ depends = asmjit-git
depends = hicolor-icon-theme
depends = libgl
depends = libgme
@@ -42,7 +43,7 @@ pkgbase = gzdoom
optdepends = urbanbrawl-wad: Urban Brawl: Action Doom 2 game data
optdepends = xorg-xmessage: crash dialog (other)
replaces = gzdoom1
- source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g3.6.0
+ source = gzdoom::git://github.com/coelckers/gzdoom.git#tag=g3.7.0
source = gzdoom.desktop
source = 0001-Fix-soundfont-search-path.patch
sha256sums = SKIP
diff --git a/PKGBUILD b/PKGBUILD
index f10c380e55e7..68bf95ce0248 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,13 +3,14 @@
_name=gzdoom
pkgname=${_name}
-pkgver=3.6.0
+pkgver=3.7.0
pkgrel=1
pkgdesc='Advanced Doom source port with OpenGL support'
arch=('i686' 'x86_64')
url='http://www.zdoom.org/'
license=('BSD' 'custom:dumb' 'GPL3' 'LGPL3')
-depends=('hicolor-icon-theme'
+depends=('asmjit-git'
+ 'hicolor-icon-theme'
'libgl'
'libgme'
'libjpeg'
@@ -62,7 +63,12 @@ build() {
-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_DISABLE_FIND_PACKAGE_asmjit=TRUE \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DASMJIT_FOUND=TRUE \
+ -DASMJIT_INCLUDE_DIR=/usr/include \
+ -DASMJIT_LIBRARIES=asmjit \
+ -DASMJIT_LIBRARY=asmjit \
-DINSTALL_PATH=bin \
-DINSTALL_PK3_PATH=share/$_name \
.