games/alienarena: Fix 15.0 build.

Signed-off-by: B. Watson <yalhcru@gmail.com>

Signed-off-by: Willy Sudiarto Raharjo <willysr@slackbuilds.org>

2 files changed, 27 insertions, 27 deletions

diff --git a/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch b/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch
index 1f07e24f46..981a4769a3 100644
--- a/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch
+++ b/games/alienarena/alienarena-7.66-no-qglBlitFramebufferEXT.patch
@@ -1,22 +1,19 @@
-diff -up alienarena-7.66/source/ref_gl/r_shadowmaps.c.no-qglBlitFramebufferEXT alienarena-7.66/source/ref_gl/r_shadowmaps.c
---- alienarena-7.66/source/ref_gl/r_shadowmaps.c.no-qglBlitFramebufferEXT	2013-11-05 14:46:37.611487279 -0500
-+++ alienarena-7.66/source/ref_gl/r_shadowmaps.c	2013-11-05 15:00:47.510933729 -0500
-@@ -95,12 +95,12 @@ void R_CheckFBOExtensions (void)
- 	
- 	//must check for ability to blit(Many old ATI drivers do not support)
- 	//TODO: redundant with previous check?
--	if(gl_state.hasFBOblit) {
--		if(!qglBlitFramebufferEXT) {
--			Com_Printf("glBlitFramebufferEXT not found...\n");
--			gl_state.hasFBOblit = false;
--		}
--	}
-+	// if(gl_state.hasFBOblit) {
-+	//	if(!qglBlitFramebufferEXT) {
-+	//		Com_Printf("glBlitFramebufferEXT not found...\n");
-+	//		gl_state.hasFBOblit = false;
-+	//	}
-+	//}
- }
-     
- 
+diff -Naur alienarena-7.66-svn4307/source/ref_gl/r_shadowmaps.c alienarena-7.66-svn4307.patched/source/ref_gl/r_shadowmaps.c
+--- alienarena-7.66-svn4307/source/ref_gl/r_shadowmaps.c	2017-08-02 05:34:56.000000000 -0400
++++ alienarena-7.66-svn4307.patched/source/ref_gl/r_shadowmaps.c	2022-02-22 23:27:40.462295225 -0500
+@@ -92,15 +92,6 @@
+ 	{

+ 		Com_Printf("...GL_EXT_framebuffer_blit not found\n");

+ 	}

+-	

+-	//must check for ability to blit(Many old ATI drivers do not support)

+-	//TODO: redundant with previous check?

+-	if(gl_state.hasFBOblit) {

+-		if(!qglBlitFramebufferEXT) {

+-			Com_Printf("glBlitFramebufferEXT not found...\n");

+-			gl_state.hasFBOblit = false;

+-		}

+-	}

+ }

+     

+ 

diff --git a/games/alienarena/alienarena.SlackBuild b/games/alienarena/alienarena.SlackBuild
index a5ec68d686..6d491d724e 100644
--- a/games/alienarena/alienarena.SlackBuild
+++ b/games/alienarena/alienarena.SlackBuild
@@ -22,6 +22,8 @@
 #  OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 #  ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+# 20220222 bkw: Modified by SlackBuilds.org: fix build on 15.0.
+
 cd $(dirname $0) ; CWD=$(pwd)
 
 PRGNAM=alienarena
@@ -38,9 +40,6 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
-# the name of the created package would be, and then exit. This information
-# could be useful to other scripts.
 if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
   echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
   exit 0
@@ -75,16 +74,20 @@ cd $PRGNAM-$VERSION-svn4307
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
-  -o -perm 511 \) -exec chmod 755 {} \; -o \
+  -o -perm 511 \) -exec chmod 755 {} \+ -o \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
+  -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \+
 
+# 20220222 bkw: this patch wouldn't apply. WTF? reworked it by hand.
+# Not really sure it's necessary, but someone thought it was, so...
 patch -p1 < $CWD/alienarena-7.66-no-qglBlitFramebufferEXT.patch
 
 rm -rf source/unix/ode
 
 sed -i -e "s|crx|$PRGNAM|g" -e "s|\.codred|\.${PRGNAM}|g" Tools/LinuxScripts/*
 
+SLKCFLAGS+=" -fcommon"
+
 ALIENARENA_HOMEDIR=".${PRGNAM}" \
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \