16794101 Xorg server start failure using gdm
16815647 X consolidation should build with Studio 12.3 per P-team CBE guidelines
--- a/open-src/app/gfx-utils/sun-src/vts/Makefile.common Thu May 09 11:04:14 2013 -0700
+++ b/open-src/app/gfx-utils/sun-src/vts/Makefile.common Fri May 17 12:39:19 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2006, 2011, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2006, 2013, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -52,7 +52,7 @@
all: libvtsSUNW${Dev}.so.1
libvtsSUNW${Dev}.so.1: $(LIB_OBJS) mapfile
- ${CC} ${CFLAGS} ${LIB_LDFLAGS} -M mapfile -G -lXext -lX11 $(LIB_OBJS) -o $@
+ ${CC} ${CFLAGS} ${LIB_LDFLAGS} -M mapfile -G -lc -lXext -lX11 $(LIB_OBJS) -o $@
gfx_vts.o: ${GFX_COMMON}/vts/gfx_vts.c $(HDRS)
${CC} ${CFLAGS} -c ${INCL} -Kpic -xregs=no%appl ${GFX_COMMON}/vts/gfx_vts.c -o $@
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/lib/libX11/16815647.patch Fri May 17 12:39:19 2013 -0700
@@ -0,0 +1,78 @@
+--- src/Cmap.h Fri Jun 1 23:37:19 2012
++++ src/Cmap.h Thu May 9 10:17:19 2013
+@@ -1,3 +1,4 @@
++#include <X11/Xlib.h>
+
+ #ifndef _CMAP_H_
+ #define _CMAP_H_
+--- src/Cr.h Fri Jun 1 23:37:19 2012
++++ src/Cr.h Thu May 9 10:17:25 2013
+@@ -1,3 +1,4 @@
++#include <X11/Xlib.h>
+
+ #ifndef _CR_H_
+ #define _CR_H_
+--- src/Key.h Fri Jun 1 23:37:19 2012
++++ src/Key.h Thu May 9 10:24:27 2013
+@@ -1,3 +1,5 @@
++#include <X11/Xlib.h>
++#include <X11/Xresource.h>
+
+ #ifndef _KEY_H_
+ #define _KEY_H_
+--- src/Xresinternal.h Fri Jun 1 23:37:19 2012
++++ src/Xresinternal.h Thu May 9 10:27:08 2013
+@@ -2,6 +2,8 @@
+ #ifndef _XRESINTERNAL_H_
+ #define _XRESINTERNAL_H_
+
++#include <X11/Xlib.h>
++#include <X11/Xresource.h>
+ #include <inttypes.h>
+
+ /* type defines */
+--- src/locking.h Fri Jun 1 23:37:19 2012
++++ src/locking.h Thu May 9 10:29:25 2013
+@@ -36,6 +36,8 @@
+
+ #define xmalloc(s) Xmalloc(s)
+ #define xfree(s) Xfree(s)
++#include <X11/Xlib.h>
++#include <X11/Xlibint.h>
+ #include <X11/Xthreads.h>
+
+ struct _XCVList {
+--- src/Xintatom.h Fri Jun 1 23:37:19 2012
++++ src/Xintatom.h Thu May 9 10:19:14 2013
+@@ -1,7 +1,7 @@
+-
+ #ifndef _XINTATOM_H_
+ #define _XINTATOM_H_ 1
+
++#include <X11/Xlib.h>
+ #include <X11/Xfuncproto.h>
+
+ /* IntAtom.c */
+--- src/Xintconn.h Fri Jun 1 23:37:19 2012
++++ src/Xintconn.h Thu May 9 10:19:05 2013
+@@ -1,8 +1,8 @@
+-
+ #ifndef _XINTCONN_H_
+ #define _XINTCONN_H_ 1
+
+ #include <X11/Xfuncproto.h>
++#include <X11/Xlib.h>
+
+ _XFUNCPROTOBEGIN
+
+--- src/Xprivate.h Fri Jun 1 23:37:19 2012
++++ src/Xprivate.h Thu May 9 10:19:26 2013
+@@ -8,6 +8,8 @@
+ #ifndef XPRIVATE_H
+ #define XPRIVATE_H
+
++#include <X11/Xlib.h>
++
+ extern _X_HIDDEN void _XIDHandler(Display *dpy);
+ extern _X_HIDDEN void _XSeqSyncFunction(Display *dpy);
+ extern _X_HIDDEN void _XSetPrivSyncFunction(Display *dpy);
--- a/open-src/lib/libX11/Makefile Thu May 09 11:04:14 2013 -0700
+++ b/open-src/lib/libX11/Makefile Fri May 17 12:39:19 2013 -0700
@@ -91,7 +91,8 @@
locale-zh_HK.UTF-8.patch \
locale-zh_TW.UTF-8.patch \
locale-zh_TW.patch \
- locale-ru-RU.UTF-8.patch
+ locale-ru-RU.UTF-8.patch \
+ 16815647.patch
# Patches from May 2013 security alert - will be integrated into libX11 1.6
SOURCE_PATCHES += upstream-cleanup.patch,-p1
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/open-src/xserver/xorg/16794101.patch Fri May 17 12:39:19 2013 -0700
@@ -0,0 +1,25 @@
+--- a/hw/xfree86/modes/xf86Crtc.c Tue Apr 16 23:07:39 2013
++++ b/hw/xfree86/modes/xf86Crtc.c Wed May 15 09:54:30 2013
+@@ -2599,7 +2599,7 @@
+ xf86CrtcConfigPtr config = XF86_CRTC_CONFIG_PTR(scrn);
+ xf86CrtcPtr crtc = config->crtc[0];
+ int c;
+- int enabled = 0;
++ int enabled = 0, failed = 0;
+
+ /* A driver with this hook will take care of this */
+ if (!crtc->funcs->set_mode_major) {
+@@ -2659,11 +2659,12 @@
+ if (config->output[o]->crtc == crtc)
+ config->output[o]->crtc = NULL;
+ crtc->enabled = FALSE;
++ ++failed;
+ }
+ }
+
+ xf86DisableUnusedFunctions(scrn);
+- return enabled != 0;
++ return enabled != 0 || failed == 0;
+ }
+
+ /**
--- a/open-src/xserver/xorg/patch-list Thu May 09 11:04:14 2013 -0700
+++ b/open-src/xserver/xorg/patch-list Fri May 17 12:39:19 2013 -0700
@@ -27,3 +27,4 @@
cli-nolock.patch,-p1
16418361.patch,-p1
sparc-config-improv.patch,-p1
+16794101.patch,-p1
--- a/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Makefile Thu May 09 11:04:14 2013 -0700
+++ b/open-src/xserver/xorg/sun-src/os/solaris/mdb/modules/Makefile Fri May 17 12:39:19 2013 -0700
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2010, 2012, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2010, 2013, Oracle and/or its affiliates. All rights reserved.
#
# Permission is hereby granted, free of charge, to any person obtaining a
# copy of this software and associated documentation files (the "Software"),
@@ -26,7 +26,7 @@
CFLAGS += -K pic -g
CPPFLAGS += -I ../../../../include -I ../../../.. -I ../../../../Xext
-LDFLAGS += -Wl,-z,text -M mapfile -Wl,-z,parent=/usr/bin/$(ARCHLIBSUBDIR)/mdb
+LDFLAGS += -lc -Wl,-z,text -M mapfile -Wl,-z,parent=/usr/bin/$(ARCHLIBSUBDIR)/mdb
HEADERS = Xserver_mdb.h
SOURCES = Xserver_clients.c Xserver_device_grabs.c mdb_module.c