[upd] Use source from GitHub, build with cmake

2 files changed, 47 insertions, 21 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d799c66e18b..caa165d1a9c7 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,37 @@
 pkgbase = pingus-git
 	pkgdesc = A Lemmings clone, i.e. a level-based puzzle game (development version)
-	pkgver = 0.7.6.r80.g6a1153a
+	pkgver = 0.7.6.r326.gfa980e4
 	pkgrel = 1
 	url = http://pingus.seul.org
 	arch = i686
 	arch = x86_64
 	license = GPL
 	makedepends = git
-	makedepends = scons
-	makedepends = coreutils
+	makedepends = cmake
 	makedepends = boost
 	makedepends = mesa
-	makedepends = glu
-	depends = sdl_image
-	depends = sdl_mixer
+	depends = sdl2_image
+	depends = sdl2_mixer
 	depends = libgl
+	depends = jsoncpp
 	depends = boost-libs
 	depends = libpng
 	optdepends = cwiid: to play with your wiimote (requires rebuild)
 	provides = pingus
 	conflicts = pingus
-	source = git+https://code.google.com/p/pingus/
+	source = git+https://github.com/Pingus/pingus.git
+	source = git+https://github.com/logmich/logmich.git
+	source = git+https://github.com/tinygettext/tinygettext.git
+	source = git+https://github.com/google/googletest
+	source = git+https://github.com/Grumbel/uitest.git
+	source = git+https://github.com/lispparser/sexp-cpp.git
 	source = pingus.desktop
 	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
+	sha256sums = SKIP
 	sha256sums = c00aef6d6f95449955e1367a5912e211f09dc345bb154084d0f13137e2089dce
 
 pkgname = pingus-git
diff --git a/PKGBUILD b/PKGBUILD
index 886e6be7a516..561abb24283e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor: Eric Belanger <eric@archlinux.org>
 
 pkgname=pingus-git
-pkgver=0.7.6.r80.g6a1153a
+pkgver=0.7.6.r326.gfa980e4
 pkgrel=1
 pkgdesc="A Lemmings clone, i.e. a level-based puzzle game (development version)"
 arch=('i686' 'x86_64')
@@ -10,37 +10,54 @@ url="http://pingus.seul.org"
 license=('GPL')
 conflicts=('pingus')
 provides=('pingus')
-depends=('sdl_image' 'sdl_mixer' 'libgl' 'boost-libs' 'libpng')
-makedepends=('git' 'scons' 'coreutils' 'boost' 'mesa' 'glu')
+depends=('sdl2_image' 'sdl2_mixer' 'libgl' 'jsoncpp' 'boost-libs' 'libpng')
+makedepends=('git' 'cmake' 'boost' 'mesa')
 optdepends=("cwiid: to play with your wiimote (requires rebuild)")
-source=("git+https://code.google.com/p/pingus/"
+source=("git+https://github.com/Pingus/pingus.git"
+        "git+https://github.com/logmich/logmich.git"
+        "git+https://github.com/tinygettext/tinygettext.git"
+        "git+https://github.com/google/googletest"
+        "git+https://github.com/Grumbel/uitest.git"
+        "git+https://github.com/lispparser/sexp-cpp.git"
         "pingus.desktop")
 sha256sums=('SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
+            'SKIP'
             'c00aef6d6f95449955e1367a5912e211f09dc345bb154084d0f13137e2089dce')
 
 pkgver() {
   cd pingus
-
   git describe --long --tags | sed 's/^v//;s/-/.r/;s/-/./'
 }
 
 prepare() {
-  # manpage must be in man6, not man1
-  sed "s|/man1/|/man6/|g" -i pingus/Makefile
-}
+  rm -rf build
+  mkdir build
 
-build() {
   cd pingus
+  git submodule init
+  git config submodule.external/logmich.url "$srcdir"/logmich
+  git config submodule.external/tinygettext.url "$srcdir"/tinygettext
+  git config submodule.external/googletest.url "$srcdir"/googletest
+  git config submodule.external/uitest.url "$srcdir"/uitest
+  git config submodule.external/sexp-cpp.url "$srcdir"/sexp-cpp
+  git submodule update
+}
 
-  # add our build flags... yes, this looks ugly :/
-  scons CPPFLAGS="\"$CPPFLAGS\"" CXXFLAGS="\"$CXXFLAGS\"" LINKFLAGS="\"$LDFLAGS\"" -j$(nproc)
+build() {
+  cd build
+  cmake ../pingus -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr
+  make
 }
 
 package() {
-  cd pingus
+  cd build
+  make install DESTDIR="$pkgdir/"
 
-  make install DESTDIR="$pkgdir/" PREFIX="/usr"
   # .desktop entry
   install -Dm644 ../pingus.desktop "$pkgdir"/usr/share/applications/pingus.desktop
-  install -Dm644 data/images/core/editor/actions.png "$pkgdir"/usr/share/pixmaps/pingus.png
+  install -Dm644 ../pingus/data/images/core/editor/actions.png "$pkgdir"/usr/share/pixmaps/pingus.png
 }