ODROID-U3 xorg-server debian package fork :

[deb_xorg-server.git] / debian / patches / xfree86_add_matchseat_key_to_xorg_conf.patch

diff --git a/debian/patches/xfree86_add_matchseat_key_to_xorg_conf.patch b/debian/patches/xfree86_add_matchseat_key_to_xorg_conf.patch
index 31ab950600c8ea6a8eccb279ff3ae95ec9061ed8..f6d3fa332a62f0b2205d8dbde4d0d4c153b5c9cb 100644 (file)
--- a/debian/patches/xfree86_add_matchseat_key_to_xorg_conf.patch
+++ b/debian/patches/xfree86_add_matchseat_key_to_xorg_conf.patch
@@ -42,11 +42,9 @@ Signed-off-by: Peter Hutterer <peter.hutterer@who-t.net>
  hw/xfree86/parser/xf86tokens.h |  1 +
  6 files changed, 47 insertions(+), 9 deletions(-)
 
-Index: xorg-server-trusty-matchseat/hw/xfree86/common/xf86Config.c
-===================================================================
---- xorg-server-trusty-matchseat.orig/hw/xfree86/common/xf86Config.c   2014-09-11 10:50:39.823851011 -0300
-+++ xorg-server-trusty-matchseat/hw/xfree86/common/xf86Config.c        2014-09-11 10:55:16.098992439 -0300
-@@ -232,6 +232,18 @@
+--- a/hw/xfree86/common/xf86Config.c
++++ b/hw/xfree86/common/xf86Config.c
+@@ -233,6 +233,18 @@ xf86ValidateFontPath(char *path)
      return tmp_path;
  }
  
