Mercurial Mercurial > upstream > oracle > x-cons > x-s11-update-clone / diff
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | file | latest | revisions | annotate | diff | comparison | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
open-src/xserver/xorg/xtsol.patch
changeset 1265 0b5cc5c013e4
parent 1188 54006236410a
child 1276 52f85727ce94 
--- a/open-src/xserver/xorg/xtsol.patch	Thu Mar 29 13:35:26 2012 -0700
+++ b/open-src/xserver/xorg/xtsol.patch	Fri Apr 06 21:57:14 2012 -0700
@@ -20,7 +20,7 @@
 # DEALINGS IN THE SOFTWARE.
 
 diff --git a/Makefile.am b/Makefile.am
-index 4d2e2ca..e14a6e3 100644
+index b1408f2..54d64ab 100644
 --- a/Makefile.am
 +++ b/Makefile.am
 @@ -17,6 +17,10 @@ if RECORD
@@ -33,8 +33,8 @@
 +
  SUBDIRS = \
  	doc \
- 	include \
-@@ -37,6 +41,7 @@ SUBDIRS = \
+ 	man \
+@@ -38,6 +42,7 @@ SUBDIRS = \
  	$(COMPOSITE_DIR) \
  	$(GLX_DIR) \
  	IA \
@@ -43,10 +43,10 @@
  	config \
  	hw \
 diff --git a/Xext/security.c b/Xext/security.c
-index 8673880..14bb5cd 100644
+index df5bd58..8825bb6 100644
 --- a/Xext/security.c
 +++ b/Xext/security.c
-@@ -1144,3 +1144,27 @@ SecurityExtensionInit(INITARGS)
+@@ -1138,3 +1138,27 @@ SecurityExtensionInit(INITARGS)
      /* Label objects that were created before we could register ourself */
      SecurityLabelInitial();
  }
@@ -88,12 +88,12 @@
 +
  #endif /* _SECURITY_SRV_H */
 diff --git a/configure.ac b/configure.ac
-index c6cbb69..32a3cce 100644
+index 460da17..c3b310d 100644
 --- a/configure.ac
 +++ b/configure.ac
-@@ -227,6 +227,14 @@ dnl Find the math libary
+@@ -221,6 +221,14 @@ dnl Find the math libary, then check for cbrt function in it.
  AC_CHECK_LIB(m, sqrt)
- AC_CHECK_LIB(m, cbrt, AC_DEFINE(HAVE_CBRT, 1, [Have the 'cbrt' function]))
+ AC_CHECK_FUNCS([cbrt])
  
 +dnl Check for libtsol for Solaris Trusted Extensions module
 +AC_CHECK_LIB(tsol, bsllow, [BUILD_TSOL_MODULE=yes], [BUILD_TSOL_MODULE=no])
@@ -106,7 +106,7 @@
  AC_CHECK_HEADERS([ndbm.h dbm.h rpcsvc/dbm.h])
  
  dnl AGPGART headers
-@@ -1507,6 +1515,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
+@@ -1500,6 +1508,8 @@ AM_CONDITIONAL(XVFB, [test "x$XVFB" = xyes])
  if test "x$XVFB" = xyes; then
  	XVFB_LIBS="$FB_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"
  	XVFB_SYS_LIBS="$XVFBMODULES_LIBS $GLX_SYS_LIBS"
@@ -115,16 +115,16 @@
  	AC_SUBST([XVFB_LIBS])
  	AC_SUBST([XVFB_SYS_LIBS])
  fi
-@@ -1528,6 +1538,8 @@ if test "x$XNEST" = xyes; then
+@@ -1521,6 +1531,8 @@ if test "x$XNEST" = xyes; then
  	fi
- 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $DIX_LIB $MAIN_LIB $OS_LIB"
+ 	XNEST_LIBS="$FB_LIB $FIXES_LIB $MI_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $MAIN_LIB $DIX_LIB $OS_LIB"
  	XNEST_SYS_LIBS="$XNESTMODULES_LIBS $GLX_SYS_LIBS"
 +	XNEST_LIBS="$XNEST_LIBS $TSOL_LIB"
 +	XNEST_SYS_LIBS="$XNEST_SYS_LIBS $TSOL_SYS_LIBS"
  	AC_SUBST([XNEST_LIBS])
  	AC_SUBST([XNEST_SYS_LIBS])
  fi
