--- irrlicht-1.7+dfsg1.orig/debian/libirrlicht-doc.examples +++ irrlicht-1.7+dfsg1/debian/libirrlicht-doc.examples @@ -0,0 +1 @@ +examples/* --- irrlicht-1.7+dfsg1.orig/debian/control +++ irrlicht-1.7+dfsg1/debian/control @@ -0,0 +1,65 @@ +Source: irrlicht +Priority: optional +Maintainer: Debian Games Team +Uploaders: Christoph Egger +Build-Depends: debhelper (>= 7), + quilt, + libjpeg62-dev, + libpng12-dev, + mesa-common-dev (>= 7.6), + libglu1-mesa-dev, + libsdl1.2-dev, + libx11-dev, + libxrandr-dev, + x11proto-xf86vidmode-dev, + libxxf86vm-dev, + libbz2-dev +Standards-Version: 3.8.4 +Vcs-Git: git://git.debian.org/git/pkg-games/irrlicht.git +Vcs-Browser: http://git.debian.org/?p=pkg-games/irrlicht.git +Section: libs +Homepage: http://irrlicht.sf.net + +Package: libirrlicht-dev +Section: libdevel +Architecture: any +Depends: libirrlicht1.7 (= ${binary:Version}), ${misc:Depends} +Suggests: irrlicht-doc +Description: High performance realtime 3D engine development library + The Irrlicht Engine is an open source completely cross-platform 3D engine. + It has support for OpenGL and its own software renderer, + and has all of the state-of-the-art features + which can be found in commercial 3d engines. + . + This package contains the development library. + +Package: libirrlicht1.7 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Description: High performance realtime 3D engine + The Irrlicht Engine is an open source completely cross-platform 3D engine. + It has support for OpenGL and its own software renderer, + and has all of the state-of-the-art features + which can be found in commercial 3d engines. + +Package: libirrlicht1.7-dbg +Section: debug +Priority: extra +Architecture: any +Depends: libirrlicht1.7 (= ${binary:Version}), ${misc:Depends} +Description: debugging symbols for irrlicht + This package contains the debugging symbols associated with irrlicht. + They will automatically be used by gdb for debugging irrlicht-related + issues. + +Package: libirrlicht-doc +Section: doc +Architecture: all +Depends: ${misc:Depends} +Description: High performance realtime 3D engine (API documentation) + The Irrlicht Engine is an open source completely cross-platform 3D engine. + It has support for OpenGL and its own software renderer, + and has all of the state-of-the-art features + which can be found in commercial 3d engines. + . + This package contains the API documentation and examples. --- irrlicht-1.7+dfsg1.orig/debian/compat +++ irrlicht-1.7+dfsg1/debian/compat @@ -0,0 +1 @@ +7 --- irrlicht-1.7+dfsg1.orig/debian/libirrlicht-dev.install +++ irrlicht-1.7+dfsg1/debian/libirrlicht-dev.install @@ -0,0 +1,4 @@ +include/* usr/include/irrlicht +usr/lib/lib*.a +usr/lib/lib*.so + --- irrlicht-1.7+dfsg1.orig/debian/README.source +++ irrlicht-1.7+dfsg1/debian/README.source @@ -0,0 +1,13 @@ +Task: apply debian patches +Tools: quilt, topgit +Command: quilt push -a +Description: Please read /usr/share/doc/quilt/README.source how to use + quilt for managing Debian patches + . + For creating / editing patches this package uses the topgit + system. You can find information on how to use this system in + /usr/share/doc/topgit/README.source and + /usr/share/doc/topgit/HOWTO-tg2quilt.gz provided you have topgit + installed. + + -- Christoph Egger , Mon, 17 Aug 2009 15:50:35 +0200 --- irrlicht-1.7+dfsg1.orig/debian/series +++ irrlicht-1.7+dfsg1/debian/series @@ -0,0 +1,5 @@ +debian/correct-install.diff +debian/use-system-libs.diff.diff +debian/link-against-needed-libs.diff +debian/arch-support.diff +debian/remove-svn-soname.diff \ No newline at end of file --- irrlicht-1.7+dfsg1.orig/debian/changelog +++ irrlicht-1.7+dfsg1/debian/changelog @@ -0,0 +1,41 @@ +irrlicht (1.7+dfsg1-1) unstable; urgency=low + + * New Upstream Release + * SoName bump, so rename the library + * Update copyright information + * Update repacking, killing newly embedded libbz2 + * Build with RTTI (Closes: #568247) + * Update my E-Mail Address + + -- Christoph Egger Wed, 03 Feb 2010 17:46:30 +0100 + +irrlicht (1.6+dfsg1-1) unstable; urgency=low + + * New upstream Version + * This breaks ABI and API in quite some ways! + * Change name of the library package to reflect new soname + * Refresh patches + * Update get-orig-source target, debian/copyright file + * Needs mesa-common-dev >= 7.6 to build, reflected in build-deps + * Add patch arch-support + * Build with -fPIC instead of -fpic (Closes: #550349) + * Remove assumption that every sparc is runnign solaris + * Implement some real endian detection that gets triggered not only for + sparcs using endian.h + * Building on GNU/kFreeBSD and GNU/Hurd succedes if Linux joystick + support is disabled, doing so there + * call dh_link only with -plibirrlicht1.6, not with -a so the symlink is + only present in one package (Closes: 549481) + * Bump standards version (no changes) + + -- Christoph Egger Sat, 10 Oct 2009 23:47:15 +0200 + +irrlicht (1.5+dfsg1-1) unstable; urgency=low + + [ Christoph Egger ] + * Initial release (Closes: #397255) + + [ Gonéri Le Bouder ] + * clean the tarball up + + -- Christoph Egger Wed, 30 Sep 2009 01:29:49 +0200 --- irrlicht-1.7+dfsg1.orig/debian/libirrlicht1.7.install +++ irrlicht-1.7+dfsg1/debian/libirrlicht1.7.install @@ -0,0 +1 @@ +usr/lib/lib*.so.* --- irrlicht-1.7+dfsg1.orig/debian/watch +++ irrlicht-1.7+dfsg1/debian/watch @@ -0,0 +1,7 @@ +version=3 +opts=dversionmangle=s/\+dfsg\d+$//g \ + http://sf.net/irrlicht/irrlicht-([\.0-9]+)\.zip + +# http://irrlicht.sourceforge.net/downloads.html irrlicht-(.*)\.zip + +# http://sf.net/irrlicht/irrlicht-([\.0-9]+)\.zip --- irrlicht-1.7+dfsg1.orig/debian/libirrlicht-doc.docs +++ irrlicht-1.7+dfsg1/debian/libirrlicht-doc.docs @@ -0,0 +1,4 @@ +doc/html +doc/index.html +doc/readme.txt +doc/upgrade-guide.txt --- irrlicht-1.7+dfsg1.orig/debian/rules +++ irrlicht-1.7+dfsg1/debian/rules @@ -0,0 +1,116 @@ +#!/usr/bin/make -f +# -*- makefile -*- +# Sample debian/rules that uses debhelper. +# This file was originally written by Joey Hess and Craig Small. +# As a special exception, when this file is copied by dh-make into a +# dh-make output file, you may use that output file without restriction. +# This special exception was added by Craig Small in version 0.37 of dh-make. + +# Uncomment this to turn on verbose mode. +# export DH_VERBOSE=1 + + +include /usr/share/quilt/quilt.make +-include /usr/share/topgit/tg2quilt.mk + +# shared library versions, option 1 +version=1.7.0 +major=1.7 +repackv=1 + +build-lib-%: $(QUILT_STAMPFN) + dh_testdir + + mkdir -p lib/Linux + + CFLAGS="$(CFLAGS)" LFLAGS="$(LFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C source/Irrlicht $* + + touch $@ + +build-arch: build-lib-sharedlib build-lib-staticlib + +build-indep: # build-doc + +build: build-arch build-indep + +#build-doc: +# archmage doc/irrlicht.chm html +# touch $@ + +get-orig-source: + mkdir ../repack + uscan --force-download --destdir ../repack --download-current-version + ( \ + cd ../repack ;\ + unzip * ;\ + cd irrlicht-$(major) ;\ + rm -rf source/Irrlicht/jpeglib ;\ + rm -rf source/Irrlicht/zlib ;\ + rm -rf source/Irrlicht/libpng ;\ + rm -rf source/Irrlicht/lzma ;\ + rm -rf source/Irrlicht/bzip2 ;\ + rm -rf source/Irrlicht/MacOSX ;\ + for i in glext.h glxext.h wglext.h ; do rm source/Irrlicht/$$i ; done ;\ + rm -rf bin ;\ + rm -rf media ;\ + rm -rf lib;\ + find . \( -name \*.exe -o -name \*.dll \) -exec rm {} \; ;\ + ( cd doc && svn export https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk/scripts/doc/irrlicht/ ) ;\ + cd .. ;\ + GZIP="--best" tar -czf irrlicht_$(major)+dfsg$(repackv).orig.tar.gz irrlicht-$(major) ;\ + mv irrlicht_$(major)+dfsg$(repackv).orig.tar.gz .. ;\ + ) + rm -rf ../repack + +clean: unpatch + dh_testdir + dh_testroot + rm -rf html + + $(MAKE) -C source/Irrlicht clean + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs -plibirrlicht-dev -Pdebian/tmp usr/include/irrlicht usr/lib + + $(MAKE) -C source/Irrlicht DESTDIR=$(CURDIR)/debian/tmp INSTALL_DIR=$(CURDIR)/debian/tmp/usr/lib install + + +# Build architecture-independent files here. +binary-indep: install + dh_testdir -i + dh_testroot -i + dh_installchangelogs -i changes.txt + dh_installdocs -i + dh_installexamples -i + dh_compress -i + dh_fixperms -i + dh_gencontrol -i + dh_md5sums -i + dh_builddeb -i + +# Build architecture-dependent files here. +binary-arch: install + dh_testdir -a + dh_testroot -a + dh_installchangelogs -a changes.txt + dh_installdocs -a + dh_install -a + dh_installman -a + dh_link -plibirrlicht$(major) usr/lib/libIrrlicht.so.$(version) usr/lib/libIrrlicht.so.$(major) + dh_strip -a --dbg-package=libirrlicht$(major)-dbg + dh_compress -a + dh_fixperms -a + dh_makeshlibs -a + dh_installdeb -a + dh_shlibdeps -a + dh_gencontrol -a + dh_md5sums -a + dh_builddeb -a + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install configure --- irrlicht-1.7+dfsg1.orig/debian/libirrlicht-doc.doc-base +++ irrlicht-1.7+dfsg1/debian/libirrlicht-doc.doc-base @@ -0,0 +1,10 @@ +Document: irrlicht +Title: Irrlicht Manual +Author: Nikolaus Gebhardt +Abstract: The manual contains the API documentation for the irrlicht + gameengine +Section: Programming/C++ + +Format: HTML +Index: /usr/share/doc/libirrlicht-doc/html/index.html +Files: /usr/share/doc/libirrlicht-doc/html/* --- irrlicht-1.7+dfsg1.orig/debian/docs +++ irrlicht-1.7+dfsg1/debian/docs @@ -0,0 +1 @@ +readme.txt --- irrlicht-1.7+dfsg1.orig/debian/clean +++ irrlicht-1.7+dfsg1/debian/clean @@ -0,0 +1,6 @@ +lib/Linux/libIrrlicht.a +lib/Linux/libIrrlicht.so.* +source/Irrlicht/libIrrlicht.so.* +build-lib-sharedlib +build-lib-staticlib +build-doc --- irrlicht-1.7+dfsg1.orig/debian/copyright +++ irrlicht-1.7+dfsg1/debian/copyright @@ -0,0 +1,99 @@ +This package was debianized by Christoph Egger on +Fri, 10 Apr 2009 11:30:21 +0200. + +It was downloaded from + +Copyright: + + © 2002-2009 Nikolaus Gebhardt + © 2002-2009 Thomas Alten + © 2006-2009 Luke Hoschke + © 2002-2009 Christian Stehno + © 2005-2008 Etienne Petitjean + © 2006-2009 Michael Zeilfelder + © 2006-2009 Kat'Oun + © 2002-2008 Saurav Mohapatra + © 2004-2005 Murphy McCauley + © 2002-2008 ZDimitor + © 2002-2009 Anders la Cour-Harbo + © 2002-2008 Salvatore Russo + © 2002-2009 Fabio Concas + © 2005 A. Buschhueter + © 2002-2008 Jonas Petersen + © 2002-2008 William Finlayson + © 2002-2008 Michael Zoech + © 2002-2008 Spintz + © 2007-2009 Dean Wadsworth + © 2006-2009 Burningwater + © 2009 Reinhard Ostermeier + © 2009 Gary Conway + © 2002-2009 Gaz Davidson + © 2006-2009 Asger Feldthaus + © 2008 Neil Burlock + +License: + + This software is provided 'as-is', without any express or implied + warranty. In no event will the authors be held liable for any damages + arising from the use of this software. + + Permission is granted to anyone to use this software for any purpose, + including commercial applications, and to alter it and redistribute it + freely, subject to the following restrictions: + + 1. The origin of this software must not be misrepresented; you must not + claim that you wrote the original software. If you use this software + in a product, an acknowledgment in the product documentation would be + appreciated but is not required. + 2. Altered source versions must be plainly marked as such, and must not be + misrepresented as being the original software. + 3. This notice may not be removed or altered from any source distribution. + +source/Irrlicht/CDMFLoader.{cpp,h} has the additional term + + You can use this software as you wish but you must not remove these notes about license nor + credits to others for parts of this code. + +source/Irrlicht/dmfsupport.h has the additional notice + + This support library has been made by Salvatore Russo and is released under GNU public license for general uses. + For uses in Irrlicht core and only for Irrlicht related uses I release this library under zlib license. + +source/Irrlicht/aesGladman/* + + Copyright: + © 2002-2003 Dr Brian Gladman + + License: + The free distribution and use of this software in both source and binary + form is allowed (with or without changes) provided that: + + 1. distributions of this source code include the above copyright + notice, this list of conditions and the following disclaimer; + + 2. distributions in binary form include the above copyright + notice, this list of conditions and the following disclaimer + in the documentation and/or other associated materials; + + 3. the copyright holder's name is not used to endorse products + built using this software without specific written permission. + + ALTERNATIVELY, provided that this notice is retained in full, this product + may be distributed under the terms of the GNU General Public License (GPL), + in which case the provisions of the GPL apply INSTEAD OF those given above. + + DISCLAIMER + + This software is provided 'as is' with no explicit or implied warranties + in respect of its properties, including, but not limited to, correctness + and/or fitness for purpose. + + +The Debian packaging is: + + © 2009 Christoph Egger + +and is licensed under the same terms as Irrlicht, reproduced above. + +For reference, you can find a copy of the GNU GPL on any Debian +(based) System at /usr/share/common-licenses/GPL-2 \ No newline at end of file --- irrlicht-1.7+dfsg1.orig/debian/patches/series +++ irrlicht-1.7+dfsg1/debian/patches/series @@ -0,0 +1,5 @@ +debian/correct-install.diff +debian/use-system-libs.diff.diff +debian/link-against-needed-libs.diff +debian/arch-support.diff +debian/remove-svn-soname.diff \ No newline at end of file --- irrlicht-1.7+dfsg1.orig/debian/patches/debian/correct-install.diff +++ irrlicht-1.7+dfsg1/debian/patches/debian/correct-install.diff @@ -0,0 +1,37 @@ +From: Christoph Egger +Subject: [PATCH] debian/correct-install + +The variables setup for the install target does not work. We're correcting it here + +Signed-off-by: Christoph Egger + +--- + source/Irrlicht/Makefile | 13 +++++++++++-- + 1 files changed, 11 insertions(+), 2 deletions(-) + +diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index 49f990d..a66980b 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -141,8 +141,17 @@ install install_osx: + mkdir -p $(INSTALL_DIR)/../include/irrlicht + cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/ + cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR) +- cd $(INSTALL_DIR) && ln -s -f $(SHARED_LIB).$(VERSION) $(SHARED_LIB) +-# ldconfig -n $(INSTALL_DIR) ++ cp $(LIB_PATH)/$(STATIC_LIB) $(INSTALL_DIR) ++ cd $(INSTALL_DIR) && ln -s -f libIrrlicht.so.$(VERSION) $(SHARED_LIB) ++ #ldconfig -n $(INSTALL_DIR) ++ ++install_osx: ++ $(RM) -r $(INSTALL_DIR)/../include/irrlicht ++ mkdir -p $(INSTALL_DIR)/../include/irrlicht ++ cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht ++ cp $(LIB_PATH)/$(SHARED_LIB).$(VERSION) $(INSTALL_DIR) ++ cd $(INSTALL_DIR) && ln -s libIrrlicht.dylib.$(VERSION) $(SHARED_LIB) ++ ldconfig -n $(INSTALL_DIR) + + TAGS: + ctags *.cpp ../../include/*.h *.h +-- +tg: (9f40966..) debian/correct-install (depends on: master) --- irrlicht-1.7+dfsg1.orig/debian/patches/debian/use-system-libs.diff.diff +++ irrlicht-1.7+dfsg1/debian/patches/debian/use-system-libs.diff.diff @@ -0,0 +1,182 @@ +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 + #ifdef _IRR_OPENGL_USE_EXTPOINTER_ +-#include "glxext.h" ++#include + #endif + #endif + +diff --git a/source/Irrlicht/COpenGLExtensionHandler.h b/source/Irrlicht/COpenGLExtensionHandler.h +index aabbeeb..f0cb5b8 100644 +--- a/source/Irrlicht/COpenGLExtensionHandler.h ++++ b/source/Irrlicht/COpenGLExtensionHandler.h +@@ -36,7 +36,7 @@ + #endif + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +- #include "glext.h" ++ #include + #endif + #elif defined(_IRR_COMPILE_WITH_SDL_DEVICE_) && !defined(_IRR_COMPILE_WITH_X11_DEVICE_) + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +@@ -49,7 +49,7 @@ + #define NO_SDL_GLEXT + #include + #include +- #include "glext.h" ++ #include + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + #define GL_GLEXT_LEGACY 1 +@@ -61,9 +61,9 @@ + #include + #include + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +- #include "glext.h" ++ #include + #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h +- #include "glxext.h" ++ #include + #endif + #endif + +diff --git a/source/Irrlicht/COpenGLSLMaterialRenderer.h b/source/Irrlicht/COpenGLSLMaterialRenderer.h +index e857e4c..4cb4be0 100644 +--- a/source/Irrlicht/COpenGLSLMaterialRenderer.h ++++ b/source/Irrlicht/COpenGLSLMaterialRenderer.h +@@ -12,7 +12,7 @@ + #define WIN32_LEAN_AND_MEAN + #include + #include +- #include "glext.h" ++ #include + #else + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) + #define GL_GLEXT_LEGACY 1 +@@ -25,7 +25,7 @@ + #include + #endif + #if defined(_IRR_OPENGL_USE_EXTPOINTER_) +- #include "glext.h" ++ #include + #endif + #endif + +diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index a66980b..e78614b 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -36,7 +36,7 @@ IRRIMAGEOBJ = CColorConverter.o CImage.o CImageLoaderBMP.o CImageLoaderJPG.o CIm + 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 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 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 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 +@@ -49,14 +49,14 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o + 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 +-- +tg: (b970ef9..) debian/use-system-libs.diff (depends on: debian/correct-install) --- irrlicht-1.7+dfsg1.orig/debian/patches/debian/arch-support.diff +++ irrlicht-1.7+dfsg1/debian/patches/debian/arch-support.diff @@ -0,0 +1,53 @@ +From: Christoph Egger +Subject: [PATCH] debian/arch-support + +Building on non-linux architectures currently fails with unpatched +irrlicht because irrlicht tries to create Joystick support using +linux-specific headers. However there's infrastructure to disable +Joystick support, we just need to activate that on non-linux +architectures. + +Additionally if built on a sparc machine irrlicht assumes wrongly it's +a solaris system. We fix this wrong assumption as our sparc builds are +all on linux. + +Finally irrlicht exceeds the size constraights for -fpic requiering to +build with -fPIC. As upstream doesn't do that we need to fix this for +sparc and s390 builds (powerPC?). + +Signed-off-by: Christoph Egger + +--- + include/IrrCompileConfig.h | 10 +++++----- + 1 files changed, 5 insertions(+), 5 deletions(-) + +diff --git a/include/IrrCompileConfig.h b/include/IrrCompileConfig.h +index aa495b8..439ae15 100644 +--- a/include/IrrCompileConfig.h ++++ b/include/IrrCompileConfig.h +@@ -88,6 +88,10 @@ + #if !defined(_IRR_WINDOWS_API_) && !defined(_IRR_OSX_PLATFORM_) + #ifndef _IRR_SOLARIS_PLATFORM_ + #define _IRR_LINUX_PLATFORM_ ++#include ++ #if __BYTE_ORDER == __BIG_ENDIAN ++ #define __BIG_ENDIAN__ ++ #endif + #endif + #define _IRR_POSIX_API_ + #define _IRR_COMPILE_WITH_X11_DEVICE_ +@@ -505,11 +509,7 @@ precision will be lower but speed higher. currently X86 only + #undef _IRR_WCHAR_FILESYSTEM + #endif + +-#if defined(__sparc__) || defined(__sun__) +-#define __BIG_ENDIAN__ +-#endif +- +-#if defined(_IRR_SOLARIS_PLATFORM_) ++#if defined(_IRR_SOLARIS_PLATFORM_) || defined(__FreeBSD_kernel__) || defined(__gnu_hurd__) + #undef _IRR_COMPILE_WITH_JOYSTICK_EVENTS_ + #endif + +-- +tg: (9b70ffe..) debian/arch-support (depends on: debian/link-against-needed-libs) --- irrlicht-1.7+dfsg1.orig/debian/patches/debian/link-against-needed-libs.diff +++ irrlicht-1.7+dfsg1/debian/patches/debian/link-against-needed-libs.diff @@ -0,0 +1,28 @@ +From: Christoph Egger +Subject: [PATCH] debian/link-against-needed-libs + +There are quite some libraries irrlicht needs but does not link +against. This patch makes irrlicht link correctly against all the +needed libraries. + +Signed-off-by: Christoph Egger + +--- + source/Irrlicht/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index 5816be1..c53412b 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -82,7 +82,7 @@ LIB_PATH = ../../lib/$(SYSTEM) + INSTALL_DIR = /usr/local/lib + sharedlib install: SHARED_LIB = libIrrlicht.so + staticlib sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias +-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm ++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lX11 -lz -lpng -ljpeg -lbz2 + staticlib sharedlib: CXXINCS += -I/usr/X11R6/include + + #OSX specific options +-- +tg: (2deb50e..) debian/link-against-needed-libs (depends on: debian/use-system-libs.diff) --- irrlicht-1.7+dfsg1.orig/debian/patches/debian/remove-svn-soname.diff +++ irrlicht-1.7+dfsg1/debian/patches/debian/remove-svn-soname.diff @@ -0,0 +1,26 @@ +From: Christoph Egger +Subject: [PATCH] debian/remove-svn-soname + +Upstream Build System currently adds a -SVN suffix we don't want on +our library name so this patch removes it. + +Signed-off-by: Christoph Egger + +--- + source/Irrlicht/Makefile | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/source/Irrlicht/Makefile b/source/Irrlicht/Makefile +index 49f990d..883f582 100644 +--- a/source/Irrlicht/Makefile ++++ b/source/Irrlicht/Makefile +@@ -1,6 +1,6 @@ + VERSION_MAJOR = 1 + VERSION_MINOR = 7 +-VERSION_RELEASE = 0-SVN ++VERSION_RELEASE = 0 + VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE) + # Irrlicht Engine 1.7.0-SVN + # Makefile for Linux +-- +tg: (e5dfb21..) debian/remove-svn-soname (depends on: master)