@@ -65,7 +63,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/common/xf86Config.c
  /*
   * use the datastructure that the parser provides and pick out the parts
   * that we need at this point
-@@ -1600,8 +1612,11 @@
+@@ -1604,8 +1616,11 @@ configLayout(serverLayoutPtr servlayoutp
       * config file, or - if it is NULL - configScreen autogenerates one for
       * us */
      if (!count) {
@@ -78,7 +76,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/common/xf86Config.c
                            0, X_CONFIG)) {
              free(slp[0].screen);
              free(slp);
-@@ -1841,7 +1856,7 @@
+@@ -1845,7 +1860,7 @@ configScreen(confScreenPtr screenp, XF86
       * set it to NULL so that the section can be autoconfigured later */
      screenp->device = xnfcalloc(1, sizeof(GDevRec));
      if ((!conf_screen->scrn_device) && (xf86configptr->conf_device_lst)) {
@@ -87,7 +85,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/common/xf86Config.c
          xf86Msg(X_DEFAULT, "No device specified for screen \"%s\".\n"
                  "\tUsing the first device section listed.\n", screenp->id);
      }
-@@ -2374,6 +2389,7 @@
+@@ -2378,6 +2393,7 @@ xf86HandleConfigFile(Bool autoconfig)
      char *scanptr;
      Bool singlecard = 0;
      Bool implicit_layout = FALSE;
@@ -95,7 +93,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/common/xf86Config.c
  
      if (!autoconfig) {
          char *filename, *dirname, *sysdirname;
-@@ -2449,14 +2465,17 @@
+@@ -2453,14 +2469,17 @@ xf86HandleConfigFile(Bool autoconfig)
       */
  
      /* First check if a layout section is present, and if it is valid. */
@@ -115,7 +113,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/common/xf86Config.c
                                   xf86configptr)) {
              xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
              return CONFIG_PARSE_ERROR;
-@@ -2471,16 +2490,13 @@
+@@ -2475,16 +2494,13 @@ xf86HandleConfigFile(Bool autoconfig)
              if (optlist && xf86FindOption(optlist, "defaultserverlayout"))
                  dfltlayout =
                      xf86SetStrOption(optlist, "defaultserverlayout", NULL);
@@ -134,11 +132,9 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/common/xf86Config.c
                  xf86Msg(X_ERROR, "Unable to determine the screen layout\n");
                  return CONFIG_PARSE_ERROR;
              }
-Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Device.c
-===================================================================
---- xorg-server-trusty-matchseat.orig/hw/xfree86/parser/Device.c       2014-09-11 10:48:54.272129993 -0300
-+++ xorg-server-trusty-matchseat/hw/xfree86/parser/Device.c    2014-09-11 10:55:16.094992284 -0300
-@@ -72,6 +72,7 @@
+--- a/hw/xfree86/parser/Device.c
++++ b/hw/xfree86/parser/Device.c
+@@ -72,6 +72,7 @@ xf86ConfigSymTabRec DeviceTab[] = {
      {RAMDAC, "ramdac"},
      {DACSPEED, "dacspeed"},
      {CLOCKS, "clocks"},
@@ -146,7 +142,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Device.c
      {OPTION, "option"},
      {VIDEORAM, "videoram"},
      {BIOSBASE, "biosbase"},
-@@ -217,6 +218,11 @@
+@@ -217,6 +218,11 @@ xf86parseDeviceSection(void)
                  Error(NUMBER_MSG, "TextClockFreq");
              ptr->dev_textclockfreq = (int) (val.realnum * 1000.0 + 0.5);
              break;
@@ -158,11 +154,9 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Device.c
          case OPTION:
              ptr->dev_option_lst = xf86parseOption(ptr->dev_option_lst);
              break;
-Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Layout.c
-===================================================================
---- xorg-server-trusty-matchseat.orig/hw/xfree86/parser/Layout.c       2014-09-11 10:48:54.272129993 -0300
-+++ xorg-server-trusty-matchseat/hw/xfree86/parser/Layout.c    2014-09-11 10:55:16.094992284 -0300
-@@ -71,6 +71,7 @@
+--- a/hw/xfree86/parser/Layout.c
++++ b/hw/xfree86/parser/Layout.c
+@@ -71,6 +71,7 @@ static xf86ConfigSymTabRec LayoutTab[] =
      {ENDSECTION, "endsection"},
      {SCREEN, "screen"},
      {IDENTIFIER, "identifier"},
@@ -170,7 +164,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Layout.c
      {INACTIVE, "inactive"},
      {INPUTDEVICE, "inputdevice"},
      {OPTION, "option"},
-@@ -110,6 +111,11 @@
+@@ -110,6 +111,11 @@ xf86parseLayoutSection(void)
              ptr->lay_identifier = val.str;
              has_ident = TRUE;
              break;
@@ -182,11 +176,9 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Layout.c
          case INACTIVE:
          {
              XF86ConfInactivePtr iptr;
-Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Screen.c
-===================================================================
---- xorg-server-trusty-matchseat.orig/hw/xfree86/parser/Screen.c       2014-09-11 10:48:54.272129993 -0300
-+++ xorg-server-trusty-matchseat/hw/xfree86/parser/Screen.c    2014-09-11 10:55:16.094992284 -0300
-@@ -199,6 +199,7 @@
+--- a/hw/xfree86/parser/Screen.c
++++ b/hw/xfree86/parser/Screen.c
+@@ -199,6 +199,7 @@ xf86parseDisplaySubSection(void)
  static xf86ConfigSymTabRec ScreenTab[] = {
      {ENDSECTION, "endsection"},
      {IDENTIFIER, "identifier"},
@@ -194,7 +186,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Screen.c
      {OBSDRIVER, "driver"},
      {MDEVICE, "device"},
      {MONITOR, "monitor"},
-@@ -237,6 +238,11 @@
+@@ -237,6 +238,11 @@ xf86parseScreenSection(void)
                  Error(ONLY_ONE_MSG, "Identifier or Driver");
              has_ident = TRUE;
              break;
@@ -206,11 +198,9 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/Screen.c
          case OBSDRIVER:
              if (xf86getSubToken(&(ptr->scrn_comment)) != STRING)
                  Error(QUOTE_MSG, "Driver");
-Index: xorg-server-trusty-matchseat/hw/xfree86/parser/xf86Parser.h
-===================================================================
---- xorg-server-trusty-matchseat.orig/hw/xfree86/parser/xf86Parser.h   2014-09-11 10:48:54.272129993 -0300
-+++ xorg-server-trusty-matchseat/hw/xfree86/parser/xf86Parser.h        2014-09-11 10:55:16.094992284 -0300
-@@ -224,6 +224,7 @@
+--- a/hw/xfree86/parser/xf86Parser.h
++++ b/hw/xfree86/parser/xf86Parser.h
+@@ -224,6 +224,7 @@ typedef struct {
      int dev_screen;
      XF86OptionPtr dev_option_lst;
      char *dev_comment;
@@ -218,7 +208,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/xf86Parser.h
  } XF86ConfDeviceRec, *XF86ConfDevicePtr;
  
  typedef struct {
-@@ -275,6 +276,7 @@
+@@ -275,6 +276,7 @@ typedef struct {
      XF86OptionPtr scrn_option_lst;
      char *scrn_comment;
      int scrn_virtualX, scrn_virtualY;
@@ -226,7 +216,7 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/xf86Parser.h
  } XF86ConfScreenRec, *XF86ConfScreenPtr;
  
  typedef struct {
-@@ -366,6 +368,7 @@
+@@ -366,6 +368,7 @@ typedef struct {
      XF86ConfInactivePtr lay_inactive_lst;
      XF86ConfInputrefPtr lay_input_lst;
      XF86OptionPtr lay_option_lst;
@@ -234,11 +224,9 @@ Index: xorg-server-trusty-matchseat/hw/xfree86/parser/xf86Parser.h
      char *lay_comment;
  } XF86ConfLayoutRec, *XF86ConfLayoutPtr;
  
-Index: xorg-server-trusty-matchseat/hw/xfree86/parser/xf86tokens.h
-===================================================================
---- xorg-server-trusty-matchseat.orig/hw/xfree86/parser/xf86tokens.h   2014-09-11 10:48:54.272129993 -0300
-+++ xorg-server-trusty-matchseat/hw/xfree86/parser/xf86tokens.h        2014-09-11 10:55:16.094992284 -0300
-@@ -87,6 +87,7 @@
+--- a/hw/xfree86/parser/xf86tokens.h
++++ b/hw/xfree86/parser/xf86tokens.h
+@@ -87,6 +87,7 @@ typedef enum {
      VENDOR,
      DASH,
      COMMA,