packages: scorched3d/scorched3d.spec, scorched3d/scorched3d-openal.patch (N...

Fri Aug 14 02:05:20 CEST 2009

Author: arvenil                      Date: Fri Aug 14 00:05:20 2009 GMT
Module: packages                      Tag: HEAD
---- Log message:
- release 3 (rebuild with OpenAL)
- added openal patch
- use autotools
- adapter

---- Files affected:
packages/scorched3d:
   scorched3d.spec (1.32 -> 1.33) , scorched3d-openal.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/scorched3d/scorched3d.spec
diff -u packages/scorched3d/scorched3d.spec:1.32 packages/scorched3d/scorched3d.spec:1.33

--- packages/scorched3d/scorched3d.spec:1.32	Tue Jul 14 22:19:38 2009
+++ packages/scorched3d/scorched3d.spec	Fri Aug 14 02:05:14 2009
@@ -3,19 +3,21 @@
 Summary(pl.UTF-8):	Wersja 3D klasycznej DOS-owej gry Scorched Earth
 Name:		scorched3d
 Version:	42.1
-Release:	2
+Release:	3
 License:	GPL v2+
 Group:		X11/Applications/Games
 Source0:	http://dl.sourceforge.net/scorched3d/Scorched3D-%{version}-src.tar.gz
 # Source0-md5:	e24867615568ef541a291a4813fcbdae
 Source1:	%{name}.desktop
 Patch0:		%{name}-types.patch
+Patch1:		%{name}-openal.patch
 URL:		http://www.scorched3d.co.uk/
 BuildRequires:	ImageMagick-coder-png
 BuildRequires:	OpenAL-devel >= 0.0.8
-BuildRequires:	OpenGL-GLU-devel 
-BuildRequires:	SDL_net-devel
+BuildRequires:	OpenGL-GLU-devel
 BuildRequires:	SDL-devel >= 1.2.5
+BuildRequires:	SDL_net-devel
+BuildRequires:	autoconf
 BuildRequires:	automake
 BuildRequires:	dos2unix
 BuildRequires:	fftw3-single-devel >= 3.0
@@ -35,20 +37,23 @@
 
 %description -l pl.UTF-8
 Scorched 3D to wieloplatformowe, trójwymiarowe odtworzenie popularnej
-dwuwymiarowej gry artyleryjnej Scorched Earth. W Scorched3D można grać
-przeciwko komputerowi, innym graczom oraz zdalnie poprzez Internet lub
-LAN.
+dwuwymiarowej gry artyleryjnej Scorched Earth. W Scorched3D można
+grać przeciwko komputerowi, innym graczom oraz zdalnie poprzez
+Internet lub LAN.
 
 %prep
 %setup -q -n scorched
 dos2unix src/common/porting/windows.h
 %patch0 -p1
+%patch1 -p1
 
 %build
-cp -f /usr/share/automake/config.sub .
+%{__aclocal}
+%{__autoconf}
+%{__automake}
 %configure \
 	--datadir=%{_datadir}/%{name} \
-	--with-wx-config=wx-gtk2-ansi-config 
+	--with-wx-config=wx-gtk2-ansi-config
 
 %{__make}
 
@@ -86,6 +91,12 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.33  2009/08/14 00:05:14  arvenil
+- release 3 (rebuild with OpenAL)
+- added openal patch
+- use autotools
+- adapter
+
 Revision 1.32  2009/07/14 20:19:38  arekm
 - rel 2; dos line ending fixes
 
@@ -191,5 +202,3 @@
 Revision 1.1  2003/12/21 21:35:02  undefine
 - initital pld version. not ready, not working, not finished, not...
 
-* Sun Dec 7 2003 Gavin Camp gcamp at scorched3d.co.uk
-- First build.

================================================================
Index: packages/scorched3d/scorched3d-openal.patch
diff -u /dev/null packages/scorched3d/scorched3d-openal.patch:1.1
--- /dev/null	Fri Aug 14 02:05:20 2009
+++ packages/scorched3d/scorched3d-openal.patch	Fri Aug 14 02:05:14 2009
@@ -0,0 +1,118 @@
+--- scorched3d/configure-al.m4
++++ scorched3d/configure-al.m4
+@@ -1,111 +1,8 @@
+ dnl Checking for OpenAL
+-AC_ARG_WITH([openal-static],
+-            AC_HELP_STRING([--with-openal-static],
+-                           [enable static linking for openal (default no)]),
+-            [use_static_openal=${withval}],,)
+-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
+-
+-AC_MSG_CHECKING(for Freealut support)
+-AC_PATH_PROG(FREEALUT_CONFIG, freealut-config, no)
+-if test x$FREEALUT_CONFIG = xno; then
+-	echo "*** Warning: The freealut-config script installed by OpenAL could not be found."
+-	echo "*** The alut library is required, however some older OpenAL distribitions may include it."
+-	echo "*** If Scorched3D fails to link check alut is in the link line."
+-	echo "*** Alternatively, make sure freealut-config is in your path, or set the FREEALUT_CONFIG"
+-	echo "*** environment variable to the full path to openal-config."
+-else
+-
+-	AL_LIBS="$AL_LIBS `$FREEALUT_CONFIG --libs`"
+-	AL_CFLAGS="$AL_CFLAGS `$FREEALUT_CONFIG --cflags`"
+-
+-	AC_MSG_RESULT(yes)
+-fi
+-
+-AC_MSG_CHECKING(for OpenAL compilation)
+-if test "x$enable_openaltest" = "xyes" ; then
+-
+-	ac_save_CFLAGS="$CFLAGS"
+-	ac_save_LIBS="$LIBS"
+-	CFLAGS="$CFLAGS $AL_CFLAGS"
+-	LIBS="$AL_LIBS $LIBS"
+-
+-	AC_TRY_COMPILE([
+-#ifdef __APPLE__
+-		#include <OpenAL/al.h>
+-		#include <OpenAL/alut.h>
+-		#include <OpenAL/alc.h>
+-#else
+-		#include <AL/al.h>
+-		#include <AL/alut.h>
+-		#include <AL/alc.h>
+-#endif
+-
+-		],[
+-		],[
+-		have_openal=yes	
+-		],[
+-		echo "*** Failed to compile using the OpenAL library."
+-		echo "*** CFLAGS = $AL_CFLAGS";
+-    		AC_MSG_ERROR([*** Check the OpenAL library is correctly installed.])
+-	])
+-
+-	AC_TRY_LINK([
+-#ifdef __APPLE__
+-		#include <OpenAL/al.h>
+-		#include <OpenAL/alut.h>
+-		#include <OpenAL/alc.h>
+-#else
+-		#include <AL/al.h>
+-		#include <AL/alut.h>
+-		#include <AL/alc.h>
+-#endif
+-
+-		int main(int argc, char *argv[])
+-		{
+-			alutInit(argc, argv);
+-			return 0;
+-		}
+-#undef  main
+-#define main K_and_R_C_main
+-
+-		],[
+-		],[
+-		have_openal=yes	
+-		],[
+-		echo "*** Compiled but failed to link using the OpenAL library."
+-		echo "*** LIBS = $AL_LIBS";
+-		echo "*** Check the OpenAL library is on the LD_LIBRARY_PATH";
+-    		AC_MSG_ERROR([*** Check the OpenAL library is correctly installed.])
+-	])
+-
+-	CFLAGS="$ac_save_CFLAGS"
+-	LIBS="$ac_save_LIBS"
+-
+-	AC_MSG_RESULT(yes)
+-fi
+-
++PKG_CHECK_MODULES([OPENAL], [openal])
++PKG_CHECK_MODULES([FREEALUT], [freealut])
++AL_CFLAGS="$OPENAL_CFLAGS $FREEALUT_CFLAGS"
++AL_LIBS="$OPENAL_LIBS $FREEALUT_LIBS"
+ AC_SUBST(AL_CFLAGS)
+ AC_SUBST(AL_LIBS)
+ 
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/scorched3d/scorched3d.spec?r1=1.32&r2=1.33&f=u

