Fix xcomposite automagic, bug 376785

Package-Manager: portage-2.1.10.11/cvs/Linux x86_64

4 files changed, 106 insertions, 15 deletions

diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 811e9d54e9d6..bfdaa4be8dc5 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for kde-base/kwin
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.236 2011/08/12 19:19:32 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.237 2011/08/15 15:03:04 dilfridge Exp $
+
+*kwin-4.7.0-r1 (15 Aug 2011)
+
+  15 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> +kwin-4.7.0-r1.ebuild,
+  +files/kwin-4.7.0-xcomposite_cmake_automagic.patch:
+  Fix xcomposite automagic, bug 376785
 
   12 Aug 2011; Andreas K. Huettel <dilfridge@gentoo.org> -kwin-4.6.4.ebuild:
   Drop KDE 4.6.4
diff --git a/kde-base/kwin/Manifest b/kde-base/kwin/Manifest
index aec1574a703b..842029ef9560 100644
--- a/kde-base/kwin/Manifest
+++ b/kde-base/kwin/Manifest
@@ -3,29 +3,31 @@ Hash: SHA512
 
 AUX kwin-4.4.2-xinerama_cmake_automagic.patch 923 RMD160 45519a7e51001e6f16cf4bc13f7ef99eeaff793a SHA1 22102eaa95aa07bce19262842fcda69e0bc751f0 SHA256 c1f605148ba9ea606924c934a3b79bb7b415346a3fbe2e7c1732cc6956a44157
 AUX kwin-4.6.3-desktopnames.patch 1110 RMD160 627e919a4836973b0c45512101ebb6d7160a084f SHA1 a5dda38663f4c9bf30a5fc27063158d83a6514af SHA256 7883a5e98075b7366a38c7003a7620b7283f13e2c226c20301e4c8c0a06f06ad
+AUX kwin-4.7.0-xcomposite_cmake_automagic.patch 812 RMD160 aa8c3da2127c5e2ca9e8146321d87d194897eb5d SHA1 58848db2ac7a6484ef842c8494699fa42dead7cb SHA256 cd417576701e45ca7f5906c8fab860b2d7b97b4dd3a7d4f099fd51b3087ba6c4
 AUX kwin-fix-opengl.patch 2039 RMD160 4a0d9a0134083ed87277581e77dd63b4386553fe SHA1 9b6bfca1dded2f878a989e83425faa1c2174adee SHA256 079df31ea30250bae85e693c83d7d67a6d5cf637e6baf13cd421caee7934271a
 DIST kde-workspace-4.7.0.tar.bz2 20049430 RMD160 20520845b336d9485bb2149191ad9f5e6a90824d SHA1 cbc61a20013c746f424681020c29480c6249fd10 SHA256 7e30d1a493b2b8981790a255edf0003bab19bf4dc3e77c37694da495a33a3468
 DIST kdebase-workspace-4.6.3.tar.bz2 69349331 RMD160 ae7928eb7f524564890181a8862e657cf13727f6 SHA1 50103b7752defbab08965b665fa95361bb5b3ff6 SHA256 ab11dbfc48b94a4cb867436d91aa80a3677bdb6e49a6df8cc1c70a4f8dd5868d
 DIST kdebase-workspace-4.6.5.tar.bz2 69241659 RMD160 580bcfe80aeb70dc7c2ef559338a58c41227e476 SHA1 bdcdbf235b3e3941b968f57afd3d490e7ca106e5 SHA256 4df66edf88df327d10d131536e6daebdeae449fb75eebc6bfae67cf3128093c0
 EBUILD kwin-4.6.3-r1.ebuild 1774 RMD160 9407c2e5ab194ad6231f0482b14e616a2e7f4a7b SHA1 4d2720f72d3e14500c8e116f62312e9a721391db SHA256 b06642d5fc28e99122f77c20a691c7ac544df78ecd8a75c7167a094e01a141c0
 EBUILD kwin-4.6.5.ebuild 1733 RMD160 428b4929241065ccab0d1279a7bf3b5b129469b0 SHA1 0bcc95327f0495ce7d4752b2d1efc8b50109d6ca SHA256 f0b79a7e9c2637e5e83a8dc29206df30b58fd20d41abc9921892ed9b612dbb76
+EBUILD kwin-4.7.0-r1.ebuild 1738 RMD160 31473fecbea64cae10b4aa6351f30c70eac3d778 SHA1 48eeed7acce816b6416a2089f09e91dff16743d4 SHA256 57c60aef0ffe3705821eee9c69e9947af12a5b841b52ba180a7b4cb924abba75
 EBUILD kwin-4.7.0.ebuild 1619 RMD160 76045ff039d2022d006fb2868f8d81e3c3df3b66 SHA1 c8b0f6adcfb27a34327d32dd963f9d0f8809ea1d SHA256 81cfffa9ff38fe739359123b87f5b72f9f78a19bef3bd3f91c6d70fe880ebff2
