scorched3d: 41.3 -> 43.2

2010-11-16 23:26:55 +11:00 · 2010-11-16 23:26:55 +11:00 · 12b12e6ab3
commit 12b12e6ab3
parent b0257e8f5a
6 changed files with 1357 additions and 1295 deletions
--- a/scorched3d/.footprint
+++ b/scorched3d/.footprint
--- a/scorched3d/.md5sum
+++ b/scorched3d/.md5sum
@ -1,2 +1,3 @@
-6bb47045abccaca1f775ff4cde8b3b5d  Scorched3D-41.3-src.tar.gz
-1f50cde0160b494aae7fdae553e3150a  scorched3d-41.3-gcc43.patch
+a40def5cba8cacf58bba93064c94aa73  Scorched3D-43.2-src.tar.gz
+ccc23027eeb13723b69432bd7bf5703a  scorched3d-43.2-misc.patch
+959a024702c2cbeeef028d17b5521ecd  scorched3d-43.2-openal.patch
--- a/scorched3d/Pkgfile
+++ b/scorched3d/Pkgfile
@ -5,17 +5,20 @@
 # Depends on: sdl_mixer sdl_net wxgtk freealut fftw

 name=scorched3d
-version=41.3
+version=43.2
 release=1
 source=(http://download.sourceforge.net/scorched3d/Scorched3D-$version-src.tar.gz
-	scorched3d-41.3-gcc43.patch)
+	scorched3d-43.2-openal.patch
+	scorched3d-43.2-misc.patch)

 build() {
 	cd scorched
-	patch -p 1 -i $SRC/scorched3d-41.3-gcc43.patch
-	chmod +x $SRC/scorched/scripts/openal-config

-	OPENAL_CONFIG=$SRC/scorched/scripts/openal-config \
+	touch INSTALL NEWS AUTHORS ChangeLog
+	patch -p 1 -i $SRC/scorched3d-43.2-openal.patch
+	patch -p 1 -i $SRC/scorched3d-43.2-misc.patch
+	autoreconf
+
 	./configure \
 		--prefix=/usr \
 		--datadir=/usr/share/scorched3d \
--- a/scorched3d/scorched3d-41.3-gcc43.patch
+++ b/scorched3d/scorched3d-41.3-gcc43.patch
@ -1,49 +0,0 @@
-Index: scorched3d-41.3dfsg/src/common/main.h
-===================================================================
--- scorched3d-41.3dfsg.orig/src/common/main.h	2008-01-26 20:41:37.000000000 +0100
-+++ scorched3d-41.3dfsg/src/common/main.h	2008-01-26 20:45:15.000000000 +0100
-@@ -21,6 +21,8 @@
- #define WIN32_LEAN_AND_MEAN
- 
- #include <windows.h>
-+#include <cstdlib>
-+#include <vector>
- 
- #ifdef HAVE_UNISTD_H
- #include <unistd.h>
-Index: scorched3d-41.3dfsg/src/common/sha2.h
-===================================================================
--- scorched3d-41.3dfsg.orig/src/common/sha2.h	2008-01-26 20:41:37.000000000 +0100
-+++ scorched3d-41.3dfsg/src/common/sha2.h	2008-01-26 20:45:15.000000000 +0100
-@@ -46,6 +46,7 @@
- 
- #include <string>
- #include <stdexcept>
-+#include <cstring>
- 
- // NOTE: You may need to define things by hand for your system: 
- typedef unsigned char  sha_byte;           // Exactly 1 byte 
-Index: scorched3d-41.3dfsg/src/common/DefinesFile.cpp
-===================================================================
--- scorched3d-41.3dfsg.orig/src/common/DefinesFile.cpp	2008-01-26 20:41:37.000000000 +0100
-+++ scorched3d-41.3dfsg/src/common/DefinesFile.cpp	2008-01-26 20:45:15.000000000 +0100
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string>
-+#include <cstring>
- #include <common/DefinesFile.h>
- #include <sys/types.h>
- #include <sys/stat.h>
-Index: scorched3d-41.3dfsg/src/common/LoggerI.cpp
-===================================================================
--- scorched3d-41.3dfsg.orig/src/common/LoggerI.cpp	2008-01-26 20:45:33.000000000 +0100
-+++ scorched3d-41.3dfsg/src/common/LoggerI.cpp	2008-01-26 20:46:03.000000000 +0100
-@@ -20,6 +20,7 @@
- 
- #include <common/LoggerI.h>
- #include <time.h>
-+#include <cstring>
- 
- LoggerInfo::LoggerInfo(
- 	const char *message, 
--- a/scorched3d/scorched3d-43.2-misc.patch
+++ b/scorched3d/scorched3d-43.2-misc.patch
@ -0,0 +1,26 @@
+diff -pruN scorched.orig/configure.ac scorched/configure.ac
+--- scorched.orig/configure.ac	2010-11-16 12:10:55.194706554 +0000
+++ scorched/configure.ac	2010-11-16 12:13:24.084293554 +0000
+@@ -13,22 +13,6 @@ AC_PROG_CXX
+ AC_PROG_INSTALL
+ AC_PROG_RANLIB
+ 
+-LDFLAGS="-L/usr/X11R6/lib -L/usr/X11R6"
+-CPPFLAGS="-I/usr/X11R6/include -I/usr/X11R6"
+-
+-if test `uname` == Darwin; then
+-LDFLAGS="$LDFLAGS -lmx"
+-CPPFLAGS="$CPPFLAGS -DFFTW_USE_DOUBLE -D__DARWIN__ -D__MACOSX__"
+-else
+-LDFLAGS="$LDFLAGS -L/usr/local/lib"
+-CPPFLAGS="$CPPFLAGS -I/usr/local/include"
+-fi
+-
+-AC_CHECK_LIB(fridge, beer, echo "Hmm?!",[
+-	echo "Warning: No beer found in fridge!";
+-	echo "We highly suggest that you rectify this situation immediately."
+-])
+-
+ AC_ARG_ENABLE(serveronly, 
+ 	[  --enable-serveronly Enable server only compilation],
+ 		    , enable_serveronly=no,
--- a/scorched3d/scorched3d-43.2-openal.patch
+++ b/scorched3d/scorched3d-43.2-openal.patch
@ -0,0 +1,32 @@
+diff -pruN scorched.orig/configure-al.m4 scorched/configure-al.m4
+--- scorched.orig/configure-al.m4	2010-11-16 11:59:34.712924554 +0000
+++ scorched/configure-al.m4	2010-11-16 12:03:22.675886054 +0000
+@@ -7,25 +7,9 @@ AC_ARG_ENABLE(openaltest,
+ 	[  --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)