media-gfx/openscenegraph: Version bump

svn path=/sunrise/; revision=1533

5 files changed, 237 insertions, 4 deletions

diff --git a/media-gfx/openscenegraph/ChangeLog b/media-gfx/openscenegraph/ChangeLog
index bcb087d8e..86edea555 100644
--- a/media-gfx/openscenegraph/ChangeLog
+++ b/media-gfx/openscenegraph/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Oct 2006; Cedric Krier <ced@ced.homedns.org>
+  +openscenegraph-1.2.ebuild, +files/openscenegraph-1.2-build.patch:
+  Version bump
+
   12 Sep 2006; Cedric Krier <ced@ced.homedns.org>
   +openscenegraph-1.0.ebuild, +files/openscenegraph-1.0-build.patch,
   files/openscenegraph-1.1-build.patch:
diff --git a/media-gfx/openscenegraph/Manifest b/media-gfx/openscenegraph/Manifest
index b2ed602c8..acfb85b6a 100644
--- a/media-gfx/openscenegraph/Manifest
+++ b/media-gfx/openscenegraph/Manifest
@@ -6,8 +6,13 @@ AUX openscenegraph-1.1-build.patch 3056 RMD160 5f8fea51a25f1cdef9af094a11227f999
 MD5 20025b9600acef0a9880dd4963f6446c files/openscenegraph-1.1-build.patch 3056
 RMD160 5f8fea51a25f1cdef9af094a11227f999181cb00 files/openscenegraph-1.1-build.patch 3056
 SHA256 4d4281f1eddbd0cd7f3d7d5d1f6bf5a3a769a6c5bf0234ead9a718da2c28b00c files/openscenegraph-1.1-build.patch 3056
+AUX openscenegraph-1.2-build.patch 3113 RMD160 b794d1338d8b5b268f881b7707e52b2152f518c9 SHA1 b4954c803f33fa12541148fb375bdc46050f6d6f SHA256 8b8e4664675d76c07ea54fb49a724d21474f8e9e8e339a288b899ad96b43bb19
+MD5 b4b2cfc0e4e58d1702fc9e60e5c01cdc files/openscenegraph-1.2-build.patch 3113
+RMD160 b794d1338d8b5b268f881b7707e52b2152f518c9 files/openscenegraph-1.2-build.patch 3113
+SHA256 8b8e4664675d76c07ea54fb49a724d21474f8e9e8e339a288b899ad96b43bb19 files/openscenegraph-1.2-build.patch 3113
 DIST OSG_OP_OT-1.0.zip 5036053 RMD160 f23bcf1955b701ce2bc7e927bb296649bd77ec8c SHA1 30ecb0c53b67be5aa61532d813469f0a9c74a38e SHA256 c39572c72d9ed7b7a34a36779bcf56180ba2917926f6f658b5af1824eeb3b6a6
 DIST OSG_OP_OT-1.1.zip 5280940 RMD160 bfdb7f81fb65e94c25dec327ab9dc7f3aa439d20 SHA1 dd6aa2ca6c92970b0331e00ee59fefe43b91dfa2 SHA256 b2b9d4aa39c6022d304f41974e6fc766b1c1723b920b81d341dbe93c61abccc5
+DIST OSG_OP_OT-1.2.zip 5286887 RMD160 b7a961ba2cc413a23049d64631bfbf2c9a5a04bc SHA1 89550da0e0cbaeba742deeae6eb29602854d9284 SHA256 3ccd899c83140a542313f9a659698af36ea30bb7cfddcd8962e25cf0fe7e1fb5
 EBUILD openscenegraph-1.0.ebuild 3406 RMD160 ef36e31446c8e945f70e48c06d8c40bd899185ea SHA1 aefab0004b22bb5074ea261138f89177aae0002d SHA256 f610c5c8c782ecf58b1e7131c76a0f1e50e2f70c4fae80ad6eec7056c9c8c3cb
 MD5 c7658e8697d529885c692629c5b15f8e openscenegraph-1.0.ebuild 3406
 RMD160 ef36e31446c8e945f70e48c06d8c40bd899185ea openscenegraph-1.0.ebuild 3406
