Merge lp:~goelkunal/kdelibs/debian into lp:~kubuntu-packagers/kubuntu-packaging/kdelibs

[KunalGoel]

remove direct OpenGL dependency for libplasma

[Steve Langasek (vorlon)]

The patch itself seems to be straightforward, but why are the glClearColor(), glClear() calls not needed here? Presumably they were added for a reason, and we should be sure that reason no longer applies before making such a change.

I see that these API calls are also part of GLES; so if these calls need to be kept, an alternative would be for plasma to select either GL or GLES as needed.

review: Needs Information

[KunalGoel (goelkunal)]

The glClearColor and glClear were used in GLApplet, which is targeted to write plasmoid using OpenGL, but currently the GLApplet is not used anymore in KDE, and there is plan to re-write this part in the future for libplasma2.

For more details please check: https://git.reviewboard.kde.org/r/100705/

[Steve Langasek (vorlon)]

As the upstream discussion shows, even for applets using the GLApplet interface (of which there appear to not be any), these calls should not be needed here. So this change is needed on ARM, and has no adverse affects elsewhere.

review: Approve

[Jonathan Riddell (jr)]

Merged by Harald

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-02-27 13:12:07 +0000
+++ debian/changelog	2011-03-03 01:11:16 +0000
@@ -1,3 +1,10 @@
+kde4libs (4:4.6.1-0ubuntu2) natty; urgency=low
+
+  * Add remove-direct-OpenGL-dependency-for-libplasma.diff
+    to remove direct OpenGL dependency for libplasma 
+
+ -- Kunal Goel <[e-mail]>  Wed, 02 Mar 2011 22:37:31 +0530
+
 kde4libs (4:4.6.1-0ubuntu1) UNRELEASED; urgency=low
 
   * New upstream release

=== added file 'debian/patches/remove-direct-OpenGL-dependency-for-libplasma.diff'
--- debian/patches/remove-direct-OpenGL-dependency-for-libplasma.diff	1970-01-01 00:00:00 +0000
+++ debian/patches/remove-direct-OpenGL-dependency-for-libplasma.diff	2011-03-03 01:11:16 +0000
@@ -0,0 +1,104 @@
+Description: Remove OpenGL dependency 
+ Remove direct OpenGL dependency for libplasma.
+Author: Kunal Goel <[e-mail]>
+Last-Update: 2011-03-01
+
+--- kde4libs-4.6.1.orig/CMakeLists.txt
++++ kde4libs-4.6.1/CMakeLists.txt
+@@ -99,9 +99,6 @@ macro_log_feature(OPENSSL_FOUND "OpenSSL
+ 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}" "")
+--- kde4libs-4.6.1.orig/includes/CMakeLists.txt
++++ kde4libs-4.6.1/includes/CMakeLists.txt
+@@ -1148,11 +1148,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
+--- kde4libs-4.6.1.orig/plasma/glapplet.cpp
++++ kde4libs-4.6.1/plasma/glapplet.cpp
+@@ -188,10 +188,6 @@ void GLApplet::paintInterface(QPainter *
+     }
+     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());
+--- kde4libs-4.6.1.orig/plasma/CMakeLists.txt
++++ kde4libs-4.6.1/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)
+ 
+@@ -231,12 +224,12 @@ kde4_add_ui_files(plasma_LIB_SRCS
+ #   TEST_INCLUDES
+ #)
+ 
+-if(QT_QTOPENGL_FOUND AND OPENGL_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)
++endif(QT_QTOPENGL_FOUND)
+ 
+ if (PHONON_FOUND)
+     message(STATUS "Adding support for Phonon to libplasma")
+@@ -271,9 +264,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})
+ 
+@@ -354,11 +347,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}

=== modified file 'debian/patches/series'
--- debian/patches/series	2011-02-21 15:28:25 +0000
+++ debian/patches/series	2011-03-03 01:11:16 +0000
@@ -27,3 +27,4 @@
 security_01_CVE-2009-2702.diff
 kubuntu_77_ksambashare.diff
 kubuntu_78_hide_old_file_share.diff
+remove-direct-OpenGL-dependency-for-libplasma.diff