rpms/irrlicht/devel irrlicht-1.7.1-libaesgm.patch, NONE, 1.1 irrlicht.spec, 1.6, 1.7

[Tom Callaway]

Author: spot

Update of /cvs/pkgs/rpms/irrlicht/devel
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv7546

Modified Files:
	irrlicht.spec 
Added Files:
	irrlicht-1.7.1-libaesgm.patch 
Log Message:
fix libaesgm support

irrlicht-1.7.1-libaesgm.patch:
 CZipReader.cpp |    2 +-
 Makefile       |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

--- NEW FILE irrlicht-1.7.1-libaesgm.patch ---
diff -up irrlicht-1.7.1/source/Irrlicht/CZipReader.cpp.libaesgm irrlicht-1.7.1/source/Irrlicht/CZipReader.cpp
--- irrlicht-1.7.1/source/Irrlicht/CZipReader.cpp.libaesgm	2010-01-31 16:03:28.000000000 -0500
+++ irrlicht-1.7.1/source/Irrlicht/CZipReader.cpp	2010-05-24 11:15:18.856512375 -0400
@@ -20,7 +20,7 @@
 	#endif
 
 	#ifdef _IRR_COMPILE_WITH_ZIP_ENCRYPTION_
-	#include "aesGladman/fileenc.h"
+	#include <aes/fileenc.h>
 	#endif
 	#ifdef _IRR_COMPILE_WITH_BZIP2_
 	#ifndef _IRR_USE_NON_SYSTEM_BZLIB_
--- irrlicht-1.7.1/source/Irrlicht/Makefile.libaesgm	2010-05-24 11:18:35.966512547 -0400
+++ irrlicht-1.7.1/source/Irrlicht/Makefile	2010-05-24 11:18:10.368387943 -0400
@@ -54,7 +54,7 @@ LINKOBJ = $(IRRMESHOBJ) $(IRROBJ) $(IRRP
 ###############
 #Compiler flags
 CXXINCS = -I../../include
-CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 $(RPM_OPT_FLAGS)
+CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1 -DUSE_SHA1 $(RPM_OPT_FLAGS)
 CXXFLAGS += $(RPM_OPT_FLAGS) -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing
 ifndef NDEBUG
 CXXFLAGS += -g -D_DEBUG


Index: irrlicht.spec
===================================================================
RCS file: /cvs/pkgs/rpms/irrlicht/devel/irrlicht.spec,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -p -r1.6 -r1.7
--- irrlicht.spec	1 Apr 2010 14:39:39 -0000	1.6
+++ irrlicht.spec	24 May 2010 16:08:34 -0000	1.7
@@ -1,7 +1,7 @@
 Name:		irrlicht
 Summary: 	A high performance realtime 3D engine
 Version:	1.7.1
-Release:	1%{?dist}
+Release:	2%{?dist}
 License:	zlib
 Group:		System Environment/Libraries
 Source0:	http://downloads.sourceforge.net/irrlicht/%{name}-%{version}.zip
@@ -10,6 +10,8 @@ Source0:	http://downloads.sourceforge.ne
 Patch0:		irrlicht-1.7.1-optflags.patch
 # Get the code compiling
 Patch1:		irrlicht-1.5.1-glext.patch
+# Use system libaesgm
+Patch2:		irrlicht-1.7.1-libaesgm.patch
 URL:		http://irrlicht.sourceforge.net/
 BuildRoot:	%{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 BuildRequires:	libXxf86vm-devel, mesa-libGL-devel, mesa-libGLU-devel
@@ -37,11 +39,12 @@ Development headers and libraries for ir
 %setup -q
 %patch0 -p1 -b .optflags
 %patch1 -p1 -b .glext
+%patch2 -p1 -b .libaesgm
 sed -i 's/\r//' readme.txt
 iconv -o readme.txt.iso88591 -f iso88591 -t utf8 readme.txt
 mv readme.txt.iso88591 readme.txt
 # We don't use any of this. Deleting it so the debuginfo doesn't pick it up.
-rm -rf source/Irrlicht/jpeglib source/Irrlicht/zlib source/Irrlicht/libpng
+rm -rf source/Irrlicht/jpeglib source/Irrlicht/zlib source/Irrlicht/libpng source/Irrlicht/aesGladman
 
 for i in include/*.h doc/upgrade-guide.txt source/Irrlicht/*.cpp source/Irrlicht/*.h; do
   	sed -i 's/\r//' $i
@@ -81,6 +84,9 @@ rm -rf %{buildroot}
 %{_libdir}/libIrrlicht*.so
 
 %changelog
+* Mon May 24 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.1-2
+- rebuild against fixed libaesgm
+
 * Thu Feb 18 2010 Tom "spot" Callaway <tcallawa at redhat.com> - 1.7.1-1
 - update to 1.7.1