diff options
author | David Seifert <soap@gentoo.org> | 2019-08-28 10:18:34 +0200 |
---|---|---|
committer | David Seifert <soap@gentoo.org> | 2019-08-28 10:18:34 +0200 |
commit | 2e20f68543c8c5fb387d783c40437a721c4624ed (patch) | |
tree | b81c11ed6d8214ccd627534f4446310debb3d236 /dev-games/openscenegraph | |
parent | app-cdr/cdemu-daemon: Fix MissingSlash (diff) | |
download | gentoo-2e20f68543c8c5fb387d783c40437a721c4624ed.tar.gz gentoo-2e20f68543c8c5fb387d783c40437a721c4624ed.tar.bz2 gentoo-2e20f68543c8c5fb387d783c40437a721c4624ed.zip |
dev-games/openscenegraph: [QA] Remove media-libs/jasper dep
Bug: https://bugs.gentoo.org/689784
Closes: https://github.com/gentoo/gentoo/pull/12440
Package-Manager: Portage-2.3.68, Repoman-2.3.16
Signed-off-by: David Seifert <soap@gentoo.org>
Diffstat (limited to 'dev-games/openscenegraph')
-rw-r--r-- | dev-games/openscenegraph/openscenegraph-3.5.5.ebuild | 7 | ||||
-rw-r--r-- | dev-games/openscenegraph/openscenegraph-3.6.3.ebuild | 7 |
2 files changed, 6 insertions, 8 deletions
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild index 7b066c0abf2c..29582ffe9098 100644 --- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Foundation +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -17,7 +17,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86" IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg -jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff +las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xine xrandr zlib" REQUIRED_USE="sdl2? ( sdl )" @@ -49,7 +49,6 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( @@ -112,7 +111,7 @@ src_configure() { -DWITH_GLIB=$(usex gstreamer) -DWITH_GtkGl=$(usex gtk) -DWITH_JPEG=$(usex jpeg) - -DWITH_Jasper=$(usex jpeg2k) + -DWITH_Jasper=OFF -DWITH_LIBLAS=$(usex las) -DWITH_Lua=$(usex lua) -DWITH_OpenEXR=$(usex openexr) diff --git a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild index b1bbf9578d9a..995535e2ff3c 100644 --- a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild +++ b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2019 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -16,7 +16,7 @@ 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 debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg -jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff +las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff truetype vnc wxwidgets xrandr zlib" REQUIRED_USE="sdl2? ( sdl )" @@ -49,7 +49,6 @@ RDEPEND=" media-libs/gst-plugins-base:1.0 ) jpeg? ( virtual/jpeg:0 ) - jpeg2k? ( media-libs/jasper:= ) las? ( >=sci-geosciences/liblas-1.8.0 ) lua? ( >=dev-lang/lua-5.1.5:* ) openexr? ( @@ -114,7 +113,7 @@ src_configure() { $(cmake-utils_use_find_package gstreamer GStreamer) $(cmake-utils_use_find_package gtk GtkGl) $(cmake-utils_use_find_package jpeg JPEG) - $(cmake-utils_use_find_package jpeg2k Jasper) + -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 |