components/x11/xorg-server/patches/13-autoconfig.patch

   1 # Copyright (c) 2006, 2012, Oracle and/or its affiliates. All rights reserved.
   2 #
   3 # Permission is hereby granted, free of charge, to any person obtaining a
   4 # copy of this software and associated documentation files (the "Software"),
   5 # to deal in the Software without restriction, including without limitation
   6 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
   7 # and/or sell copies of the Software, and to permit persons to whom the
   8 # Software is furnished to do so, subject to the following conditions:
   9 #
  10 # The above copyright notice and this permission notice (including the next
  11 # paragraph) shall be included in all copies or substantial portions of the
  12 # Software.
  13 #
  14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
  15 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
  16 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
  17 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
  18 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
  19 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  20 # DEALINGS IN THE SOFTWARE.
  21 6385111: Xorg auto-configuration Improvement
  22
  23 diff --git a/hw/xfree86/common/xf86Config.c b/hw/xfree86/common/xf86Config.c
  24 index 891623d..ca1b1aa 100644
  25 --- a/hw/xfree86/common/xf86Config.c
  26 +++ b/hw/xfree86/common/xf86Config.c
  27 @@ -1111,6 +1111,7 @@
  28  freeDevice(InputInfoPtr * list, InputInfoPtr pInfo)
  29  {
  30      InputInfoPtr *devs;
  31 +    char **end, **drv, **drivers, **x;
  32
  33      for (devs = list; devs && *devs; devs++) {
  34          if (*devs == pInfo) {
  35
  36 @@ -1993,7 +1993,7 @@ configMonitor(MonPtr monitorp, XF86ConfMonitorPtr conf_monitor)
  37      cmodep = conf_monitor->mon_modeline_lst;
  38      while (cmodep) {
  39          mode = xnfcalloc(1, sizeof(DisplayModeRec));
  40 -        mode->type = 0;
  41 +        mode->type = M_T_USERDEF;
  42          mode->Clock = cmodep->ml_clock;
  43          mode->HDisplay = cmodep->ml_hdisplay;
  44          mode->HSyncStart = cmodep->ml_hsyncstart;