reavertm    15/06/06 03:28:39

  Modified:             openscenegraph-3.2.1.ebuild ChangeLog
  Log:
  Properly handle USE=qt4, fixes bug 550206.
  
  (Portage version: 2.2.20/cvs/Linux x86_64, signed Manifest commit with key 
B1E955DB)

Revision  Changes    Path
1.5                  dev-games/openscenegraph/openscenegraph-3.2.1.ebuild

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild?rev=1.5&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild?rev=1.5&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild?r1=1.4&r2=1.5

Index: openscenegraph-3.2.1.ebuild
===================================================================
RCS file: 
/var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- openscenegraph-3.2.1.ebuild 21 Feb 2015 12:02:44 -0000      1.4
+++ openscenegraph-3.2.1.ebuild 6 Jun 2015 03:28:39 -0000       1.5
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: 
/var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild,v 
1.4 2015/02/21 12:02:44 ago Exp $
+# $Header: 
/var/cvsroot/gentoo-x86/dev-games/openscenegraph/openscenegraph-3.2.1.ebuild,v 
1.5 2015/06/06 03:28:39 reavertm Exp $
 
 EAPI=5
 
@@ -33,11 +33,6 @@
                fox? ( x11-libs/fox:1.6[opengl] )
                glut? ( media-libs/freeglut )
                gtk? ( x11-libs/gtkglext )
-               qt4? (
-                       dev-qt/qtcore:4
-                       dev-qt/qtgui:4
-                       dev-qt/qtopengl:4
-               )
                sdl? ( media-libs/libsdl )
                wxwidgets? ( x11-libs/wxGTK[opengl,X] )
        )
@@ -53,6 +48,11 @@
        openinventor? ( media-libs/coin )
        pdf? ( app-text/poppler[cairo] )
        png? ( media-libs/libpng:0 )
+       qt4? (
+               dev-qt/qtcore:4
+               dev-qt/qtgui:4
+               dev-qt/qtopengl:4
+       )
        svg? (
                gnome-base/librsvg
                x11-libs/cairo
@@ -90,6 +90,7 @@
        append-cppflags -D__STDC_CONSTANT_MACROS
 
        mycmakeargs=(
+               -DDESIRED_QT_VERSION=4
                -DDYNAMIC_OPENSCENEGRAPH=ON
                -DWITH_ITK=OFF
                -DGENTOO_DOCDIR="/usr/share/doc/${PF}"
@@ -111,7 +112,7 @@
                $(cmake-utils_use_with openinventor Inventor)
                $(cmake-utils_use_with pdf Poppler-glib)
                $(cmake-utils_use_with png)
-               $(cmake-utils_use_with qt4)
+               $(cmake-utils_use qt4 OSG_USE_QT)
                $(cmake-utils_use_with sdl)
                $(cmake-utils_use_with svg rsvg)
                $(cmake-utils_use_with tiff)



1.62                 dev-games/openscenegraph/ChangeLog

file : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/ChangeLog?rev=1.62&view=markup
plain: 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/ChangeLog?rev=1.62&content-type=text/plain
diff : 
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-games/openscenegraph/ChangeLog?r1=1.61&r2=1.62

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v
retrieving revision 1.61
retrieving revision 1.62
diff -u -r1.61 -r1.62
--- ChangeLog   21 Feb 2015 12:02:44 -0000      1.61
+++ ChangeLog   6 Jun 2015 03:28:39 -0000       1.62
@@ -1,6 +1,10 @@
 # ChangeLog for dev-games/openscenegraph
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.61 
2015/02/21 12:02:44 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-games/openscenegraph/ChangeLog,v 1.62 
2015/06/06 03:28:39 reavertm Exp $
+
+  06 Jun 2015; Maciej Mrozowski <[email protected]>
+  files/openscenegraph-3.2.1-cmake.patch, openscenegraph-3.2.1.ebuild:
+  Properly handle USE=qt4, fixes bug 550206.
 
   21 Feb 2015; Agostino Sarubbo <[email protected]> openscenegraph-3.2.1.ebuild:
   Stable for ppc, wrt bug #526372




Reply via email to