Add patch to disable composite (kompmgr) support; add xcomposite useflag.

(Portage version: 2529-svn)

6 files changed, 89 insertions, 9 deletions

diff --git a/kde-base/kdebase/ChangeLog b/kde-base/kdebase/ChangeLog
index a82936a9be9c..b70199c037bc 100644
--- a/kde-base/kdebase/ChangeLog
+++ b/kde-base/kdebase/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kdebase
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.248 2006/01/02 17:08:23 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/ChangeLog,v 1.249 2006/01/11 19:26:54 flameeyes Exp $
+
+  11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kwin-3.5.0-composite.patch, kdebase-3.5.0-r1.ebuild:
+  Add patch to disable composite (kompmgr) support; add xcomposite useflag.
 
   02 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
   files/kxkb-3.5.0-modularxkb.patch:
diff --git a/kde-base/kdebase/files/kwin-3.5.0-composite.patch b/kde-base/kdebase/files/kwin-3.5.0-composite.patch
new file mode 100644
index 000000000000..c7f5dab275a0
--- /dev/null
+++ b/kde-base/kdebase/files/kwin-3.5.0-composite.patch
@@ -0,0 +1,21 @@
+Index: kdebase-3.5.0/kwin/kompmgr/configure.in.in
+===================================================================
+--- kdebase-3.5.0/kwin/kompmgr/configure.in.in	(revision 497003)
++++ kdebase-3.5.0/kwin/kompmgr/configure.in.in	(working copy)
+@@ -1,5 +1,11 @@
+-compile_kompmgr=yes
+-KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
+-KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
+-KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
+-AM_CONDITIONAL(include_kompmgr, test "$compile_kompmgr" = "yes" )
++AC_ARG_WITH([composite],
++  AS_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) )
++
++if test "x$with_composite" != "xno"; then
++  KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
++  KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
++  KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
++else
++  compile_kompmgr=no
++fi
++AM_CONDITIONAL(include_kompmgr, test x"$compile_kompmgr" != x"no" )
diff --git a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
index 3c6ea2da07cf..38af8c260711 100644
--- a/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
+++ b/kde-base/kdebase/kdebase-3.5.0-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.7 2005/12/31 21:44:45 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kdebase/kdebase-3.5.0-r1.ebuild,v 1.8 2006/01/11 19:26:54 flameeyes Exp $
 
 inherit kde-dist eutils flag-o-matic
 
@@ -36,9 +36,19 @@ RDEPEND="${DEPEND}
 	|| ( (
 			x11-misc/xkbdata
 			x11-apps/setxkbmap
-		) virtual/x11 )"
+		) virtual/x11 )
+	xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			x11-libs/libXdamage
+			) <=x11-base/xorg-x11-6.9 )
+		)"
 
 DEPEND="${DEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			x11-proto/damageproto
+			) <=x11-base/xorg-x11-6.9 )
+		)
 	dev-util/pkgconfig"
 
 src_unpack() {
@@ -63,6 +73,9 @@ src_unpack() {
 	# another copy for kcmusb. SVN Commit 492985.
 	epatch "${FILESDIR}/kcontrol-3.5.0-global-usbids.patch"
 
+	# Add --without-composite option to disable kompmgr.
+	epatch "${FILESDIR}/kwin-3.5.0-composite.patch"
+
 	# For the noimake patch.
 	make -f admin/Makefile.common || die
 }
diff --git a/kde-base/kwin/ChangeLog b/kde-base/kwin/ChangeLog
index 3e59c6b60e6b..82847a4fe439 100644
--- a/kde-base/kwin/ChangeLog
+++ b/kde-base/kwin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for kde-base/kwin
-# Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.37 2005/12/17 10:18:32 corsair Exp $
+# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/ChangeLog,v 1.38 2006/01/11 19:24:57 flameeyes Exp $
+
+  11 Jan 2006; Diego Pettenò <flameeyes@gentoo.org>
+  +files/kwin-3.5.0-composite.patch, kwin-3.5.0.ebuild:
+  Add patch to disable composite (kompmgr) support; add xcomposite useflag.
 
   17 Dec 2005; Markus Rothe <corsair@gentoo.org> kwin-3.5.0.ebuild:
   Added ~ppc64
diff --git a/kde-base/kwin/files/kwin-3.5.0-composite.patch b/kde-base/kwin/files/kwin-3.5.0-composite.patch
new file mode 100644
index 000000000000..c7f5dab275a0
--- /dev/null
+++ b/kde-base/kwin/files/kwin-3.5.0-composite.patch
@@ -0,0 +1,21 @@
+Index: kdebase-3.5.0/kwin/kompmgr/configure.in.in
+===================================================================
+--- kdebase-3.5.0/kwin/kompmgr/configure.in.in	(revision 497003)
++++ kdebase-3.5.0/kwin/kompmgr/configure.in.in	(working copy)
+@@ -1,5 +1,11 @@
+-compile_kompmgr=yes
+-KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
+-KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
+-KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
+-AM_CONDITIONAL(include_kompmgr, test "$compile_kompmgr" = "yes" )
++AC_ARG_WITH([composite],
++  AS_HELP_STRING([--without-composite], [Disable Xcomposite support (default: check)]) )
++
++if test "x$with_composite" != "xno"; then
++  KDE_CHECK_HEADERS(X11/extensions/Xdamage.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
++  KDE_CHECK_HEADERS(X11/extensions/Xcomposite.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
++  KDE_CHECK_HEADERS(X11/extensions/Xrender.h,,compile_kompmgr=no,[#include <X11/Xlib.h>])
++else
++  compile_kompmgr=no
++fi
++AM_CONDITIONAL(include_kompmgr, test x"$compile_kompmgr" != x"no" )
diff --git a/kde-base/kwin/kwin-3.5.0.ebuild b/kde-base/kwin/kwin-3.5.0.ebuild
index 3f32ec4b043a..74d147f63377 100644
--- a/kde-base/kwin/kwin-3.5.0.ebuild
+++ b/kde-base/kwin/kwin-3.5.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2005 Gentoo Foundation
+# Copyright 1999-2006 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0.ebuild,v 1.4 2005/12/17 10:18:32 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/kde-base/kwin/kwin-3.5.0.ebuild,v 1.5 2006/01/11 19:24:57 flameeyes Exp $
 
 KMNAME=kdebase
 MAXKDEVER=$PV
@@ -9,5 +9,22 @@ inherit kde-meta eutils
 
 DESCRIPTION="KDE window manager"
 KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE=""
+IUSE="xcomposite"
+RDEPEND="xcomposite? ( || ( (
+			x11-libs/libXcomposite
+			x11-libs/libXdamage
+			) <=x11-base/xorg-x11-6.9 )
+		)"
+DEPEND="${RDEPEND}
+	xcomposite? ( || ( (
+			x11-proto/compositeproto
+			x11-proto/damageproto
+			) <=x11-base/xorg-x11-6.9 )
+		)"
 
+PATCHES="${FILESDIR}/${P}-composite.patch"
+
+src_compile() {
+	myconf="$myconf $(use_with xcomposite composite)"
+	kde-meta_src_compile
+}