PR# pkg/39621: wm/metacity configure fails - missing xdamage

               (NetBSD 3.0 XFree86)

Disable compositing support if native X doesn't provide libXdamage.

3 files changed, 65 insertions, 3 deletions

diff --git a/wm/metacity/Makefile b/wm/metacity/Makefile
index fd8ab9184e8..64aa79d413b 100644
--- a/wm/metacity/Makefile
+++ b/wm/metacity/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2008/10/16 15:37:51 drochner Exp $
+# $NetBSD: Makefile,v 1.79 2008/12/24 18:49:55 jmcneill Exp $
 #
 
 DISTNAME=	metacity-2.24.0
@@ -30,6 +30,10 @@ GCONF_SCHEMAS=		metacity.schemas
 CONFIGURE_ARGS+=	--disable-xinerama
 .endif
 
+.if ${X11_TYPE} != "modular" && !exists(${X11BASE}/lib/libXdamage.so)
+CONFIGURE_ARGS+=	--disable-compositor
+.endif
+
 BUILDLINK_API_DEPENDS.glib2+=			glib2>=2.6.0
 BUILDLINK_API_DEPENDS.gtk2+=			gtk2+>=2.10.0
 BUILDLINK_API_DEPENDS.startup-notification+=	startup-notification>=0.7
@@ -45,8 +49,8 @@ BUILDLINK_DEPMETHOD.libXt?=	build
 .include "../../x11/libSM/buildlink3.mk"
 .include "../../x11/libXcomposite/buildlink3.mk"
 .include "../../x11/libXcursor/buildlink3.mk"
+.include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/libXrender/buildlink3.mk"
 .include "../../x11/libXt/buildlink3.mk"
-.include "../../x11/libXdamage/buildlink3.mk"
 .include "../../x11/startup-notification/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/metacity/distinfo b/wm/metacity/distinfo
index 7f94a2d1234..f86cc5288df 100644
--- a/wm/metacity/distinfo
+++ b/wm/metacity/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.37 2008/10/16 15:37:51 drochner Exp $
+$NetBSD: distinfo,v 1.38 2008/12/24 18:49:55 jmcneill Exp $
 
 SHA1 (metacity-2.24.0.tar.bz2) = 0b2e37e372498e26a6926fbb68e96556c6db6497
 RMD160 (metacity-2.24.0.tar.bz2) = 758c26e163fdc84dcee1e386ab8cbefc38cdd7a5
 Size (metacity-2.24.0.tar.bz2) = 2160557 bytes
+SHA1 (patch-aa) = e57853437a8485399f302553a4a4289e607d3780
diff --git a/wm/metacity/patches/patch-aa b/wm/metacity/patches/patch-aa
new file mode 100644
index 00000000000..9271463a64c
--- /dev/null
+++ b/wm/metacity/patches/patch-aa
@@ -0,0 +1,57 @@
+$NetBSD: patch-aa,v 1.5 2008/12/24 18:49:55 jmcneill Exp $
+
+--- src/compositor/compositor-xrender.c.orig	2008-12-24 13:43:30.000000000 -0500
++++ src/compositor/compositor-xrender.c	2008-12-24 13:46:14.000000000 -0500
+@@ -288,6 +288,7 @@ make_gaussian_map (double r)
+   return c;
+ }
+ 
++#ifdef HAVE_COMPOSITE_EXTENSIONS
+ static void
+ dump_xserver_region (const char   *location, 
+                      MetaDisplay  *display,
+@@ -321,6 +322,7 @@ dump_xserver_region (const char   *locat
+   else
+     fprintf (stderr, "%s (XSR): null\n", location);
+ }
++#endif
+ 
+ /*
+ * A picture will help
+@@ -1052,7 +1054,7 @@ get_window_picture (MetaCompWindow *cw)
+ 
+   meta_error_trap_push (display);
+ 
+-#ifdef HAVE_NAME_WINDOW_PIXMAP
++#if defined(HAVE_NAME_WINDOW_PIXMAP) && defined(HAVE_COMPOSITE_EXTENSIONS)
+   if (have_name_window_pixmap (display))
+     {
+       if (cw->back_pixmap == None)
+@@ -1219,7 +1221,7 @@ paint_windows (MetaScreen   *screen,
+         {
+           int x, y, wid, hei;
+           
+-#ifdef HAVE_NAME_WINDOW_PIXMAP
++#if defined(HAVE_NAME_WINDOW_PIXMAP) && defined(HAVE_COMPOSITE_EXTENSIONS)
+           if (have_name_window_pixmap (display))
+             {
+               x = cw->attrs.x;
+@@ -1361,7 +1363,9 @@ paint_all (MetaScreen   *screen,
+     {
+       Picture overlay;
+ 
++#ifdef HAVE_COMPOSITE_EXTENSIONS
+       dump_xserver_region ("paint_all", display, region);
++#endif
+ 
+       /* Make a random colour overlay */
+       overlay = solid_picture (display, screen, TRUE, 1, /* 0.3, alpha */
+@@ -2481,7 +2485,7 @@ show_overlay_window (MetaScreen *screen,
+   MetaDisplay *display = meta_screen_get_display (screen);
+   Display *xdisplay = meta_display_get_xdisplay (display);
+ 
+-#ifdef HAVE_COW
++#if defined(HAVE_COW) && defined(HAVE_COMPOSITE_EXTENSIONS)
+   if (have_cow (display))
+     {
+       XserverRegion region;