[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE
From:       Andriy Rysin <arysin () gmail ! com>
Date:       2010-12-27 19:12:37
Message-ID: 20101227191237.821F8AC8AD () svn ! kde ! org
[Download RAW message or body]

SVN commit 1209642 by rysin:

Allow kdelibs/kdebase compile without glu library (review 6213)

 M  +2 -0      kdebase/workspace/kwin/compositingprefs.cpp  
 M  +2 -0      kdebase/workspace/kwin/options.cpp  
 M  +2 -2      kdelibs/plasma/CMakeLists.txt  


--- trunk/KDE/kdebase/workspace/kwin/compositingprefs.cpp #1209641:1209642
@@ -241,6 +241,7 @@
 // See http://techbase.kde.org/Projects/KWin/HW for a list of some cards that are known to work.
 void CompositingPrefs::applyDriverSpecificOptions()
     {
+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
     // Always recommend
     mRecommendCompositing = true;
 
@@ -248,6 +249,7 @@
     mStrictBinding = !gl->supports( LooseBinding );
     if ( gl->driver() == Driver_Intel )
         mEnableVSync = false;
+#endif
     }
 
 
--- trunk/KDE/kdebase/workspace/kwin/options.cpp #1209641:1209642
@@ -57,6 +57,7 @@
     int rate = -1;
     if( options->refreshRate > 0 ) // use manually configured refresh rate
         rate = options->refreshRate;
+#ifdef KWIN_HAVE_OPENGL_COMPOSITING
     else if ( GLPlatform::instance()->driver() == Driver_NVidia )
         {
         QProcess nvidia_settings;
@@ -73,6 +74,7 @@
                 rate = qRound(frate);
             }
         }
+#endif
 #ifdef HAVE_XRANDR
     else if( Extensions::randrAvailable() )
         {
--- trunk/KDE/kdelibs/plasma/CMakeLists.txt #1209641:1209642
@@ -231,12 +231,12 @@
 #   TEST_INCLUDES
 #)
 
-if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+if(QT_QTOPENGL_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
     message(STATUS "Adding support for OpenGL applets to libplasma")
     set(plasma_LIB_SRCS
         ${plasma_LIB_SRCS}
         glapplet.cpp)
-endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
 
 if (PHONON_FOUND)
     message(STATUS "Adding support for Phonon to libplasma")
[prev in list] [next in list] [prev in thread] [next in thread]