diff options
author | Daniel Bermond | 2019-04-02 23:11:11 +0000 |
---|---|---|
committer | Daniel Bermond | 2019-04-02 23:11:11 +0000 |
commit | ae38d645c90044f328527f6bee0455c892168196 (patch) | |
tree | 792bf70d6b136188cfdaf07a64f95b80c601755d | |
parent | 4a1f2d07ac39f974c03531242702abf0328cbf79 (diff) | |
download | aur-ae38d645c90044f328527f6bee0455c892168196.tar.gz |
Fix build when vlc is installed
Also use all threads by default during 'make', letting the user
manually adjust it if having xvfb installed.
-rw-r--r-- | .SRCINFO | 2 | ||||
-rw-r--r-- | PKGBUILD | 21 |
2 files changed, 13 insertions, 10 deletions
@@ -1,6 +1,6 @@ pkgbase = megaglest-git pkgdesc = Fork of Glest, a 3D real-time strategy game in a fantastic world (git version) - pkgver = 3.13.0.r102.ge50e4f300 + pkgver = 3.13.0.r103.gaec1e6d41 pkgrel = 1 url = https://megaglest.org/ arch = i686 @@ -2,7 +2,7 @@ pkgname=megaglest-git _srcname=megaglest-source -pkgver=3.13.0.r102.ge50e4f300 +pkgver=3.13.0.r103.gaec1e6d41 pkgrel=1 pkgdesc='Fork of Glest, a 3D real-time strategy game in a fantastic world (git version)' arch=('i686' 'x86_64') @@ -21,6 +21,12 @@ conflicts=('megaglest') source=('git+https://github.com/MegaGlest/megaglest-source.git') sha256sums=('SKIP') +prepare() { + cd "$_srcname" + + mkdir -p build +} + pkgver() { cd "$_srcname" @@ -29,16 +35,12 @@ pkgver() { } build() { - cd "$_srcname" - # - SSE is available only from Pentium 3 onwards (i686 is way older) # - SSE and SSE2 are availabe on all x86_64 CPUs [ "$CARCH" = 'i686' ] && local _sse='0' [ "$CARCH" = 'x86_64' ] && local _sse='2' # (supported: 0-3) - rm -rf build - mkdir -p build - cd build + cd "${_srcname}/build" cmake .. \ -DCMAKE_INSTALL_PREFIX='/usr' \ @@ -46,15 +48,16 @@ build() { -DCMAKE_CXX_FLAGS="-lX11 ${CXXFLAGS}" \ -DWANT_GIT_STAMP='0' \ -DwxWidgets_CONFIG_EXECUTABLE='/usr/bin/wx-config-gtk3' \ + -DWANT_USE_VLC:BOOL='OFF' \ -Wno-dev \ .. - # using '-j1' will prevent errors if xvfb is installed (will build manpages) - make -j1 + # use 'maje -j1' if xvfb is installed on your system to prevent errors (will build manpages) + make } package() { cd "${_srcname}/build" - make -j1 DESTDIR="$pkgdir" install + make DESTDIR="$pkgdir" install } |