| 1 |
commit: cfece1167cece8d8aa2775cb149579804cca4a8f |
| 2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Fri Jan 10 22:38:09 2020 +0000 |
| 4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Jan 10 22:43:40 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cfece116 |
| 7 |
|
| 8 |
dev-games/openscenegraph: Drop USE gtk |
| 9 |
|
| 10 |
Reported-by: David Heidelberg (okias) <david <AT> ixit.cz> |
| 11 |
Closes: https://bugs.gentoo.org/703674 |
| 12 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 13 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
| 14 |
|
| 15 |
dev-games/openscenegraph/openscenegraph-3.5.5.ebuild | 7 +++---- |
| 16 |
dev-games/openscenegraph/openscenegraph-3.6.4.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 29582ffe909..ab15331d995 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-2019 Gentoo Authors |
| 25 |
+# Copyright 1999-2020 Gentoo Authors |
| 26 |
# Distributed under the terms of the GNU General Public License v2 |
| 27 |
|
| 28 |
EAPI=6 |
| 29 |
@@ -16,7 +16,7 @@ SRC_URI="https://github.com/${PN}/${MY_PN}/archive/${MY_P}.tar.gz" |
| 30 |
LICENSE="wxWinLL-3 LGPL-2.1" |
| 31 |
SLOT="0/145" # NOTE: CHECK WHEN BUMPING! Subslot is SOVERSION |
| 32 |
KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 x86" |
| 33 |
-IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer gtk jpeg |
| 34 |
+IUSE="asio curl debug doc examples ffmpeg fltk fox gdal gif glut gstreamer jpeg |
| 35 |
las libav lua openexr openinventor osgapps pdf png sdl sdl2 svg tiff |
| 36 |
truetype vnc wxwidgets xine xrandr zlib" |
| 37 |
|
| 38 |
@@ -34,7 +34,6 @@ RDEPEND=" |
| 39 |
fltk? ( x11-libs/fltk:1[opengl] ) |
| 40 |
fox? ( x11-libs/fox:1.6[opengl] ) |
| 41 |
glut? ( media-libs/freeglut ) |
| 42 |
- gtk? ( x11-libs/gtkglext ) |
| 43 |
sdl2? ( media-libs/libsdl2 ) |
| 44 |
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) |
| 45 |
) |
| 46 |
@@ -109,7 +108,7 @@ src_configure() { |
| 47 |
-DWITH_GIFLIB=$(usex gif) |
| 48 |
-DWITH_GStreamer=$(usex gstreamer) |
| 49 |
-DWITH_GLIB=$(usex gstreamer) |
| 50 |
- -DWITH_GtkGl=$(usex gtk) |
| 51 |
+ -DWITH_GtkGl=OFF |
| 52 |
-DWITH_JPEG=$(usex jpeg) |
| 53 |
-DWITH_Jasper=OFF |
| 54 |
-DWITH_LIBLAS=$(usex las) |
| 55 |
|
| 56 |
diff --git a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild |
| 57 |
index 1e0f1b579dc..2cf82085b9d 100644 |
| 58 |
--- a/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild |
| 59 |
+++ b/dev-games/openscenegraph/openscenegraph-3.6.4.ebuild |
| 60 |
@@ -1,4 +1,4 @@ |
| 61 |
-# Copyright 1999-2019 Gentoo Authors |
| 62 |
+# Copyright 1999-2020 Gentoo Authors |
| 63 |
# Distributed under the terms of the GNU General Public License v2 |
| 64 |
|
| 65 |
EAPI=7 |
| 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 dicom debug doc egl examples ffmpeg fltk fox gdal gif glut |
| 70 |
-gstreamer gtk jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2 |
| 71 |
+gstreamer jpeg las libav lua openexr openinventor osgapps pdf png sdl sdl2 |
| 72 |
svg tiff truetype vnc wxwidgets xrandr +zlib" |
| 73 |
|
| 74 |
REQUIRED_USE="sdl2? ( sdl ) dicom? ( zlib ) openexr? ( zlib )" |
| 75 |
@@ -39,7 +39,6 @@ RDEPEND=" |
| 76 |
fltk? ( x11-libs/fltk:1[opengl] ) |
| 77 |
fox? ( x11-libs/fox:1.6[opengl] ) |
| 78 |
glut? ( media-libs/freeglut ) |
| 79 |
- gtk? ( x11-libs/gtkglext ) |
| 80 |
sdl2? ( media-libs/libsdl2 ) |
| 81 |
wxwidgets? ( x11-libs/wxGTK:${WX_GTK_VER}[opengl,X] ) |
| 82 |
) |
| 83 |
@@ -112,7 +111,7 @@ src_configure() { |
| 84 |
$(cmake_use_find_package gif GIFLIB) |
| 85 |
$(cmake_use_find_package gstreamer GLIB) |
| 86 |
$(cmake_use_find_package gstreamer GStreamer) |
| 87 |
- $(cmake_use_find_package gtk GtkGl) |
| 88 |
+ -DCMAKE_DISABLE_FIND_PACKAGE_GtkGl=ON |
| 89 |
$(cmake_use_find_package jpeg JPEG) |
| 90 |
-DCMAKE_DISABLE_FIND_PACKAGE_Jasper=ON |
| 91 |
$(cmake_use_find_package las LIBLAS) |
Archives