64e78659f4
* gnu/packages/games.scm (irrlicht): Update to 1.8.5. [source]: Use unmodified Debian patches rather than manually maintain a custom mash-up. [arguments]: Add a new 'delete-broken-install-rule phase instead. Don't explicitly return #t from phases. * gnu/packages/patches/irrlicht-link-against-needed-libs.patch: New file. * gnu/local.mk (dist_patch_DATA): Add it.
154 lines
7.5 KiB
Diff
154 lines
7.5 KiB
Diff
Subject: [PATCH] debian/use-system-libs
|
|
|
|
Path to build irrlicht using the system libraries for png,zlib and
|
|
jpeg as well as the glext family of header files.
|
|
|
|
Signed-off-by: Christoph Egger <debian@christoph-egger.org
|
|
|
|
--- irrlicht.orig/include/IrrCompileConfig.h
|
|
+++ irrlicht/include/IrrCompileConfig.h
|
|
@@ -253,10 +253,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_
|
|
-#ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
|
|
#undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
|
|
-#endif
|
|
|
|
//! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
|
|
/** This enables the engine to read png images. If you comment this out,
|
|
@@ -269,10 +266,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_
|
|
-#ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
|
|
#undef _IRR_USE_NON_SYSTEM_LIB_PNG_
|
|
-#endif
|
|
|
|
//! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
|
|
/** If _IRR_D3D_NO_SHADER_DEBUGGING is undefined in IrrCompileConfig.h,
|
|
@@ -606,10 +600,7 @@
|
|
/** If this is commented out, Irrlicht will try to compile using the zlib
|
|
installed on the system. This is only used when _IRR_COMPILE_WITH_ZLIB_ is
|
|
defined. */
|
|
-#define _IRR_USE_NON_SYSTEM_ZLIB_
|
|
-#ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
|
|
#undef _IRR_USE_NON_SYSTEM_ZLIB_
|
|
-#endif
|
|
//! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
|
|
#define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
|
|
#ifdef NO_IRR_COMPILE_WITH_ZIP_ENCRYPTION_
|
|
@@ -627,18 +618,12 @@
|
|
/** If this is commented out, Irrlicht will try to compile using the bzlib
|
|
installed on the system. This is only used when _IRR_COMPILE_WITH_BZLIB_ is
|
|
defined. */
|
|
-#define _IRR_USE_NON_SYSTEM_BZLIB_
|
|
-#ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
|
|
#undef _IRR_USE_NON_SYSTEM_BZLIB_
|
|
-#endif
|
|
//! Define _IRR_COMPILE_WITH_LZMA_ if you want to use LZMA compressed zip files.
|
|
/** LZMA is a very efficient compression code, known from 7zip. Irrlicht
|
|
currently only supports zip archives, though. */
|
|
-#define _IRR_COMPILE_WITH_LZMA_
|
|
-#ifdef NO_IRR_COMPILE_WITH_LZMA_
|
|
#undef _IRR_COMPILE_WITH_LZMA_
|
|
#endif
|
|
-#endif
|
|
|
|
//! Define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_ if you want to mount folders as archives
|
|
#define __IRR_COMPILE_WITH_MOUNT_ARCHIVE_LOADER_
|
|
--- irrlicht.orig/source/Irrlicht/CIrrDeviceLinux.h
|
|
+++ irrlicht/source/Irrlicht/CIrrDeviceLinux.h
|
|
@@ -22,7 +22,7 @@
|
|
#define GLX_GLXEXT_LEGACY 1
|
|
#include <GL/glx.h>
|
|
#ifdef _IRR_OPENGL_USE_EXTPOINTER_
|
|
-#include "glxext.h"
|
|
+#include <GL/glxext.h>
|
|
#endif
|
|
#endif
|
|
|
|
--- irrlicht.orig/source/Irrlicht/COpenGLExtensionHandler.h
|
|
+++ irrlicht/source/Irrlicht/COpenGLExtensionHandler.h
|
|
@@ -35,7 +35,7 @@
|
|
#endif
|
|
#include <OpenGL/gl.h>
|
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
- #include "glext.h"
|
|
+ #include <GL/glext.h>
|
|
#endif
|
|
#elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_)
|
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
@@ -48,7 +48,7 @@
|
|
#define NO_SDL_GLEXT
|
|
#include <SDL/SDL_video.h>
|
|
#include <SDL/SDL_opengl.h>
|
|
- #include "glext.h"
|
|
+ #include <GL/glext.h>
|
|
#else
|
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
#define GL_GLEXT_LEGACY 1
|
|
@@ -60,9 +60,9 @@
|
|
#include <GL/gl.h>
|
|
#include <GL/glx.h>
|
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
- #include "glext.h"
|
|
+ #include <GL/glext.h>
|
|
#undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
|
|
- #include "glxext.h"
|
|
+ #include <GL/glxext.h>
|
|
#endif
|
|
#endif
|
|
|
|
--- irrlicht.orig/source/Irrlicht/COpenGLSLMaterialRenderer.h
|
|
+++ irrlicht/source/Irrlicht/COpenGLSLMaterialRenderer.h
|
|
@@ -25,7 +25,7 @@
|
|
#include <GL/gl.h>
|
|
#endif
|
|
#if defined(_IRR_OPENGL_USE_EXTPOINTER_)
|
|
- #include "glext.h"
|
|
+ #include <GL/glext.h>
|
|
#endif
|
|
#endif
|
|
|
|
--- irrlicht.orig/source/Irrlicht/Makefile
|
|
+++ irrlicht/source/Irrlicht/Makefile
|
|
@@ -45,7 +45,7 @@
|
|
CImageWriterBMP.o CImageWriterJPG.o CImageWriterPCX.o CImageWriterPNG.o CImageWriterPPM.o CImageWriterPSD.o CImageWriterTGA.o
|
|
IRRVIDEOOBJ = CVideoModeList.o CFPSCounter.o $(IRRDRVROBJ) $(IRRIMAGEOBJ)
|
|
IRRSWRENDEROBJ = CSoftwareDriver.o CSoftwareTexture.o CTRFlat.o CTRFlatWire.o CTRGouraud.o CTRGouraudWire.o CTRNormalMap.o CTRStencilShadow.o CTRTextureFlat.o CTRTextureFlatWire.o CTRTextureGouraud.o CTRTextureGouraudAdd.o CTRTextureGouraudNoZ.o CTRTextureGouraudWire.o CZBuffer.o CTRTextureGouraudVertexAlpha2.o CTRTextureGouraudNoZ2.o CTRTextureLightMap2_M2.o CTRTextureLightMap2_M4.o CTRTextureLightMap2_M1.o CSoftwareDriver2.o CSoftwareTexture2.o CTRTextureGouraud2.o CTRGouraud2.o CTRGouraudAlpha2.o CTRGouraudAlphaNoZ2.o CTRTextureDetailMap2.o CTRTextureGouraudAdd2.o CTRTextureGouraudAddNoZ2.o CTRTextureWire2.o CTRTextureLightMap2_Add.o CTRTextureLightMapGouraud2_M4.o IBurningShader.o CTRTextureBlend.o CTRTextureGouraudAlpha.o CTRTextureGouraudAlphaNoZ.o CDepthBuffer.o CBurningShader_Raster_Reference.o
|
|
-IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o
|
|
+IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CWADReader.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o
|
|
IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o
|
|
IRRGUIOBJ = 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 CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o
|
|
ZLIBOBJ = 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
|
|
@@ -58,14 +58,14 @@
|
|
EXTRAOBJ =
|
|
LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
|
|
$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
|
|
- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
|
|
- $(BZIP2OBJ) $(EXTRAOBJ)
|
|
+ $(IRRGUIOBJ) $(LIBAESGM) \
|
|
+ $(EXTRAOBJ)
|
|
|
|
###############
|
|
#Compiler flags
|
|
-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
|
|
+CXXINCS = -I../../include # -Izlib -Ijpeglib -Ilibpng
|
|
CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
|
|
-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
|
|
+CXXFLAGS += -Wall -pipe -fno-exceptions -fstrict-aliasing
|
|
ifndef NDEBUG
|
|
CXXFLAGS += -g -D_DEBUG
|
|
else
|
|
@@ -156,6 +156,7 @@
|
|
mkdir -p $(INSTALL_DIR)/../include/irrlicht
|
|
cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/
|
|
cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)
|
|
+ cp $(LIB_PATH)/$(STATIC_LIB) $(INSTALL_DIR)
|
|
cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME)
|
|
cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB)
|
|
# ldconfig -n $(INSTALL_DIR)
|