[Xquartz-changes] xserver: Branch 'for-keith' - 2 commits

Jeremy Huddleston jeremyhu at freedesktop.org
Sun Oct 9 17:13:17 PDT 2011

Rebased ref, commits from common ancestor:
commit 8b29addc30163bb7ba74c74351f312aac02f049a
Author: Jeremy Huddleston <jeremyhu at apple.com>
Date:   Sun Oct 9 04:00:41 2011 -0700

    loader: when creating sdksyms.c only include shmint.h if MITSHM is enabled #29109
    When configured with --disable-mitshm the symbols declared in shmint.h
    do not exist. By guarding the include with '#ifdef MITSHM' these
    symbols are skipped when generating sdksyms.c with --disable-mitshm.
    Signed-off-by: Michael Olbrich <m.olbrich at pengutronix.de>
    Reviewed-by: Jeremy Huddleston <jeremyhu at apple.com>

diff --git a/hw/xfree86/sdksyms.sh b/hw/xfree86/sdksyms.sh
index 18bb735..1755f02 100755
--- a/hw/xfree86/sdksyms.sh
+++ b/hw/xfree86/sdksyms.sh
@@ -52,7 +52,9 @@ cat > sdksyms.c << EOF
 #include "geext.h"
 #include "geint.h"
+#ifdef MITSHM
 #include "shmint.h"
 #include "syncsdk.h"
 # include "panoramiXsrv.h"
commit eabd5532fb589bd0550344ebd23c9765e591aadf
Author: Julien Cristau <jcristau at debian.org>
Date:   Sun Oct 9 17:06:14 2011 -0700

    xfree86: fix build with xv disabled
    Signed-off-by: Julien Cristau <jcristau at debian.org>
    Tested-by: Cyril Brulebois <kibi at debian.org>
    Reviewed-by: Cyril Brulebois <kibi at debian.org>

diff --git a/hw/xfree86/modes/xf86Crtc.c b/hw/xfree86/modes/xf86Crtc.c
index 3fae039..cbe0b5c 100644
--- a/hw/xfree86/modes/xf86Crtc.c
+++ b/hw/xfree86/modes/xf86Crtc.c
@@ -3090,6 +3090,7 @@ xf86_crtc_box_area(BoxPtr box)
     return (int) (box->x2 - box->x1) * (int) (box->y2 - box->y1);
+#ifdef XV
  * Return the crtc covering 'box'. If two crtcs cover a portion of
  * 'box', then prefer 'desired'. If 'desired' is NULL, then prefer the crtc
@@ -3178,6 +3179,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
     return ret;
 xf86_wrap_crtc_notify (ScreenPtr screen, xf86_crtc_notify_proc_ptr new)
diff --git a/hw/xfree86/modes/xf86Crtc.h b/hw/xfree86/modes/xf86Crtc.h
index ffb2eff..716499f 100644
--- a/hw/xfree86/modes/xf86Crtc.h
+++ b/hw/xfree86/modes/xf86Crtc.h
@@ -956,6 +956,7 @@ xf86_cursors_fini (ScreenPtr screen);
 extern _X_EXPORT void
 xf86CrtcTransformCursorPos (xf86CrtcPtr crtc, int *x, int *y);
+#ifdef XV
  * For overlay video, compute the relevant CRTC and
  * clip video to that.
@@ -974,6 +975,7 @@ xf86_crtc_clip_video_helper(ScrnInfoPtr pScrn,
 			    RegionPtr   reg,
 			    INT32	width,
 			    INT32	height);
 extern _X_EXPORT xf86_crtc_notify_proc_ptr
 xf86_wrap_crtc_notify (ScreenPtr pScreen, xf86_crtc_notify_proc_ptr new);

More information about the Xquartz-changes mailing list