-@@ -2092,6 +2104,7 @@ if test "$KDRIVE" = yes; then
+@@ -2057,6 +2069,7 @@ if test "$KDRIVE" = yes; then
      KDRIVE_CFLAGS="$XSERVER_CFLAGS -DHAVE_KDRIVE_CONFIG_H $TSLIB_CFLAGS"
  
      KDRIVE_PURE_LIBS="$FB_LIB $MI_LIB $FIXES_LIB $XEXT_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_SYNC_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $OS_LIB"
@@ -132,7 +132,7 @@
      KDRIVE_LIB='$(top_builddir)/hw/kdrive/src/libkdrive.la'
      case $host_os in
  	*linux*)
-@@ -2283,3 +2296,6 @@ xorg-server.pc
+@@ -2247,3 +2260,6 @@ xorg-server.pc
  
  # Add Sun IA extension
  AC_OUTPUT([IA/Makefile])
@@ -140,7 +140,7 @@
 +# Add Sun Trusted Extensions extension
 +AC_OUTPUT([tsol/Makefile])
 diff --git a/dix/dispatch.c b/dix/dispatch.c
-index 7b2132d..63a2378 100644
+index 44c2433..e710ea4 100644
 --- a/dix/dispatch.c
 +++ b/dix/dispatch.c
 @@ -74,8 +74,8 @@ Equipment Corporation.
@@ -154,7 +154,7 @@
   *
   * Permission is hereby granted, free of charge, to any person obtaining a
   * copy of this software and associated documentation files (the "Software"),
-@@ -162,6 +162,10 @@ int connBlockScreenStart;
+@@ -163,6 +163,10 @@ int connBlockScreenStart;
  
  static void KillAllClients(void);
  
@@ -165,7 +165,7 @@
  static int nextFreeClientID; /* always MIN free client ID */
  
  static int	nClients;	/* number of authorized clients */
-@@ -896,7 +900,12 @@ ProcCirculateWindow(ClientPtr client)
+@@ -904,7 +908,12 @@ ProcCirculateWindow(ClientPtr client)
      return Success;
  }
  
@@ -179,7 +179,7 @@
  GetGeometry(ClientPtr client, xGetGeometryReply *rep)
  {
      DrawablePtr pDraw;
-@@ -1990,7 +1999,12 @@ ProcPutImage(ClientPtr client)
+@@ -1997,7 +2006,12 @@ ProcPutImage(ClientPtr client)
       return Success;
  }
  
@@ -194,10 +194,10 @@
             int x, int y, int width, int height, 
             Mask planemask, xGetImageReply **im_return)
 diff --git a/dix/events.c b/dix/events.c
-index eefcdef..a945411 100644
+index 04d7fb5..e39b4f9 100644
 --- a/dix/events.c
 +++ b/dix/events.c
-@@ -2544,6 +2544,9 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
+@@ -2842,6 +2842,9 @@ PointInBorderSize(WindowPtr pWin, int x, int y)
   *
   * @returns the window at the given coordinates.
   */
