components/x11/xorg-server/patches/31-118-port.patch

   1 --- a/hw/xfree86/sdksyms.sh     Fri Jan  8 15:20:10 2016
   2 +++ b/hw/xfree86/sdksyms.sh     Fri Jan  8 15:20:28 2016
   3 @@ -302,7 +302,13 @@
   4  LC_ALL=C
   5  export LC_ALL
   6  ${CPP:-cpp} "$@" sdksyms.c > /dev/null || exit $?
   7 -${CPP:-cpp} "$@" sdksyms.c | ${AWK:-awk} -v topdir=$topdir '
   8 +# Some cpps add spaces in the middle of __attribute__((visibility(...)))
   9 +# so we need to remove them for the following awk script to work.
  10 +# Changes by alanc upstream
  11 +${CPP:-cpp} "$@" sdksyms.c | \
  12 +    ${SED:-sed} -e 's/( /(/g' -e 's/_ (/_(/g' -e 's/ )/)/g' \
  13 +    -e 's/visibility (/visibility(/' | \
  14 +    ${AWK:-awk} -v topdir=$topdir '
  15  BEGIN {
  16      sdk = 0;
  17      print("/*");
  18
  19 --- a/hw/xfree86/drivers/modesetting/Makefile.am        Thu Feb 26 13:47:39 2015
  20 +++ b/hw/xfree86/drivers/modesetting/Makefile.am        Thu Feb 26 13:48:23 2015
  21 @@ -39,7 +39,9 @@
  22
  23  modesetting_drv_la_LTLIBRARIES = modesetting_drv.la
  24  modesetting_drv_la_LDFLAGS = -module -avoid-version
  25 -modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS)
  26 +modesetting_drv_la_LDFLAGS += $(XORG_EXTERNS_FLAG)
  27 +modesetting_drv_la_LIBADD = $(UDEV_LIBS) $(DRM_LIBS) $(LIBDRM_LIBS) $(top_builddir)/fb/libfb.la $(top_builddir)/miext/shadow/libshadow.la
  28 +
  29  modesetting_drv_ladir = @moduledir@/drivers
  30
  31  modesetting_drv_la_SOURCES = \
  32 --- a/hw/xfree86/utils/cvt/cvt.c        Sun May  3 12:41:51 2015
  33 +++ b/hw/xfree86/utils/cvt/cvt.c        Mon May  4 09:13:02 2015
  34 @@ -39,6 +39,13 @@
  35  {
  36      abort();
  37  }
  38 +
  39 +/* added to quieten LogMessage undefined symbol error while compiling with Studio 12.4 */
  40 +#include "os.h"
  41 +_X_HIDDEN void
  42 +LogMessage(MessageType type, const char *format, ...) {
  43 +       abort();
  44 +}
  45  #endif
  46
  47  #include "xf86.h"
  48 --- a/hw/dmx/config/xdmxconfig.c        Mon May  4 10:01:10 2015
  49 +++ b/hw/dmx/config/xdmxconfig.c        Mon May  4 10:01:43 2015
  50 @@ -63,6 +63,13 @@
  51  {
  52      abort();
  53  }
  54 +
  55 +/* added to quieten LogMessage undefined symbol error while compiling with Studio 12.4 */
  56 +#include "os.h"
  57 +_X_HIDDEN void
  58 +LogMessage(MessageType type, const char *format, ...) {
  59 +       abort();
  60 +}
  61  #endif
  62
  63  #define DMX_INFO "xdmxconfig v0.9\nCopyright 2002 Red Hat Inc.\n"
  64 --- a/glx/glxdriswrast.c        Fri Jan  8 15:45:38 2016
  65 +++ b/glx/glxdriswrast.c        Fri Jan  8 15:45:53 2016
  66 @@ -519,7 +519,7 @@
  67      return NULL;
  68  }
  69
  70 -_X_EXPORT __GLXprovider __glXDRISWRastProvider = {
  71 +__GLXprovider __glXDRISWRastProvider = {
  72      __glXDRIscreenProbe,
  73      "DRISWRAST",
  74      NULL
  75 --- a/glx/glxscreens.c  Fri Jan  8 15:46:15 2016
  76 +++ b/glx/glxscreens.c  Fri Jan  8 15:46:29 2016
  77 @@ -193,7 +193,7 @@
  78      return dixLookupPrivate(&pScreen->devPrivates, glxScreenPrivateKey);
  79  }
  80
  81 -_X_EXPORT void
  82 +void
  83  GlxSetVisualConfigs(int nconfigs, void *configs, void **privates)
  84  {
  85      /* We keep this stub around for the DDX drivers that still
  86 --- a/include/input.h   Fri Jan  8 15:46:44 2016
  87 +++ b/include/input.h   Fri Jan  8 15:47:06 2016
  88 @@ -604,7 +604,7 @@
  89                            xEvent *xE,
  90                            WindowPtr pWin, Window child, Bool calcChild);
  91  extern Bool PointInBorderSize(WindowPtr pWin, int x, int y);
  92 -extern WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
  93 +extern _X_EXPORT WindowPtr XYToWindow(SpritePtr pSprite, int x, int y);
  94  extern int EventIsDeliverable(DeviceIntPtr dev, int evtype, WindowPtr win);
  95  extern Bool ActivatePassiveGrab(DeviceIntPtr dev, GrabPtr grab,
  96                                  InternalEvent *ev, InternalEvent *real_event);