assaultcube-reloaded: 2.7

3 files changed, 29 insertions, 68 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 0a11947efa71..5cc4a6de5f11 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,9 +1,7 @@
-# Generated by mksrcinfo v8
-# Sat Nov 18 19:04:27 UTC 2017
 pkgbase = assaultcube-reloaded
 	pkgdesc = AssaultCube Reloaded
-	pkgver = 2.6.3
-	pkgrel = 3
+	pkgver = 2.7
+	pkgrel = 1
 	url = http://acr.victorz.ca
 	arch = i686
 	arch = x86_64
@@ -17,18 +15,16 @@ pkgbase = assaultcube-reloaded
 	depends = sdl
 	depends = sdl_image
 	depends = zlib
-	source = https://github.com/actf/acr/archive/v2.6.3.tar.gz
+	source = https://github.com/actf/acr/archive/v2.7.tar.gz
 	source = acreloaded
 	source = acreloaded-server
 	source = acreloaded.desktop
 	source = acreloaded.svg
-	source = dde2726796d8cfc4e2ad9793b045182f1a1ec082.patch
-	md5sums = 260e71aa128710012a94e53fdde61286
+	md5sums = 8ef9f42706153f4d60a918a0f892d811
 	md5sums = c6db5816ce66282f6d6c7d08792b6095
 	md5sums = 53b17712afb7f0a5646b9894032d06ff
 	md5sums = bff621e554812c7325b2bd7f56e9e881
 	md5sums = 3b142417157d73da4a7981fd07bcb628
-	md5sums = 45a0c9247df6cd6547ee9f90ff181024
 
 pkgname = assaultcube-reloaded
 
diff --git a/PKGBUILD b/PKGBUILD
index f5da23588590..50c44f611563 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,43 +1,41 @@
 # Maintainer: robertfoster
 
 pkgname=assaultcube-reloaded
-pkgver=2.6.3
-pkgrel=3
+pkgver=2.7
+pkgrel=1
 pkgdesc='AssaultCube Reloaded'
 arch=('i686' 'x86_64')
 url='http://acr.victorz.ca'
 license=('ZLIB')
 depends=('curl' 'gcc-libs' 'libgl' 'libvorbis' 'libx11' 'openal' 'sdl' 'sdl_image' 'zlib')
 source=("https://github.com/actf/acr/archive/v${pkgver}.tar.gz"
-        'acreloaded'
-        'acreloaded-server'
-        'acreloaded.desktop'
-        'acreloaded.svg'
-	dde2726796d8cfc4e2ad9793b045182f1a1ec082.patch)
+    'acreloaded'
+    'acreloaded-server'
+    'acreloaded.desktop'
+    'acreloaded.svg'
+)
 
 package() {
-  install -d "${pkgdir}"/usr/bin
-  install -d "${pkgdir}"/usr/share/acreloaded  
-  cd ${srcdir}/acr-${pkgver}
-  patch -Np1 -i ../dde2726796d8cfc4e2ad9793b045182f1a1ec082.patch
-  cd  source/src
+    install -d "${pkgdir}"/usr/bin
+    install -d "${pkgdir}"/usr/share/acreloaded
+    cd ${srcdir}/acr-${pkgver}
+    cd  source/src
 
-  make DESTDIR=$pkgdir install
-  cd ../..
+    make DESTDIR=$pkgdir install
+    cd ../..
 
-  cp -rf bot config packages acr/packages ${pkgdir}/usr/share/acreloaded
+    cp -rf bot config packages acr/packages ${pkgdir}/usr/share/acreloaded
 
-  install -Dm755 bin_unix/native_client ${pkgdir}/usr/share/acreloaded/native_client
-  install -Dm755 bin_unix/native_server ${pkgdir}/usr/share/acreloaded/native_server
-  install -Dm644 ${srcdir}/acreloaded.svg ${pkgdir}/usr/share/pixmaps/acreloaded.svg
-  install -Dm644 ${srcdir}/acreloaded.desktop ${pkgdir}/usr/share/applications/acreloaded.desktop
-  install -Dm755 ${srcdir}/acreloaded ${pkgdir}/usr/bin/acreloaded
-  install -Dm755 ${srcdir}/acreloaded-server ${pkgdir}/usr/bin/acreloaded-server
+    install -Dm755 bin_unix/native_client ${pkgdir}/usr/share/acreloaded/native_client
+    install -Dm755 bin_unix/native_server ${pkgdir}/usr/share/acreloaded/native_server
+    install -Dm644 ${srcdir}/acreloaded.svg ${pkgdir}/usr/share/pixmaps/acreloaded.svg
+    install -Dm644 ${srcdir}/acreloaded.desktop ${pkgdir}/usr/share/applications/acreloaded.desktop
+    install -Dm755 ${srcdir}/acreloaded ${pkgdir}/usr/bin/acreloaded
+    install -Dm755 ${srcdir}/acreloaded-server ${pkgdir}/usr/bin/acreloaded-server
 }
 
