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

List:       kde-commits
Subject:    =?utf-8?q?=5Bkdelibs=5D_/=3A_Remove_direct_OpenGL_dependency_for?=
From:       Jammy Zhou <jammy.zhou () linaro ! org>
Date:       2011-03-01 1:18:48
Message-ID: 20110301011848.EA7A3A60C9 () git ! kde ! org
[Download RAW message or body]

Git commit 46b3025245ee6b22cfa8d2a898756f5c075d822e by Jammy Zhou.
Committed on 25/02/2011 at 04:25.
Pushed by jammyzhou into branch 'master'.

Remove direct OpenGL dependency for libplasma

M  +0    -3    CMakeLists.txt     
M  +2    -2    includes/CMakeLists.txt     
M  +7    -14   plasma/CMakeLists.txt     
M  +0    -4    plasma/glapplet.cpp     

http://commits.kde.org/kdelibs/46b3025245ee6b22cfa8d2a898756f5c075d822e

diff --git a/CMakeLists.txt b/CMakeLists.txt
index b8d53de..482225b 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -111,9 +111,6 @@ macro_log_feature(OPENSSL_FOUND "OpenSSL" "Support for secure \
network communicat  macro_optional_find_package(Libintl)
 macro_log_feature(LIBINTL_FOUND "Libintl" "Support for multiple languages" \
"http://www.gnu.org/software/gettext" FALSE "" "STRONGLY RECOMMENDED: Enables KDE to \
be available in many different languages")  
-macro_optional_find_package(OpenGL)
-macro_log_feature(OPENGL_FOUND "OpenGL" "Support for hardware-accelerated graphics" \
"http://mesa3d.sourceforge.net" FALSE "" "STRONGLY RECOMMENDED: The 3D hardware \
acceleration available through the OpenGL API is used in applications ranging from \
                graphics and modellers to screensavers and video players")
-
 set(SOPRANO_MIN_VERSION "2.5.60")
 macro_optional_find_package(Soprano ${SOPRANO_MIN_VERSION} COMPONENTS \
PLUGIN_RAPTORPARSER PLUGIN_REDLANDBACKEND)  macro_log_feature(SOPRANO_FOUND "Soprano" \
"Support for the Nepomuk semantic desktop system" "http://soprano.sourceforge.net" \
                FALSE "${SOPRANO_MIN_VERSION}" "")
diff --git a/includes/CMakeLists.txt b/includes/CMakeLists.txt
index 9954c37..9e3f461 100644
--- a/includes/CMakeLists.txt
+++ b/includes/CMakeLists.txt
@@ -1097,11 +1097,11 @@ install(FILES
   Plasma/VideoWidget
 DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma COMPONENT Devel)
 
-if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+if(QT_QTOPENGL_FOUND)
    install(FILES
       Plasma/GLApplet
       DESTINATION ${INCLUDE_INSTALL_DIR}/KDE/Plasma COMPONENT Devel)
-endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+endif(QT_QTOPENGL_FOUND)
 
 if(NOT KDE_NO_DEPRECATED)
 install( FILES
diff --git a/plasma/CMakeLists.txt b/plasma/CMakeLists.txt
index 8e6b0d7..ef45635 100644
--- a/plasma/CMakeLists.txt
+++ b/plasma/CMakeLists.txt
@@ -46,13 +46,6 @@ if(QCA2_FOUND)
 endif(QCA2_FOUND)
 configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config-plasma.h.cmake \
${CMAKE_CURRENT_BINARY_DIR}/config-plasma.h)  
-if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
-    # libGL needs dlopen() and friends from the dl library
-    find_library(DL_LIBRARY dl)
-    mark_as_advanced(DL_LIBRARY)
-    include_directories(${OPENGL_INCLUDE_DIR})
-endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
-
 add_subdirectory(tests)
 add_definitions(-DKDE_DEFAULT_DEBUG_AREA=1209)
 
@@ -232,12 +225,12 @@ kde4_add_ui_files(plasma_LIB_SRCS
 #   TEST_INCLUDES
 #)
 
-if(QT_QTOPENGL_FOUND AND OPENGL_FOUND AND OPENGL_GLU_FOUND)
+if (QT_QTOPENGL_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 AND OPENGL_GLU_FOUND)
+endif(QT_QTOPENGL_FOUND)
 
 if (PHONON_FOUND)
     message(STATUS "Adding support for Phonon to libplasma")
@@ -269,9 +262,9 @@ if(DL_LIBRARY)
     target_link_libraries(plasma ${DL_LIBRARY})
 endif(DL_LIBRARY)
 
-if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
-    target_link_libraries(plasma ${QT_QTOPENGL_LIBRARY} ${OPENGL_gl_LIBRARY})
-endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+if(QT_QTOPENGL_FOUND)
+    target_link_libraries(plasma ${QT_QTOPENGL_LIBRARY})
+endif(QT_QTOPENGL_FOUND)
 
 target_link_libraries(plasma LINK_INTERFACE_LIBRARIES kdeui kdecore \
${QT_QTGUI_LIBRARY})  
@@ -352,11 +345,11 @@ if(NOT KDE_NO_DEPRECATED)
 endif(NOT KDE_NO_DEPRECATED)
 
 
-if(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+if(QT_QTOPENGL_FOUND)
     set(plasma_LIB_INCLUDES
         ${plasma_LIB_INCLUDES}
         glapplet.h)
-endif(QT_QTOPENGL_FOUND AND OPENGL_FOUND)
+endif(QT_QTOPENGL_FOUND)
 
 install(FILES
         ${plasma_LIB_INCLUDES}
diff --git a/plasma/glapplet.cpp b/plasma/glapplet.cpp
index 00d7caf..e55f46a 100644
--- a/plasma/glapplet.cpp
+++ b/plasma/glapplet.cpp
@@ -188,10 +188,6 @@ void GLApplet::paintInterface(QPainter *painter,
     }
     d->pbuf->makeCurrent();
 
-    // handle background filling
-    glClearColor(0, 0, 0, 0);
-    glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
     QMatrix m = painter->worldMatrix();
     QRect deviceRect = m.mapRect(QRect(QPoint(23, 25), \
boundingRect().size().toSize()));  d->updateGlSize(deviceRect.size());


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