rpms/bolzplatz2006/devel bolzplatz2006-functions.sh, NONE, 1.1 bolzplatz2006-irrlicht-extra-qualification-error.patch, NONE, 1.1 bolzplatz2006-irrlicht-png-64bit.patch, NONE, 1.1 bolzplatz2006-irrlicht-use-systemlibs.patch, NONE, 1.1 bolzplatz2006-irrlicht.i.patch, NONE, 1.1 bolzplatz2006-jirr-no-crash.patch, NONE, 1.1 bolzplatz2006-lwjgl-Makefile.patch, NONE, 1.1 bolzplatz2006-lwjgl-nofmod.patch, NONE, 1.1 bolzplatz2006-lwjgl-openal11.patch, NONE, 1.1 bolzplatz2006-settings.desktop, NONE, 1.1 bolzplatz2006-settings.sh, NONE, 1.1 bolzplatz2006.autodlrc, NONE, 1.1 bolzplatz2006.desktop, NONE, 1.1 bolzplatz2006.png, NONE, 1.1 bolzplatz2006.sh, NONE, 1.1 bolzplatz2006.spec, NONE, 1.1 input.xml, NONE, 1.1 .cvsignore, 1.1, 1.2 sources, 1.1, 1.2
Hans de Goede (jwrdegoede)
fedora-extras-commits at redhat.com
Fri Nov 30 18:55:10 UTC 2007
- Previous message (by thread): rpms/gdm/F-8 gdm-2.20.1-suspend.patch, NONE, 1.1 .cvsignore, 1.58, 1.59 gdm.spec, 1.312, 1.313
- Next message (by thread): rpms/java-1.7.0-icedtea/devel .cvsignore, 1.12, 1.13 java-1.7.0-icedtea.spec, 1.28, 1.29 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: jwrdegoede
Update of /cvs/extras/rpms/bolzplatz2006/devel
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv2597/devel
Modified Files:
.cvsignore sources
Added Files:
bolzplatz2006-functions.sh
bolzplatz2006-irrlicht-extra-qualification-error.patch
bolzplatz2006-irrlicht-png-64bit.patch
bolzplatz2006-irrlicht-use-systemlibs.patch
bolzplatz2006-irrlicht.i.patch
bolzplatz2006-jirr-no-crash.patch
bolzplatz2006-lwjgl-Makefile.patch
bolzplatz2006-lwjgl-nofmod.patch
bolzplatz2006-lwjgl-openal11.patch
bolzplatz2006-settings.desktop bolzplatz2006-settings.sh
bolzplatz2006.autodlrc bolzplatz2006.desktop bolzplatz2006.png
bolzplatz2006.sh bolzplatz2006.spec input.xml
Log Message:
initial bolzplatz2006 import
--- NEW FILE bolzplatz2006-functions.sh ---
# creates a local working directory in user-home
function createLocalDir ()
{
if [ ! -f $myHomeDir/bolzplatz2006-1.0.3 ]; then
echo "creating local working directory $myHomeDir ..."
set +e
/usr/share/autodl/AutoDL.py $myShareDir/bolzplatz2006.autodlrc
STATUS=$?
set -e
# status 2 means download was ok, but the user choose not to start the game
if [ "$STATUS" = "0" -o "$STATUS" = "2" ]; then
cd $myHomeDir
tar xfz bolzplatz2006-1.0.3-linux.tar.gz
mv bolzplatz2006/data .
rm -fr bolzplatz2006 bolzplatz2006-1.0.3-linux.tar.gz
# Fix for some files being opened by the wrong name sometimes
cd data/meshes
ln -s terrain1.png terrain.png
ln -s envi4.png envi04.png
ln -s soccerfield4.png soccerfield04.png
cd ../..
# The upstream default input settings only work with German keyboards
cp $myShareDir/input.xml data/config/input.xml
cp $myShareDir/input.xml data/config/input-default.xml
# Signal succesfull datafiles installation
touch bolzplatz2006-1.0.3
fi
if [ "$STATUS" != "0" ]; then
exit $STATUS
fi
fi
}
bolzplatz2006-irrlicht-extra-qualification-error.patch:
--- NEW FILE bolzplatz2006-irrlicht-extra-qualification-error.patch ---
diff -Naur bolzplatz2006/libsrc/irrlicht-0.14-patched/CCrowdSceneNode.h bolzplatz2006-new/libsrc/irrlicht-0.14-patched/CCrowdSceneNode.h
--- bolzplatz2006/libsrc/irrlicht-0.14-patched/CCrowdSceneNode.h 2006-04-22 10:49:56.000000000 +0200
+++ bolzplatz2006-new/libsrc/irrlicht-0.14-patched/CCrowdSceneNode.h 2007-06-18 17:30:55.000000000 +0200
@@ -46,12 +46,12 @@
//! returns amount of materials used by this scene node.
virtual s32 getMaterialCount();
- void CCrowdSceneNode::createCharacter(
+ void createCharacter(
s32 characterIndex, f32 x, f32 y, f32 z, f32 rotY, f32 width, f32 height);
- void CCrowdSceneNode::updateBox();
+ void updateBox();
- void CCrowdSceneNode::setCharacterTCords(s32 characterIndex,
+ void setCharacterTCords(s32 characterIndex,
f32 x0, f32 y0, f32 x1, f32 y1, f32 x2, f32 y2, f32 x3, f32 y3);
private:
diff -Naur bolzplatz2006/libsrc/irrlicht-0.14-patched/COpenGLTexture.h bolzplatz2006-new/libsrc/irrlicht-0.14-patched/COpenGLTexture.h
--- bolzplatz2006/libsrc/irrlicht-0.14-patched/COpenGLTexture.h 2006-03-25 20:11:38.000000000 +0100
+++ bolzplatz2006-new/libsrc/irrlicht-0.14-patched/COpenGLTexture.h 2007-06-18 17:31:48.000000000 +0200
@@ -53,7 +53,7 @@
//! unlock function
virtual void unlock();
- virtual void COpenGLTexture::snowPixel(s32 count);
+ virtual void snowPixel(s32 count);
//! Returns original size of the texture.
virtual const core::dimension2d<s32>& getOriginalSize();
diff -Naur bolzplatz2006/libsrc/irrlicht-0.14-patched/include/matrix4.h bolzplatz2006-new/libsrc/irrlicht-0.14-patched/include/matrix4.h
--- bolzplatz2006/libsrc/irrlicht-0.14-patched/include/matrix4.h 2006-03-21 15:26:20.000000000 +0100
+++ bolzplatz2006-new/libsrc/irrlicht-0.14-patched/include/matrix4.h 2007-06-18 17:31:20.000000000 +0200
@@ -59,7 +59,7 @@
void setTranslation( const vector3df& translation );
//! Gets the current translation
- vector3df matrix4::getTranslation() const;
+ vector3df getTranslation() const;
//! Set the inverse translation of the current matrix. Will erase any previous values.
void setInverseTranslation( const vector3df& translation );
diff -Naur bolzplatz2006/libsrc/irrlicht-0.14-patched/include/quaternion.h bolzplatz2006-new/libsrc/irrlicht-0.14-patched/include/quaternion.h
--- bolzplatz2006/libsrc/irrlicht-0.14-patched/include/quaternion.h 2006-03-21 15:26:20.000000000 +0100
+++ bolzplatz2006-new/libsrc/irrlicht-0.14-patched/include/quaternion.h 2007-06-18 17:31:16.000000000 +0200
@@ -52,7 +52,7 @@
quaternion& operator*=(f32 s);
//! multiplication operator
- vector3df quaternion::operator* (const vector3df& v) const;
+ vector3df operator* (const vector3df& v) const;
//! multiplication operator
quaternion& operator*=(const quaternion& other);
bolzplatz2006-irrlicht-png-64bit.patch:
--- NEW FILE bolzplatz2006-irrlicht-png-64bit.patch ---
--- bolzplatz2006/libsrc/irrlicht-0.14-patched/CImageLoaderPNG.cpp~ 2007-09-07 21:58:09.000000000 +0200
+++ bolzplatz2006/libsrc/irrlicht-0.14-patched/CImageLoaderPNG.cpp 2007-09-07 22:08:27.000000000 +0200
@@ -157,10 +157,17 @@ IImage* CImageLoaderPng::loadImage(irr::
png_set_sig_bytes(png_ptr, 8); // Tell png that we read the signature
png_read_info(png_ptr, info_ptr); // Read the info section of the png file
+
+ /* We MUST use these and not use the address of our width/height
+ attributes directly as png_uint_32 = 64 bits on 64 bits, brilliant
+ huh? */
+ png_uint_32 temp_width, temp_height;
- png_get_IHDR(png_ptr, info_ptr, (png_uint_32*)&width,
- (png_uint_32*)&height, &bitdepth, &colortype, &interlace,
+ png_get_IHDR(png_ptr, info_ptr, &temp_width,
+ &temp_height, &bitdepth, &colortype, &interlace,
&compression, &filter); // Extract info
+ width = temp_width;
+ height = temp_height;
if ( bitdepth != 8)
{
@@ -206,10 +213,13 @@ IImage* CImageLoaderPng::loadImage(irr::
png_read_update_info(png_ptr, info_ptr);
png_get_IHDR(png_ptr, info_ptr,
- (png_uint_32*)&width, (png_uint_32*)&height,
+ &temp_width, &temp_height,
&bitdepth,&colortype, &interlace, &compression,
&filter); // Extract info
+ width = temp_width;
+ height = temp_height;
+
// Check the number of bytes per row
int bytes_per_row = png_get_rowbytes(png_ptr, info_ptr);
bolzplatz2006-irrlicht-use-systemlibs.patch:
--- NEW FILE bolzplatz2006-irrlicht-use-systemlibs.patch ---
diff -ur bolzplatz2006/libsrc/irrlicht-0.14-patched/CImageLoaderJPG.h bolzplatz2006.new/libsrc/irrlicht-0.14-patched/CImageLoaderJPG.h
--- bolzplatz2006/libsrc/irrlicht-0.14-patched/CImageLoaderJPG.h 2006-03-21 15:26:50.000000000 +0100
+++ bolzplatz2006.new/libsrc/irrlicht-0.14-patched/CImageLoaderJPG.h 2007-09-04 15:29:39.000000000 +0200
@@ -12,7 +12,7 @@
#include "IrrCompileConfig.h"
#ifdef _IRR_COMPILE_WITH_LIBJPEG_
extern "C" {
- #include "jpeglib/jconfig.h"
+ #include <jconfig.h>
#ifndef _IRR_USE_NON_SYSTEM_JPEG_LIB_
#include <jpeglib.h> // use system lib
#else // _IRR_USE_NON_SYSTEM_JPEG_LIB_
diff -ur bolzplatz2006/libsrc/irrlicht-0.14-patched/Makefile bolzplatz2006.new/libsrc/irrlicht-0.14-patched/Makefile
--- bolzplatz2006/libsrc/irrlicht-0.14-patched/Makefile 2006-04-30 23:43:32.000000000 +0200
+++ bolzplatz2006.new/libsrc/irrlicht-0.14-patched/Makefile 2007-09-04 15:32:31.000000000 +0200
@@ -19,9 +19,9 @@
#
CPP = g++
-LINKOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CColorConverter.o CFPSCounter.o CImage.o CImageLoaderBmp.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CNullDriver.o CD3D9Driver.o CD3D9HLSLMaterialRe!
nderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o CVideoModeList.o C3DSMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMS3D.o CAnimatedMeshSceneNode.o CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CColladaFileLoader.o CCSMLoader.o CDefaultMeshFormatLoader.o CDMFLoader.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CLMTSMeshFileLoader.o CMeshManipulator.o CMeshSceneNode.o CMetaTriangleSelector.o CMY3DMeshFileLoader.o COCTLoader.o COctTreeSceneNode.o COctTreeTriangleSelector.o CParticleBoxEmitter.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticlePointEmitter.o CParticleSystemSceneNode.o CQ3LevelMesh.o CSceneCollisionManager.o CSceneManager.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation!
.o CSceneNodeAnimatorTexture.o CShadowVolumeSceneNode.o CSkyBo!
xSceneNo
de.o CStaticMeshOBJ.o CTerrainSceneNode.o CTerrainTriangleSelector.o CTestSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CXAnimationPlayer.o CXFileReader.o CXMeshFileLoader.o CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o irrXML.o zlib/adler32.o zlib/compress.o zlib/crc32.o zlib/deflate.o zlib/inffast.o zlib/inflate.o zlib/inftrees.o zlib/trees.o zlib/uncompr.o zlib/zutil.o jpeglib/jcapimin.o jpeglib/jcapistd.o jpeglib/jccoefct.o jpeglib/jccolor.o jpeglib/jcdctmgr.o jpeglib/jchuff.o jpeglib/jcinit.o jpeglib/jcmainct.o jpeglib/jcmarker.o jpeglib/jcmaster.o jpeglib/jcomapi.o jpeglib/jcparam.o jpeglib/jcphuff.o jpeglib/jcprepct.o jpeglib/jcsample.o jpeglib/jctrans.o jpeglib/jdapimin.o jpeglib/jdapistd.o jpeglib/jdatadst.o jpeglib/jdatasrc.o jpeglib/jdcoefct.o jpeglib/jdcolor.o jpeglib/jddctmgr.o jpeglib/jdhuff.o jpeglib/jdinput.o jpeglib/jdmainct.o jpeg!
lib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.o jpeglib/jdphuff.o jpeglib/jdpostct.o jpeglib/jdsample.o jpeglib/jdtrans.o jpeglib/jerror.o jpeglib/jfdctflt.o jpeglib/jfdctfst.o jpeglib/jfdctint.o jpeglib/jidctflt.o jpeglib/jidctfst.o jpeglib/jidctint.o jpeglib/jidctred.o jpeglib/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/rdbmp.o jpeglib/rdcolmap.o jpeglib/rdgif.o jpeglib/rdppm.o jpeglib/rdrle.o jpeglib/rdswitch.o jpeglib/rdtarga.o jpeglib/transupp.o jpeglib/wrbmp.o jpeglib/wrgif.o jpeglib/wrppm.o jpeglib/wrrle.o jpeglib/wrtarga.o libpng/png.o libpng/pngerror.o libpng/pngget.o libpng/pngmem.o libpng/pngpread.o libpng/pngread.o libpng/pngrio.o libpng/pngrtran.o libpng/pngrutil.o libpng/pngset.o libpng/pngtrans.o libpng/pngwio.o libpng/pngwrite.o libpng/pngwtran.o libpng/pngwutil.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o CStringParameters.o Irrlicht.o os.o CMeshCache.o COpenGLSLMaterialRend!
erer.o CZBuffer2.o CTRTextureGouraudAlpha2.o CTRTextureGouraud!
NoZ2.o C
TRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CCrowdSceneNode.o $(RES)
-LIBS = -L"/usr/X11R6/lib" -L"jpeglib" -L"zlib" --no-export-all-symbols --add-stdcall-alias -lGL -lGLU -lXxf86vm
-CXXINCS = -I"include/" -I"zlib/"
+LINKOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUIToolBar.o CGUIWindow.o CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o COpenGLDriver.o COpenGLNormalMapRenderer.o COpenGLParallaxMapRenderer.o COpenGLShaderMaterialRenderer.o COpenGLTexture.o CD3D8Driver.o CD3D8NormalMapRenderer.o CD3D8ParallaxMapRenderer.o CD3D8ShaderMaterialRenderer.o CD3D8Texture.o CColorConverter.o CFPSCounter.o CImage.o CImageLoaderBmp.o CImageLoaderJPG.o CImageLoaderPCX.o CImageLoaderPNG.o CImageLoaderPSD.o CImageLoaderTGA.o CNullDriver.o CD3D9Driver.o CD3D9HLSLMaterialRe!
nderer.o CD3D9NormalMapRenderer.o CD3D9ParallaxMapRenderer.o CD3D9ShaderMaterialRenderer.o CD3D9Texture.o CVideoModeList.o C3DSMeshFileLoader.o CAnimatedMeshMD2.o CAnimatedMeshMS3D.o CAnimatedMeshSceneNode.o CBillboardSceneNode.o CCameraFPSSceneNode.o CCameraMayaSceneNode.o CCameraSceneNode.o CColladaFileLoader.o CCSMLoader.o CDefaultMeshFormatLoader.o CDMFLoader.o CDummyTransformationSceneNode.o CEmptySceneNode.o CGeometryCreator.o CLightSceneNode.o CLMTSMeshFileLoader.o CMeshManipulator.o CMeshSceneNode.o CMetaTriangleSelector.o CMY3DMeshFileLoader.o COCTLoader.o COctTreeSceneNode.o COctTreeTriangleSelector.o CParticleBoxEmitter.o CParticleFadeOutAffector.o CParticleGravityAffector.o CParticlePointEmitter.o CParticleSystemSceneNode.o CQ3LevelMesh.o CSceneCollisionManager.o CSceneManager.o CSceneNodeAnimatorCollisionResponse.o CSceneNodeAnimatorDelete.o CSceneNodeAnimatorFlyCircle.o CSceneNodeAnimatorFlyStraight.o CSceneNodeAnimatorFollowSpline.o CSceneNodeAnimatorRotation!
.o CSceneNodeAnimatorTexture.o CShadowVolumeSceneNode.o CSkyBo!
xSceneNo
de.o CStaticMeshOBJ.o CTerrainSceneNode.o CTerrainTriangleSelector.o CTestSceneNode.o CTextSceneNode.o CTriangleBBSelector.o CTriangleSelector.o CWaterSurfaceSceneNode.o CXAnimationPlayer.o CXFileReader.o CXMeshFileLoader.o CFileList.o CFileSystem.o CLimitReadFile.o CMemoryReadFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o irrXML.o CIrrDeviceLinux.o CIrrDeviceStub.o CIrrDeviceWin32.o CLogger.o COSOperator.o CStringParameters.o Irrlicht.o os.o CMeshCache.o COpenGLSLMaterialRenderer.o CZBuffer2.o CTRTextureGouraudAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CCrowdSceneNode.o $(RES)
+LIBS = --no-export-all-symbols --add-stdcall-alias -lGL -lGLU -lXxf86vm -lz -ljpeg -lpng
+CXXINCS = -I"include"
STATIC_LIB = libIrrlicht.a
SHARED_LIB = libIrrlicht.so
CXXFLAGS = $(CXXINCS) -DIRRLICHT_EXPORTS=1
diff -ur bolzplatz2006/libsrc/irrlicht-0.14-patched/include/IrrCompileConfig.h bolzplatz2006.new/libsrc/irrlicht-0.14-patched/include/IrrCompileConfig.h
--- bolzplatz2006/libsrc/irrlicht-0.14-patched/include/IrrCompileConfig.h 2006-03-21 15:26:20.000000000 +0100
+++ bolzplatz2006.new/libsrc/irrlicht-0.14-patched/include/IrrCompileConfig.h 2007-09-04 15:29:30.000000000 +0200
@@ -65,7 +65,7 @@
//! Define _IRR_USE_NON_SYSTEM_ZLIB_ to let irrlicht use the zlib which comes with irrlicht.
/** If this is commented out, Irrlicht will try to compile using the zlib installed in the system.
This is only used when _IRR_COMPILE_WITH_ZLIB_ is defined. */
-#define _IRR_USE_NON_SYSTEM_ZLIB_
+//#define _IRR_USE_NON_SYSTEM_ZLIB_
//! Define _IRR_COMPILE_WITH_JPEGLIB_ to enable compiling the engine using libjpeg.
@@ -76,7 +76,7 @@
//! Define _IRR_USE_NON_SYSTEM_JPEG_LIB_ to let irrlicht use the jpeglib which comes with irrlicht.
/** If this is commented out, Irrlicht will try to compile using the jpeg lib installed in the system.
This is only used when _IRR_COMPILE_WITH_LIBJPEG_ is defined. */
-#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
+//#define _IRR_USE_NON_SYSTEM_JPEG_LIB_
//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
@@ -87,7 +87,7 @@
//! Define _IRR_USE_NON_SYSTEM_LIBPNG_ to let irrlicht use the libpng which comes with irrlicht.
/** If this is commented out, Irrlicht will try to compile using the libpng installed in the system.
This is only used when _IRR_COMPILE_WITH_LIBPNG_ is defined. */
-#define _IRR_USE_NON_SYSTEM_LIB_PNG_
+//#define _IRR_USE_NON_SYSTEM_LIB_PNG_
//! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
diff -ur bolzplatz2006/libsrc/jirr-dev/Makefile bolzplatz2006.new/libsrc/jirr-dev/Makefile
--- bolzplatz2006/libsrc/jirr-dev/Makefile 2006-03-28 18:42:00.000000000 +0200
+++ bolzplatz2006.new/libsrc/jirr-dev/Makefile 2007-09-04 16:03:40.000000000 +0200
@@ -36,8 +36,7 @@
endif
IRRLICHT_INCDIR=$(IRRLICHT_HOME)/include
-#IRRLICHT_LDFLAGS=-L$(IRRLICHT_LIBDIR) -lIrrlicht -ljpeg -lz
-IRRLICHT_LDFLAGS=-L$(IRRLICHT_LIBDIR) -lIrrlicht
+IRRLICHT_LDFLAGS=-L$(IRRLICHT_LIBDIR) -lIrrlicht -ljpeg -lpng -lz
ifeq ($(OS), win32)
IRRLICHT_LDFLAGS+=-lgdi32 -lglu32 -lopengl32
bolzplatz2006-irrlicht.i.patch:
--- NEW FILE bolzplatz2006-irrlicht.i.patch ---
--- irrlicht.i.org 2007-06-18 17:08:18.000000000 +0200
+++ irrlicht.i 2007-06-18 17:08:43.000000000 +0200
@@ -264,6 +264,7 @@
%include "IShaderConstantSetCallBack.h" // 0.9
%include "IStringParameters.h" // 0.9
+%include "ICrowdSceneNode.h"
//OAK INSERTED THIS
%include "irrlicht.h"
@@ -525,4 +526,4 @@
return ((irr::core::matrix4 const *)self)->operator *((irr::core::matrix4 const &)*matrix);
};
}
-
\ Kein Zeilenumbruch am Dateiende.
+
bolzplatz2006-jirr-no-crash.patch:
--- NEW FILE bolzplatz2006-jirr-no-crash.patch ---
diff -up bolzplatz2006/libsrc/jirr-dev/src/java/net/sf/jirr/SMaterial.java~ bolzplatz2006/libsrc/jirr-dev/src/java/net/sf/jirr/SMaterial.java
--- jirr/src/java/net/sf/jirr/SMaterial.java~ 2007-09-08 11:57:38.000000000 +0200
+++ jirr/src/java/net/sf/jirr/SMaterial.java 2007-09-08 11:57:38.000000000 +0200
@@ -98,7 +98,9 @@ public class SMaterial {
}
public void setTexture(int index, ITexture texture) {
- JirrJNI.SMaterial_setTexture(swigCPtr, this, index, ITexture.getCPtr(texture), texture);
+ // Work around for missing materials better to have no texture then to crash
+ if (swigCPtr != 0)
+ JirrJNI.SMaterial_setTexture(swigCPtr, this, index, ITexture.getCPtr(texture), texture);
}
public boolean notEqualsOperator(SMaterial b) {
bolzplatz2006-lwjgl-Makefile.patch:
--- NEW FILE bolzplatz2006-lwjgl-Makefile.patch ---
diff -up bolzplatz2006/libsrc/lwjgl/src/native/linux/Makefile~ bolzplatz2006/libsrc/lwjgl/src/native/linux/Makefile
--- bolzplatz2006/libsrc/lwjgl/src/native/linux/Makefile~ 2007-09-06 13:51:35.000000000 +0200
+++ bolzplatz2006/libsrc/lwjgl/src/native/linux/Makefile 2007-09-06 13:51:35.000000000 +0200
@@ -2,10 +2,10 @@
CC=gcc
LINKER=gcc
-STRIP=strip
+STRIP=
CFLAGS_LINK=-shared -Wall
-LIBS=-L/usr/X11R6/lib -L/usr/X11/lib -lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/i386 -ljawt -lvorbisfile -Wl,-static,-lXxf86vm,-lXcursor,-lXrender,-lXrandr,-call_shared
+LIBS=-lX11 -lXext -lpthread -L$(JAVA_HOME)/jre/lib/$(JAVA_ARCH) -ljawt -lvorbisfile -lXxf86vm -lXcursor -lXrender -lXrandr
-CFLAGS_O=-fPIC -O2 -D_X11 -Wall -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
+CFLAGS_O=-fPIC $(RPM_OPT_FLAGS) -D_X11 -pthread -c -I../common -I$(JAVA_HOME)/include -I$(JAVA_HOME)/include/linux
SRC=$(wildcard *.c) $(wildcard ../common/*.c) $(wildcard ../common/arb/*.c) $(wildcard ../common/ati/*.c) $(wildcard ../common/ext/*.c) $(wildcard ../common/nv/*.c) $(wildcard ../common/ov/*.c)
OBJECTS=$(subst .c,.o,$(SRC))
LIBRARY=liblwjgl.so
bolzplatz2006-lwjgl-nofmod.patch:
--- NEW FILE bolzplatz2006-lwjgl-nofmod.patch ---
diff -up bolzplatz2006/libsrc/lwjgl/build.xml.nofmod bolzplatz2006/libsrc/lwjgl/build.xml
--- bolzplatz2006/libsrc/lwjgl/build.xml.nofmod 2006-05-29 18:49:34.000000000 +0200
+++ bolzplatz2006/libsrc/lwjgl/build.xml 2007-09-06 10:48:30.000000000 +0200
@@ -48,12 +48,6 @@
<include name="org/lwjgl/util/**" />
</fileset>
- <!-- Files to include in the lwjgl_fmod3.jar file -->
- <fileset id="lwjgl_fmod3.fileset" dir="${lwjgl.bin}">
- <exclude name="**.*" />
- <include name="org/lwjgl/fmod3/**" />
- </fileset>
-
<!-- Files to include in the lwjgl_devil.jar file -->
<fileset id="lwjgl_devil.fileset" dir="${lwjgl.bin}">
<exclude name="**.*"/>
@@ -80,7 +74,6 @@
<!-- Files to include in win32 package -->
<patternset id="lwjgl-win32.fileset">
<include name="lwjgl.dll" />
- <include name="lwjgl-fmod3.dll" />
<include name="lwjgl-devil.dll" />
<include name="lwjgl-audio.dll" />
@@ -93,7 +86,6 @@
<!-- Files to include in linux, glibc2.3 package -->
<patternset id="lwjgl-linux.fileset">
<include name="liblwjgl.so" />
- <include name="liblwjgl-fmod3.so" />
<include name="liblwjgl-devil.so" />
<include name="liblwjgl-audio.so" />
@@ -106,7 +98,6 @@
<!-- Files to include in mac os x package -->
<patternset id="lwjgl-macosx.fileset">
<include name="liblwjgl.jnilib" />
- <include name="liblwjgl-fmod3.jnilib" />
<include name="liblwjgl-devil.jnilib" />
<include name="liblwjgl-audio.jnilib" />
@@ -130,11 +121,6 @@
<srcfiles dir= "${lwjgl.src.native}/win32" includes="*.cpp"/>
</uptodate>
- <uptodate property="lwjgl.fmod.built" targetfile="${lwjgl.lib}/win32/lwjgl-fmod3.dll" >
- <srcfiles dir= "${lwjgl.src.native}/common" includes="*.c"/>
- <srcfiles dir= "${lwjgl.src.native}/common/fmod3" includes="*.c"/>
- </uptodate>
-
<uptodate property="lwjgl.devil.built" targetfile="${lwjgl.lib}/win32/lwjgl-devil.dll" >
<srcfiles dir= "${lwjgl.src.native}/common" includes="*.c"/>
<srcfiles dir= "${lwjgl.src.native}/common/devil" includes="*.c"/>
@@ -241,11 +227,6 @@
<fileset refid="lwjgl_util.fileset" />
</jar>
- <!-- Create lwjgl_fmod.jar -->
- <jar destfile="${lwjgl.temp}/jar/lwjgl_fmod3.jar" taskname="lwjgl_fmod3.jar">
- <fileset refid="lwjgl_fmod3.fileset" />
- </jar>
-
<!-- Create lwjgl_devil.jar -->
<jar destfile="${lwjgl.temp}/jar/lwjgl_devil.jar" taskname="lwjgl_devil.jar">
<fileset refid="lwjgl_devil.fileset" />
@@ -320,7 +301,6 @@
<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/test/**" source="1.4" target="1.4" taskname="test" />
<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/examples/**" source="1.4" target="1.4" taskname="examples" />
<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/util/**" excludes="org/lwjgl/util/generator/**" source="1.4" target="1.4" taskname="util" />
- <javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/fmod3/**" source="1.4" target="1.4" taskname="fmod" />
<javac debug="yes" srcdir="${lwjgl.src}/java/" destdir="${lwjgl.bin}" includes="org/lwjgl/devil/**" source="1.4" target="1.4" taskname="devil"/>
</target>
@@ -373,13 +353,6 @@
<class name="org.lwjgl.audio.vorbis.Util" />
</javah>
- <!-- fmod -->
- <javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/fmod3" force="yes">
- <class name="org.lwjgl.fmod3.FMOD" />
- <class name="org.lwjgl.fmod3.FMusic" />
- <class name="org.lwjgl.fmod3.FSound" />
- </javah>
-
<!-- devil -->
<javah classpath="${lwjgl.bin}" destdir="${lwjgl.src.headers}/devil" force="yes">
<class name="org.lwjgl.devil.IL"/>
@@ -610,7 +583,6 @@
<fail message="Missing FMODHOME path environment property" unless="env.FMODHOME"/>
<antcall target="-compile_native_win32_main" />
- <antcall target="-compile_native_win32_fmod" />
<antcall target="-compile_native_win32_devil" />
</target>
@@ -622,14 +594,6 @@
<move file="platform_build/win32_ms_cmdline/lwjgl.dll" tofile="${lwjgl.lib}/win32/lwjgl.dll"/>
</target>
- <target name="-compile_native_win32_fmod" unless="lwjgl.fmod.built">
- <!-- build fmod -->
- <exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
- <arg line="/c build-fmod.bat" />
- </exec>
- <move file="platform_build/win32_ms_cmdline/lwjgl-fmod3.dll" tofile="${lwjgl.lib}/win32/lwjgl-fmod3.dll"/>
- </target>
-
<target name="-compile_native_win32_devil" unless="lwjgl.devil.built">
<!-- build devil -->
<exec dir="platform_build/win32_ms_cmdline" executable="cmd.exe" failonerror="true">
@@ -645,18 +609,13 @@
<!-- check for required properties -->
<property environment="env"/>
<fail message="Missing JAVA_HOME path environment property" unless="env.JAVA_HOME"/>
- <fail message="Missing FMOD path environment property" unless="env.FMOD"/>
<exec executable="make" dir="${lwjgl.src.native}/linux"/>
<exec executable="make" dir="${lwjgl.src.native}/common/devil">
<arg line="-f Makefile.linux"/>
</exec>
- <exec executable="make" dir="${lwjgl.src.native}/common/fmod3">
- <arg line="-f Makefile.linux"/>
- </exec>
<move file="${lwjgl.src.native}/linux/liblwjgl.so" tofile="${lwjgl.lib}/linux/liblwjgl.so" />
<move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.so" tofile="${lwjgl.lib}/linux/liblwjgl-devil.so" />
- <move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.so" tofile="${lwjgl.lib}/linux/liblwjgl-fmod3.so" />
</target>
<!-- Compiles LWJGL on Mac OS X platforms -->
@@ -671,12 +630,8 @@
<exec executable="make" dir="${lwjgl.src.native}/common/devil">
<arg line="-f Makefile.macosx"/>
</exec>
- <exec executable="make" dir="${lwjgl.src.native}/common/fmod3">
- <arg line="-f Makefile.macosx"/>
- </exec>
<move file="${lwjgl.src.native}/macosx/liblwjgl.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl.jnilib" />
<move file="${lwjgl.src.native}/common/devil/liblwjgl-devil.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-devil.jnilib" />
- <move file="${lwjgl.src.native}/common/fmod3/liblwjgl-fmod3.jnilib" tofile="${lwjgl.lib}/macosx/liblwjgl-fmod3.jnilib" />
</target>
<!-- Creates a build of LWJGL directly from CVS -->
bolzplatz2006-lwjgl-openal11.patch:
--- NEW FILE bolzplatz2006-lwjgl-openal11.patch ---
diff -up bolzplatz2006/libsrc/lwjgl/src/native/common/extal.h.openal11 bolzplatz2006/libsrc/lwjgl/src/native/common/extal.h
--- bolzplatz2006/libsrc/lwjgl/src/native/common/extal.h.openal11 2006-05-29 18:49:26.000000000 +0200
+++ bolzplatz2006/libsrc/lwjgl/src/native/common/extal.h 2007-09-06 10:26:05.000000000 +0200
@@ -38,8 +38,8 @@
#endif
#ifdef _X11
-#include <AL/altypes.h>
-#include <AL/alctypes.h>
+//#include <AL/al.h>
+//#include <AL/alc.h>
#endif
#ifdef _WIN32
#include <altypes.h>
@@ -93,6 +93,106 @@ extern "C" {
#define INITGUID
#define OPENAL
+/** Sound samples: format specifier. */
+#define AL_FORMAT_MONO8 0x1100
+#define AL_FORMAT_MONO16 0x1101
+#define AL_FORMAT_STEREO8 0x1102
+#define AL_FORMAT_STEREO16 0x1103
+
+/* Boolean False. */
+#define AL_FALSE 0
+
+/** Errors: No Error. */
+#define AL_NO_ERROR AL_FALSE
+
+/**
+ * Invalid parameter passed to AL call.
+ */
+#define AL_INVALID_ENUM 0xA002
+
+
+// ALC typedefs
+typedef struct ALCdevice_struct ALCdevice;
+typedef struct ALCcontext_struct ALCcontext;
+/** 8-bit boolean */
+typedef char ALCboolean;
+
+/** character */
+typedef char ALCchar;
+
+/** signed 8-bit 2's complement integer */
+typedef char ALCbyte;
+
+/** unsigned 8-bit integer */
+typedef unsigned char ALCubyte;
+
+/** signed 16-bit 2's complement integer */
+typedef short ALCshort;
+
+/** unsigned 16-bit integer */
+typedef unsigned short ALCushort;
+
+/** signed 32-bit 2's complement integer */
+typedef int ALCint;
+
+/** unsigned 32-bit integer */
+typedef unsigned int ALCuint;
+
+/** non-negative 32-bit binary integer size */
+typedef int ALCsizei;
+
+/** enumerated 32-bit value */
+typedef int ALCenum;
+
+/** 32-bit IEEE754 floating-point */
+typedef float ALCfloat;
+
+/** 64-bit IEEE754 floating-point */
+typedef double ALCdouble;
+
+/** void type (for opaque pointers only) */
+typedef void ALCvoid;
+
+// AL typedefs
+/** 8-bit boolean */
+typedef char ALboolean;
+
+/** character */
+typedef char ALchar;
+
+/** signed 8-bit 2's complement integer */
+typedef char ALbyte;
+
+/** unsigned 8-bit integer */
+typedef unsigned char ALubyte;
+
+/** signed 16-bit 2's complement integer */
+typedef short ALshort;
+
+/** unsigned 16-bit integer */
+typedef unsigned short ALushort;
+
+/** signed 32-bit 2's complement integer */
+typedef int ALint;
+
+/** unsigned 32-bit integer */
+typedef unsigned int ALuint;
+
+/** non-negative 32-bit binary integer size */
+typedef int ALsizei;
+
+/** enumerated 32-bit value */
+typedef int ALenum;
+
+/** 32-bit IEEE754 floating-point */
+typedef float ALfloat;
+
+/** 64-bit IEEE754 floating-point */
+typedef double ALdouble;
+
+/** void type (for opaque pointers only) */
+typedef void ALvoid;
+
void InitializeOpenAL(JNIEnv *env, jobjectArray oalPaths);
void DeInitializeOpenAL();
--- NEW FILE bolzplatz2006-settings.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Bolzplatz 2006 Settings
Comment=Slam Soccer 2006 is a funny football game in 3D-comic-style
Comment[de]=Bolzplatz 2006 ist ein spaßiges Fußballspiel im 3D-Comic-Stil
Comment[fr]=Coup de Foot 2006 est un jeu comique en 3D
Exec=bolzplatz2006-settings
Icon=bolzplatz2006.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;SportsGame;
--- NEW FILE bolzplatz2006-settings.sh ---
#!/bin/sh
# startscript for bolzplatz2006-settings
#
# written by oc2pus and Hans de Goede <j.w.r.degoede at hhs.nl>
#
# Changelog:
# 18.06.2007 initial version (oc2pus)
# 08.09.2007 Don't symlink entire data dir, instead copy over a few dirs which
# need to be writable and symlink the rest, make the script work on systems
# which have lib64 dirs (Hans).
# activate for debugging
#set -x
# exit on error
set -e
# base settings
myShareDir=/usr/share/bolzplatz2006
myHomeDir=~/.bolzplatz2006
. $myShareDir/bolzplatz2006-functions.sh
echo ""
echo "starting bolzplatz2006 settings ..."
# creates a local working directory in user-home
createLocalDir
cd $myHomeDir
# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions
# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs
if [ -x /usr/lib64/bolzplatz2006/libirrlicht_wrap.so ]; then
set_options "-Djava.library.path="/usr/lib64/bolzplatz2006:/usr/lib64/sdljava""
else
set_options "-Djava.library.path="/usr/lib/bolzplatz2006:/usr/lib/sdljava""
fi
CLASSPATH=`build-classpath sdljava dom4j vecmath bolzplatz2006`
MAIN_CLASS="com.xenoage.bp2k6.tools.settings.SettingsTool"
run $@ > bolzplatz2006-settings.log 2>&1
--- NEW FILE bolzplatz2006.autodlrc ---
[MESSAGELIST]
[MESSAGE]
[TITLE]Please click 'Accept' to allow internet access.[/TITLE]
[TEXT]In order to play bolzplatz / slamsoccer 2006, the bolzplatz2006 data files are needed.
These files are not included in Fedora because they are licensed under the Creative Commons Attribution-NonCommercial-ShareAlike 2.5 License, which contains a no commercial use clause. These files can be freely downloaded from the internet.
If you click Accept the necessary files will be automatically downloaded and installed for you.
Please click Accept to allow access to the internet to download the necessary datafiles.[/TEXT]
[/MESSAGE]
[MESSAGE]
[TITLE]License Information[/TITLE]
[TEXT]Attribution-NonCommercial-ShareAlike 2.5 License
You are free:
* to Share — to copy, distribute and transmit
the work
* to Remix — to adapt the work
Under the following conditions:
* Attribution. You must attribute the work in the
manner specified by the author or licensor (but
not in any way that suggests that they endorse
you or your use of the work).
* Noncommercial. You may not use this work for
commercial purposes.
* Share Alike. If you alter, transform, or build
upon this work, you may distribute the resulting
work only under the same or similar license to
this one.
* For any reuse or distribution, you must make clear
to others the license terms of this work. The best
way to do this is with a link to this web page.
* Any of the above conditions can be waived if you
get permission from the copyright holder.
* Nothing in this license impairs or restricts the
author's moral rights.
Disclaimer
Your fair dealing and other rights are in no way affected by the above.
This is a human-readable summary of the Legal Code (the full license), which is available here:
http://creativecommons.org/licenses/by-nc-sa/2.5/legalcode
[/TEXT]
[/MESSAGE]
[/MESSAGELIST]
[FILELIST]
[FILE]
[FILENAME]bolzplatz2006-1.0.3-linux.tar.gz[/FILENAME]
[MD5]6cac1e95dd6f2deebbf33941c78c6ed8[/MD5]
[PATH]$HOME/.bolzplatz2006[/PATH]
[MIRRORS]
[URL]http://downloads.sourceforge.net/bp2k6/bolzplatz2006-1.0.3-linux.tar.gz[/URL]
[URL]http://downloads.sourceforge.net/bp2k6/bolzplatz2006-1.0.3-linux.tar.gz[/URL]
[URL]http://downloads.sourceforge.net/bp2k6/bolzplatz2006-1.0.3-linux.tar.gz[/URL]
[/MIRRORS]
[/FILE]
[/FILELIST]
--- NEW FILE bolzplatz2006.desktop ---
[Desktop Entry]
Encoding=UTF-8
Name=Bolzplatz 2006
Comment=Slam Soccer 2006 is a funny football game in 3D-comic-style
Comment[de]=Bolzplatz 2006 ist ein spaßiges Fußballspiel im 3D-Comic-Stil
Comment[fr]=Coup de Foot 2006 est un jeu comique en 3D
Exec=bolzplatz2006
Icon=bolzplatz2006.png
Terminal=false
StartupNotify=false
Type=Application
Categories=Game;SportsGame;
--- NEW FILE bolzplatz2006.sh ---
#!/bin/sh
# startscript for bolzplatz2006
#
# written by oc2pus and Hans de Goede <j.w.r.degoede at hhs.nl>
#
# Changelog:
# 18.06.2007 initial version (oc2pus)
# 08.09.2007 Don't symlink entire data dir, instead copy over a few dirs which
# need to be writable and symlink the rest, make the script work on systems
# which have lib64 dirs (Hans).
# activate for debugging
#set -x
# exit on error
set -e
# base settings
myShareDir=/usr/share/bolzplatz2006
myHomeDir=~/.bolzplatz2006
. $myShareDir/bolzplatz2006-functions.sh
echo ""
echo "starting bolzplatz2006 ..."
# creates a local working directory in user-home
createLocalDir
cd $myHomeDir
# source the jpackage helpers
VERBOSE=1
. /usr/share/java-utils/java-functions
# set JAVA_* environment variables
set_javacmd
check_java_env
set_jvm_dirs
if [ -x /usr/lib64/bolzplatz2006/libirrlicht_wrap.so ]; then
set_options "-Djava.library.path="/usr/lib64/bolzplatz2006:/usr/lib64/sdljava""
else
set_options "-Djava.library.path="/usr/lib/bolzplatz2006:/usr/lib/sdljava""
fi
CLASSPATH=`build-classpath sdljava dom4j vecmath bolzplatz2006`
MAIN_CLASS="com.xenoage.bp2k6.Main"
run $@ > bolzplatz2006.log 2>&1
--- NEW FILE bolzplatz2006.spec ---
# Copyright (c) 2007 oc2pus <toni at links2linux.de>
# Copyright (c) 2007 Hans de Goede <j.w.r.degoede at hhs.nl>
# This file and all modifications and additions to the pristine
# package are under the same license as the package itself.
#
# Please submit bugfixes or comments to us at the above email addresses
Name: bolzplatz2006
Version: 1.0.3
Release: 3%{?dist}
Summary: Slam Soccer 2006 is a funny football game in 3D-comic-style
Summary(fr): Coup de Foot 2006 est un jeu comique en 3D
Summary(de): Bolzplatz 2006 ist ein spaßiges Fußballspiel im 3D-Comic-Stil
License: GPLv2+
Group: Amusements/Games
URL: http://www.bolzplatz2006.de
Source0: http://downloads.sourceforge.net/bp2k6/%{name}-%{version}-src.zip
Source1: %{name}.png
Source2: %{name}.sh
Source3: %{name}-settings.sh
Source4: %{name}.desktop
Source5: %{name}-settings.desktop
Source6: %{name}-jirr-no-crash.patch
Source7: %{name}-functions.sh
Source8: %{name}.autodlrc
Source9: input.xml
Patch0: %{name}-irrlicht.i.patch
Patch1: %{name}-irrlicht-extra-qualification-error.patch
Patch2: %{name}-irrlicht-use-systemlibs.patch
Patch3: %{name}-irrlicht-png-64bit.patch
Patch4: %{name}-lwjgl-nofmod.patch
Patch5: %{name}-lwjgl-openal11.patch
Patch6: %{name}-lwjgl-Makefile.patch
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildRequires: ant-nodeps sdljava dom4j vecmath1.2 swig xml-commons-apis
BuildRequires: libGLU-devel DevIL-devel libXxf86vm-devel libjpeg-devel
BuildRequires: libpng-devel libXext-devel libXrandr-devel libXcursor-devel
BuildRequires: libXt-devel libXrender-devel libvorbis-devel desktop-file-utils
# Building ( & running) only works with icedtea (which is i386 and x86_64 only)
BuildRequires: java-1.7.0-icedtea-devel
Requires: sdljava dom4j vecmath1.2 java-1.7.0-icedtea jpackage-utils
Requires: hicolor-icon-theme autodownloader
ExclusiveArch: %{ix86} x86_64
%description
Slam Soccer 2006 is a funny football game in
3D-comic-style - and it's for free!
* Freeware and open source
* Funny 3d-comic-style
* Enthralling stadium atmosphere
* Keyboard and gamepad control
* 2-player mode
* Career and world cup
* Register in the online hall of fame
* Build your own stadium
* 80 teams
* 20 stadiums
* 10 weather conditions
* 50 adboards
* 10 referees
* 9 commentators (5 German, 2 English, 2 French)
* 3 languages: German, English, French
%description -l de
Bolzplatz 2006 ist ein spaßiges Fußballspiel
im 3D-Comic-Stil für lau.
* Kostenlos und Open-Source
* Witzige 3D-Comic-Grafik
* Packende Stadionatmosphäre
* Steuerung mit Tastatur oder Gamepad
* 2-Spieler-Modus
* Karriere und Weltmeisterschaft
* Eintrag in die Hall of Fame
* Baue Dein eigenes Stadion
* 80 Teams
* 20 Stadien
* 10 Wetterverhältnisse
* 50 Werbebanden
* 10 Schiedsrichter
* 9 Kommentatoren (5xDeutsch, 2xEnglisch, 2xFranzösisch)
* 3 Sprachen: Deutsch, Englisch und Französisch
%description -l fr
Coup de Foot 2006 est un jeu comique en 3D.
Gratuit et open-source.
* Graphiques 3D en style cartoon
* Ambiance de stade presqu'originale
* A commander par clavier ou gamepad
* Mode 2 joueurs
* Mode Carrière et Coupe du Monde
* Inscription au Hall of Fame
* Construis tes propres stades
* 80 équipes
* 20 stades
* 10 conditions atmosphériques différentes
* 50 panneaux publicitaires
* 10 arbitres
* 9 commentateurs
* 3 langues: allemand, anglais et français
%prep
%setup -q -c
pushd libsrc/jirr-dev
%patch0 -p0
cp %{SOURCE6} diff.txt
popd
%patch1 -p1
%patch2 -p1
%patch3 -p1
%patch4 -p1
%patch5 -p1
%patch6 -p1
sed -i 's/\r//' license.txt
# we use the system versions of these
rm -r libsrc/irrlicht-0.14-patched/libpng libsrc/irrlicht-0.14-patched/zlib \
libsrc/irrlicht-0.14-patched/jpeglib
%build
export RPM_OPT_FLAGS
export JAVA_HOME=/usr/lib/jvm/java-icedtea
%ifarch %{ix86}
export JAVA_ARCH=i386
%endif
%ifarch x86_64
export JAVA_ARCH=amd64
%endif
# jbolzplatz ships with copies of several libraries, as these are heavily
# patched we use the bolzplatz versions and not the system ones
# build irrlicht-0.14
pushd libsrc/irrlicht-0.14-patched
make %{?_smp_mflags} CPP="g++ $RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" \
CC="g++ $RPM_OPT_FLAGS -fPIC -fno-strict-aliasing"
popd
# build jirr-0.6
pushd libsrc/jirr-dev
make CXX="g++ $RPM_OPT_FLAGS -fPIC -fno-strict-aliasing" \
CC="g++ $RPM_OPT_FLAGS -fPIC -fno-strict-aliasing"
popd
# build lwjgl
pushd libsrc/lwjgl
ant jars
ant compile_native
popd
# build bolzplatz itself
mkdir classes
javac -d classes -encoding iso-8859-1 \
-cp `build-classpath dom4j sdljava vecmath`:./libsrc/jirr-dev/lib/irrlicht.jar:./libsrc/lwjgl/libs/lwjgl.jar \
`find ./src -name '*.java'`
jar cf %{name}.jar -C classes .
%install
rm -rf $RPM_BUILD_ROOT
# dirs
mkdir -p $RPM_BUILD_ROOT%{_bindir}
mkdir -p $RPM_BUILD_ROOT%{_libdir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_javadir}/%{name}
mkdir -p $RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
# jars
install -m 644 %{name}.jar libsrc/jirr-dev/lib/irrlicht.jar \
libsrc/lwjgl/libs/lwjgl.jar $RPM_BUILD_ROOT%{_javadir}/%{name}
# native libraries
install -m 755 libsrc/jirr-dev/libirrlicht_wrap.so \
libsrc/lwjgl/libs/linux/liblwjgl.so $RPM_BUILD_ROOT%{_libdir}/%{name}
# startscripts
install -m 755 %{SOURCE2} $RPM_BUILD_ROOT%{_bindir}/%{name}
install -m 755 %{SOURCE3} $RPM_BUILD_ROOT%{_bindir}/%{name}-settings
# icon and menu-entry
install -p -m 644 %{SOURCE1} \
$RPM_BUILD_ROOT%{_datadir}/icons/hicolor/16x16/apps
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE4}
desktop-file-install --vendor fedora \
--dir $RPM_BUILD_ROOT%{_datadir}/applications \
%{SOURCE5}
# needed "data" files
install -p -m 644 %{SOURCE7} %{SOURCE8} %{SOURCE9} \
$RPM_BUILD_ROOT%{_datadir}/%{name}
%clean
rm -rf $RPM_BUILD_ROOT
%post
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%postun
touch --no-create %{_datadir}/icons/hicolor || :
if [ -x %{_bindir}/gtk-update-icon-cache ]; then
%{_bindir}/gtk-update-icon-cache --quiet %{_datadir}/icons/hicolor || :
fi
%files
%defattr(-,root,root,-)
%doc license.txt
%{_bindir}/%{name}*
%{_libdir}/%{name}
%{_datadir}/%{name}
%{_javadir}/%{name}
%{_datadir}/applications/fedora-%{name}*.desktop
%{_datadir}/icons/hicolor/16x16/apps/%{name}.png
%changelog
* Thu Nov 29 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-3
- Add missing BuildRequires: libXxf86vm-devel, libGLU-devel, libjpeg-devel,
libpng-devel, libXext-devel, libXrandr-devel, libXcursor-devel, libXt-devel
libXrender-devel, libvorbis-devel, desktop-file-utils
* Mon Sep 17 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-2
- Switch to using autodownloader for the datafiles, upstream wanted to change
the license of the datafiles to be free, but not all contributers have
agreed to the license change :(
* Sat Sep 8 2007 Hans de Goede <j.w.r.degoede at hhs.nl> 1.0.3-1
- Adapted Packman spec file for Fedora
* Mon Jun 18 2007 Toni Graffy <toni at links2linux.de> - 1.0.3-0.pm.1
- initial release 1.0.3
- repacked as tar.bz2
- added docs from binary-tarball
--- NEW FILE input.xml ---
<?xml version="1.0" encoding="windows-1252"?>
<input>
<user id="1">
<keyboard>
<key id="arrowleft" value="37"/>
<key id="arrowup" value="38"/>
<key id="arrowright" value="39"/>
<key id="arrowdown" value="40"/>
<key id="pass" value="162"/>
<key id="shoot" value="32"/>
<key id="sprint" value="160"/>
</keyboard>
<gamepad>
<key id="pass" value="1"/>
<key id="shoot" value="3"/>
<key id="sprint" value="2"/>
</gamepad>
</user>
<user id="2">
<keyboard>
<key id="arrowleft" value="70"/>
<key id="arrowup" value="84"/>
<key id="arrowright" value="72"/>
<key id="arrowdown" value="71"/>
<key id="pass" value="68"/>
<key id="shoot" value="83"/>
<key id="sprint" value="65"/>
</keyboard>
<gamepad>
<key id="pass" value="1"/>
<key id="shoot" value="3"/>
<key id="sprint" value="2"/>
</gamepad>
</user>
</input>
Index: .cvsignore
===================================================================
RCS file: /cvs/extras/rpms/bolzplatz2006/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- .cvsignore 30 Nov 2007 17:32:02 -0000 1.1
+++ .cvsignore 30 Nov 2007 18:54:37 -0000 1.2
@@ -0,0 +1 @@
+bolzplatz2006-1.0.3-src.zip
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/bolzplatz2006/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- sources 30 Nov 2007 17:32:02 -0000 1.1
+++ sources 30 Nov 2007 18:54:37 -0000 1.2
@@ -0,0 +1 @@
+1fb64848d92e2f096339ac9046a1da7e bolzplatz2006-1.0.3-src.zip
- Previous message (by thread): rpms/gdm/F-8 gdm-2.20.1-suspend.patch, NONE, 1.1 .cvsignore, 1.58, 1.59 gdm.spec, 1.312, 1.313
- Next message (by thread): rpms/java-1.7.0-icedtea/devel .cvsignore, 1.12, 1.13 java-1.7.0-icedtea.spec, 1.28, 1.29 sources, 1.19, 1.20
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-extras-commits
mailing list