open-src/xserver/xorg/nvidia-autoconfig.patch
changeset 919 425233ae7236
parent 851 d428083dbbdd
child 943 294f64612d23
equal deleted inserted replaced
918:813b95829e8b 919:425233ae7236
     1 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
     1 # Copyright 2009 Sun Microsystems, Inc.  All rights reserved.
     2 # Use is subject to license terms.
     2 # Use is subject to license terms.
     3 #
     3 #
     4 # Permission is hereby granted, free of charge, to any person obtaining a
     4 # Permission is hereby granted, free of charge, to any person obtaining a
     5 # copy of this software and associated documentation files (the
     5 # copy of this software and associated documentation files (the "Software"),
     6 # "Software"), to deal in the Software without restriction, including
     6 # to deal in the Software without restriction, including without limitation
     7 # without limitation the rights to use, copy, modify, merge, publish,
     7 # the rights to use, copy, modify, merge, publish, distribute, sublicense,
     8 # distribute, and/or sell copies of the Software, and to permit persons
     8 # and/or sell copies of the Software, and to permit persons to whom the
     9 # to whom the Software is furnished to do so, provided that the above
     9 # Software is furnished to do so, subject to the following conditions:
    10 # copyright notice(s) and this permission notice appear in all copies of
    10 #
    11 # the Software and that both the above copyright notice(s) and this
    11 # The above copyright notice and this permission notice (including the next
    12 # permission notice appear in supporting documentation.
    12 # paragraph) shall be included in all copies or substantial portions of the
    13 # 
    13 # Software.
    14 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
    14 #
    15 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
    15 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    16 # MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
    16 # IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    17 # OF THIRD PARTY RIGHTS. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
    17 # FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
    18 # HOLDERS INCLUDED IN THIS NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL
    18 # THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    19 # INDIRECT OR CONSEQUENTIAL DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING
    19 # LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
    20 # FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT,
    20 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
    21 # NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
    21 # DEALINGS IN THE SOFTWARE.
    22 # WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
       
    23 # 
       
    24 # Except as contained in this notice, the name of a copyright holder
       
    25 # shall not be used in advertising or otherwise to promote the sale, use
       
    26 # or other dealings in this Software without prior written authorization
       
    27 # of the copyright holder.
       
    28 
       
    29 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
    22 diff -urp -x '*~' -x '*.orig' hw/xfree86/common/xf86Config.c hw/xfree86/common/xf86Config.c
    30 --- hw/xfree86/common/xf86Config.c	2009-11-03 22:29:03.988992847 -0800
    23 --- hw/xfree86/common/xf86Config.c	2009-11-03 22:29:03.988992847 -0800
    31 +++ hw/xfree86/common/xf86Config.c	2009-11-03 22:29:05.439748324 -0800
    24 +++ hw/xfree86/common/xf86Config.c	2009-11-03 22:29:05.439748324 -0800
    32 @@ -534,11 +534,30 @@ fixup_video_driver_list(char **drivers)
    25 @@ -534,11 +534,30 @@ fixup_video_driver_list(char **drivers)
    33                  if (!strcmp(*drv, "ati")) {
    26                  if (!strcmp(*drv, "ati")) {