Add upstream patch to fix build with gles enabled and opengl disabled by Michael Palimaka <kensington@astralcloak.net>, fixes bug #411475.

Package-Manager: portage-2.2.0_alpha100/cvs/Linux i686

5 files changed, 113 insertions, 13 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 48913ecfa654..1dc849755ef8 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.270 2012/04/04 23:59:14 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.271 2012/04/14 19:36:28 johu Exp $
+
+  14 Apr 2012; Johannes Huber <johu@gentoo.org>
+  +files/kwin-4.8.1-fix-opengl-disabled-build.patch, kwin-4.8.1.ebuild,
+  kwin-4.8.2.ebuild:
+  Add upstream patch to fix build with gles enabled and opengl disabled by
+  Michael Palimaka <kensington@astralcloak.net>, fixes bug #411475.
 
 *kwin-4.8.2 (04 Apr 2012)
 
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index 21bf49cc9cb6..ae8a761c1365 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -2,22 +2,23 @@
 Hash: SHA512
 
 AUX kwin-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
+AUX kwin-4.8.1-fix-opengl-disabled-build.patch 4083 RMD160 2930e8882a5b3ad97a41c072aeffa31f08b149b2 SHA1 6dc879e4ea6f9547b97a43ace7dadec2c8483b8c SHA256 a1106c04eb346a636922aa5bb9c50823dfa674b74b377f63b0ebc4f7f686c7d9
 DIST kde-workspace-4.7.4.tar.bz2 20557567 RMD160 94f1a36b3881276663a559a57dbd210d50ede06b SHA1 b7810ba13f6f2a1c4783b153ad9349a1dd27b495 SHA256 175cdc6a72e89b3b0f859fd06712947f485aecf507896f637e49f3dbac4d43b6
 DIST kde-workspace-4.8.1.tar.xz 33575180 RMD160 e10ff44ca7281bb89b87441d10c68aa2234db9c0 SHA1 675df4befd736e770e3029af8d38800c9018e888 SHA256 d8d15fb8ea47f4424ba97f252a79fb486794848dbe58417d2137ab466deff4b3
 DIST kde-workspace-4.8.2.tar.xz 34081864 RMD160 3afa0b2bb7b037cadee947382b009a76c8fad843 SHA1 3cd36ed633def0db74ad872a0d6385bf06662121 SHA256 ad3bb23ee86cca96be608a856420f45ac636dc89405c9c6cd32d2b85e4b09928
 EBUILD kwin-4.7.4.ebuild 1690 RMD160 34a673573cbc95bd67e6961e3c81c05487559240 SHA1 ba826eb65ae48e5fb46df6794d5a2d9b6a96cf44 SHA256 505b58989145d9614e1448e61518dbf4b65a958e4fff9bbe1f2f5fcd54d77630
-EBUILD kwin-4.8.1.ebuild 1731 RMD160 c8075581a113569f8a823d9f3dce92700293186d SHA1 2e90f0a4337cf9cacfc6d963531e198a4bd2bf54 SHA256 984133119a775fead30c72eba28bc37ed4819c26d4aa7432bb422ad4ef87e912
-EBUILD kwin-4.8.2.ebuild 1733 RMD160 ab9c225d2857c18f9f1fa0e8b4fac6cfffbebda2 SHA1 c84d03b15a23215aa82f8c4a2f67b4bb2520e58d SHA256 ecfc6c302ba2b67bc0ff5ad71bad6628a584dddb9f31b2234b9ce420504f0877
-MISC ChangeLog 33149 RMD160 b85c9a1d71ad6a512e1fc2a590de9ef33486d4b9 SHA1 71025f7ea50da285a075d4b923e9e7dd67b003a3 SHA256 f25dcb46e2f10012ca450cf59f357c0bc7cd383a18b25cf642bb5ddf3b69d6cb
+EBUILD kwin-4.8.1.ebuild 1791 RMD160 3acb710b58a97a0cc07e36da52f7a3375d1af254 SHA1 7a5749950e89fe1241f845b73210ef5f42b947ab SHA256 9cb811877bdcf5dc3332df8c67bd5eea107b388b3861e5033e77a0a3c3d60b1e
+EBUILD kwin-4.8.2.ebuild 1792 RMD160 9a8199ce53ef56eacedb37f54014c0acddeb5403 SHA1 010a2a5857609dab1d8ae7a7dbd3a8c3d86bea63 SHA256 2feca064fc8c604b758b76fbf63cd5d9bc0724cbf0f65a7dfa69b742c7667e0a
+MISC ChangeLog 33434 RMD160 42dd1eccc311f9e6c09519ea284412b6adf336ce SHA1 3877e5b3ab1f183c0885cc7c60c452a6df1ea74b SHA256 aa14898b6d59293c8f9028bbd459f80ddd86f8e5bd72b5424340c60e7669b720
 MISC metadata.xml 229 RMD160 24787dda60325ca5ed6c320b09effa57d9b2f45b SHA1 98698ac5e37a3ed20414deb0de4eb70da74a2add SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJPfOJ7AAoJEO+t9ga+3I3amz8IANFQRMxohbY/zn3i/BirQbpe