-MISC ChangeLog 28598 RMD160 47a025a830d6f4c8891d32a920f4d9267dced440 SHA1 7adf31f4d7de6ae06927f8f19dccbdbb73ce6d3c SHA256 b1fcc82e6a285e5cbe14af7f903b9c77cc51b7523d2742424d70ffbf576e888a
+MISC ChangeLog 28802 RMD160 85a34f6991ed76934064faeb0a46bc66480d7f82 SHA1 0351c8c864902d50b25e03dbaae6554e9703655c SHA256 f5e5cb11aa59a7248bfdb4ada88274f2a9ea82843f09b98de32539171c7f193e
 MISC metadata.xml 229 RMD160 24787dda60325ca5ed6c320b09effa57d9b2f45b SHA1 98698ac5e37a3ed20414deb0de4eb70da74a2add SHA256 1cd96488355a3e48a2b0b12f09ad8e3ea923e199b4fcbf175590cd317b033af7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJORX0fAAoJENwGBM22xffe114P/2b6hTIzvxJJM1tVYR2/e4BE
-0kSkoAJQBRR89ATkLNjMOTOJ1nJPGjJVXCXjaMA0eaOJnY5WXAob6U6qE80pYCLQ
-LRNk+UtId049+9mwJI7iWjRoc5KAJE4nTJhb+p/TMSfMRbtzuwHGYkb4m2K26PYH
-TVbU3zYUn/cU3EjGGedn5pnk9J3yzjMCuTke5QOb3jogUqYCAlEIjlcsyCaiYfeO
-Mn56Q6R3aGAPtDvvLUCk9qb7uvt2p+oaJoNcmM2BxbYOYXz+w4JTfhLOgPV4Fqa7
-+D9jWZ0/DXmkRuBA+lsKLtpUkAyeKpbcPvR3aMfhyN8BDaGDzL0iIF5f/IEPPr9Q
-JIjy800UhZx95yX2yeQHUa8IGg0juLH7HT9Ka1HiPLNAycYk+j6cBpIpDUGIJ+2K
-rtUfH4PVVRyF13vpEFkEtq8agGFF/c98J6l3VE6s3fp6HQTYf5grzTd0jvzaihvJ
-g1L9hj6QcqOG7nGjmStVbVwEcxpJ4VeqUkNlMRTSth2M8SvWtpUyUVpq9u8H3Tju
-pwKHM8r8G6SyEcXPm6Ppd3IE9GgbOO/8O5WfahaJAR0UYx7ErT6QUZ5hamxJjHcT
-WfE1pW44fK7OHBEcYdQLE7rpJ6TCMNve4KtQXau7+bvaapQBWfS1b8TTytLGddEQ
-1V8PFgmN7JUPWBda4ORq
-=kHAl
+iQIcBAEBCgAGBQJOSTVNAAoJEEb+UGWnxTyHCG4P/0wYPDCf092l6MFnhYWNElmw
+dthLuXrNJi/1Hl+ujeOkbRqv4/WKGOV28z9Dk3Th/AE6egVxERvMQ337joYBMQvo
+iU5edpKFJ47Sn2wS/f6xgtKzhOv3BOyRIjQLGq9yKdfC7VDcGgtCYbVCKAVPP/cn
+jfBh36Zfe73zTxStxa7qJN4ulGR6+XtHTvbL0L28bQO8dBmAO4d9d2hvCd89mdTR
+8btrA2nXrgrRrktkWeV9FPDUQ1MaDhOhJ0K8SmauBOTmLfIANj3FyMFv/IgaoePd
+rvRgcnv6d/q+JH4iJvE28KlSlp+YetshHC/xu8qXWF8AlLdYtPbpIGkRqJ2hN2T2
+EgnAdnB2DhV3cslENoieH18CVojGbJaCZOsAAIgWXn7mq8jWOI1Hfb9IH/x64dKN
+6e0X0bcEtGOT9OUwYUj80W3myDIxkHeJX1DVAvpTP+7DPWCYYAeFLiDpz+Lz5yQ/
+VXSjpDAj3S86bF9iB6vzzIwfNvTTOBnNAPcmFMYUSNH6s29/xlARPjekpcYV3CrG
+RKnlYX+hBQTDFJtH+EifJ4yNrIONeyQ9LmTadrMZQ9n0gXiS8l+TAqGiMmHoIXo3
+LNbQWHP/efgDmbHei69Rf7lHX+CPEeZXhar5y9MjUyRX5AEOl06AjzqPwx5KoPsQ
+Xe0Q9vhS6CcN5xoN2h7N
+=a84h
 -----END PGP SIGNATURE-----