@@ -208,7 +208,7 @@
  XYToWindow(SpritePtr pSprite, int x, int y)
  {
 diff --git a/dix/window.c b/dix/window.c
-index 41306b3..6d4db39 100644
+index 823294b..78cc845 100644
 --- a/dix/window.c
 +++ b/dix/window.c
 @@ -97,6 +97,33 @@ Equipment Corporation.
@@ -245,7 +245,7 @@
  
  #ifdef HAVE_DIX_CONFIG_H
  #include <dix-config.h>
-@@ -175,6 +202,11 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
+@@ -183,6 +210,11 @@ static Bool TileScreenSaver(ScreenPtr pScreen, int kind);
  
  #define SubStrSend(pWin,pParent) (StrSend(pWin) || SubSend(pParent))
  
@@ -254,10 +254,10 @@
 +extern SecurityHookPtr pSecHook;
 +#endif /* TSOL */
 +
- #ifdef DEBUG
- /******
-  * PrintWindowTree
-@@ -1837,7 +1869,12 @@ IsSiblingAboveMe(
+ #ifdef COMPOSITE
+ static const char *overlay_win_name = "<composite overlay>";
+ #endif
+@@ -1934,7 +1966,12 @@ IsSiblingAboveMe(
      return Below;
  }
  
@@ -271,7 +271,7 @@
  WindowExtents(
      WindowPtr pWin,
      BoxPtr pBox)
-@@ -1867,7 +1904,12 @@ MakeBoundingRegion (
+@@ -1964,7 +2001,12 @@ MakeBoundingRegion (
      return pRgn;
  }
  
@@ -285,7 +285,7 @@
  ShapeOverlap (
      WindowPtr	pWin,
      BoxPtr	pWinBox,
-@@ -2067,7 +2109,12 @@ WhereDoIGoInTheStack(
+@@ -2164,7 +2206,12 @@ WhereDoIGoInTheStack(
      }
  }
  
@@ -300,7 +300,7 @@
      WindowPtr pWin,
      WindowPtr pSib,
 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
-index e1d24e4..9827e4f 100644
+index 87004df..1455dae 100644
 --- a/hw/xfree86/common/xf86Config.c
 +++ b/hw/xfree86/common/xf86Config.c
 @@ -126,6 +126,7 @@ static ModuleDefault ModuleDefaults[] = {
@@ -312,10 +312,10 @@
  };
  
 diff --git a/hw/xfree86/dixmods/Makefile.am b/hw/xfree86/dixmods/Makefile.am
-index ea065fa..5e5725e 100644
+index 02a6d0d..00f8021 100644
 --- a/hw/xfree86/dixmods/Makefile.am
 +++ b/hw/xfree86/dixmods/Makefile.am
-@@ -74,3 +74,11 @@ libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA
+@@ -73,3 +73,11 @@ libia_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(top_builddir)/IA
  libia_la_LDFLAGS = -avoid-version
  libia_la_LIBADD = $(top_builddir)/IA/libIA.la
  libia_la_SOURCES = iamodule.c
@@ -328,7 +328,7 @@
 +libxtsol_la_SOURCES = tsolmodule.c
 +endif
 diff --git a/include/dix.h b/include/dix.h
-index 12e4b59..50c20ed 100644
+index f3f68d3..45e4834 100644
 --- a/include/dix.h
 +++ b/include/dix.h
 @@ -172,6 +172,15 @@ extern _X_EXPORT void MarkClientException(
@@ -348,7 +348,7 @@
  
  extern _X_EXPORT int CompareISOLatin1Lowered(
 diff --git a/include/extnsionst.h b/include/extnsionst.h
-index bb66dfb..3a51180 100644
+index aeefa99..de5e448 100644
 --- a/include/extnsionst.h
 +++ b/include/extnsionst.h
 @@ -45,6 +45,34 @@ SOFTWARE.
@@ -420,10 +420,10 @@
  #endif /* EXTENSIONSTRUCT_H */
  
 diff --git a/include/input.h b/include/input.h
-index 95aae43..3f8a884 100644
+index fb45617..93039c9 100644
 --- a/include/input.h
 +++ b/include/input.h
-@@ -408,7 +408,7 @@ extern void NoteLedState(
+@@ -422,7 +422,7 @@ extern void NoteLedState(
      int /*led*/,
      Bool /*on*/);
  
@@ -433,12 +433,12 @@
      ClientPtr /*client*/);
  
 diff --git a/include/window.h b/include/window.h
-index 6fb2f8c..29e4364 100644
+index e13598b..8860dc7 100644
 --- a/include/window.h
 +++ b/include/window.h
-@@ -266,4 +266,9 @@ extern _X_EXPORT void DisableMapUnmapEvents(
- extern _X_EXPORT void EnableMapUnmapEvents(
-     WindowPtr /* pWin */ );
+@@ -269,4 +269,9 @@ extern _X_EXPORT void EnableMapUnmapEvents(
+ extern _X_EXPORT void SetRootClip(ScreenPtr pScreen, Bool enable);
+ extern _X_EXPORT void PrintWindowTree(void);
  
 +#ifdef TSOL
 +# include "validate.h" /* needed for VTKind enum definition */
@@ -447,7 +447,7 @@
 +
  #endif /* WINDOW_H */
 diff --git a/mi/miinitext.c b/mi/miinitext.c
-index ee04b05..82a4d2e 100644
+index b3c29fb..f3d5a33 100644
 --- a/mi/miinitext.c
 +++ b/mi/miinitext.c
 @@ -66,6 +66,7 @@ SOFTWARE.
@@ -501,7 +501,7 @@
  
  #else /* XFree86LOADER */
 diff --git a/os/connection.c b/os/connection.c
-index 5580fab..c69d4fe 100644
+index 0e557a5..bb911f4 100644
 --- a/os/connection.c
 +++ b/os/connection.c
 @@ -44,6 +44,33 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS
@@ -550,7 +550,7 @@
  static XtransConnInfo
  lookup_trans_conn (int fd)
  {
-@@ -646,6 +678,12 @@ ClientAuthorized(ClientPtr client,
+@@ -645,6 +677,12 @@ ClientAuthorized(ClientPtr client,
      priv = (OsCommPtr)client->osPrivate;
      trans_conn = priv->trans_conn;
upstream/oracle/x-cons/x-s11-update-clone