orion pushed to irrlicht (epel7). "update to 1.7.1"

Sat Mar 28 03:52:44 UTC 2015

>From 5b65b8a9b69f662e2f3b03bfc74a807d5fa52bf1 Mon Sep 17 00:00:00 2001
From: Tom Callaway <spot at fedoraproject.org>
Date: Thu, 1 Apr 2010 14:39:39 +0000
Subject: update to 1.7.1

diff --git a/.cvsignore b/.cvsignore
index 629d3ca..14783b8 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-irrlicht-1.6.1.zip
+irrlicht-1.7.1.zip
diff --git a/irrlicht-1.7.1-optflags.patch b/irrlicht-1.7.1-optflags.patch
new file mode 100644
index 0000000..be343c9
--- /dev/null
+++ b/irrlicht-1.7.1-optflags.patch
@@ -0,0 +1,75 @@
+diff -up irrlicht-1.7.1/include/IrrCompileConfig.h.optflags irrlicht-1.7.1/include/IrrCompileConfig.h
+--- irrlicht-1.7.1/include/IrrCompileConfig.h.optflags	2010-02-14 13:06:28.000000000 -0500
++++ irrlicht-1.7.1/include/IrrCompileConfig.h	2010-02-18 13:05:49.965766292 -0500
+@@ -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.1/source/Irrlicht/Makefile.optflags irrlicht-1.7.1/source/Irrlicht/Makefile
+--- irrlicht-1.7.1/source/Irrlicht/Makefile.optflags	2010-01-31 16:03:28.000000000 -0500
++++ irrlicht-1.7.1/source/Irrlicht/Makefile	2010-02-18 13:07:28.699640760 -0500
+@@ -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
++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 -lpng -lbz2 -laesgm
+ staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
+ 
+ #OSX specific options
diff --git a/irrlicht.spec b/irrlicht.spec
index cea66c7..294d0b6 100644
--- a/irrlicht.spec
+++ b/irrlicht.spec
@@ -1,20 +1,20 @@
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
-Version:	1.6.1
+Version:	1.7.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
 # http://irrlicht.sourceforge.net/phpBB2/viewtopic.php?t=24076&highlight=
-Patch0:		irrlicht-1.6.1-optflags.patch
+Patch0:		irrlicht-1.7.1-optflags.patch
 # Get the code compiling
 Patch1:		irrlicht-1.5.1-glext.patch
 URL:		http://irrlicht.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
-BuildRequires:	libjpeg-devel, zlib-devel
-BuildRequires:	libpng-devel
+BuildRequires:	libjpeg-devel, zlib-devel, libaesgm-devel
+BuildRequires:	libpng-devel, bzip2-devel
 
 %description
 The Irrlicht Engine is an open source high performance realtime 3D engine 
@@ -81,6 +81,9 @@ rm -rf %{buildroot}
 %{_libdir}/libIrrlicht*.so
 
 %changelog
+* Thu Feb 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.1-1
+- update to 1.7.1
+
 * Thu Jan 14 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.6.1-1
 - update to 1.6.1
 
diff --git a/sources b/sources
index 7e9e5de..8c73ea6 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-6c7fa12053c475e3305cad4e720cb711  irrlicht-1.6.1.zip
+1a6d32b3014fdb91d27af64f735c5226  irrlicht-1.7.1.zip
-- 
cgit v0.10.2


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