-md5sums=('260e71aa128710012a94e53fdde61286'
-         'c6db5816ce66282f6d6c7d08792b6095'
-         '53b17712afb7f0a5646b9894032d06ff'
-         'bff621e554812c7325b2bd7f56e9e881'
-         '3b142417157d73da4a7981fd07bcb628'
-         '45a0c9247df6cd6547ee9f90ff181024')
+md5sums=('8ef9f42706153f4d60a918a0f892d811'
+    'c6db5816ce66282f6d6c7d08792b6095'
+    '53b17712afb7f0a5646b9894032d06ff'
+    'bff621e554812c7325b2bd7f56e9e881'
+'3b142417157d73da4a7981fd07bcb628')
diff --git a/dde2726796d8cfc4e2ad9793b045182f1a1ec082.patch b/dde2726796d8cfc4e2ad9793b045182f1a1ec082.patch
deleted file mode 100644
index cbca543d35dc..000000000000
--- a/dde2726796d8cfc4e2ad9793b045182f1a1ec082.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From dde2726796d8cfc4e2ad9793b045182f1a1ec082 Mon Sep 17 00:00:00 2001
-From: Victor <theonlypwner@users.noreply.github.com>
-Date: Mon, 4 Jul 2016 11:43:56 -0600
-Subject: [PATCH] Update blinking text code and fix #200
-
----
- source/src/rendertext.cpp | 6 ++++--
- 1 file changed, 4 insertions(+), 2 deletions(-)
-
-diff --git a/source/src/rendertext.cpp b/source/src/rendertext.cpp
-index 5ddc698..22f7a34 100644
---- a/source/src/rendertext.cpp
-+++ b/source/src/rendertext.cpp
-@@ -330,7 +330,7 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
-         if(c=='r') c = stack[(sp > 0) ? --sp : sp]; // restore color
-         else if(c == 'b') { if(allowblinkingtext && !ignoreblinkingbit) stack[sp] *= -1; } // blinking text - only if allowed
-         else stack[sp] = c;
--        switch(abs(stack[sp]))
-+        switch(abs(static_cast<int>(stack[sp])))
-         {
-             case '0': color = bvec( 2,  255,  128 ); break;   // green: player talk
-             case '1': color = bvec( 96,  160, 255 ); break;   // blue: team chat
-@@ -383,7 +383,9 @@ static void text_color(char c, char *stack, int size, int &sp, bvec color, int a
-             // white (provided color): everything else
-             //default: color = bvec( 255, 255, 255 ); break;
-         }
--        glColor4ub(color.x, color.y, color.z, stack[sp] > 0 ? a : a * min<float>(fabs(sinf(lastmillis / 200.f) * 1.15f), 1.f));
-+        if (stack[sp] <= 0)
-+            a = min(abs((int) (a * sinf(lastmillis / 200.0f) * 1.15f)), 100);
-+        glColor4ub(color.x, color.y, color.z, a);
-     }
- }
-