diff --git a/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch
new file mode 100644
index 000000000000..726abe9a5962
--- /dev/null
+++ b/kde-base/kwin/files/kwin-4.7.0-xcomposite_cmake_automagic.patch
@@ -0,0 +1,16 @@
+diff -ruN kwin-4.7.0.orig/ConfigureChecks.cmake kwin-4.7.0/ConfigureChecks.cmake
+--- kwin-4.7.0.orig/ConfigureChecks.cmake	2011-05-20 22:32:06.000000000 +0200
++++ kwin-4.7.0/ConfigureChecks.cmake	2011-08-15 16:56:52.165002024 +0200
+@@ -67,6 +67,12 @@
+ macro_bool_to_01(X11_XShm_FOUND HAVE_XSHM) # kwin, ksplash
+ macro_bool_to_01(X11_XTest_FOUND HAVE_XTEST) # khotkeys, kxkb, kdm
+ macro_bool_to_01(X11_Xcomposite_FOUND HAVE_XCOMPOSITE) # kicker, kwin
++
++if(NOT WITH_X11_Xcomposite)
++  set(X11_Xcomposite_FOUND FALSE)
++  MESSAGE(STATUS "Disabling Xcomposite as requested on commandline.")
++endif(NOT WITH_X11_Xcomposite)
++
+ macro_bool_to_01(X11_Xcursor_FOUND HAVE_XCURSOR) # many uses
+ macro_bool_to_01(X11_Xdamage_FOUND HAVE_XDAMAGE) # kwin
+ macro_bool_to_01(X11_Xfixes_FOUND HAVE_XFIXES) # klipper, kicker, kwin
diff --git a/kde-base/kwin/kwin-4.7.0-r1.ebuild b/kde-base/kwin/kwin-4.7.0-r1.ebuild
new file mode 100644
index 000000000000..1faf5af55ab6
--- /dev/null
+++ b/kde-base/kwin/kwin-4.7.0-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-4.7.0-r1.ebuild,v 1.1 2011/08/15 15:03:04 dilfridge Exp $
+
+EAPI=4
+
+KMNAME="kde-workspace"
+OPENGL_REQUIRED="optional"
+inherit kde4-meta
+
+DESCRIPTION="KDE window manager"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="debug gles +xcomposite xinerama"
+
+COMMONDEPEND="
+	$(add_kdebase_dep kephal)
+	$(add_kdebase_dep libkworkspace)
+	$(add_kdebase_dep liboxygenstyle)
+	x11-libs/libXdamage
+	x11-libs/libXfixes
+	>=x11-libs/libXrandr-1.2.1
+	x11-libs/libXrender
+	opengl? ( >=media-libs/mesa-7.10 )
+	gles? ( >=media-libs/mesa-7.10[egl(+),gles] )
+	xcomposite? ( x11-libs/libXcomposite )
+	xinerama? ( x11-libs/libXinerama )
+"
+DEPEND="${COMMONDEPEND}
+	x11-proto/damageproto
+	x11-proto/fixesproto
+	x11-proto/randrproto
+	x11-proto/renderproto
+	xcomposite? ( x11-proto/compositeproto )
+	xinerama? ( x11-proto/xineramaproto )
+"
+RDEPEND="${COMMONDEPEND}
+	x11-apps/scripts
+"
+
+KMEXTRACTONLY="
+	ksmserver/
+	libs/kephal/
+	libs/oxygen/
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.4.2-xinerama_cmake_automagic.patch"
+	"${FILESDIR}/${PN}-4.7.0-xcomposite_cmake_automagic.patch"
+)
+
+# you can use just gles or opengl or none
+REQUIRED_USE="opengl? ( !gles ) gles? ( !opengl )"
+
+src_configure() {
+	# FIXME Remove when activity API moved away from libkworkspace
+	append-cppflags "-I${EPREFIX}/usr/include/kworkspace"
+
+	mycmakeargs=(
+		$(cmake-utils_use_with gles OpenGLES)
+		$(cmake-utils_use gles KWIN_BUILD_WITH_OPENGLES)
+		$(cmake-utils_use_with opengl OpenGL)
+		$(cmake-utils_use_with xinerama X11_Xinerama)
+		$(cmake-utils_use_with xcomposite X11_Xcomposite)
+	)
+
+	kde4-meta_src_configure
+}