summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorXiao-Long Chen2016-04-17 02:04:18 -0400
committerXiao-Long Chen2016-04-17 02:04:18 -0400
commit4ea891bcbda900847dd36228c1476035580b06d1 (patch)
tree5f9d0024d96ac8776dcaf92d7ab050e331601926
parent5b02ee9c1a9b9728f9ed22d57375466bd84a37bc (diff)
downloadaur-4ea891bcbda900847dd36228c1476035580b06d1.tar.gz
Update submodules and add -fPIC to fix squirrel build
-rw-r--r--.SRCINFO18
-rw-r--r--.gitignore12
-rw-r--r--PKGBUILD35
3 files changed, 61 insertions, 4 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 9e047760673..b095f947825 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,8 @@
+# Generated by mksrcinfo v8
+# Sun Apr 17 05:59:22 UTC 2016
pkgbase = supertux-git
pkgdesc = A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario game
- pkgver = 6347.ad28273
+ pkgver = 7292.f24d3bc
pkgrel = 1
url = http://supertux.lethargik.org/
arch = i686
@@ -18,6 +20,20 @@ pkgbase = supertux-git
provides = supertux
conflicts = supertux
source = git+https://github.com/SuperTux/supertux
+ source = git+https://github.com/SuperTux/data.git
+ source = git+https://github.com/google/googletest.git
+ source = git+https://github.com/SuperTux/physfs
+ source = git+https://github.com/SuperTux/sexp-cpp.git
+ source = git+https://github.com/albertodemichelis/squirrel.git
+ source = git+https://github.com/SuperTux/tinygettext.git
+ source = git+https://github.com/SuperTux/translations
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
+ sha512sums = SKIP
sha512sums = SKIP
pkgname = supertux-git
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 00000000000..1ee63dc3c0d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,12 @@
+/supertux/
+/data/
+/googletest/
+/physfs/
+/sexp-cpp/
+/squirrel/
+/tinygettext/
+/translations/
+
+/pkg/
+/src/
+/*.pkg.tar*
diff --git a/PKGBUILD b/PKGBUILD
index 4df4c36a69f..fc0a60b384f 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
# Contributor: Patrick Bartels <p4ddy.b@gmail.com>
pkgname=supertux-git
-pkgver=6347.ad28273
+pkgver=7292.f24d3bc
pkgrel=1
pkgdesc="A classic 2D jump'n run sidescroller game in a style similar to the original SuperMario game"
url='http://supertux.lethargik.org/'
@@ -13,8 +13,23 @@ depends=(sdl2_image physfs openal libvorbis curl boost glew)
makedepends=(git cmake)
conflicts=(supertux)
provides=(supertux)
-source=('git+https://github.com/SuperTux/supertux')
-sha512sums=('SKIP')
+source=('git+https://github.com/SuperTux/supertux'
+ # submodules
+ 'git+https://github.com/SuperTux/data.git'
+ 'git+https://github.com/google/googletest.git'
+ 'git+https://github.com/SuperTux/physfs'
+ 'git+https://github.com/SuperTux/sexp-cpp.git'
+ 'git+https://github.com/albertodemichelis/squirrel.git'
+ 'git+https://github.com/SuperTux/tinygettext.git'
+ 'git+https://github.com/SuperTux/translations')
+sha512sums=('SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP'
+ 'SKIP')
pkgver() {
cd supertux
@@ -24,6 +39,16 @@ pkgver() {
prepare() {
cd supertux
+ git submodule init
+ git config submodule.data.url "${srcdir}"/data
+ git config submodule.external/googletest.url "${srcdir}"/googletest
+ git config submodule.external/physfs.url "${srcdir}"/physfs
+ git config submodule.external/sexp-cpp.url "${srcdir}"/sexp-cpp
+ git config submodule.external/squirrel.url "${srcdir}"/squirrel
+ git config submodule.external/tinygettext.url "${srcdir}"/tinygettext
+ git config submodule.translations.url "${srcdir}"/translations
+ git submodule update
+
sed -i '/curl\/types.h/d' src/addon/addon_manager.cpp
sed -i '1i#include <cstddef>' src/supertux/screen_manager.hpp
}
@@ -31,8 +56,12 @@ prepare() {
build() {
cd supertux
+ export CFLAGS+=" -fPIC"
+ export CXXFLAGS+=" -fPIC"
+
cmake . \
-DCMAKE_INSTALL_PREFIX=/usr \
+ -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-DINSTALL_SUBDIR_BIN=bin
make