fixup damage ext

hw/xquartz/xpr/xprScreen.c

@@ -49,10 +49,7 @@
 #include "micmap.h"
 
 #include "rootlessCommon.h"
-
-#ifdef DAMAGE
 #include "damage.h"
-#endif
 
 /* 10.4's deferred update makes X slower.. have to live with the tearing
  * for now.. */
@@ -436,12 +433,10 @@ have_depth:
 static Bool
 xprSetupScreen(int index, ScreenPtr pScreen)
 {
-#ifdef DAMAGE
     // The Damage extension needs to wrap underneath the
     // generic rootless layer, so do it now.
     if (!DamageSetup(pScreen))
         return FALSE;
-#endif
 
     // Initialize generic rootless code
     if (!xprInit(pScreen))

include/extinit.h

@@ -55,6 +55,7 @@ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 
 /* required by: libglx */
 extern _X_EXPORT Bool noCompositeExtension;
+extern _X_EXPORT Bool noDamageExtension;
 
 /* required by: several video drivers (eg. vmware, sis and nvidia proprietary) */
 #ifdef XINERAMA

include/meson.build

@@ -212,8 +212,6 @@ conf_data.set('CONFIG_LEGACY_NVIDIA_PADDING', legacy_nvidia_padding ? '1' : fals
 
 # some drivers (eg. xf86-video-intel) still relying on this symbol being set
 conf_data.set('COMPOSITE', '1')
-
-conf_data.set('DAMAGE', '1')
 conf_data.set('DBE', '1')
 conf_data.set('DGA', build_dga ? '1' : false)
 conf_data.set('DPMSExtension', build_dpms ? '1' : false)

mi/miinitext.c

@@ -134,9 +134,7 @@ static const ExtensionModule staticExtensions[] = {
 #ifndef DISABLE_EXT_COMPOSITE
     {CompositeExtensionInit, "COMPOSITE", &noCompositeExtension},
 #endif
-#ifdef DAMAGE
     {DamageExtensionInit, "DAMAGE", &noDamageExtension},
-#endif
 #ifdef SCREENSAVER
     {ScreenSaverExtensionInit, "MIT-SCREEN-SAVER", &noScreenSaverExtension},
 #endif