rpms/irrlicht/devel irrlicht-1.6.1-optflags.patch, NONE, 1.1 .cvsignore, 1.3, 1.4 irrlicht.spec, 1.4, 1.5 sources, 1.3, 1.4

Thu Jan 14 16:51:02 UTC 2010

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv1913

Modified Files:
	.cvsignore irrlicht.spec sources 
Added Files:
	irrlicht-1.6.1-optflags.patch 
Log Message:
1.6.1

irrlicht-1.6.1-optflags.patch:
 include/IrrCompileConfig.h |    6 +++---
 source/Irrlicht/Makefile   |   12 ++++++------
 2 files changed, 9 insertions(+), 9 deletions(-)

--- NEW FILE irrlicht-1.6.1-optflags.patch ---
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


Index: .cvsignore
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/.cvsignore,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- .cvsignore	20 Aug 2009 00:57:53 -0000	1.3
+++ .cvsignore	14 Jan 2010 16:51:01 -0000	1.4
@@ -1 +1 @@
-irrlicht-1.5.1.zip
+irrlicht-1.6.1.zip


Index: irrlicht.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/irrlicht.spec,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -p -r1.4 -r1.5
--- irrlicht.spec	20 Aug 2009 00:57:53 -0000	1.4
+++ irrlicht.spec	14 Jan 2010 16:51:01 -0000	1.5
@@ -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 ir
 
 %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
 


Index: sources
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/sources,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -p -r1.3 -r1.4
--- sources	20 Aug 2009 00:57:53 -0000	1.3
+++ sources	14 Jan 2010 16:51:02 -0000	1.4
@@ -1 +1 @@
-0174959bf5dc97fd645d2b714ba9bf6a  irrlicht-1.5.1.zip
+6c7fa12053c475e3305cad4e720cb711  irrlicht-1.6.1.zip