-Y3h5DoawxLD8kfqWu1Cw1+IJSgNCoK8VtWNlglMFAuqcSKb4E5Sk9pX07nTFiCyb
-Xq6Bhoat6cngnITSCodFNxrbs4JDqFzNKG61l4v8OpBuCdJ+NP8AEm9xj0k+18/z
-XrmcgHdiwqb98Io3CsXa3zcLJ2jefFDN+CyVTUbKbIcsMbPwvDVx46WDnad3eWUb
-d1YdK54OtgN9C81mjBCjWIsfeL6pVFYbUFuTp4RcPLbYDbuHUYU8OXZKLyQsr3yy
-5qdUMrAt9eE0ml6ITeEg36hrl4AstP2j3IY1yRfdMgY4Utq8Ltp6azvUVE+seEY=
-=MYho
+iQEcBAEBCgAGBQJPidHvAAoJEO+t9ga+3I3a77EIAKgBotI+sB5UJUwRlUzvI6Dk
+LmmdZscCxOYSrZbyRGklEdJGcvUp+R8g5MlcC99oK9IQyNm/si+hTB0aLy5VTwTF
+jEj+Fb9FxnG9ViUzD5k7iuedqfhyt6KSR1LGMCFsL8wER4e0NiEsjLT8pHhU83vZ
+Wzq43Ftt0GNrxbdEEkLLNLHOfCSVjDdUB9PvqQV/gkNE/Ru0Dc8m0BKRq6wlWWXB
+9BK3l8wHiCzopdDrpZs84MebOz89GqhBKD91Xu72u+nI4QkXltw7ztEX8XMEvnwq
+lpt3jHW5kDVRtvJ8HeZEHJ5Klu4Wky2fl2N+e/uc3yYDGgPPcrq6c0nBYq9k03Q=
+=KKiV
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch b/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch
new file mode 100644
index 000000000000..a44ee077a93c
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.8.1-fix-opengl-disabled-build.patch
@@ -0,0 +1,91 @@
+From 1554ba408633397066d31c3d565c217b5a385fb8 Mon Sep 17 00:00:00 2001
+From: Michael Palimaka <kensington@astralcloak.net>
+Date: Sun, 15 Apr 2012 04:55:03 +1000
+Subject: [PATCH] Fix KWin build failure when OpenGL is disabled and OpenGLES
+ is enabled.
+
+Some old restructuring caused -DKWIN_HAVE_OPENGLES to no longer be
+passed to the compiler, causing OpenGL-specific code to be built
+while the libraries to link it were not available.
+
+REVIEW: 104558
+---
+ kwin/effects/CMakeLists.txt                 |    4 ++--
+ kwin/kcmkwin/kwincompositing/CMakeLists.txt |    8 ++++----
+ kwin/kcmkwin/kwinscreenedges/CMakeLists.txt |    8 ++++----
+ 3 files changed, 10 insertions(+), 10 deletions(-)
+
+diff --git a/kwin/effects/CMakeLists.txt b/kwin/effects/CMakeLists.txt
+index a9eea1d..88c8b32 100644
+--- a/kwin/effects/CMakeLists.txt
++++ b/kwin/effects/CMakeLists.txt
+@@ -113,9 +113,9 @@ if( NOT KWIN_MOBILE_EFFECTS )
+     include( windowgeometry/CMakeLists.txt )
+     include( zoom/CMakeLists.txt )
+ 
+-    if( NOT KWIN_HAVE_OPENGLES_COMPOSITING )
++    if( NOT OPENGLES_FOUND )
+     include( logout/CMakeLists.txt )
+-    endif( NOT KWIN_HAVE_OPENGLES_COMPOSITING )
++    endif( NOT OPENGLES_FOUND )
+ endif( NOT KWIN_MOBILE_EFFECTS )
+ 
+ # OpenGL-specific effects
+diff --git a/kwin/kcmkwin/kwincompositing/CMakeLists.txt b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
+index 2d420c0..decc6b7 100644
+--- a/kwin/kcmkwin/kwincompositing/CMakeLists.txt
++++ b/kwin/kcmkwin/kwincompositing/CMakeLists.txt
+@@ -18,7 +18,7 @@ target_link_libraries(kcm_kwincompositing ${KDE4_KCMUTILS_LIBS} ${KDE4_KDEUI_LIB
+ install(TARGETS kcm_kwincompositing  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+ # CompositingPrefs uses OpenGL
+-if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
++if(OPENGL_FOUND)
+   target_link_libraries(kcm_kwincompositing kwinglutils ${OPENGL_gl_LIBRARY})
+   set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
+   # -ldl used by OpenGL code
+@@ -26,11 +26,11 @@ if(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
+   if (DL_LIBRARY)
+     target_link_libraries(kcm_kwincompositing ${DL_LIBRARY})
+   endif(DL_LIBRARY)
+-endif(OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING)
+-if(KWIN_HAVE_OPENGLES_COMPOSITING)
++endif(OPENGL_FOUND)
++if(OPENGLES_FOUND)
+   target_link_libraries(kcm_kwincompositing kwinglesutils ${OPENGLES_LIBRARIES})
+   set_target_properties(kcm_kwincompositing PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
+-endif(KWIN_HAVE_OPENGLES_COMPOSITING)
++endif(OPENGLES_FOUND)
+ if (X11_Xrender_FOUND)
+   target_link_libraries(kcm_kwincompositing ${X11_Xrender_LIB})
+ endif (X11_Xrender_FOUND)
+diff --git a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
+index 2827350..cecff7c 100644
+--- a/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
++++ b/kwin/kcmkwin/kwinscreenedges/CMakeLists.txt
+@@ -14,7 +14,7 @@ target_link_libraries( kcm_kwinscreenedges ${X11_LIBRARIES} kworkspace ${KDE4_PL
+ install( TARGETS kcm_kwinscreenedges  DESTINATION ${PLUGIN_INSTALL_DIR} )
+ 
+ # CompositingPrefs uses OpenGL
+-if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
++if( OPENGL_FOUND )
+   target_link_libraries( kcm_kwinscreenedges kwinglutils ${OPENGL_gl_LIBRARY} )
+   set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS -DKWIN_HAVE_OPENGL)
+ # -ldl used by OpenGL code
+@@ -22,11 +22,11 @@ if( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
+   if( DL_LIBRARY )
+     target_link_libraries( kcm_kwinscreenedges ${DL_LIBRARY} )
+   endif( DL_LIBRARY )
+-endif( OPENGL_FOUND AND NOT KWIN_HAVE_OPENGLES_COMPOSITING )
+-if(KWIN_HAVE_OPENGLES_COMPOSITING)
++endif( OPENGL_FOUND )
++if(OPENGLES_FOUND)
+   target_link_libraries(kcm_kwinscreenedges kwinglesutils ${OPENGLES_LIBRARIES})
+   set_target_properties(kcm_kwinscreenedges PROPERTIES COMPILE_FLAGS "-DKWIN_HAVE_OPENGL -DKWIN_HAVE_OPENGLES")
+-endif(KWIN_HAVE_OPENGLES_COMPOSITING)
++endif(OPENGLES_FOUND)
+ if( X11_Xrender_FOUND )
+   target_link_libraries( kcm_kwinscreenedges ${X11_Xrender_LIB} )
+ endif( X11_Xrender_FOUND )
+-- 
+1.7.10
\ No newline at end of file
diff --git a/kde-base/kwin/kwin-4.8.1.ebuild b/kde-base/kwin/kwin-4.8.1.ebuild
index 1b16c73accbe..1d5b1c463554 100644
--- a/kde-base/kwin/kwin-4.8.1.ebuild
+++ b/kde-base/kwin/kwin-4.8.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild,v 1.4 2012/04/04 19:03:15 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.1.ebuild,v 1.5 2012/04/14 19:36:28 johu Exp $
 
 EAPI=4
 
@@ -50,6 +50,7 @@ KMEXTRACTONLY="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.8.1-fix-opengl-disabled-build.patch"
 )
 
 # you need one of these
diff --git a/kde-base/kwin/kwin-4.8.2.ebuild b/kde-base/kwin/kwin-4.8.2.ebuild
index 16f327e002bc..e0d994c21d57 100644
--- a/kde-base/kwin/kwin-4.8.2.ebuild
+++ b/kde-base/kwin/kwin-4.8.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.2.ebuild,v 1.1 2012/04/04 23:59:14 johu Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.8.2.ebuild,v 1.2 2012/04/14 19:36:28 johu Exp $
 
 EAPI=4
 
@@ -50,6 +50,7 @@ KMEXTRACTONLY="
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.8.1-fix-opengl-disabled-build.patch"
 )
 
 # you need one of these