Mercurial Mercurial > upstream > oracle > x-cons > x-s12-clone / annotate
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/113-port.patch
author henryzh <henry.zhao@oracle.com>
Wed, 30 Jul 2014 17:12:53 -0700
changeset 1464 5ae7d5f1ccc6
parent 1333 988018ca2b99
permissions -rw-r--r--
19212677 Multi-session doesn't work properly when invoked with "-isolateDevice" option
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
1333
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     1
 
--- a/configure.ac	Fri Sep 14 10:22:01 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     2
 
+++ b/configure.ac	Fri Sep 14 10:29:14 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     3
 
@@ -137,7 +137,7 @@
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     4
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     5
 
 dnl Checks for typedefs, structures, and compiler characteristics.
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     6
 
 AC_C_CONST
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     7
 
-AC_C_TYPEOF
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     8
 
+#AC_C_TYPEOF
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
     9
 
 AC_C_BIGENDIAN([ENDIAN="X_BIG_ENDIAN"], [ENDIAN="X_LITTLE_ENDIAN"])
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    10
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    11
 
 AC_CHECK_SIZEOF([unsigned long])
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    12
 
--- a/configure.ac	Fri Sep 14 11:00:59 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    13
 
+++ b/configure.ac	Fri Sep 14 11:03:09 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    14
 
@@ -1515,7 +1515,7 @@
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    15
 
 # Some platforms require extra flags to do this.   libtool should set the
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    16
 
 # necessary flags for each platform when -export-dynamic is passed to it.
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    17
 
 LD_EXPORT_SYMBOLS_FLAG="-export-dynamic"
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    18
 
-LD_NO_UNDEFINED_FLAG=
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    19
 
+#LD_NO_UNDEFINED_FLAG=
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    20
 
 XORG_DRIVER_LIBS=
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    21
 
 case "$host_os" in
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    22
 
     cygwin*)
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    23
 
--- a/configure.ac	Fri Sep 14 11:23:41 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    24
 
+++ b/configure.ac	Fri Sep 14 11:25:54 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    25
 
@@ -1534,7 +1534,7 @@
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    26
 
 	    [AC_LANG_SOURCE([int main(int argc, char **argv) { return 0; }])],
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    27
 
 	    [mv conftest$EXEEXT conftest.parent
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    28
 
 	     XORG_CHECK_LINKER_FLAGS([-Wl,-z,parent=conftest.parent -G],
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    29
 
-		[LD_NO_UNDEFINED_FLAG="-Wl,-z,defs -Wl,-z,parent=\$(top_builddir)/hw/xfree86/Xorg"
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    30
 
+		[LD_NO_UNDEFINED_FLAG="-Wl,-z,defs -Wl,-z,parent=\${bindir}/Xorg"
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    31
 
 # Not set yet, since this gets exported in xorg-server.pc to all the drivers,
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    32
 
 # and they're not all fixed to build correctly with it yet.
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    33
 
 #		 XORG_DRIVER_LIBS="-Wl,-z,defs -Wl,-z,parent=${bindir}/Xorg"
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    34
 
--- a/hw/xfree86/Makefile.am	Fri Sep 14 11:42:50 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    35
 
+++ b/hw/xfree86/Makefile.am	Fri Sep 14 11:45:34 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    36
 
@@ -41,7 +41,7 @@
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    37
 
 AM_CFLAGS = $(DIX_CFLAGS) $(PIXMAN_CFLAGS) @XORG_CFLAGS@
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    38
 
 INCLUDES = $(XORG_INCS) -I$(srcdir)/parser -I$(top_srcdir)/miext/cw \
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    39
 
 	-I$(srcdir)/ddc -I$(srcdir)/i2c -I$(srcdir)/modes -I$(srcdir)/ramdac \
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    40
 
-	-I$(srcdir)/dri -I$(srcdir)/dri2
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    41
 
+	-I$(srcdir)/dri -I$(srcdir)/dri2 -I$(PROTODIR)/usr/include/X11/dri
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    42
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    43
 
 LOCAL_LIBS = \
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    44
 
             $(MAIN_LIB) \
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    45
 
--- a/mi/miinitext.c	Fri Sep 14 15:27:58 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    46
 
+++ b/mi/miinitext.c	Fri Sep 14 15:28:25 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    47
 
@@ -121,6 +121,21 @@
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    48
 
     Bool *disablePtr;
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    49
 
 } ExtensionToggle;
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    50
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    51
 
+#define SolarisIAExtension
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    52
 
+
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    53
 
+#ifdef SolarisIAExtension
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    54
 
+#include <X11/extensions/interactive.h>
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    55
 
+#include "../IA/interactive_srv.h"
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    56
 
+Bool noIAExtension;
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    57
 
+extern void IAExtensionInit(void);
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    58
 
+#endif
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    59
 
+
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    60
 
+#ifdef TSOL
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    61
 
+#include "../tsol/tsolextension.h"
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    62
 
+Bool noXTSolExtension;
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    63
 
+extern void TsolExtensionInit(void);
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    64
 
+#endif
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    65
 
+
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    66
 
 static ExtensionToggle ExtensionToggleList[] = {
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    67
 
     /* sort order is extension name string as shown in xdpyinfo */
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    68
 
     {"Generic Events", &noGEExtension},
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    69
 
--- a/include/globals.h	Tue Sep 25 14:45:20 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    70
 
+++ b/include/globals.h	Tue Sep 25 14:45:35 2012
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    71
 
@@ -50,4 +50,8 @@
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    72
 
 extern _X_EXPORT int selinuxEnforcingState;
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    73
 
 #endif
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    74
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    75
 
+#ifdef XF86DRI
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    76
 
+extern _X_EXPORT Bool noXFree86DRIExtension;
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    77
 
+#endif
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    78
 
+
988018ca2b99 14850206 update to Xorg 1.13.0
Niveditha Rau <Niveditha.Rau@Oracle.COM>
parents:
diff changeset 
    79
 
 #endif                          /* !_XSERV_GLOBAL_H_ */
upstream/oracle/x-cons/x-s12-clone