| 1 |
commit: 2e20f68543c8c5fb387d783c40437a721c4624ed |
| 2 |
Author: David Seifert <soap <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Aug 28 08:18:34 2019 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Aug 28 08:18:34 2019 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e20f685 |
| 7 |
|
| 8 |
dev-games/openscenegraph: [QA] Remove media-libs/jasper dep |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/689784 |
| 11 |
Closes: https://github.com/gentoo/gentoo/pull/12440 |
| 12 |
Package-Manager: Portage-2.3.68, Repoman-2.3.16 |
| 13 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-games/openscenegraph/openscenegraph-3.5.5.ebuild | 7 +++---- |
| 16 |
dev-games/openscenegraph/openscenegraph-3.6.3.ebuild | 7 +++---- |
| 17 |
2 files changed, 6 insertions(+), 8 deletions(-) |
| 18 |
|
| 19 |
diff --git a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild |
| 20 |
index 7b066c0abf2..29582ffe909 100644 |
| 21 |
--- a/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild |
| 22 |
+++ b/dev-games/openscenegraph/openscenegraph-3.5.5.ebuild |
| 23 |
@@ -1,4 +1,4 @@ |
| 24 |
-# Copyright 1999-2018 Gentoo Foundation |
| 25 |
+# Copyright 1999-2019 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -17,7 +17,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" |
| 30 |
SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION |
| 31 |
KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86" |
| 32 |
IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg |
| 33 |
-jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff |
| 34 |
+las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff |
| 35 |
truetype vnc wxwidgets xine xrandr zlib" |
| 36 |
|
| 37 |
REQUIRED_USE="sdl2? ( sdl )" |
| 38 |
@@ -49,7 +49,6 @@ RDEPEND=" |
| 39 |
media-libs/gst-plugins-base:1.0 |
| 40 |
) |
| 41 |
jpeg? ( virtual/jpeg:0 ) |
| 42 |
- jpeg2k? ( media-libs/jasper:= ) |
| 43 |
las? ( >=sci-geosciences/liblas-1.8.0 ) |
| 44 |
lua? ( >=dev-lang/lua-5.1.5:* ) |
| 45 |
openexr? ( |
| 46 |
@@ -112,7 +111,7 @@ src_configure() { |
| 47 |
-DWITH_GLIB=$(usex gstreamer) |
| 48 |
-DWITH_GtkGl=$(usex gtk) |
| 49 |
-DWITH_JPEG=$(usex jpeg) |
| 50 |
- -DWITH_Jasper=$(usex jpeg2k) |
| 51 |
+ -DWITH_Jasper=OFF |
| 52 |
-DWITH_LIBLAS=$(usex las) |
| 53 |
-DWITH_Lua=$(usex lua) |
| 54 |
-DWITH_OpenEXR=$(usex openexr) |
| 55 |
|
| 56 |
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild |
| 57 |
index b1bbf9578d9..995535e2ff3 100644 |
| 58 |
--- a/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild |
| 59 |
+++ b/dev-games/openscenegraph/openscenegraph-3.6.3.ebuild |
| 60 |
@@ -1,4 +1,4 @@ |
| 61 |
-# Copyright 1999-2018 Gentoo Authors |
| 62 |
+# Copyright 1999-2019 Gentoo Authors |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
EAPI=6 |
| 66 |
@@ -16,7 +16,7 @@ LICENSE="wxWinLL-3 LGPL-2.1" |
| 67 |
SLOT="0/158" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION |
| 68 |
KEYWORDS="~amd64 ~hppa ~ia64 ~ppc ~ppc64 ~x86" |
| 69 |
IUSE="asio curl debug doc egl examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg |
| 70 |
-jpeg2k las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff |
| 71 |
+las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff |
| 72 |
truetype vnc wxwidgets xrandr zlib" |
| 73 |
|
| 74 |
REQUIRED_USE="sdl2? ( sdl )" |
| 75 |
@@ -49,7 +49,6 @@ RDEPEND=" |
| 76 |
media-libs/gst-plugins-base:1.0 |
| 77 |
) |
| 78 |
jpeg? ( virtual/jpeg:0 ) |
| 79 |
- jpeg2k? ( media-libs/jasper:= ) |
| 80 |
las? ( >=sci-geosciences/liblas-1.8.0 ) |
| 81 |
lua? ( >=dev-lang/lua-5.1.5:* ) |
| 82 |
openexr? ( |
| 83 |
@@ -114,7 +113,7 @@ src_configure() { |
| 84 |
$(cmake-utils_use_find_package gstreamer GStreamer) |
| 85 |
$(cmake-utils_use_find_package gtk GtkGl) |
| 86 |
$(cmake-utils_use_find_package jpeg JPEG) |
| 87 |
- $(cmake-utils_use_find_package jpeg2k Jasper) |
| 88 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON |
| 89 |
$(cmake-utils_use_find_package las LIBLAS) |
| 90 |
$(cmake-utils_use_find_package lua Lua51) |
| 91 |
-DCMAKE_DISABLE_FIND_PACKAGE_Lua52=ON |
Archives