components/x11/xorg-server/patches/29-glx-mesa.patch

   1 # Remove this patch once Mesa is updated to the latest release
   2 --- a/glx/glxdricommon.c        Fri Dec 13 16:15:57 2013
   3 +++ b/glx/glxdricommon.c        Fri Dec 13 16:22:22 2013
   4 @@ -209,6 +209,7 @@
   5
   6  static const char dri_driver_path[] = DRI_DRIVER_PATH;
   7
   8 +#if 0
   9  /* Temporary define to allow building without a dri_interface.h from
  10   * updated Mesa.  Some day when we don't care about Mesa that old any
  11   * more this can be removed.
  12 @@ -216,6 +217,7 @@
  13  #ifndef __DRI_DRIVER_GET_EXTENSIONS
  14  #define __DRI_DRIVER_GET_EXTENSIONS "__driDriverGetExtensions"
  15  #endif
  16 +#endif
  17
  18  void *
  19  glxProbeDriver(const char *driverName,
  20 @@ -238,6 +240,7 @@
  21          goto cleanup_failure;
  22      }
  23
  24 +#if 0
  25      if (asprintf(&get_extensions_name, "%s_%s",
  26                   __DRI_DRIVER_GET_EXTENSIONS, driverName) != -1) {
  27          const __DRIextension **(*get_extensions)(void);
  28 @@ -249,7 +252,8 @@
  29      }
  30
  31      if (!extensions)
  32 -        extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
  33 +#endif
  34 +    extensions = dlsym(driver, __DRI_DRIVER_EXTENSIONS);
  35      if (extensions == NULL) {
  36          LogMessage(X_ERROR, "AIGLX error: %s exports no extensions (%s)\n",
  37                     driverName, dlerror());