[gentoo-commits] repo/gentoo:master commit in: dev-games/openscenegraph/

["Andreas Sturmlechner" <asturm@gentoo.org>]

commit:     d4d1dcd9fcc8b12a4024470e10ce65f831e3706a
Author:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Fri Nov  8 22:06:12 2019 +0000
Commit:     Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sat Nov  9 08:57:43 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4d1dcd9

dev-games/openscenegraph: 3.6.4 version bump, EAPI-7 bump, USE dicom

Fix automagic dependency.
Fix REQUIRED_USE.

Reported-by: Bernd Waibel <waebbl <AT> gmail.com>
Closes: https://bugs.gentoo.org/689928
Package-Manager: Portage-2.3.78, Repoman-2.3.17
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org>

 dev-games/openscenegraph/Manifest                  |   1 +
 dev-games/openscenegraph/metadata.xml              |   1 +
 .../openscenegraph/openscenegraph-3.6.4.ebuild     | 151 +++++++++++++++++++++
 3 files changed, 153 insertions(+)

diff --git a/dev-games/openscenegraph/Manifest b/dev-games/openscenegraph/Manifest
index f002f9143fe..dca7a0ca60e 100644
--- a/dev-games/openscenegraph/Manifest
+++ b/dev-games/openscenegraph/Manifest
@@ -1,2 +1,3 @@
 DIST OpenSceneGraph-3.5.5.tar.gz 5666085 BLAKE2B f474f7e62476c816cc9b036995f2571e65d33ed426a95eb2727994fd2c46e95457bf5392e488556e53c13c30bd46250f0c3d871678a4de234eae8953c03560a6 SHA512 f4a890bfbabab0ed8d50ad50e8f9ae5aa6edd4a73eda30d6c53ad478889608f7c980306a79549ca1e472cdd3df8061af03537c8139fa6446b00aebf47ec26827
 DIST OpenSceneGraph-3.6.3.tar.gz 5784660 BLAKE2B b117a10d7be8fa456d739eb04f218cf9565ea4bd5a91642ada3bde5cc194a71809482ca2e6f2b4ff977fd26f3a855e27392ac60921e4217b72ebd828efa4df0e SHA512 5d66002cffa935ce670a119ffaebd8e4709acdf79ae2b34b37ad9df284ec8a1a74fee5a7a4109fbf3da6b8bd857960f2b7ae68c4c2e26036edbf484fccf08322
+DIST OpenSceneGraph-3.6.4.tar.gz 5771539 BLAKE2B 3f608566ed8bd927f30c18ab25147826a40655bfa0eca2b0765f775d1fca53c090b77c9963b392bb73b405150f64f1b3bdc57ac6ef59de7f88bf9fd208b2ff6e SHA512 7cb34fc279ba62a7d7177d3f065f845c28255688bd29026ffb305346e1bb2e515a22144df233e8a7246ed392044ee3e8b74e51bf655282d33ab27dcaf12f4b19

diff --git a/dev-games/openscenegraph/metadata.xml b/dev-games/openscenegraph/metadata.xml
index 119bb5e3405..fca914ad559 100644
--- a/dev-games/openscenegraph/metadata.xml
+++ b/dev-games/openscenegraph/metadata.xml
@@ -14,6 +14,7 @@
 	</longdescription>
 	<use>
 		<flag name="asio">Enable support for <pkg>dev-cpp/asio</pkg> library</flag>
+		<flag name="dicom">Enable DICOM medical image file support via <pkg>sci-libs/dcmtk</pkg></flag>
 		<flag name="egl">Enable EGL support</flag>
 		<flag name="fox">Build examples using <pkg>x11-libs/fox</pkg> library</flag>
 		<flag name="gdal">Enable support for <pkg>sci-libs/gdal</pkg> library</flag>

diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
new file mode 100644
index 00000000000..1f0f59ca8e4
--- /dev/null
+++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenSceneGraph"
+MY_P=${MY_PN}-${PV}
+WX_GTK_VER="3.0"
+inherit cmake-utils flag-o-matic wxwidgets
+
+DESCRIPTION="Open source high performance 3D graphics toolkit"
+HOMEPAGE="http://www.openscenegraph.org/"
+SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz"
+
+LICENSE="wxWinLL-3 LGPL-2.1"
+SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION
+KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="asio curl dicom debug doc egl examples ffmpeg fltk fox gdal gif glut
+gstreamer gtk jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2
+svg tiff truetype vnc wxwidgets xrandr +zlib"
+
+REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )"
+
+# TODO: COLLADA, FBX, GTA, NVTT, OpenVRML, Performer
+BDEPEND="
+	app-arch/unzip
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	media-libs/mesa[egl?]
+	virtual/glu
+	virtual/opengl
+	x11-libs/libSM
+	x11-libs/libXext
+	asio? ( dev-cpp/asio )
+	curl? ( net-misc/curl )
+	examples? (
+		fltk? ( x11-libs/fltk:1[opengl] )
+		fox? ( x11-libs/fox:1.6[opengl] )
+		glut? ( media-libs/freeglut )
+		gtk? ( x11-libs/gtkglext )
+		sdl2? ( media-libs/libsdl2 )
+		wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] )
+	)
+	ffmpeg? (
+		libav? ( media-video/libav:0= )
+		!libav? ( media-video/ffmpeg:0= )
+	)
+	gdal? ( sci-libs/gdal:= )
+	gif? ( media-libs/giflib:= )
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	jpeg? ( virtual/jpeg:0 )
+	las? ( >=sci-geosciences/liblas-1.8.0 )
+	lua? ( >=dev-lang/lua-5.1.5:* )
+	openexr? (
+		media-libs/ilmbase:=
+		media-libs/openexr:=
+	)
+	openinventor? ( media-libs/coin )
+	pdf? ( app-text/poppler[cairo] )
+	png? ( media-libs/libpng:0= )
+	sdl? ( media-libs/libsdl )
+	svg? (
+		gnome-base/librsvg
+		x11-libs/cairo
+	)
+	tiff? ( media-libs/tiff:0 )
+	truetype? ( media-libs/freetype:2 )
+	vnc? ( net-libs/libvncserver )
+	xrandr? ( x11-libs/libXrandr )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+"
+
+S="${WORKDIR}/${MY_PN}-${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.3-cmake.patch
+	"${FILESDIR}"/${PN}-3.6.3-docdir.patch
+)
+
+src_configure() {
+	if use examples && use wxwidgets; then
+		need-wxwidgets unicode
+	fi
+
+	# Needed by FFmpeg
+	append-cppflags -D__STDC_CONSTANT_MACROS
+
+	local libdir=$(get_libdir)
+	local mycmakeargs=(
+		-DDYNAMIC_OPENSCENEGRAPH=ON
+		-DLIB_POSTFIX=${libdir/lib}
+		-DOPENGL_PROFILE=GL2 #GL1 GL2 GL3 GLES1 GLES3 GLES3
+		-DOSG_ENVVAR_SUPPORTED=ON
+		-DOSG_PROVIDE_READFILE=ON
+		-DOSG_USE_LOCAL_LUA_SOURCE=OFF
+		$(cmake-utils_use_find_package asio Asio)
+		$(cmake-utils_use_find_package curl CURL)
+		-DBUILD_DOCUMENTATION=$(usex doc)
+		$(cmake-utils_use_find_package dicom DCMTK)
+		$(cmake-utils_use_find_package egl EGL)
+		-DBUILD_OSG_EXAMPLES=$(usex examples)
+		$(cmake-utils_use_find_package ffmpeg FFmpeg)
+		$(cmake-utils_use_find_package gdal GDAL)
+		$(cmake-utils_use_find_package gif GIFLIB)
+		$(cmake-utils_use_find_package gstreamer GLIB)
+		$(cmake-utils_use_find_package gstreamer GStreamer)
+		$(cmake-utils_use_find_package gtk GtkGl)
+		$(cmake-utils_use_find_package jpeg JPEG)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON
+		$(cmake-utils_use_find_package las LIBLAS)
+		$(cmake-utils_use_find_package lua Lua51)
+		-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_OpenCascade=ON
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package openinventor Inventor)
+		-DBUILD_OSG_APPLICATIONS=$(usex osgapps)
+		$(cmake-utils_use_find_package pdf Poppler-glib)
+		$(cmake-utils_use_find_package png PNG)
+		$(cmake-utils_use_find_package sdl SDL)
+		$(cmake-utils_use_find_package sdl2 SDL2)
+		$(cmake-utils_use_find_package svg RSVG)
+		$(cmake-utils_use_find_package tiff TIFF)
+		$(cmake-utils_use_find_package truetype Freetype)
+		$(cmake-utils_use_find_package vnc LibVNCServer)
+		-DOSGVIEWER_USE_XRANDR=$(usex xrandr)
+		$(cmake-utils_use_find_package zlib ZLIB)
+	)
+	if use examples; then
+		mycmakeargs+=(
+			$(cmake-utils_use_find_package fltk FLTK)
+			$(cmake-utils_use_find_package fox FOX)
+			$(cmake-utils_use_find_package glut GLUT)
+			$(cmake-utils_use_find_package wxwidgets wxWidgets)
+		)
+	fi
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile
+	use doc && cmake-utils_src_compile doc_openscenegraph doc_openthreads
+}