@@ -16,10 +21,14 @@ EBUILD openscenegraph-1.1.ebuild 3407 RMD160 803193f2c59666b0f28bc7e34dd7f604a8c
 MD5 3962e8b2d55d38dd5a438b3473be9561 openscenegraph-1.1.ebuild 3407
 RMD160 803193f2c59666b0f28bc7e34dd7f604a8c69cf6 openscenegraph-1.1.ebuild 3407
 SHA256 65365da89962cd64e7955ea3ddf4f3acddc4a5ee3bacc814a7bba1ea74a6b77e openscenegraph-1.1.ebuild 3407
-MISC ChangeLog 611 RMD160 5a7fbcc2a17342b227e4c792b8e3273d17f08a3e SHA1 5c0a4e47f2e591a8b661a4af7cb077191a443dd4 SHA256 5fe15d032c21fab080e7a8cec69339d4f4fc9a5728cc01334696520f07959b21
-MD5 776f21c51b53f7c8f7cc0d1f4374f1de ChangeLog 611
-RMD160 5a7fbcc2a17342b227e4c792b8e3273d17f08a3e ChangeLog 611
-SHA256 5fe15d032c21fab080e7a8cec69339d4f4fc9a5728cc01334696520f07959b21 ChangeLog 611
+EBUILD openscenegraph-1.2.ebuild 3407 RMD160 803193f2c59666b0f28bc7e34dd7f604a8c69cf6 SHA1 e96afb7561fc07fef90c8b22775009a9c538b08f SHA256 65365da89962cd64e7955ea3ddf4f3acddc4a5ee3bacc814a7bba1ea74a6b77e
+MD5 3962e8b2d55d38dd5a438b3473be9561 openscenegraph-1.2.ebuild 3407
+RMD160 803193f2c59666b0f28bc7e34dd7f604a8c69cf6 openscenegraph-1.2.ebuild 3407
+SHA256 65365da89962cd64e7955ea3ddf4f3acddc4a5ee3bacc814a7bba1ea74a6b77e openscenegraph-1.2.ebuild 3407
+MISC ChangeLog 746 RMD160 28bd149ea549edf16e58a56b2b1620023e29fb1c SHA1 f7cf1d1a843a53ff45a6a207f79c97f59bc44de7 SHA256 ed248382c04aabc6396291c0ecdc4b185ad07d14bea0672cab95bd50fd15bafb
+MD5 930d4dfa1e5868b0480eac7667dfdb77 ChangeLog 746
+RMD160 28bd149ea549edf16e58a56b2b1620023e29fb1c ChangeLog 746
+SHA256 ed248382c04aabc6396291c0ecdc4b185ad07d14bea0672cab95bd50fd15bafb ChangeLog 746
 MISC metadata.xml 170 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 SHA1 ac7f48a14fec325926f9ce1be8fbf1f311b4f2e4 SHA256 d797a2ec6f9dc516c9f9c1a758ee87ad3e8c43101b5dc76c2f872d5bd4639b42
 MD5 1e678929a9fec6632e227bdf2262e9a1 metadata.xml 170
 RMD160 645927a396fdc21cdeb089fe42c5397332420ea6 metadata.xml 170
@@ -30,3 +39,6 @@ SHA256 1d399b6b37bfd8bb6be3d877b0d0d963c679f4d67b1e86bc01ade7b9a0c25c36 files/di
 MD5 3a5506bb3d7c756ab066c9e1c2b60e75 files/digest-openscenegraph-1.1 235
 RMD160 5d7a40ffddda1faa8da05d9ae3cc5296297a8c1f files/digest-openscenegraph-1.1 235
 SHA256 56fd7213f1611ae5fda3fb9a895dfb22f11866059555e44cde04c19f275a2098 files/digest-openscenegraph-1.1 235
