diff options
| author | Pierre Choffet | 2018-08-22 14:32:22 -0400 |
|---|---|---|
| committer | Pierre Choffet | 2018-08-22 14:32:22 -0400 |
| commit | 6ef473483d76fd804f3848e80a5055c1ac73ebf1 (patch) | |
| tree | 95d05163ce2b7b9a376a8b0205c4d9f7df3a0755 | |
| parent | 10b30dad31db1c0b8aed0f2e2e9cab1256944f7a (diff) | |
| download | aur-6ef473483d76fd804f3848e80a5055c1ac73ebf1.tar.gz | |
Update PKGBUILD after upstream changes
| -rw-r--r-- | .SRCINFO | 9 | ||||
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | PKGBUILD | 20 |
3 files changed, 22 insertions, 13 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Fri Feb 16 18:27:01 UTC 2018 +# Wed Aug 22 18:30:01 UTC 2018 pkgbase = return-to-the-roots-git pkgdesc = Free/libre implementation of The Settlers II game engine - pkgver = r3863.e340f253 - pkgrel = 3 + pkgver = r3946.826300c2 + pkgrel = 1 url = https://siedler25.org/ install = return-to-the-roots.install changelog = ChangeLog @@ -15,12 +15,13 @@ pkgbase = return-to-the-roots-git makedepends = mesa makedepends = sdl_mixer makedepends = curl - makedepends = lua + makedepends = lua52 makedepends = miniupnpc depends = boost-libs depends = libgl depends = sdl_mixer depends = miniupnpc + depends = lua52 provides = return-to-the-roots conflicts = return-to-the-roots conflicts = s25rttr diff --git a/ChangeLog b/ChangeLog index ba54e4e2673e..c6cdd8518d18 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2018-08-22 Pierre Choffet <peuc@wanadoo.fr> + * r3946.826300c2-1 : + Add missing dependencies + Update build after upstream changes + Force build system to use system LUA library instead of the provided one + 2018-02-16 Pierre Choffet <peuc@wanadoo.fr> * r3863.e340f253-3 : Add missing depends and makedepends @@ -1,14 +1,14 @@ # Maintainer: Pierre Choffet <peuc@wanadoo.fr> pkgname=return-to-the-roots-git -pkgver=r3863.e340f253 -pkgrel=3 +pkgver=r3946.826300c2 +pkgrel=1 pkgdesc="Free/libre implementation of The Settlers II game engine" arch=("x86_64") url="https://siedler25.org/" license=("GPL3") -makedepends=("cmake" "git" "boost" "mesa" "sdl_mixer" "curl" "lua" "miniupnpc") -depends=("boost-libs" "libgl" "sdl_mixer" "miniupnpc") +makedepends=("cmake" "git" "boost" "mesa" "sdl_mixer" "curl" "lua52" "miniupnpc") +depends=("boost-libs" "libgl" "sdl_mixer" "miniupnpc" "lua52") conflicts=("return-to-the-roots" "s25rttr" "s25rttr-nightly-bin") provides=("return-to-the-roots") install="return-to-the-roots.install" @@ -67,12 +67,14 @@ prepare() { } build() { - cd "s25client/build/" + cd s25client - # NOTE: Fix upstream make install problem in s-c since 056acfe5b75cf08d433e2b356758c1202b7ebdea - sed -i 's/PARAMS="$PARAMS -DRTTR_BINDIR=$RTTR_BINDIR"/PARAMS="$PARAMS -DRTTR_BINDIR=$RTTR_BINDIR -DRTTR_EXTRA_BINDIR=$RTTR_BINDIR"/' cmake.sh + # Force use of system LUA library + sed -i 's/set(_contrib_lua_libpath ${_contrib_lua_path}\/lin64)/set(_contrib_lua_libpath \/usr\/lib\/)/' src/libGamedata/CMakeLists.txt - ./cmake.sh --prefix="${pkgdir}/usr" --RTTR_BINDIR="bin" --RTTR_DATADIR="share/s25rttr" --RTTR_LIBDIR="lib/s25rttr" + # Build + mkdir -p build && cd build + cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX="${pkgdir}/usr" -RTTR_BINDIR="bin" -DRTTR_DATADIR="share/s25rttr" -DRTTR_LIBDIR="lib/s25rttr" -DRTTR_EXTRA_BINDIR="bin" .. make } @@ -82,7 +84,7 @@ package() { # Use make based installer make install - # Deal with binaries + # Deal with extra binaries rm ${pkgdir}/usr/bin/s25update # Copy launch script |