summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO8
-rw-r--r--PKGBUILD16
-rw-r--r--mars-shader.patch17
3 files changed, 15 insertions, 26 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 888ce1eed28..a170aabf057 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
pkgbase = mars-shooter-git
pkgdesc = A ridiculous space shooter with nice graphics (development version)
- pkgver = 0.7.4.r4.d88244b
+ pkgver = 0.7.4.r7.c855d04
pkgrel = 1
url = http://mars-game.sourceforge.net/
install = mars.install
@@ -18,11 +18,13 @@ pkgbase = mars-shooter-git
conflicts = mars-shooter
source = mars-shooter::git+https://github.com/thelaui/M.A.R.S..git
source = mars-fribidi.patch
- source = mars-shader.patch
+ source = mars-shader.patch::https://github.com/thelaui/M.A.R.S./pull/2.patch
+ source = mars-noglu.patch::https://github.com/thelaui/M.A.R.S./pull/17.patch
source = mars-archinstall.patch
sha256sums = SKIP
sha256sums = 6fb105bd6c7f0b3c35bedc13240e1b1f9ad37bb5b4b1328438532b4f40e19c6e
- sha256sums = 3f9b15350fb9a3acf05469e6bb2a83ff7fc7113499098d11dc759c343c459afa
+ sha256sums = 2cb61532d94eb68100ddf24888c513a06ef44c32fc867a3b20dfd901d0a0b1d2
+ sha256sums = 729fb013fe4ad95e2a15e59bf1ce94eddc3fc42f942253522a9e7b041e052664
sha256sums = d33d6cd40bf6b2846c069524ed3344e2f4c3afe373e89c74d3e4888d63e2261a
pkgname = mars-shooter-git
diff --git a/PKGBUILD b/PKGBUILD
index 1361f1cd8b3..a75f4888261 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
-# Maintainer: carstene1ns <url/mail: arch carsten-teibes de>
+# Maintainer: carstene1ns <arch carsten-teibes de> - http://git.io/ctPKG
# Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
pkgname=mars-shooter-git
-pkgver=0.7.4.r4.d88244b
+pkgver=0.7.4.r7.c855d04
pkgrel=1
pkgdesc="A ridiculous space shooter with nice graphics (development version)"
arch=('i686' 'x86_64')
@@ -15,11 +15,13 @@ provides=('mars-shooter')
conflicts=('mars-shooter')
source=(mars-shooter::"git+https://github.com/thelaui/M.A.R.S..git"
mars-fribidi.patch
- mars-shader.patch
+ mars-shader.patch::"https://github.com/thelaui/M.A.R.S./pull/2.patch"
+ mars-noglu.patch::"https://github.com/thelaui/M.A.R.S./pull/17.patch"
mars-archinstall.patch)
sha256sums=('SKIP'
'6fb105bd6c7f0b3c35bedc13240e1b1f9ad37bb5b4b1328438532b4f40e19c6e'
- '3f9b15350fb9a3acf05469e6bb2a83ff7fc7113499098d11dc759c343c459afa'
+ '2cb61532d94eb68100ddf24888c513a06ef44c32fc867a3b20dfd901d0a0b1d2'
+ '729fb013fe4ad95e2a15e59bf1ce94eddc3fc42f942253522a9e7b041e052664'
'd33d6cd40bf6b2846c069524ed3344e2f4c3afe373e89c74d3e4888d63e2261a')
pkgver() {
@@ -37,10 +39,12 @@ prepare() {
# add include dir of fribidi
patch -Np1 < ../mars-fribidi.patch
# fix use of sfml2 shader
- patch -Np0 < ../mars-shader.patch
+ patch -Np1 < ../mars-shader.patch
+ # remove glu dependency
+ patch -Np1 < ../mars-noglu.patch
# fix install target
patch -Np0 < ../mars-archinstall.patch
- # fix executable name in and remove mimetype from launcher, todo: use setconf
+ # fix executable name in and remove mimetype from launcher
sed 's/Exec=mars$/&-shooter/;/MimeType=.*/d' -i resources/mars.desktop
}
diff --git a/mars-shader.patch b/mars-shader.patch
deleted file mode 100644
index de140b8ef1a..00000000000
--- a/mars-shader.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/System/window.cpp.orig 2014-03-31 15:18:22.264354000 +0200
-+++ src/System/window.cpp 2014-03-31 15:18:22.407689000 +0200
-@@ -308,13 +308,10 @@ namespace window {
- glEnable(GL_TEXTURE_2D);
-
- if (shader)
-- shader->bind();
-+ shader->bind(NULL);
-
- window_.draw(toBeDrawn, states);
-
-- if (shader)
-- shader->unbind();
--
- window_.popGLStates();
- glPopMatrix();
- glPopAttrib();