Miroirs/slackbuilds_ponce
1
0
Fork 0
mirror of https://github.com/Ponce/slackbuilds synced 2024-09-29 17:37:55 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

games/Scorched3D: Updated for version 43.3d.

Browse source 
Signed-off-by: Matteo Bernardini <ponce@slackbuilds.org>
This commit is contained in:
Heinz Wiesinger 2013-12-07 17:03:49 +01:00 committed by Erik Hanson
parent 83fcce18d7
commit cb0b8510e6
4 changed files with 7 additions and 84 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
games/Scorched3D/Scorched3D.SlackBuild
View file

@ -2,7 +2,7 @@
# Slackware build script for Scorched3D
# Copyright 2008-2010 Heinz Wiesinger, Amsterdam, The Netherlands
# Copyright 2008-2013 Heinz Wiesinger, Amsterdam, The Netherlands
# All rights reserved.
#
# Redistribution and use of this script, with or without modification, is
@ -23,8 +23,8 @@
# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
PRGNAM=Scorched3D
VERSION=43.1c
BUILD=${BUILD:-2}
VERSION=43.3d
BUILD=${BUILD:-1}
TAG=${TAG:-_SBo}
if [ -z "$ARCH" ]; then
@ -61,6 +61,7 @@ mkdir -p $TMP $PKG $OUTPUT
cd $TMP
rm -rf scorched
rm -rf scorched-dep-osx
rm -rf scorched-dep-win32
tar xvf $CWD/$PRGNAM-$VERSION-src.tar.gz
cd scorched
chown -R root:root .
@ -70,12 +71,6 @@ find -L . \
\( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
-o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
#fix detection of OpenAL
patch -p1 -i $CWD/scorched3d-42.1-fixups.patch
#fix building with libpng14
patch -p0 -i $CWD/scorched3d-43.1c-libpng14.patch
#fix for glibc-2.15 http://www.scorched3d.co.uk/mantisbt/view.php?id=156
patch -p1 -i $CWD/scorched-svn_glibc-2.15_fix.patch

6
games/Scorched3D/Scorched3D.info
View file

@ -1,8 +1,8 @@
PRGNAM="Scorched3D"
VERSION="43.1c"
VERSION="43.3d"
HOMEPAGE="http://www.scorched3d.co.uk"
DOWNLOAD="http://downloads.sourceforge.net/scorched3d/Scorched3D-43.1c-src.tar.gz"
MD5SUM="91d8b8cfecba870d33984319c8035a4c"
DOWNLOAD="http://downloads.sourceforge.net/scorched3d/Scorched3D-43.3d-src.tar.gz"
MD5SUM="9c3043282a9e7451468ff325bef3b04c"
DOWNLOAD_x86_64=""
MD5SUM_x86_64=""
REQUIRES="freealut wxPython"

32
games/Scorched3D/scorched3d-42.1-fixups.patch
View file

@ -1,32 +0,0 @@
diff -ru scorched.orig/configure-al.m4 scorched/configure-al.m4
--- scorched.orig/configure-al.m4 2008-03-03 16:17:18.000000000 -0500
+++ scorched/configure-al.m4 2009-02-15 20:43:35.000000000 -0500
@@ -7,25 +7,9 @@
[ --disable-openaltest Do not try to compile and run a test OpenAL program],
, enable_openaltest=yes)
AC_MSG_CHECKING(for OpenAL support)
-AC_PATH_PROG(OPENAL_CONFIG, openal-config, no)
-if test x$OPENAL_CONFIG = xno; then
- echo "*** The openal-config script installed by OpenAL could not be found"
- echo "*** Make sure openal-config is in your path, or set the OPENAL_CONFIG"
- echo "*** environment variable to the full path to openal-config."
-
- AC_MSG_ERROR([*** Can't find the openal library. Try: http://www.openal.org/])
-else
-
- if test x"$use_static_openal" = x"yes"; then
- AL_LIBS="/usr/local/lib/libopenal.a"
- else
- AL_LIBS="`$OPENAL_CONFIG --libs`"
- fi
-
- AL_CFLAGS="`$OPENAL_CONFIG --cflags`"
-
- AC_MSG_RESULT(yes)
-fi
+AL_LIBS="-lopenal"
+AL_CFLAGS="-I/usr/include/AL"
+AC_MSG_RESULT(yes)
AC_MSG_CHECKING(for Freealut support)
AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)

40
games/Scorched3D/scorched3d-43.1c-libpng14.patch
View file

@ -1,40 +0,0 @@
http://bugs.gentoo.org/show_bug.cgi?id=308867
--- src/common/image/ImagePng.cpp
+++ src/common/image/ImagePng.cpp
@@ -189,7 +189,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
info_ptr = png_create_info_struct(png_ptr);
if (info_ptr == NULL)
{
- png_destroy_read_struct(&png_ptr, png_infopp_NULL, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, NULL, NULL);
return false;
}
@@ -200,7 +200,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
if (setjmp(png_jmpbuf(png_ptr)))
{
/* Free all of the memory associated with the png_ptr and info_ptr */
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
/* If we get here, we had a problem reading the file */
return false;
}
@@ -258,7 +258,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
}
else
{
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
Logger::log(S3D::formatStringBuffer(
"Invalid PNG format.\n"
@@ -272,7 +272,7 @@ bool ImagePng::loadFromBuffer(NetBuffer
// END NEW CODE
/* clean up after the read, and free any memory allocated - REQUIRED */
- png_destroy_read_struct(&png_ptr, &info_ptr, png_infopp_NULL);
+ png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
/* that's it */
return true;