+MD5 d2d4a534808f856d17003526edaedaff files/digest-openscenegraph-1.2 235
+RMD160 4431e8a947fce92f0a21478d93700c14e73a54b4 files/digest-openscenegraph-1.2 235
+SHA256 3158004aeb03006b223fa6595a57272a1e679994032623fa4b2665656e4f86ec files/digest-openscenegraph-1.2 235
diff --git a/media-gfx/openscenegraph/files/digest-openscenegraph-1.2 b/media-gfx/openscenegraph/files/digest-openscenegraph-1.2
new file mode 100644
index 000000000..231b9ebc0
--- /dev/null
+++ b/media-gfx/openscenegraph/files/digest-openscenegraph-1.2
@@ -0,0 +1,3 @@
+MD5 e08e0ef1f250dfc17122926ef00b1559 OSG_OP_OT-1.2.zip 5286887
+RMD160 b7a961ba2cc413a23049d64631bfbf2c9a5a04bc OSG_OP_OT-1.2.zip 5286887
+SHA256 3ccd899c83140a542313f9a659698af36ea30bb7cfddcd8962e25cf0fe7e1fb5 OSG_OP_OT-1.2.zip 5286887
diff --git a/media-gfx/openscenegraph/files/openscenegraph-1.2-build.patch b/media-gfx/openscenegraph/files/openscenegraph-1.2-build.patch
new file mode 100644
index 000000000..3affe0b13
--- /dev/null
+++ b/media-gfx/openscenegraph/files/openscenegraph-1.2-build.patch
@@ -0,0 +1,77 @@
+diff -ru OSG_OP_OT-1.2~/OpenSceneGraph/Make/instexamplesrc OSG_OP_OT-1.2/OpenSceneGraph/Make/instexamplesrc
+--- OSG_OP_OT-1.2~/OpenSceneGraph/Make/instexamplesrc	2006-10-12 14:45:38.000000000 +0200
++++ OSG_OP_OT-1.2/OpenSceneGraph/Make/instexamplesrc	2006-10-12 14:45:58.000000000 +0200
+@@ -32,7 +32,7 @@
+             cd $TOPDIR/examples/$d
+             [ -d $INST_EXAMPLE_SRC/$d ] || mkdir -m 0755 -p $INST_EXAMPLE_SRC/$d
+             echo "         installing $d"
+-            for f in `$MAKE __instfiles | grep -v $MAKE`
++            for f in `$MAKE __instfiles`
+            do
+                 src=`echo $f | cut -f1 -d"="`
+                 dst=`echo $f | cut -f2 -d"="`
+diff -ru OSG_OP_OT-1.2~/OpenSceneGraph/Make/makedefs OSG_OP_OT-1.2/OpenSceneGraph/Make/makedefs
+--- OSG_OP_OT-1.2~/OpenSceneGraph/Make/makedefs	2006-10-12 14:45:38.000000000 +0200
++++ OSG_OP_OT-1.2/OpenSceneGraph/Make/makedefs	2006-10-12 14:45:58.000000000 +0200
+@@ -76,8 +76,8 @@
+ ##                            doesn't make a distinction, we will.
+ ############################################################################
+ 
+-CXXFLAGS   = $(ARCHARGS) $(DOF) $(DEF) $(INC)
+-LDFLAGS    = $(ARCHARGS) $(DOF) $(LINKARGS) -L$(TOPDIR)/lib/$(OS)$(ARCH) 
++CXXFLAGS   += -Wall $(ARCHARGS) $(DOF) $(DEF) $(INC)
++LDFLAGS    += $(ARCHARGS) $(DOF) -L$(TOPDIR)/lib/$(OS)$(ARCH) $(LINKARGS)
+ OBJS       = $(C++FILES:.cpp=.o) \
+              $(CXXFILES:.cpp=.o) \
+              $(CFILES:.c=.o) \
+@@ -355,9 +355,9 @@
+     endif
+   else
+ 
+-ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
+-    LDFLAGS         += -Wl,-soname -Wl,$@.0
+-endif
++#ifeq ("$(COMPILE_OSG_OP_OT_WITH_SONAMES)","YES")
++    LDFLAGS         += -Wl,-soname -Wl,$@
++#endif
+ 
+ #    LDFLAGS         += `getconf LFS_LDFLAGS`
+ #    DEF             += `getconf LFS_CFLAGS`
+@@ -365,7 +365,7 @@
+     LIBS            = -lstdc++
+ #    DEF             += -W -Wall -fPIC -pipe -Woverloaded-virtual
+     DEF             += -W -Wall -fPIC -pipe
+-    OPTF            = -O2 
++    #OPTF            = -O2 
+     DBGF            = -g -gstabs+ -DOSG_COMPILE_UNIT_TESTS 
+     SYSARCH           := $(shell arch)
+     ifeq ($(SYSARCH),x86_64)
+@@ -381,15 +381,15 @@
+ 
+   SHARED            = -shared
+   ifeq ($(SYSARCH),x86_64)
+-    LINKARGS          = -L/usr/X11R6/lib64
++    LINKARGS          = -L/usr/lib64
+   else
+-    LINKARGS          = -L/usr/X11R6/lib
++    LINKARGS          = -L/usr/lib
+   endif
+   DYNAMICLIBRARYLIB = -ldl
+   OSG_LIBS          = -losgGA -losgDB -losgUtil -losg 
+   GL_LIBS           = -lGLU -lGL 
+   GLUT_LIBS         = -lglut
+-  X_INC             = -I/usr/X11R6/include
++  X_INC             = -I/usr/include
+   X_LIBS            = -lXi -lXmu -lX11
+   PF_XTRA_LIBS      = -L/usr/lib/libpfdb   -Xlinker -rpath /usr/lib/libpfdb \
+                       -lpfdu -lpfutil -lpf 
+@@ -398,7 +398,7 @@
+   PNG_LIBS          = -lpng
+   JPEG_LIBS         = -ljpeg
+   TIFF_LIB          = -ltiff
+-  GIF_LIBS          = -lungif
++  GIF_LIBS          = -lgif
+   MAKEDIST          = $(TOPDIR)/Make/makerpms
+ 
+   ifeq ("$(PROFILER)","gprof")
+Only in OSG_OP_OT-1.2/OpenSceneGraph/Make: makedefs.orig
diff --git a/media-gfx/openscenegraph/openscenegraph-1.2.ebuild b/media-gfx/openscenegraph/openscenegraph-1.2.ebuild
new file mode 100644
index 000000000..1b6649764
--- /dev/null
+++ b/media-gfx/openscenegraph/openscenegraph-1.2.ebuild
@@ -0,0 +1,137 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+inherit eutils toolchain-funcs
+
+MY_PN=OpenSceneGraph
+MY_PV=${PV/_rc/-rc}
+
+DESCRIPTION="Cross-platform, high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="http://www.openscenegraph.org/downloads/snapshots/OSG_OP_OT-${MY_PV}.zip"
+
+LICENSE="OSGPL"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="doc examples introspection  producer gdal jasper truetype xine jpeg gif tiff png coin inventor glut"
+
+RDEPEND=">=dev-libs/openproducer-1.0.2
+	>=dev-libs/openthreads-1.4.3
+	media-libs/mesa
+	virtual/opengl
+	x11-libs/libXi
+	x11-libs/libXmu
+	x11-libs/libX11
+	gdal? ( sci-libs/gdal )
+	jasper? ( media-libs/jasper )
+	truetype? ( media-libs/freetype )
+	xine? ( media-libs/xine-lib )
+	jpeg? ( media-libs/jpeg )
+	gif? ( media-libs/giflib )
+	tiff? ( media-libs/tiff )
+	png? ( media-libs/libpng
+				sys-libs/zlib )
+	coin? ( media-libs/coin )
+	inventor? ( media-libs/openinventor )
+	glut? ( virtual/glut )"
+DEPEND="${RDEPEND}
+	app-arch/unzip
+	doc? ( app-doc/doxygen )"
+
+S=${WORKDIR}/OSG_OP_OT-${MY_PV}/${MY_PN}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-build.patch
+}
+
+src_compile() {
+	local myconf
+
+	use introspection \
+		&& myconf="${myconf} COMPILE_INTROSPECTION=yes" \
+		|| myconf="${myconf} COMPILE_INTROSPECTION=no"
+
+	use producer \
+		&& myconf="${myconf} PRODUCER_INSTALLED=yes" \
+		|| myconf="${myconf} PRODUCER_INSTALLED=no"
+
+	use examples \
+		&& myconf="${myconf} COMPILE_EXAMPLES=yes" \
+		|| myconf="${myconf} COMPILE_EXAMPLES=no"
+
+	use gdal \
+		&& myconf="${myconf} GDAL_INSTALLED=yes" \
+		|| myconf="${myconf} GDAL_INSTALLED=no"
+
+	use jasper \
+		&& myconf="${myconf} JASPER_INSTALLED=yes" \
+		|| myconf="${myconf} JASPER_INSTALLED=no"
+
+	use truetype \
+		&& myconf="${myconf} FREETYPE_INSTALLED=yes" \
+		|| myconf="${myconf} FREETYPE_INSTALLED=no"
+
+	use xine \
+		&& myconf="${myconf} XINE_INSTALLED=yes" \
+		|| myconf="${myconf} XINE_INSTALLED=no"
+
+	myconf="${myconf} QUICKTIME_INSTALLED=no"
+
+	use jpeg \
+		&& myconf="${myconf} LIBJPEG_INSTALLED=yes" \
+		|| myconf="${myconf} LIBJPEG_INSTALLED=no"
+
+	use gif \
+		&& myconf="${myconf} LIBUNGIF_INSTALLED=yes" \
+		|| myconf="${myconf} LIBUNGIF_INSTALLED=no"
+
+	use tiff \
+		&& myconf="${myconf} LIBTIFF_INSTALLED=yes" \
+		|| myconf="${myconf} LIBTIFF_INSTALLED=no"
+
+	use png \
+		&& myconf="${myconf} LIBPNG_INSTALLED=yes" \
+		|| myconf="${myconf} LIBPNG_INSTALLED=no"
+
+	use coin \
+		&& myconf="${myconf} COIN_INSTALLED=yes" \
+		|| myconf="${myconf} COIN_INSTALLED=no"
+
+	use inventor \
+		&& myconf="${myconf} INVENTOR_INSTALLED=yes" \
+		|| myconf="${myconf} INVENTOR_INSTALLED=no"
+
+	myconf="${myconf} PERFORMER_INSTALLED=no"
+
+	use glut \
+		&& myconf="${myconf} GLUT_INSTALLED=yes" \
+		|| myconf="${myconf} GLUT_INSTALLED=no"
+
+	emake CXX=$(tc-getCXX) ${myconf} || die "emake failed"
+
+	if use doc; then
+		OSGHOME="${S}" doxygen doc/Doxyfiles/all_Doxyfile
+	fi
+}
+
+src_install() {
+	emake INST_LOCATION="${D}"/usr INST_EXAMPLES="${D}"/usr/bin \
+		INST_EXAMPLE_SRC="${D}"/usr/share/doc/${P}/examples \
+		INST_SRC="${D}"/usr/share/doc/${P}/src install \
+		|| die "emake install failed"
+
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins Make/openscenegraph.pc
+
+
+	dodoc AUTHORS.txt ChangeLog NEWS.txt README.txt
+
+	if use doc; then
+		dodoc doc/ProgrammingGuide/ProgrammingGuide.odt
+		dohtml -r doc/doxygen/html
+	fi
+}