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

Package-Manager: portage-2.1.8.3/cvs/Linux i686

4 files changed, 73 insertions, 20 deletions

diff --git a/dev-games/irrlicht/ChangeLog b/dev-games/irrlicht/ChangeLog
index f6e89495e7fe..5972fae33f1c 100644
--- a/dev-games/irrlicht/ChangeLog
+++ b/dev-games/irrlicht/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/irrlicht
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.38 2010/03/14 18:50:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/ChangeLog,v 1.39 2010/04/13 21:35:32 mr_bones_ Exp $
+
+  13 Apr 2010; Michael Sterrett <mr_bones_@gentoo.org>
+  irrlicht-1.7.1.ebuild, +files/irrlicht-1.7.1-gentoo.patch:
+  use the system bzip2; also build the shared library (bug #305271)
 
 *irrlicht-1.7.1 (14 Mar 2010)
 
diff --git a/dev-games/irrlicht/Manifest b/dev-games/irrlicht/Manifest
index 866ccbe6b6c6..6505587010cb 100644
--- a/dev-games/irrlicht/Manifest
+++ b/dev-games/irrlicht/Manifest
@@ -2,9 +2,10 @@ AUX irrlicht-1.5.1-config.patch 1308 RMD160 936792e3c36018ab0c77dad5056b420e5a57
 AUX irrlicht-1.5.1-demoMake.patch 676 RMD160 103f82bf2249b4dc21b170bdaed5289cdb1d7429 SHA1 5c13fff5f8063eb1b666cffc8a7fa390cdcaf1a6 SHA256 7e462b5d561a7ba791d6f39f17b1441763846ec3b8dc0fe59dc246920369f9c8
 AUX irrlicht-1.7.1-config.patch 1524 RMD160 605b3e87e1a979614cd47e1d9939d75556e744a4 SHA1 70a01ddfe947f8abf4a8b23f195eba7a1928158b SHA256 57da1c0af56b5a2145e3befa16c227f2222aeccd2fe050bd93d484a22643ab1d
 AUX irrlicht-1.7.1-demoMake.patch 19873 RMD160 61ad654a0824a1bde18a26ff642de412082166dd SHA1 582b60ef94fe93d458322429b4622da6e122ada2 SHA256 f4686dceb39913fb26035f970e999dff7b8dd82e87de6b999f3dfb5aacf846d0
+AUX irrlicht-1.7.1-gentoo.patch 4295 RMD160 e67dc327a73d628200335faebe32b4742d7f4b97 SHA1 39d0711fdcc04a9ec2d26daa42c39a31bb6ca990 SHA256 f1a2aadb5be6e8239a782623ed685ecf4b380664cb7d673a98d5a1b701d629d8
 DIST irrlicht-1.5.1.zip 22514017 RMD160 2296568336dc9d506b59c1204c137526391fe3e5 SHA1 6110f398f4ed3850e0c5237629aa48050fb95fec SHA256 b5518bdb3fa8098ca92795a4bb03d19596b81103797fbaca199fc546d3c07070
 DIST irrlicht-1.7.1.zip 19542368 RMD160 7125d2ed59627c84181a22172c6f270e41758e2e SHA1 077603b157b35637d2496ac5bb97a97b5109b384 SHA256 489fe899e900944b8d898da6fda537ed2f8fcf590eb35b93d8ad9d1151ebe79f
 EBUILD irrlicht-1.5.1.ebuild 1372 RMD160 6d39f2f581b8e908ac685212fd7225841640982e SHA1 eb58b8d9ea0b5c3364b0678c0735a3849c4c96da SHA256 fe451866873e0484783ec8dca6ff0bddc856ed6518024a2b7305ac26faa3ac59
-EBUILD irrlicht-1.7.1.ebuild 1611 RMD160 2791973c74a208b06f8d9d51caf53836080ecb0a SHA1 a30ecadf912274d2b61165be6354e9fe2849c248 SHA256 adc2480efcc638a86125049b3b65a5004f97aaa23935c4c6d4efc12e417a72e2
-MISC ChangeLog 6505 RMD160 5a584a6b0ac8f608cb83d0454b62713bde5464df SHA1 8dcb7a0690e5d86e38de0fbb8d6fe30ae7a05956 SHA256 6397488fad70a89dd6c7412b80456c39ea35ed543e65571d7f0fb969b6f996c0
+EBUILD irrlicht-1.7.1.ebuild 1394 RMD160 d6bd2abf26ccad3d8223626d58070124a600e613 SHA1 bd27de4269f8a4d97e6385b0fc2e52fd3679991a SHA256 78ff5d26ad58cb27906f8e1c8cfee30f0cf178fec2629f108d5997f0801efa8b
+MISC ChangeLog 6693 RMD160 3206c788624c282e2b24a53777e3f168bf549eaa SHA1 e6db5da0e829ae46fde6195de9d1ae8b129f8938 SHA256 1e127505173ac907ce056fae7347b83e7a3c3af5a9786eda58bab7b2a0374b01
 MISC metadata.xml 790 RMD160 86dd226d08a73ae77a31e174094cb4bdfeb5426a SHA1 ff4789ffad6e5473e3c2bbd8b0d64a4edc34b651 SHA256 f98d87925d064aebca00d2da850d027f1e2a66586c6715e12151e34a9167fffc
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

diff --git a/dev-games/irrlicht/irrlicht-1.7.1.ebuild b/dev-games/irrlicht/irrlicht-1.7.1.ebuild
index d25ba100d0b8..c5e4bd480f2a 100644
--- a/dev-games/irrlicht/irrlicht-1.7.1.ebuild
+++ b/dev-games/irrlicht/irrlicht-1.7.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.1.ebuild,v 1.1 2010/03/14 18:50:37 tupone Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/irrlicht/irrlicht-1.7.1.ebuild,v 1.2 2010/04/13 21:35:32 mr_bones_ Exp $
 
 EAPI=2
 inherit eutils toolchain-funcs
@@ -16,6 +16,7 @@ IUSE="doc"
 
 RDEPEND="media-libs/jpeg
 	media-libs/libpng
+	app-arch/bzip2
 	virtual/opengl
 	virtual/glu
 	x11-libs/libX11"
@@ -27,18 +28,7 @@ DEPEND="${RDEPEND}
 S=${WORKDIR}/${P}/source/Irrlicht
 
 src_prepare() {
-	sed -i \
-		-e '/^CXXFLAGS/s:=:+=:' \
-		-e '/^CXXINCS/s:-Izlib -Ijpeglib -Ilibpng::' \
-		-e '/^ZLIBOBJ/d' \
-		-e '/^JPEGLIBOBJ/d' \
-		-e '/^LIBPNGOBJ/d' \
-		Makefile || die "sed failed"
-
-	sed -i \
-		-e 's:png_set_gray_1_2_4_to_8:png_set_expand_gray_1_2_4_to_8:' \
-		CImageLoaderPNG.cpp || die
-
+	epatch "${FILESDIR}"/${P}-gentoo.patch
 	cd ../..
 	edos2unix include/IrrCompileConfig.h
 	epatch \
@@ -52,17 +42,19 @@ src_prepare() {
 }
 
 src_compile() {
-	emake CXX="$(tc-getCXX)" || die "emake failed"
+	tc-export CXX CC AR
+	emake sharedlib staticlib || die "emake failed"
 }
 
 src_install() {
 	cd ../..
-	dolib.a lib/Linux/libIrrlicht.a || die "dolib.a failed"
+	dolib.a lib/Linux/libIrrlicht.a || die
+	dolib.so lib/Linux/libIrrlicht.so* || die
 	insinto /usr/include/${PN}
-	doins include/* || die "doins failed"
+	doins include/* || die
 	dodoc changes.txt readme.txt
 	if use doc ; then
 		insinto /usr/share/doc/${PF}
-		doins -r examples media || die "doins failed"
+		doins -r examples media || die
 	fi
 }