1634N/A--- a/hw/xfree86/sdksyms.sh Fri Jan 8 15:20:10 2016
1634N/A+++ b/hw/xfree86/sdksyms.sh Fri Jan 8 15:20:28 2016
1634N/A@@ -302,7 +302,13 @@
1634N/A LC_ALL=C
1634N/A export LC_ALL
1634N/A ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
1634N/A-${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
1634N/A+# Some cpps add spaces in the middle of __attribute__((visibility(...)))
1634N/A+# so we need to remove them for the following awk script to work.
1634N/A+# Changes by alanc upstream
1634N/A+${CPP:-cpp} "$@" sdksyms.c | \
1634N/A+ ${SED:-sed} -e 's/( /(/g' -e 's/_ (/_(/g' -e 's/ )/)/g' \
1634N/A+ -e 's/visibility (/visibility(/' | \
1634N/A+ ${AWK:-awk} -v topdir=$topdir '
1634N/A BEGIN {
1634N/A sdk = 0;
1634N/A print("/*");
1634N/A
1634N/A--- a/hw/xfree86/drivers/modesetting/Makefile.am Thu Feb 26 13:47:39 2015
1634N/A+++ b/hw/xfree86/drivers/modesetting/Makefile.am Thu Feb 26 13:48:23 2015
1634N/A@@ -39,7 +39,9 @@
1634N/A
1634N/A modesetting_drv_la_LTLIBRARIES = modesetting_drv.la
1634N/A modesetting_drv_la_LDFLAGS = -module -avoid-version
1634N/A-modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS)
1634N/A+modesetting_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
1634N/A+modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) $(LIBDRM_LIBS) $(top_builddir)/fb/libfb.la $(top_builddir)/miext/shadow/libshadow.la
1634N/A+
1634N/A modesetting_drv_ladir = @moduledir@/drivers
1634N/A
1634N/A modesetting_drv_la_SOURCES = \
1634N/A--- a/hw/xfree86/utils/cvt/cvt.c Sun May 3 12:41:51 2015
1634N/A+++ b/hw/xfree86/utils/cvt/cvt.c Mon May 4 09:13:02 2015
1634N/A@@ -39,6 +39,13 @@
1634N/A {
1634N/A abort();
1634N/A }
1634N/A+
1634N/A+/* added to quieten LogMessage undefined symbol error while compiling with Studio 12.4 */
1634N/A+#include "os.h"
1634N/A+_X_HIDDEN void
1634N/A+LogMessage(MessageType type, const char *format, ...) {
1634N/A+ abort();
1634N/A+}
1634N/A #endif
1634N/A
1634N/A #include "xf86.h"
1634N/A--- a/hw/dmx/config/xdmxconfig.c Mon May 4 10:01:10 2015
1634N/A+++ b/hw/dmx/config/xdmxconfig.c Mon May 4 10:01:43 2015
1634N/A@@ -63,6 +63,13 @@
1634N/A {
1634N/A abort();
1634N/A }
1634N/A+
1634N/A+/* added to quieten LogMessage undefined symbol error while compiling with Studio 12.4 */
1634N/A+#include "os.h"
1634N/A+_X_HIDDEN void
1634N/A+LogMessage(MessageType type, const char *format, ...) {
1634N/A+ abort();
1634N/A+}
1634N/A #endif
1634N/A
1634N/A #define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n"
1634N/A--- a/glx/glxdriswrast.c Fri Jan 8 15:45:38 2016
1634N/A+++ b/glx/glxdriswrast.c Fri Jan 8 15:45:53 2016
1634N/A@@ -519,7 +519,7 @@
1634N/A return NULL;
1634N/A }
1634N/A
1634N/A-_X_EXPORT __GLXprovider __glXDRISWRastProvider = {
1634N/A+__GLXprovider __glXDRISWRastProvider = {
1634N/A __glXDRIscreenProbe,
1634N/A "DRISWRAST",
1634N/A NULL
1634N/A--- a/glx/glxscreens.c Fri Jan 8 15:46:15 2016
1634N/A+++ b/glx/glxscreens.c Fri Jan 8 15:46:29 2016
1634N/A@@ -193,7 +193,7 @@
1634N/A return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey);
1634N/A }
1634N/A
1634N/A-_X_EXPORT void
1634N/A+void
1634N/A GlxSetVisualConfigs(int nconfigs, void *configs, void **privates)
1634N/A {
1634N/A /* We keep this stub around for the DDX drivers that still
1634N/A--- a/include/input.h Fri Jan 8 15:46:44 2016
1634N/A+++ b/include/input.h Fri Jan 8 15:47:06 2016
1634N/A@@ -604,7 +604,7 @@
1634N/A xEvent *xE,
1634N/A WindowPtr pWin, Window child, Bool calcChild);
1634N/A extern Bool PointInBorderSize(WindowPtr pWin, int x, int y);
1634N/A-extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
1634N/A+extern _X_EXPORT WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
1634N/A extern int EventIsDeliverable(DeviceIntPtr dev, int evtype, WindowPtr win);
1634N/A extern Bool ActivatePassiveGrab(DeviceIntPtr dev, GrabPtr grab,
1634N/A InternalEvent *ev, InternalEvent *real_event);