orion pushed to irrlicht (epel7). "1.7.3"

Sat Mar 28 03:51:44 UTC 2015

>From 4829ebe68f95ee653de5f00e2b343cd69fe8bff0 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Mon, 25 Jun 2012 23:25:25 -0400
Subject: 1.7.3

diff --git a/.gitignore b/.gitignore
index 7aa1e64..f731511 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 irrlicht-1.7.1.zip
 /irrlicht-1.7.2.zip
+/irrlicht-1.7.3.zip
diff --git a/irrlicht-1.7.3-irrXML-shared-library.patch b/irrlicht-1.7.3-irrXML-shared-library.patch
new file mode 100644
index 0000000..61347f7
--- /dev/null
+++ b/irrlicht-1.7.3-irrXML-shared-library.patch
@@ -0,0 +1,79 @@
+diff -up irrlicht-1.7.3/source/Irrlicht/Makefile.irrXML irrlicht-1.7.3/source/Irrlicht/Makefile
+--- irrlicht-1.7.3/source/Irrlicht/Makefile.irrXML	2012-06-25 23:07:13.155649725 -0400
++++ irrlicht-1.7.3/source/Irrlicht/Makefile	2012-06-25 23:12:56.860675130 -0400
+@@ -36,9 +36,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 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 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
+@@ -79,9 +80,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 = 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
+@@ -105,14 +107,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).$(VERSION_RELEASE) -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
+@@ -140,7 +152,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) $(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:
+@@ -164,8 +177,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.7.3-optflags.patch b/irrlicht-1.7.3-optflags.patch
new file mode 100644
index 0000000..accf41f
--- /dev/null
+++ b/irrlicht-1.7.3-optflags.patch
@@ -0,0 +1,75 @@
+diff -up irrlicht-1.7.3/include/IrrCompileConfig.h.optflags irrlicht-1.7.3/include/IrrCompileConfig.h
+--- irrlicht-1.7.3/include/IrrCompileConfig.h.optflags	2012-02-19 23:56:18.000000000 -0500
++++ irrlicht-1.7.3/include/IrrCompileConfig.h	2012-06-25 23:05:24.764641714 -0400
+@@ -176,7 +176,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_
+ 
+ 
+ //! Define _IRR_COMPILE_WITH_LIBPNG_ to enable compiling the engine using libpng.
+@@ -187,7 +187,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_
+ 
+ 
+ //! Define _IRR_D3D_NO_SHADER_DEBUGGING to disable shader debugging in D3D9
+@@ -348,7 +348,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_
+ //! Define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_ if you want to read AES-encrypted ZIP archives
+ #define _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
+ //! Define _IRR_COMPILE_WITH_BZIP2_ if you want to support bzip2 compressed zip archives
+@@ -360,7 +360,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_
+ //! 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. */
+diff -up irrlicht-1.7.3/source/Irrlicht/Makefile.optflags irrlicht-1.7.3/source/Irrlicht/Makefile
+--- irrlicht-1.7.3/source/Irrlicht/Makefile.optflags	2012-02-19 23:54:06.000000000 -0500
++++ irrlicht-1.7.3/source/Irrlicht/Makefile	2012-06-25 23:06:41.486647385 -0400
+@@ -49,18 +49,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
+@@ -82,7 +81,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 -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 9367afb..d8579bb 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -1,16 +1,16 @@
 %global irrxml_version 1.2
-%global irrlicht_version 1.7.2
+%global irrlicht_version 1.7.3
 
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
 Version:	%{irrlicht_version}
-Release:	11%{?dist}
+Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{irrlicht_version}.zip
 # Various fixes, optflags, system libraries/headers
 # http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
-Patch0:		irrlicht-1.7.1-optflags.patch
+Patch0:		irrlicht-1.7.3-optflags.patch
 # Get the code compiling
 Patch1:		irrlicht-1.5.1-glext.patch
 # Use system libaesgm
@@ -18,7 +18,7 @@ Patch2:		irrlicht-1.7.1-libaesgm.patch
 # Use improved fastatof from assimp
 Patch3:		irrlicht-1.7.2-fastatof-improvements-typefixes.patch
 # Make libIrrXML.so
-Patch4:		irrlicht-1.7.2-irrXML-shared-library.patch
+Patch4:		irrlicht-1.7.3-irrXML-shared-library.patch
 # Use png15
 Patch5:		irrlicht-1.7.2-png15.patch
 URL:		http://irrlicht.sourceforge.net/
@@ -92,7 +92,8 @@ mkdir -p %{buildroot}%{_includedir}/%{name}
 make -C source/Irrlicht INSTALL_DIR=%{buildroot}%{_libdir} install 
 cp -a include/*.h %{buildroot}%{_includedir}/%{name}/
 cd %{buildroot}%{_libdir}
-ln -s libIrrlicht.so.%{irrlicht_version} libIrrlicht.so.1.7
+ln -s libIrrlicht.so.%{irrlicht_version} libIrrlicht.so.1
+ln -s libIrrXML.so.%{irrlicht_version} libIrrXML.so.1
 
 %post -p /sbin/ldconfig
 %postun -p /sbin/ldconfig
@@ -103,7 +104,6 @@ ln -s libIrrlicht.so.%{irrlicht_version} libIrrlicht.so.1.7
 %files
 %doc readme.txt
 %{_libdir}/libIrrlicht*.so.*
-%{_libdir}/libIrrXML*.so.*
 
 %files devel
 %doc doc/upgrade-guide.txt
@@ -115,7 +115,6 @@ ln -s libIrrlicht.so.%{irrlicht_version} libIrrlicht.so.1.7
 %exclude %{_includedir}/%{name}/irrTypes.h
 %exclude %{_includedir}/%{name}/irrXML.h
 %{_libdir}/libIrrlicht*.so
-%{_libdir}/libIrrXML*.so
 
 %files -n irrXML
 %doc readme.txt
@@ -132,6 +131,9 @@ ln -s libIrrlicht.so.%{irrlicht_version} libIrrlicht.so.1.7
 %{_libdir}/libIrrXML*.so
 
 %changelog
+* Mon Jun 25 2012 Tom Callaway <spot at fedoraproject.org> - 1.7.3-1
+- update to 1.7.3
+
 * Fri Jan 13 2012 Fedora Release Engineering <rel-eng at lists.fedoraproject.org> - 1.7.2-11
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_17_Mass_Rebuild
 
diff --git a/sources b/sources
index 124de43..4f8dc6c 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-eb627d4c432bf73f12bc6d9ddc700b07  irrlicht-1.7.2.zip
+cfbdc8c68fbca544c7c8dfb3623ae086  irrlicht-1.7.3.zip
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/irrlicht.git/commit/?h=epel7&id=4829ebe68f95ee653de5f00e2b343cd69fe8bff0
