orion pushed to irrlicht (epel7). "1.6.1"

Sat Mar 28 03:52:44 UTC 2015

>From 8c75a16486d14f0df0a52ac0e45069a435c47b26 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Thu, 14 Jan 2010 16:51:02 +0000
Subject: 1.6.1

diff --git a/.cvsignore b/.cvsignore
index bef7c40..629d3ca 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-irrlicht-1.5.1.zip
+irrlicht-1.6.1.zip
diff --git a/irrlicht-1.6.1-optflags.patch b/irrlicht-1.6.1-optflags.patch
new file mode 100644
index 0000000..33388ee
--- /dev/null
+++ b/irrlicht-1.6.1-optflags.patch
@@ -0,0 +1,69 @@
+diff -up irrlicht-1.6.1/include/IrrCompileConfig.h.optflags irrlicht-1.6.1/include/IrrCompileConfig.h
+--- irrlicht-1.6.1/include/IrrCompileConfig.h.optflags	2010-01-10 08:44:22.000000000 -0500
++++ irrlicht-1.6.1/include/IrrCompileConfig.h	2010-01-14 11:30:19.555245963 -0500
+@@ -175,7 +175,7 @@ ones. */
+ //! 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.
+@@ -186,7 +186,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.
+@@ -197,7 +197,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
+diff -up irrlicht-1.6.1/source/Irrlicht/Makefile.optflags irrlicht-1.6.1/source/Irrlicht/Makefile
+--- irrlicht-1.6.1/source/Irrlicht/Makefile.optflags	2010-01-10 08:40:04.000000000 -0500
++++ irrlicht-1.6.1/source/Irrlicht/Makefile	2010-01-14 11:33:13.076377209 -0500
+@@ -46,13 +46,13 @@ LIBPNGOBJ = libpng/png.o libpng/pngerror
+ EXTRAOBJ =
+ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRPARTICLEOBJ) $(IRRANIMOBJ) \
+ 	$(IRRVIDEOOBJ) $(IRRSWRENDEROBJ) $(IRRIOOBJ) $(IRROTHEROBJ) \
+-	$(IRRGUIOBJ) $(ZLIBOBJ) $(JPEGLIBOBJ) $(LIBPNGOBJ) $(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
++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
+@@ -61,7 +61,7 @@ endif
+ ifdef PROFILE
+ CXXFLAGS += -pg
+ endif
+-CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES
++CFLAGS := -fexpensive-optimizations -O3 -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES $(RPM_OPT_FLAGS)
+ 
+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC
+ sharedlib sharedlib_osx: CFLAGS += -fPIC
+@@ -78,7 +78,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 -lpng
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+ 
+ #OSX specific options
diff --git a/irrlicht.spec b/irrlicht.spec
index b219e09..cea66c7 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -1,14 +1,13 @@
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
-Version:	1.5.1
+Version:	1.6.1
 Release:	1%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
 # Various fixes, optflags, system libraries/headers
-# Don't call ldconfig during make install.
 # http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
-Patch0:		irrlicht-1.5-optflags.patch
+Patch0:		irrlicht-1.6.1-optflags.patch
 # Get the code compiling
 Patch1:		irrlicht-1.5.1-glext.patch
 URL:		http://irrlicht.sourceforge.net/
@@ -36,7 +35,7 @@ Development headers and libraries for irrlicht.
 
 %prep
 %setup -q
-%patch0 -p1
+%patch0 -p1 -b .optflags
 %patch1 -p1 -b .glext
 sed -i 's/\r//' readme.txt
 iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
@@ -82,6 +81,12 @@ rm -rf %{buildroot}
 %{_libdir}/libIrrlicht*.so
 
 %changelog
+* Thu Jan 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.1-1
+- update to 1.6.1
+
+* Wed Sep 30 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6-1
+- update to 1.6
+
 * Wed Aug 19 2009 Tom "spot" Callaway <tcallawa at redhat.com> - 1.5.1-1
 - update to 1.5.1
 
diff --git a/sources b/sources
index af208a5..7e9e5de 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-0174959bf5dc97fd645d2b714ba9bf6a  irrlicht-1.5.1.zip
+6c7fa12053c475e3305cad4e720cb711  irrlicht-1.6.1.zip
-- 
cgit v0.10.2


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