orion pushed to irrlicht (epel7). "update to 1.8"
notifications at fedoraproject.org
notifications at fedoraproject.org
Sat Mar 28 03:51:31 UTC 2015
>From 68c3e56cef350194e2fa4b6b388e64c8d723205e Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Wed, 14 Nov 2012 15:36:21 -0500
Subject: update to 1.8
diff --git a/.gitignore b/.gitignore
index 1c9b14f..5bd9b82 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,3 +2,4 @@ irrlicht-1.7.1.zip
/irrlicht-1.7.2.zip
/irrlicht-1.7.3.zip
/irrlicht18-svn3629.tar.bz2
+/irrlicht-1.8.zip
diff --git a/irrlicht-1.8-glext.patch b/irrlicht-1.8-glext.patch
new file mode 100644
index 0000000..8b9fe2a
--- /dev/null
+++ b/irrlicht-1.8-glext.patch
@@ -0,0 +1,25 @@
+diff -up irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.h.glext irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.h
+--- irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.h.glext 2012-11-03 18:07:56.000000000 -0400
++++ irrlicht-1.8/source/Irrlicht/COpenGLExtensionHandler.h 2012-11-13 12:48:52.120896690 -0500
+@@ -49,7 +49,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
+@@ -61,9 +61,10 @@
+ #include <GL/gl.h>
+ #include <GL/glx.h>
+ #if defined(_IRR_OPENGL_USE_EXTPOINTER_)
+- #include "glext.h"
++ #include <GL/glext.h>
++ typedef void (APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC) (GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data);
+ #undef GLX_ARB_get_proc_address // avoid problems with local glxext.h
+- #include "glxext.h"
++ #include <GL/glxext.h>
+ #endif
+ #endif
+
diff --git a/irrlicht-1.8-irrXML-shared-library.patch b/irrlicht-1.8-irrXML-shared-library.patch
new file mode 100644
index 0000000..aa35bac
--- /dev/null
+++ b/irrlicht-1.8-irrXML-shared-library.patch
@@ -0,0 +1,80 @@
+diff -up irrlicht-1.8/source/Irrlicht/Makefile.irrXML irrlicht-1.8/source/Irrlicht/Makefile
+--- irrlicht-1.8/source/Irrlicht/Makefile.irrXML 2012-11-13 12:55:50.000000000 -0500
++++ irrlicht-1.8/source/Irrlicht/Makefile 2012-11-13 13:00:51.266370158 -0500
+@@ -43,9 +43,10 @@ IRRIMAGEOBJ = CColorConverter.o CImage.o
+ 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 CAttributes.o lzma/LzmaDec.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
++IRRXMLOBJ = irrXML.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
+ JPEGLIBOBJ = 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/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 jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.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/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
+ LIBPNGOBJ = 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
+@@ -86,8 +87,10 @@ staticlib sharedlib install: SYSTEM = Li
+ STATIC_LIB = libIrrlicht.a
+ LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+-sharedlib install: SHARED_LIB = libIrrlicht.so
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
++irrxml_sharedlib install: IRRXML_SHARED_LIB = libIrrXML.so
++irrlicht_sharedlib install: SHARED_LIB = libIrrlicht.so
++irrlicht_sharedlib irrxml_sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
++irrlicht_sharedlib: LDFLAGS += -L$(LIB_PATH) -lIrrXML
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+
+ #OSX specific options
+@@ -118,14 +121,25 @@ SONAME = $(SHARED_LIB).$(VERSION_MAJOR).
+ # All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
+ all linux: staticlib
+
++sharedlib: irrxml_sharedlib irrlicht_sharedlib
++
++# Builds IrrXML as a shared lib (libIrrXML.so.versionNumber) and copies it into lib/Linux
++irrxml_sharedlib: $(IRRXMLOBJ)
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(IRRXML_SHARED_LIB).$(VERSION_MAJOR) -o $(IRRXML_SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
++ mkdir -p $(LIB_PATH)
++ cp $(IRRXML_SHARED_LIB).$(VERSION) $(LIB_PATH)
++ # We need this for linking libIrrlicht.so
++ cd $(LIB_PATH) && ln -s $(IRRXML_SHARED_LIB).$(VERSION) $(IRRXML_SHARED_LIB)
++
++
+ # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
+-sharedlib: $(LINKOBJ)
+- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SONAME) -o $(SHARED_FULLNAME) $^ $(LDFLAGS)
++irrlicht_sharedlib: irrxml_sharedlib $(LINKOBJ)
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR) -o $(SHARED_LIB).$(VERSION) $(LINKOBJ) $(LDFLAGS)
+ mkdir -p $(LIB_PATH)
+ cp $(SHARED_FULLNAME) $(LIB_PATH)
+
+ # Builds Irrlicht as static lib (libIrrlicht.a)
+-$(STATIC_LIB): $(LINKOBJ)
++$(STATIC_LIB): $(LINKOBJ) $(IRRXMLOBJ)
+ $(AR) rs $@ $^
+
+ # Copies static lib into lib/Linux
+@@ -153,8 +167,8 @@ install install_osx:
+ mkdir -p $(INSTALL_DIR)/../include/irrlicht
+ cp ../../include/*.h $(INSTALL_DIR)/../include/irrlicht/
+ cp $(LIB_PATH)/$(SHARED_FULLNAME) $(INSTALL_DIR)
+- cd $(INSTALL_DIR) && ln -s -f $(SHARED_FULLNAME) $(SONAME)
+- cd $(INSTALL_DIR) && ln -s -f $(SONAME) $(SHARED_LIB)
++ cp $(LIB_PATH)/$(IRRXML_SHARED_LIB).$(VERSION) $(INSTALL_DIR)
++ cd $(INSTALL_DIR) && ln -s -f $(SHARED_LIB).$(VERSION) $(SHARED_LIB) && ln -s -f $(IRRXML_SHARED_LIB).$(VERSION) $(IRRXML_SHARED_LIB)
+ # ldconfig -n $(INSTALL_DIR)
+
+ TAGS:
+@@ -178,8 +192,10 @@ endif
+
+ help:
+ @echo "Available targets for Irrlicht"
+- @echo " sharedlib: Build shared library Irrlicht.so for Linux"
++ @echo " sharedlib: Build all shared libraries for Linux"
+ @echo " staticlib: Build static library Irrlicht.a for Linux"
++ @echo " irrlicht_sharedlib: Build shared library libIrrlicht.so for Linux"
++ @echo " irrxml_sharedlib: Build shared library libIrrXML.so for Linux"
+ @echo " install: Copy shared library to /usr/local/lib"
+ @echo ""
+ @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
diff --git a/irrlicht-1.8-optflags.patch b/irrlicht-1.8-optflags.patch
new file mode 100644
index 0000000..03dd43d
--- /dev/null
+++ b/irrlicht-1.8-optflags.patch
@@ -0,0 +1,75 @@
+diff -up irrlicht-1.8/include/IrrCompileConfig.h.optflags irrlicht-1.8/include/IrrCompileConfig.h
+--- irrlicht-1.8/include/IrrCompileConfig.h.optflags 2012-11-05 15:14:14.000000000 -0500
++++ irrlicht-1.8/include/IrrCompileConfig.h 2012-11-13 12:45:47.316780394 -0500
+@@ -245,7 +245,7 @@ the engine will no longer read .jpeg ima
+ //! 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_
+ #ifdef NO_IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #undef _IRR_USE_NON_SYSTEM_JPEG_LIB_
+ #endif
+@@ -261,7 +261,7 @@ the engine will no longer read .png imag
+ //! 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_
+ #ifdef NO_IRR_USE_NON_SYSTEM_LIB_PNG_
+ #undef _IRR_USE_NON_SYSTEM_LIB_PNG_
+ #endif
+@@ -598,7 +598,7 @@ ones. */
+ /** 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_
++// #define _IRR_USE_NON_SYSTEM_ZLIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_ZLIB_
+ #undef _IRR_USE_NON_SYSTEM_ZLIB_
+ #endif
+@@ -619,7 +619,7 @@ library. */
+ /** 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_
++// #define _IRR_USE_NON_SYSTEM_BZLIB_
+ #ifdef NO_IRR_USE_NON_SYSTEM_BZLIB_
+ #undef _IRR_USE_NON_SYSTEM_BZLIB_
+ #endif
+diff -up irrlicht-1.8/source/Irrlicht/Makefile.optflags irrlicht-1.8/source/Irrlicht/Makefile
+--- irrlicht-1.8/source/Irrlicht/Makefile.optflags 2012-11-05 15:14:12.000000000 -0500
++++ irrlicht-1.8/source/Irrlicht/Makefile 2012-11-13 12:46:35.660811963 -0500
+@@ -56,18 +56,17 @@ BZIP2OBJ = bzip2/blocksort.o bzip2/huffm
+ EXTRAOBJ =
+ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ $(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+- $(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(LIBAESGM) \
+- $(BZIP2OBJ) $(EXTRAOBJ)
++ $(IRRGUIOBJ) $(EXTRAOBJ)
+
+ ###############
+ #Compiler flags
+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng
+-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1
+-CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
++CXXINCS = -I../../include `libpng-config --cflags`
++CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
++CXXFLAGS += $(RPM_OPT_FLAGS) -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
+ ifndef NDEBUG
+ CXXFLAGS += -g -D_DEBUG
+ else
+-CXXFLAGS += -fexpensive-optimizations -O3
++CXXFLAGS += -fexpensive-optimizations -O3 $(RPM_OPT_FLAGS)
+ endif
+ ifdef PROFILE
+ CXXFLAGS += -pg
+@@ -88,7 +87,7 @@ STATIC_LIB = libIrrlicht.a
+ LIB_PATH = ../../lib/$(SYSTEM)
+ INSTALL_DIR = /usr/local/lib
+ sharedlib install: SHARED_LIB = libIrrlicht.so
+-sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm
++sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+
+ #OSX specific options
diff --git a/irrlicht.spec b/irrlicht.spec
index d879a5c..ba54c81 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -1,6 +1,6 @@
-%global irrxml_version 1.2
-%global irrlicht_version 1.7.3
-%global master_release 4
+%global irrxml_version 1.8
+%global irrlicht_version 1.8
+%global master_release 1
Name: irrlicht
Summary: A high performance realtime 3D engine
@@ -9,39 +9,25 @@ Release: %{master_release}%{?dist}
License: zlib
Group: System Environment/Libraries
Source0: http://downloads.sourceforge.net/irrlicht/%{name}-%{irrlicht_version}.zip
-# Until 1.8 comes out, we're making an SVN snapshot subpackage. (3629 is what supertuxcart wants)
-# svn export -r 3629 https://irrlicht.svn.sourceforge.net/svnroot/irrlicht/trunk/ irrlicht18-svn3629
-# cd irrlicht18-svn3629
-# rm -rf source/Irrlicht/jpeglib source/Irrlicht/zlib source/Irrlicht/libpng source/Irrlicht/aesGladman
-# cd ..
-# tar cf irrlicht18-svn3629.tar.bz2 irrlicht18-svn3629
-Source1: irrlicht18-svn3629.tar.bz2
# Various fixes, optflags, system libraries/headers
# http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
-Patch0: irrlicht-1.7.3-optflags.patch
+Patch0: irrlicht-1.8-optflags.patch
# Get the code compiling
-Patch1: irrlicht-1.5.1-glext.patch
+Patch1: irrlicht-1.8-glext.patch
# Use system libaesgm
-Patch2: irrlicht-1.7.1-libaesgm.patch
+Patch2: irrlicht18-libaesgm.patch
# Use improved fastatof from assimp
-Patch3: irrlicht-1.7.2-fastatof-improvements-typefixes.patch
+# Upstream applied a modified version of most of this.
+# Patch3: irrlicht18-fastatof-improvements-typefixes.patch
# Make libIrrXML.so
-Patch4: irrlicht-1.7.3-irrXML-shared-library.patch
-# Use png15
-Patch5: irrlicht-1.7.2-png15.patch
-# 1.8 patches
-Patch6: irrlicht18-optflags.patch
-Patch7: irrlicht18-glext.patch
-Patch8: irrlicht18-libaesgm.patch
-Patch9: irrlicht18-fastatof-improvements-typefixes.patch
-Patch10: irrlicht18-irrXML-shared-library.patch
-# Remove "-SVN" from Version
-Patch11: irrlicht18-noSVN.patch
+Patch4: irrlicht-1.8-irrXML-shared-library.patch
URL: http://irrlicht.sourceforge.net/
BuildRequires: libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
BuildRequires: libjpeg-devel, zlib-devel, libaesgm-devel
BuildRequires: libpng-devel, bzip2-devel
+Provides: irrlicht18 = %{version}-%{release}
+Obsoletes: irrlicht18 <= 1.8-0.4.svn3629%{?dist}
%description
The Irrlicht Engine is an open source high performance realtime 3D engine
@@ -57,6 +43,8 @@ Requires: mesa-libGL-devel, mesa-libGLU-devel, libXxf86vm-devel
Requires: libjpeg-devel, zlib-devel, libpng-devel
Requires: irrXML-devel%{?_isa} = %{irrxml_version}
Group: Development/Libraries
+Provides: irrlicht18-devel = %{version}-%{release}
+Obsoletes: irrlicht18-devel <= 1.8-0.4.svn3629%{?dist}
%description devel
Development headers and libraries for irrlicht.
@@ -65,6 +53,8 @@ Development headers and libraries for irrlicht.
Summary: Simple and fast XML parser for C++
Group: System Environment/Libraries
Version: %{irrxml_version}
+Provides: irrXML18 = %{irrxml_version}-%{release}
+Obsoletes: irrXML18 <= 1.8-0.4.svn3629%{?dist}
%description -n irrXML
irrXML is a simple and fast open source xml parser for C++.
@@ -74,61 +64,19 @@ Summary: Development headers and libraries for irrXML
Version: %{irrxml_version}
Requires: irrXML%{?_isa} = %{irrxml_version}-%{release}
Group: Development/Libraries
+Provides: irrXML18-devel = %{irrxml_version}-%{release}
+Obsoletes: irrXML18-devel <= 1.8-0.4.svn3629%{?dist}
%description -n irrXML-devel
Development headers and libraries for irrXML.
-%package -n irrlicht18
-Summary: A high performance realtime 3D engine
-Version: 1.8
-Release: 0.%{master_release}.svn3629%{?dist}
-
-%description -n irrlicht18
-The Irrlicht Engine is an open source high performance realtime 3D engine
-written and usable in C++ and also available for .NET languages. It is
-completely cross-platform, using D3D, 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 is an SVN checkout of what will eventually become
-Irrlicht 1.8.
-
-%package -n irrlicht18-devel
-Summary: Development headers and libraries for Irrlicht18
-Version: 1.8
-Release: 0.%{master_release}.svn3629%{?dist}
-Requires: irrlicht18%{?_isa} = 1.8-0.%{master_release}.svn3629%{?dist}
-Requires: mesa-libGL-devel, mesa-libGLU-devel, libXxf86vm-devel
-Requires: libjpeg-devel, zlib-devel, libpng-devel
-Requires: irrXML18-devel%{?_isa} = 1.8-0.%{master_release}.svn3629%{?dist}
-
-%description -n irrlicht18-devel
-Development headers and libraries for Irrlicht18
-
-%package -n irrXML18
-Summary: Simple and fast XML parser for C++
-Version: 1.8
-Release: 0.%{master_release}.svn3629%{?dist}
-
-%description -n irrXML18
-irrXML is a simple and fast open source xml parser for C++.
-This is the corresponding irrXML for Irrlicht18.
-
-%package -n irrXML18-devel
-Summary: Development headers and libraries for irrXML18
-Version: 1.8
-Release: 0.%{master_release}.svn3629%{?dist}
-Requires: irrXML18%{?_isa} = 1.8-0.%{master_release}.svn3629%{?dist}
-
-%description -n irrXML18-devel
-Development headers and libraries for irrXML18.
-
%prep
%setup -q
%patch0 -p1 -b .optflags
%patch1 -p1 -b .glext
%patch2 -p1 -b .libaesgm
-%patch3 -p1 -b .fastatof
+# %patch3 -p1 -b .fastatof
%patch4 -p1 -b .irrXML
-%patch5 -p1 -b .png15
sed -i 's/\r//' readme.txt
iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
@@ -142,29 +90,10 @@ for i in include/*.h doc/upgrade-guide.txt source/Irrlicht/*.cpp source/Irrlicht
touch -r changes.txt $i
done
-# unpack the svn tree separately
-tar xf %{SOURCE1}
-%patch6 -p0 -b .optflags18
-%patch7 -p0 -b .glext18
-%patch8 -p0 -b .libaesgm18
-%patch9 -p0 -b .fastatof18
-%patch10 -p0 -b .irrXML18
-%patch11 -p0 -b .noSVN
-pushd irrlicht18-svn3629
-sed -i 's/\r//' readme.txt
-iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
-mv readme.txt.iso88591 readme.txt
-popd
-
%build
cd source/Irrlicht
make %{?_smp_mflags} sharedlib
-pushd ../../irrlicht18-svn3629/source/Irrlicht
-make %{?_smp_mflags} sharedlib
-popd
-
-
%install
mkdir -p %{buildroot}%{_libdir}
mkdir -p %{buildroot}%{_includedir}/%{name}
@@ -175,28 +104,12 @@ ln -s libIrrlicht.so.%{irrlicht_version} libIrrlicht.so.1
ln -s libIrrXML.so.%{irrlicht_version} libIrrXML.so.1
popd
-mkdir -p %{buildroot}%{_includedir}/%{name}18
-pushd irrlicht18-svn3629
-make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install
-cp -a include/*.h %{buildroot}%{_includedir}/%{name}18/
-popd
-pushd %{buildroot}%{_libdir}
-ln -s libIrrlicht18.so.1.8.0 libIrrlicht18.so.1
-ln -s libIrrXML18.so.1.8.0 libIrrXML18.so.1
-popd
-
%post -p /sbin/ldconfig
%postun -p /sbin/ldconfig
%post -n irrXML -p /sbin/ldconfig
%postun -n irrXML -p /sbin/ldconfig
-%post -n irrlicht18 -p /sbin/ldconfig
-%postun -n irrlicht18 -p /sbin/ldconfig
-
-%post -n irrXML18 -p /sbin/ldconfig
-%postun -n irrXML18 -p /sbin/ldconfig
-
%files
%doc readme.txt
%{_libdir}/libIrrlicht.so.*
@@ -212,35 +125,6 @@ popd
%exclude %{_includedir}/%{name}/irrXML.h
%{_libdir}/libIrrlicht.so
-%files -n irrlicht18
-%doc irrlicht18-svn3629/readme.txt
-%{_libdir}/libIrrlicht18.so.*
-
-%files -n irrlicht18-devel
-%doc irrlicht18-svn3629/doc/upgrade-guide.txt
-%{_includedir}/%{name}18/
-%exclude %{_includedir}/%{name}18/fast_atof.h
-%exclude %{_includedir}/%{name}18/heapsort.h
-%exclude %{_includedir}/%{name}18/irrArray.h
-%exclude %{_includedir}/%{name}18/irrString.h
-%exclude %{_includedir}/%{name}18/irrTypes.h
-%exclude %{_includedir}/%{name}18/irrXML.h
-%{_libdir}/libIrrlicht18.so
-
-%files -n irrXML18
-%doc irrlicht18-svn3629/readme.txt
-%{_libdir}/libIrrXML18.so.*
-
-%files -n irrXML18-devel
-%dir %{_includedir}/%{name}18/
-%{_includedir}/%{name}18/fast_atof.h
-%{_includedir}/%{name}18/heapsort.h
-%{_includedir}/%{name}18/irrArray.h
-%{_includedir}/%{name}18/irrString.h
-%{_includedir}/%{name}18/irrTypes.h
-%{_includedir}/%{name}18/irrXML.h
-%{_libdir}/libIrrXML18.so
-
%files -n irrXML
%doc readme.txt
%{_libdir}/libIrrXML.so.*
@@ -256,6 +140,9 @@ popd
%{_libdir}/libIrrXML.so
%changelog
+* Tue Nov 13 2012 Tom Callaway <spot at fedoraproject.org> - 1.8-1
+- update to 1.8 final
+
* Thu Aug 23 2012 Tom Callaway <spot at fedoraproject.org> - 1.7.3-4
- add missing %%{dist} tags.
diff --git a/irrlicht18-irrXML-shared-library.patch b/irrlicht18-irrXML-shared-library.patch
index 953e014..8804bf8 100644
--- a/irrlicht18-irrXML-shared-library.patch
+++ b/irrlicht18-irrXML-shared-library.patch
@@ -2,79 +2,79 @@ diff -up irrlicht18-svn3629/source/Irrlicht/Makefile.irrXML18 irrlicht18-svn3629
--- irrlicht18-svn3629/source/Irrlicht/Makefile.irrXML18 2012-08-23 14:48:20.000000000 -0500
+++ irrlicht18-svn3629/source/Irrlicht/Makefile 2012-08-23 14:52:59.654627706 -0500
@@ -37,9 +37,10 @@ IRRIMAGEOBJ = CColorConverter.o CImage.o
- 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 CAttributes.o lzma/LzmaDec.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
-+IRRXMLOBJ = irrXML.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
- JPEGLIBOBJ = 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/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 jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.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/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
- LIBPNGOBJ = 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
+ 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 CAttributes.o lzma/LzmaDec.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
++IRRXMLOBJ = irrXML.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
+ JPEGLIBOBJ = 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/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 jpeglib/jdmarker.o jpeglib/jdmaster.o jpeglib/jdmerge.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/jmemmgr.o jpeglib/jmemnobs.o jpeglib/jquant1.o jpeglib/jquant2.o jpeglib/jutils.o jpeglib/jcarith.o jpeglib/jdarith.o jpeglib/jaricom.o
+ LIBPNGOBJ = 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
@@ -80,9 +81,10 @@ staticlib sharedlib install: SYSTEM = Li
- STATIC_LIB = libIrrlicht.a
- 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 -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
-+irrxml_sharedlib install: IRRXML_SHARED_LIB = libIrrXML18.so
-+irrlicht_sharedlib install: SHARED_LIB = libIrrlicht18.so
-+irrlicht_sharedlib irrxml_sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
-+irrlicht_sharedlib: LDFLAGS += -L$(LIB_PATH) -lIrrXML18
- staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
-
- #OSX specific options
+ STATIC_LIB = libIrrlicht.a
+ 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 -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
++irrxml_sharedlib install: IRRXML_SHARED_LIB = libIrrXML.so
++irrlicht_sharedlib install: SHARED_LIB = libIrrlicht.so
++irrlicht_sharedlib irrxml_sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg `libpng-config --libs` -lbz2 -laesgm
++irrlicht_sharedlib: LDFLAGS += -L$(LIB_PATH) -lIrrXML
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+
+ #OSX specific options
@@ -106,14 +108,24 @@ staticlib_win32: CPPFLAGS += -D_IRR_STAT
- # All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
- all linux: staticlib
-
-+sharedlib: irrxml_sharedlib irrlicht_sharedlib
-+
-+# Builds IrrXML as a shared lib (libIrrXML.so.versionNumber) and copies it into lib/Linux
-+irrxml_sharedlib: $(IRRXMLOBJ)
-+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(IRRXML_SHARED_LIB).$(VERSION_MAJOR) -o $(IRRXML_SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
-+ mkdir -p $(LIB_PATH)
-+ cp $(IRRXML_SHARED_LIB).$(VERSION) $(LIB_PATH)
-+ # We need this for linking libIrrlicht.so
-+ cd $(LIB_PATH) && ln -s $(IRRXML_SHARED_LIB).$(VERSION) $(IRRXML_SHARED_LIB)
-+
- # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
--sharedlib: $(LINKOBJ)
-- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
-+irrlicht_sharedlib: irrxml_sharedlib $(LINKOBJ)
-+ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR) -o $(SHARED_LIB).$(VERSION) $(LINKOBJ) $(LDFLAGS)
- mkdir -p $(LIB_PATH)
- cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
-
- # Builds Irrlicht as static lib (libIrrlicht.a)
--$(STATIC_LIB): $(LINKOBJ)
-+$(STATIC_LIB): $(LINKOBJ) $(IRRXMLOBJ)
- $(AR) rs $@ $^
-
- # Copies static lib into lib/Linux
+ # All target, builds Irrlicht as static lib (libIrrlicht.a) and copies it into lib/Linux
+ all linux: staticlib
+
++sharedlib: irrxml_sharedlib irrlicht_sharedlib
++
++# Builds IrrXML as a shared lib (libIrrXML.so.versionNumber) and copies it into lib/Linux
++irrxml_sharedlib: $(IRRXMLOBJ)
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(IRRXML_SHARED_LIB).$(VERSION_MAJOR) -o $(IRRXML_SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
++ mkdir -p $(LIB_PATH)
++ cp $(IRRXML_SHARED_LIB).$(VERSION) $(LIB_PATH)
++ # We need this for linking libIrrlicht.so
++ cd $(LIB_PATH) && ln -s $(IRRXML_SHARED_LIB).$(VERSION) $(IRRXML_SHARED_LIB)
++
+ # Builds Irrlicht as shared lib (libIrrlicht.so.versionNumber) and copies it into lib/Linux
+-sharedlib: $(LINKOBJ)
+- $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR).$(VERSION_MINOR) -o $(SHARED_LIB).$(VERSION) $^ $(LDFLAGS)
++irrlicht_sharedlib: irrxml_sharedlib $(LINKOBJ)
++ $(CXX) $(CPPFLAGS) $(CXXFLAGS) -shared -Wl,-soname,$(SHARED_LIB).$(VERSION_MAJOR) -o $(SHARED_LIB).$(VERSION) $(LINKOBJ) $(LDFLAGS)
+ mkdir -p $(LIB_PATH)
+ cp $(SHARED_LIB).$(VERSION) $(LIB_PATH)
+
+ # Builds Irrlicht as static lib (libIrrlicht.a)
+-$(STATIC_LIB): $(LINKOBJ)
++$(STATIC_LIB): $(LINKOBJ) $(IRRXMLOBJ)
+ $(AR) rs $@ $^
+
+ # Copies static lib into lib/Linux
@@ -141,8 +153,8 @@ 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) $(COMPATIBILITY_VERSION)
--
-+ cp $(LIB_PATH)/$(IRRXML_SHARED_LIB).$(VERSION) $(INSTALL_DIR)
-+ cd $(INSTALL_DIR) && ln -s -f $(SHARED_LIB).$(VERSION) $(SHARED_LIB) && ln -s -f $(IRRXML_SHARED_LIB).$(VERSION) $(IRRXML_SHARED_LIB)
- # ldconfig -n $(INSTALL_DIR)
-
- TAGS:
+ 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) $(COMPATIBILITY_VERSION)
+-
++ cp $(LIB_PATH)/$(IRRXML_SHARED_LIB).$(VERSION) $(INSTALL_DIR)
++ cd $(INSTALL_DIR) && ln -s -f $(SHARED_LIB).$(VERSION) $(SHARED_LIB) && ln -s -f $(IRRXML_SHARED_LIB).$(VERSION) $(IRRXML_SHARED_LIB)
+ # ldconfig -n $(INSTALL_DIR)
+
+ TAGS:
@@ -166,8 +178,10 @@ endif
-
- help:
- @echo "Available targets for Irrlicht"
-- @echo " sharedlib: Build shared library Irrlicht.so for Linux"
-+ @echo " sharedlib: Build all shared libraries for Linux"
- @echo " staticlib: Build static library Irrlicht.a for Linux"
-+ @echo " irrlicht_sharedlib: Build shared library libIrrlicht.so for Linux"
-+ @echo " irrxml_sharedlib: Build shared library libIrrXML.so for Linux"
- @echo " install: Copy shared library to /usr/local/lib"
- @echo ""
- @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
+
+ help:
+ @echo "Available targets for Irrlicht"
+- @echo " sharedlib: Build shared library Irrlicht.so for Linux"
++ @echo " sharedlib: Build all shared libraries for Linux"
+ @echo " staticlib: Build static library Irrlicht.a for Linux"
++ @echo " irrlicht_sharedlib: Build shared library libIrrlicht.so for Linux"
++ @echo " irrxml_sharedlib: Build shared library libIrrXML.so for Linux"
+ @echo " install: Copy shared library to /usr/local/lib"
+ @echo ""
+ @echo " sharedlib_win32: Build shared library Irrlicht.dll for Windows"
diff --git a/sources b/sources
index 1f84458..ad77e04 100644
--- a/sources
+++ b/sources
@@ -1,2 +1 @@
-cfbdc8c68fbca544c7c8dfb3623ae086 irrlicht-1.7.3.zip
-2a505222ae9695dc358e18a634af4bcb irrlicht18-svn3629.tar.bz2
+d06329d8f466658caaf4838ba349e393 irrlicht-1.8.zip
--
cgit v0.10.2
http://pkgs.fedoraproject.org/cgit/irrlicht.git/commit/?h=epel7&id=68c3e56cef350194e2fa4b6b388e64c8d723205e
More information about the scm-commits
mailing list