Version bump. gcc3.4 fixes, -fPIC fixes... amd64 compilation fixes (but doesn't run right).

9 files changed, 307 insertions, 5 deletions

diff --git a/media-gfx/pixie/ChangeLog b/media-gfx/pixie/ChangeLog
index 5f8909522813..0c968f1faf89 100644
--- a/media-gfx/pixie/ChangeLog
+++ b/media-gfx/pixie/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for media-gfx/pixie
 # Copyright 2000-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.4 2004/05/02 09:26:19 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/ChangeLog,v 1.5 2004/06/15 03:54:43 eradicator Exp $
+
+*pixie-1.3.11 (14 Jun 2004)
+
+  14 Jun 2004; Jeremy Huddleston <eradicator@gentoo.org>
+  +files/pixie-1.3.11-Makefile.patch, +files/pixie-1.3.11-gcc3.4.patch,
+  +files/pixie-1.3.11-gentoo.patch, +files/pixie-1.3.11-math.patch,
+  +files/pixie-1.3.11-pic.patch, +pixie-1.3.11.ebuild:
+  Version bump. gcc3.4 fixes, -fPIC fixes... amd64 compilation fixes (but
+  doesn't run right).
 
   02 May 2004; Jeremy Huddleston <eradicator@gentoo.org>
   pixie-1.3.5-r1.ebuild:
diff --git a/media-gfx/pixie/Manifest b/media-gfx/pixie/Manifest
index 64dcaa5d83f5..1d96dfa03279 100644
--- a/media-gfx/pixie/Manifest
+++ b/media-gfx/pixie/Manifest
@@ -1,7 +1,14 @@
-MD5 d20b283f1c385b8014dda91a8dfff5d3 pixie-1.3.5-r1.ebuild 1106
-MD5 ea38a8ddbaf5a97ea0842e6265d5a881 ChangeLog 803
+MD5 650345b6a4a8a12225e145d669ab66a0 ChangeLog 1180
 MD5 c1e212329f9083e2405b16dd382d6632 metadata.xml 259
-MD5 c3ecef6a787c76274c3123507835c714 files/digest-pixie-1.3.5-r1 65
+MD5 12e6a15496821138f0d475244c7f7e17 pixie-1.3.5-r1.ebuild 1105
+MD5 017610ed0a70376999437bcf08a1363f pixie-1.3.11.ebuild 1466
 MD5 cb8ed959bdd211afc4edb2b0607b5f66 files/50pixie 41
-MD5 30df58c025e459f98cf3aec8548defbb files/pixie-1.3.5-math.patch 992
+MD5 c3ecef6a787c76274c3123507835c714 files/digest-pixie-1.3.5-r1 65
 MD5 b8cf2dce5fa4e8619c3c3dd4279373b7 files/pixie-1.3.5-Makefile.patch 582
+MD5 30df58c025e459f98cf3aec8548defbb files/pixie-1.3.5-math.patch 992
+MD5 135dd3e8ee555dcdf2312d1895e61a9e files/pixie-1.3.11-Makefile.patch 436
+MD5 5c5e69938a1ff57dc47a4b82450e9f77 files/digest-pixie-1.3.11 66
+MD5 44355ed7501f8b6bb524b9c6aa348dc7 files/pixie-1.3.11-gentoo.patch 417
+MD5 60383912d72d93560e007b6e413c7074 files/pixie-1.3.11-gcc3.4.patch 8770
+MD5 6cc5b77de73a722c5e850636bf750a32 files/pixie-1.3.11-math.patch 365
+MD5 83ee14873ec52a5044f2204298f8a666 files/pixie-1.3.11-pic.patch 440
diff --git a/media-gfx/pixie/files/digest-pixie-1.3.11 b/media-gfx/pixie/files/digest-pixie-1.3.11
new file mode 100644
index 000000000000..5e0cb445616e
--- /dev/null
+++ b/media-gfx/pixie/files/digest-pixie-1.3.11
@@ -0,0 +1 @@
+MD5 4c0935f1f0fefeaaa303d6e1a5c1f7ac Pixie-src-1.3.11.tgz 4925938
diff --git a/media-gfx/pixie/files/pixie-1.3.11-Makefile.patch b/media-gfx/pixie/files/pixie-1.3.11-Makefile.patch
new file mode 100644
index 000000000000..6c69c3940829
--- /dev/null
+++ b/media-gfx/pixie/files/pixie-1.3.11-Makefile.patch
@@ -0,0 +1,14 @@
+diff -Naur Pixie.orig/Makefile.am Pixie.Makefile/Makefile.am
+--- Pixie.orig/Makefile.am	2004-06-13 20:00:09.000000000 -0700
++++ Pixie.Makefile/Makefile.am	2004-06-14 18:33:41.169944272 -0700
+@@ -11,8 +11,8 @@
+ 	cp -rf $(srcdir)/shaders $(distdir)
+ 
+ install-data-local:
+-	cp -rf $(srcdir)/doc $(prefix)
+-	cp -rf $(srcdir)/shaders $(prefix)
++	cp -rf $(srcdir)/doc $(DESTDIR)$(prefix)
++	cp -rf $(srcdir)/shaders $(DESTDIR)$(prefix)
+ 
+ 
+ 
diff --git a/media-gfx/pixie/files/pixie-1.3.11-gcc3.4.patch b/media-gfx/pixie/files/pixie-1.3.11-gcc3.4.patch
new file mode 100644
index 000000000000..cd28046d2b0d
--- /dev/null
+++ b/media-gfx/pixie/files/pixie-1.3.11-gcc3.4.patch
@@ -0,0 +1,169 @@
+diff -Naur Pixie.orig/src/common/containers.h Pixie.gcc34/src/common/containers.h
+--- Pixie.orig/src/common/containers.h	2004-06-13 20:00:09.000000000 -0700
++++ Pixie.gcc34/src/common/containers.h	2004-06-14 19:02:34.133763870 -0700
+@@ -53,13 +53,13 @@
+ 	virtual				~CDictionary()	{	}
+ 
+ 						// inserts an entity into the dictionary
+-	virtual	void		insert(keyType,valType)				=	NULL;
++	virtual	void		insert(keyType,valType)				=	0;
+ 						// return 1 if the entity is found in the dictionary
+-	virtual	int			find(keyType,valType &)	const		=	NULL;
++	virtual	int			find(keyType,valType &)	const		=	0;
+ 						// return 1 if the entity is found in the dictionary and erase it
+-	virtual	int			erase(keyType,valType &)			=	NULL;
++	virtual	int			erase(keyType,valType &)			=	0;
+ 						// Delete the dictionary including everything in it
+-	virtual	void		destroy()							=	NULL;
++	virtual	void		destroy()							=	0;
+ };
+ 
+ ///////////////////////////////////////////////////////////////////////
+diff -Naur Pixie.orig/src/framebuffer/framebuffer.h Pixie.gcc34/src/framebuffer/framebuffer.h
+--- Pixie.orig/src/framebuffer/framebuffer.h	2004-06-13 20:00:09.000000000 -0700
++++ Pixie.gcc34/src/framebuffer/framebuffer.h	2004-06-14 19:01:19.992178690 -0700
+@@ -50,8 +50,8 @@
+ 	char			*name;									// Name of the display
+ 	char			*samples;								// Samples for the display
+ 
+-	virtual	int		data(int,int,int,int,float *)	= NULL;	// Store data
+-	virtual	void	finish()						= NULL;	// Finish displaying the data
++	virtual	int		data(int,int,int,int,float *)	= 0;	// Store data
++	virtual	void	finish()						= 0;	// Finish displaying the data
+ 
+ 			void	clampData(int,int,float *);				// Clamp the data so that everything is between 0 and 1
+ };
+diff -Naur Pixie.orig/src/ri/cache.h Pixie.gcc34/src/ri/cache.h
+--- Pixie.orig/src/ri/cache.h	2004-06-13 20:00:06.000000000 -0700
++++ Pixie.gcc34/src/ri/cache.h	2004-06-14 19:02:59.297550257 -0700
+@@ -52,8 +52,8 @@
+ 					CCache(const char *,unsigned int);
+ 					~CCache();
+ 
+-	virtual	void	lookup(float *,const float *,const float *,const CGlobalIllumLookup *)		=	NULL;
+-	virtual	void	cachesample(float *,const float *,const float *,float)						=	NULL;
++	virtual	void	lookup(float *,const float *,const float *,const CGlobalIllumLookup *)		=	0;
++	virtual	void	cachesample(float *,const float *,const float *,float)						=	0;
+ 	virtual	void	finalize(const CGlobalIllumLookup *)	{	}
+ 
+ protected:
+diff -Naur Pixie.orig/src/ri/hierarchy.h Pixie.gcc34/src/ri/hierarchy.h
+--- Pixie.orig/src/ri/hierarchy.h	2004-06-13 20:00:06.000000000 -0700
++++ Pixie.gcc34/src/ri/hierarchy.h	2004-06-14 19:04:02.661940051 -0700
+@@ -49,9 +49,9 @@
+ // Date last edited		:	3/18/2002
+ class	CTracable {
+ public:
+-	virtual	void	bound(float *,float *) const					=	NULL;
+-	virtual	void	intersect(CRay *)								=	NULL;
+-	virtual	int		intersect(const float *,const float *) const	=	NULL;
++	virtual	void	bound(float *,float *) const					=	0;
++	virtual	void	intersect(CRay *)								=	0;
++	virtual	int		intersect(const float *,const float *) const	=	0;
+ 
+ 	int				ID;
+ };
+diff -Naur Pixie.orig/src/ri/reyes.h Pixie.gcc34/src/ri/reyes.h
+--- Pixie.orig/src/ri/reyes.h	2004-06-13 20:00:07.000000000 -0700
++++ Pixie.gcc34/src/ri/reyes.h	2004-06-14 19:03:21.869770596 -0700
+@@ -123,10 +123,10 @@
+ 	void						renderFrame();									// Right after world end to force rendering of the entire frame
+ 
+ 								// The following functions must be overriden by the child rasterizer
+-	virtual	void				rasterBegin(int,int,int,int)				=	NULL;
+-	virtual	void				rasterDrawPrimitives(TRasterPrimitive *,int)=	NULL;
+-	virtual	int					rasterProbeTri(TRasterPrimitive *)			=	NULL;
+-	virtual	void				rasterEnd(float *)							=	NULL;
++	virtual	void				rasterBegin(int,int,int,int)				=	0;
++	virtual	void				rasterDrawPrimitives(TRasterPrimitive *,int)=	0;
++	virtual	int					rasterProbeTri(TRasterPrimitive *)			=	0;
++	virtual	void				rasterEnd(float *)							=	0;
+ 	
+ 	
+ 	void						drawObject(CObject *,const float *,const float *);			// Draw an object
+diff -Naur Pixie.orig/src/ri/shader.h Pixie.gcc34/src/ri/shader.h
+--- Pixie.orig/src/ri/shader.h	2004-06-13 20:00:07.000000000 -0700
++++ Pixie.gcc34/src/ri/shader.h	2004-06-14 19:03:45.208862524 -0700
+@@ -211,7 +211,7 @@
+ // Date last edited		:	3/23/2003
+ class	CGatherVariable {
+ public:
+-	virtual	void	record(int,CGatherRay **,float **varying)	=	NULL;
++	virtual	void	record(int,CGatherRay **,float **varying)	=	0;
+ 
+ 	CGatherVariable	*next;		// The next item in the linked list
+ 	int				shade;		// TRUE if this variable requires shading
+@@ -395,12 +395,12 @@
+ 		void					detach()	{	refCount--; if (refCount == 0) delete this; }
+ 		void					check()		{	if (refCount == 0)	delete this;			}
+ 
+-		virtual	void			illuminate(CShadingContext *)		=	NULL;
+-		virtual	void			setParameters(int,char **,void **)	=	NULL;
+-		virtual int				getParameter(const char *,void *)	=	NULL;
+-		virtual	void			execute(CShadingContext *)			=	NULL;
+-		virtual	unsigned int	requiredParameters()				=	NULL;
+-		virtual	const char		*getName()							=	NULL;
++		virtual	void			illuminate(CShadingContext *)		=	0;
++		virtual	void			setParameters(int,char **,void **)	=	0;
++		virtual int				getParameter(const char *,void *)	=	0;
++		virtual	void			execute(CShadingContext *)			=	0;
++		virtual	unsigned int	requiredParameters()				=	0;
++		virtual	const char		*getName()							=	0;
+ 
+ 		int						refCount;						// The refcount to manage the clones
+ 		CXform					*xform;
+diff -Naur Pixie.orig/src/ri/shading.h Pixie.gcc34/src/ri/shading.h
+--- Pixie.orig/src/ri/shading.h	2004-06-13 20:00:07.000000000 -0700
++++ Pixie.gcc34/src/ri/shading.h	2004-06-14 19:04:38.863878128 -0700
+@@ -176,10 +176,10 @@
+ 		int						depth;										// The transparency depth of the bundle
+ 		CShaderInstance			*postShader;								// The shader to execute after the raytrace
+ 
+-		virtual	int				postTraceAction()				=	NULL;	// The function to be called after the rays are traced
+-		virtual	void			postShade(int,CRay **,float **)	=	NULL;	// The function that's called with the shade results
+-		virtual	void			postShade(int,CRay **)			=	NULL;	// The function that's called with the rays that don't intersect anything
+-		virtual	void			post()							=	NULL;	// The function that's called after each pass
++		virtual	int				postTraceAction()				=	0;	// The function to be called after the rays are traced
++		virtual	void			postShade(int,CRay **,float **)	=	0;	// The function that's called with the shade results
++		virtual	void			postShade(int,CRay **)			=	0;	// The function that's called with the rays that don't intersect anything
++		virtual	void			post()							=	0;	// The function that's called after each pass
+ };
+ 
+ 
+@@ -201,17 +201,17 @@
+ 		void					beginWorld();											// We're starting to specify geometry
+ 		void					endWorld();												// We're done specifying geometry
+ 
+-		virtual	void			renderFrame()					=	NULL;				// Right after world end to force rendering of the entire frame
++		virtual	void			renderFrame()					=	0;				// Right after world end to force rendering of the entire frame
+ 
+ 		// Delayed rendering functions
+-		virtual	void			drawObject(CObject *,const float *,const float *)		=	NULL;
+-		virtual	void			drawTriangle(CObject *,const float *,const float *,const float *) = NULL;
+-		virtual	void			drawQuad(CObject *,const float *,const float *,const float *,const float *) = NULL;
++		virtual	void			drawObject(CObject *,const float *,const float *)		=	0;
++		virtual	void			drawTriangle(CObject *,const float *,const float *,const float *) = 0;
++		virtual	void			drawQuad(CObject *,const float *,const float *,const float *,const float *) = 0;
+ 
+ 		// Primitive creation functions
+-		virtual	void			drawGrid(CSurface *,int,int,float,float,float,float)	=	NULL;
+-		virtual	void			drawRibbon(CSurface *,int,float,float)					=	NULL;
+-		virtual	void			drawPoints(CSurface *,int)								=	NULL;
++		virtual	void			drawGrid(CSurface *,int,int,float,float,float,float)	=	0;
++		virtual	void			drawRibbon(CSurface *,int,float,float)					=	0;
++		virtual	void			drawPoints(CSurface *,int)								=	0;
+ 
+ 		// Some shading functions
+ 		CShadingState			*currentShadingState;									// The current shading state
+diff -Naur Pixie.orig/src/ri/texture.h Pixie.gcc34/src/ri/texture.h
+--- Pixie.orig/src/ri/texture.h	2004-06-13 20:00:08.000000000 -0700
++++ Pixie.gcc34/src/ri/texture.h	2004-06-14 19:04:53.404443347 -0700
+@@ -83,7 +83,7 @@
+ 	int					fileWidth,fileHeight;											// The physical size in the file
+ protected:
+ 	// This function must be overriden by the child class
+-	virtual	void		lookupPixel(float *,int,int,const CTextureLookup *)	=	NULL;	// Lookup 4 pixel values
++	virtual	void		lookupPixel(float *,int,int,const CTextureLookup *)	=	0;	// Lookup 4 pixel values
+ };
+ 
+ 
diff --git a/media-gfx/pixie/files/pixie-1.3.11-gentoo.patch b/media-gfx/pixie/files/pixie-1.3.11-gentoo.patch
new file mode 100644
index 000000000000..58a9753f6c4a
--- /dev/null
+++ b/media-gfx/pixie/files/pixie-1.3.11-gentoo.patch
@@ -0,0 +1,13 @@
+diff -Naur Pixie.Makefile/Makefile.am Pixie.gentoo/Makefile.am
+--- Pixie.Makefile/Makefile.am	2004-06-14 18:33:41.169944272 -0700
++++ Pixie.gentoo/Makefile.am	2004-06-14 18:33:00.459761090 -0700
+@@ -1,9 +1,5 @@
+ SUBDIRS = src
+ 
+-topdir = $(prefix)
+-
+-top_DATA = README AUTHORS LICENSE COPYING
+-
+ EXTRA_DIST = Pixie.dsw Pixie.ncb Pixie.opt DEVNOTES LICENSE makeclean.bat makeinst.bat tutorials win32inst
+ 
+ dist-hook:
diff --git a/media-gfx/pixie/files/pixie-1.3.11-math.patch b/media-gfx/pixie/files/pixie-1.3.11-math.patch
new file mode 100644
index 000000000000..0da001ef1f3f
--- /dev/null
+++ b/media-gfx/pixie/files/pixie-1.3.11-math.patch
@@ -0,0 +1,12 @@
+diff -Naur Pixie.orig/src/common/global.h Pixie.math/src/common/global.h
+--- Pixie.orig/src/common/global.h	2004-06-13 20:00:09.000000000 -0700
++++ Pixie.math/src/common/global.h	2004-06-14 18:32:42.702734459 -0700
+@@ -47,6 +47,8 @@
+ #ifndef GLOBAL_H
+ #define	GLOBAL_H
+ 
++#include <math.h>
++
+ // The Pixie version
+ #define	VERSION_RELEASE	1
+ #define	VERSION_BETA	3
diff --git a/media-gfx/pixie/files/pixie-1.3.11-pic.patch b/media-gfx/pixie/files/pixie-1.3.11-pic.patch
new file mode 100644
index 000000000000..81ec5fcc5bc3
--- /dev/null
+++ b/media-gfx/pixie/files/pixie-1.3.11-pic.patch
@@ -0,0 +1,12 @@
+diff -Naur Pixie.orig/src/common/Makefile.am Pixie.amd64/src/common/Makefile.am
+--- Pixie.orig/src/common/Makefile.am	2004-06-13 20:00:09.000000000 -0700
++++ Pixie.amd64/src/common/Makefile.am	2004-06-14 18:59:50.884099612 -0700
+@@ -1,6 +1,8 @@
+ noinst_LIBRARIES = libcommon.a 
+ 
+ libcommon_a_SOURCES = algebra.cpp os.cpp memoryman.cpp
++libcommon_a_CFLAGS = -fPIC -DPIC
++libcommon_a_CXXFLAGS = -fPIC -DPIC
+ 
+ EXTRA_DIST = *.h *.cpp *.dsp
+ 
diff --git a/media-gfx/pixie/pixie-1.3.11.ebuild b/media-gfx/pixie/pixie-1.3.11.ebuild
new file mode 100644
index 000000000000..e96958120690
--- /dev/null
+++ b/media-gfx/pixie/pixie-1.3.11.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2004 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/media-gfx/pixie/pixie-1.3.11.ebuild,v 1.1 2004/06/15 03:54:43 eradicator Exp $
+
+inherit eutils
+
+IUSE="X"
+
+MY_PN="Pixie"
+S="${WORKDIR}/${MY_PN}"
+
+DESCRIPTION="RenderMan like photorealistic renderer."
+HOMEPAGE="http://pixie.sourceforge.net"
+SRC_URI="mirror://sourceforge/${PN}/${MY_PN}-src-${PV}.tgz"
+RESTRICT="nomirror"
+
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~x86 ~ppc ~sparc -amd64"
+
+RDEPEND="media-libs/jpeg
+	 sys-libs/zlib
+	 media-libs/tiff
+	 X? ( virtual/x11 )"
+
+DEPEND="${RDEPEND}
+	>=sys-devel/automake-1.8"
+
+src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	# These have been sent upstream
+	epatch ${FILESDIR}/${P}-Makefile.patch
+	epatch ${FILESDIR}/${P}-gcc3.4.patch
+	epatch ${FILESDIR}/${P}-math.patch
+	epatch ${FILESDIR}/${P}-pic.patch
+
+	# Gentoo-specific stuff
+	epatch ${FILESDIR}/${P}-gentoo.patch
+
+	# redirecting aclocal to /dev/null because there are alot of warnings
+	# output for deprecated stuff in 1.8.5
+	WANT_AUTOMAKE=1.8 aclocal >& /dev/null
+	WANT_AUTOMAKE=1.8 automake
+	WANT_AUTOCONF=2.5 autoconf
+}
+
+src_compile() {
+	./configure --prefix=/opt/pixie || die
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc AUTHORS ChangeLog DEVNOTES NEWS README
+
+	insinto /etc/env.d
+	doins ${FILESDIR}/50pixie
+
+	edos2unix ${D}/opt/pixie/shaders/*
+
+	mv ${D}/opt/pixie/doc ${D}/usr/share/doc/${PF}/html
+}