[irrlicht/f15] patch sync

[Tom Callaway]

commit 14d4ed6bf70b67962a7cdcb7a1a93462975ee22f
Author: Tom "spot" Callaway <tcallawa at redhat.com>
Date:   Tue Aug 2 10:49:06 2011 -0400

    patch sync

 irrlicht-1.7.2-irrXML-shared-library.patch |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)
---
diff --git a/irrlicht-1.7.2-irrXML-shared-library.patch b/irrlicht-1.7.2-irrXML-shared-library.patch
index 90a5d05..36ee9b4 100644
--- a/irrlicht-1.7.2-irrXML-shared-library.patch
+++ b/irrlicht-1.7.2-irrXML-shared-library.patch
@@ -1,6 +1,6 @@
 diff -up irrlicht-1.7.2/source/Irrlicht/Makefile.irrXML irrlicht-1.7.2/source/Irrlicht/Makefile
---- irrlicht-1.7.2/source/Irrlicht/Makefile.irrXML	2010-12-15 14:19:07.457930004 -0500
-+++ irrlicht-1.7.2/source/Irrlicht/Makefile	2010-12-15 14:22:18.641929916 -0500
+--- irrlicht-1.7.2/source/Irrlicht/Makefile.irrXML	2011-03-22 12:02:53.051759001 -0400
++++ irrlicht-1.7.2/source/Irrlicht/Makefile	2011-03-22 12:05:04.885759001 -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)
@@ -13,7 +13,7 @@ diff -up irrlicht-1.7.2/source/Irrlicht/Makefile.irrXML irrlicht-1.7.2/source/Ir
  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,11 @@ staticlib sharedlib install: SYSTEM = Li
+@@ -79,9 +80,10 @@ staticlib sharedlib install: SYSTEM = Li
  STATIC_LIB = libIrrlicht.a
  LIB_PATH = ../../lib/$(SYSTEM)
  INSTALL_DIR = /usr/local/lib
@@ -22,13 +22,12 @@ diff -up irrlicht-1.7.2/source/Irrlicht/Makefile.irrXML irrlicht-1.7.2/source/Ir
 -sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg -lpng -lbz2 -laesgm
 +irrxml_sharedlib install: IRRXML_SHARED_LIB = libIrrXML.so
 +irrlicht_sharedlib install: SHARED_LIB = libIrrlicht.so
-+staticlib irrlicht_sharedlib irrxml_sharedlib: LDFLAGS += --no-export-all-symbols --add-stdcall-alias
 +irrlicht_sharedlib irrxml_sharedlib: LDFLAGS += -L/usr/X11R6/lib$(LIBSELECT) -lGL -lXxf86vm -lz -ljpeg -lpng -lbz2 -laesgm
 +irrlicht_sharedlib: LDFLAGS += -L$(LIB_PATH) -lIrrXML
  staticlib sharedlib: CXXINCS += -I/usr/X11R6/include
  
  #OSX specific options
-@@ -105,14 +108,24 @@ staticlib_win32: CPPFLAGS += -D_IRR_STAT
+@@ -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
  
@@ -56,7 +55,7 @@ diff -up irrlicht-1.7.2/source/Irrlicht/Makefile.irrXML irrlicht-1.7.2/source/Ir
  	$(AR) rs $@ $^
  
  # Copies static lib into lib/Linux
-@@ -140,7 +153,8 @@ install install_osx:
+@@ -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)
@@ -66,7 +65,7 @@ diff -up irrlicht-1.7.2/source/Irrlicht/Makefile.irrXML irrlicht-1.7.2/source/Ir
  #	ldconfig -n $(INSTALL_DIR)
  
  TAGS:
-@@ -164,8 +178,10 @@ endif
+@@ -164,8 +177,10 @@ endif
  
  help:
  	@echo "Available targets for Irrlicht"