use the system bzip2; also build the shared library (bug #305271)

(Portage version: 2.1.8.3/cvs/Linux i686)

1 files changed, 56 insertions, 0 deletions

diff --git a/dev-games/irrlicht/files/irrlicht-1.7.1-gentoo.patch b/dev-games/irrlicht/files/irrlicht-1.7.1-gentoo.patch
new file mode 100644
index 000000000000..4dd356ea9c97
--- /dev/null
+++ b/dev-games/irrlicht/files/irrlicht-1.7.1-gentoo.patch
@@ -0,0 +1,56 @@
+diff -ru irrlicht-1.7.1.orig/source/Irrlicht/CImageLoaderPNG.cpp irrlicht-1.7.1/source/Irrlicht/CImageLoaderPNG.cpp
+--- irrlicht-1.7.1.orig/source/Irrlicht/CImageLoaderPNG.cpp	2010-01-31 16:03:28.000000000 -0500
++++ irrlicht-1.7.1/source/Irrlicht/CImageLoaderPNG.cpp	2010-04-13 17:12:02.201750487 -0400
+@@ -162,7 +162,7 @@
+ 	if (BitDepth < 8)

+ 	{

+ 		if (ColorType==PNG_COLOR_TYPE_GRAY || ColorType==PNG_COLOR_TYPE_GRAY_ALPHA)

+-			png_set_gray_1_2_4_to_8(png_ptr);

++			png_set_expand_gray_1_2_4_to_8(png_ptr);

+ 		else

+ 			png_set_packing(png_ptr);

+ 	}

+diff -ru irrlicht-1.7.1.orig/source/Irrlicht/Makefile irrlicht-1.7.1/source/Irrlicht/Makefile
+--- irrlicht-1.7.1.orig/source/Irrlicht/Makefile	2010-01-31 16:03:28.000000000 -0500
++++ irrlicht-1.7.1/source/Irrlicht/Makefile	2010-04-13 17:24:44.337638036 -0400
+@@ -1,6 +1,6 @@
+ VERSION_MAJOR = 1

+ VERSION_MINOR = 7

+-VERSION_RELEASE = 0-SVN

++VERSION_RELEASE = 1

+ VERSION = $(VERSION_MAJOR).$(VERSION_MINOR).$(VERSION_RELEASE)

+ # Irrlicht Engine 1.7.0-SVN

+ # Makefile for Linux

+@@ -39,11 +39,7 @@
+ IRRIOOBJ = CFileList.o CFileSystem.o CLimitReadFile.o CMemoryFile.o CReadFile.o CWriteFile.o CXMLReader.o CXMLWriter.o CZipReader.o CPakReader.o CNPKReader.o CTarReader.o CMountPointReader.o irrXML.o CAttributes.o lzma/LzmaDec.o

+ IRROTHEROBJ = CIrrDeviceSDL.o CIrrDeviceLinux.o CIrrDeviceConsole.o CIrrDeviceStub.o CIrrDeviceWin32.o CIrrDeviceFB.o CLogger.o COSOperator.o Irrlicht.o os.o

+ IRRGUIOBJ = CGUIButton.o CGUICheckBox.o CGUIComboBox.o CGUIContextMenu.o CGUIEditBox.o CGUIEnvironment.o CGUIFileOpenDialog.o CGUIFont.o CGUIImage.o CGUIInOutFader.o CGUIListBox.o CGUIMenu.o CGUIMeshViewer.o CGUIMessageBox.o CGUIModalScreen.o CGUIScrollBar.o CGUISpinBox.o CGUISkin.o CGUIStaticText.o CGUITabControl.o CGUITable.o CGUIToolBar.o CGUIWindow.o CGUIColorSelectDialog.o CDefaultGUIElementFactory.o CGUISpriteBank.o CGUIImageList.o CGUITreeView.o

+-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

+ LIBAESGM = aesGladman/aescrypt.o aesGladman/aeskey.o aesGladman/aestab.o aesGladman/fileenc.o aesGladman/hmac.o aesGladman/prng.o aesGladman/pwd2key.o aesGladman/sha1.o aesGladman/sha2.o

+-BZIP2OBJ = bzip2/blocksort.o bzip2/huffman.o bzip2/crctable.o bzip2/randtable.o bzip2/bzcompress.o bzip2/decompress.o bzip2/bzlib.o

+ 

+ # Next variable is for additional scene nodes etc. of customized Irrlicht versions

+ EXTRAOBJ =

+@@ -54,18 +50,16 @@
+ 

+ ###############

+ #Compiler flags

+-CXXINCS = -I../../include -Izlib -Ijpeglib -Ilibpng

++CXXINCS = -I../../include

+ CPPFLAGS += $(CXXINCS) -DIRRLICHT_EXPORTS=1

+ CXXFLAGS += -Wall -pipe -fno-exceptions -fno-rtti -fstrict-aliasing

+ ifndef NDEBUG

+ CXXFLAGS += -g -D_DEBUG

+-else

+-CXXFLAGS += -fexpensive-optimizations -O3

+ endif

+ ifdef PROFILE

+ CXXFLAGS += -pg

+ endif

+-CFLAGS := -O3 -fexpensive-optimizations -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

++CFLAGS += -DPNG_THREAD_UNSAFE_OK -DPNG_NO_MMX_CODE -DPNG_NO_MNG_FEATURES

+ 

+ sharedlib sharedlib_osx: CXXFLAGS += -fPIC

+ sharedlib sharedlib_osx: CFLAGS += -fPIC