Home | History | Annotate | Line # | Download | only in dist
ChangeLog revision 1.1.1.4
      1  1.1.1.4  mrg commit 4dd4a5da0697d33df0f456ccf224d5be945b7aab
      2  1.1.1.4  mrg Author: Matt Turner <mattst88 (a] gmail.com>
      3  1.1.1.4  mrg Date:   Tue Jan 17 14:48:21 2017 -0800
      4  1.1.1.4  mrg 
      5  1.1.1.4  mrg     xf86-video-tdfx 1.4.7
      6  1.1.1.4  mrg     
      7  1.1.1.4  mrg     Signed-off-by: Matt Turner <mattst88 (a] gmail.com>
      8  1.1.1.4  mrg 
      9  1.1.1.4  mrg commit b99390efcb55d7d4a68e8c595119c1af4426fc0b
     10  1.1.1.4  mrg Author: Adam Jackson <ajax (a] redhat.com>
     11  1.1.1.4  mrg Date:   Tue Jul 19 10:03:56 2016 -0400
     12  1.1.1.4  mrg 
     13  1.1.1.4  mrg     Adapt Block/WakeupHandler signature for ABI 23
     14  1.1.1.4  mrg     
     15  1.1.1.4  mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
     16  1.1.1.4  mrg 
     17  1.1.1.3  mrg commit 278042ff4c469f24ab7bc28e517e8a78e2821ddc
     18  1.1.1.3  mrg Author: Matt Turner <mattst88 (a] gmail.com>
     19  1.1.1.3  mrg Date:   Sun Feb 22 13:26:24 2015 -0800
     20  1.1.1.3  mrg 
     21  1.1.1.3  mrg     xf86-video-tdfx 1.4.6
     22  1.1.1.3  mrg     
     23  1.1.1.3  mrg     Signed-off-by: Matt Turner <mattst88 (a] gmail.com>
     24  1.1.1.3  mrg 
     25  1.1.1.3  mrg commit 2f71b05e29ae13a0fb6fbc74f4f76c78b6ddb0d7
     26  1.1.1.3  mrg Author: Adam Jackson <ajax (a] redhat.com>
     27  1.1.1.3  mrg Date:   Tue Jul 29 09:15:49 2014 -0400
     28  1.1.1.3  mrg 
     29  1.1.1.3  mrg     dri: Stop (uselessly) initializing the ValidateTree hooks
     30  1.1.1.3  mrg     
     31  1.1.1.3  mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
     32  1.1.1.3  mrg 
     33  1.1.1.3  mrg commit d8873445199bf1d229503ff1d12c6a2f3f23c863
     34  1.1.1.3  mrg Author: Guillem Jover <guillem (a] hadrons.org>
     35  1.1.1.3  mrg Date:   Thu Oct 3 15:35:05 2013 +0200
     36  1.1.1.3  mrg 
     37  1.1.1.3  mrg     Add more PCI IDs for supported chips
     38  1.1.1.3  mrg     
     39  1.1.1.3  mrg     Add support for Velocity and Voodoo4 chips.
     40  1.1.1.3  mrg     
     41  1.1.1.3  mrg     Signed-off-by: Guillem Jover <guillem (a] hadrons.org>
     42  1.1.1.3  mrg     Reviewed-by: Adam Jackson <ajax (a] redhat.com>
     43  1.1.1.3  mrg 
     44  1.1.1.3  mrg commit b15c1e8ef9858c85ead44ded22c7d48bd8ffa501
     45  1.1.1.3  mrg Author: Guillem Jover <guillem (a] hadrons.org>
     46  1.1.1.3  mrg Date:   Thu Oct 3 14:25:45 2013 +0200
     47  1.1.1.3  mrg 
     48  1.1.1.3  mrg     Unmap MMIO ranges for all chips
     49  1.1.1.3  mrg     
     50  1.1.1.3  mrg     This is relevant on SLI setups, where each chip has their own MMIO
     51  1.1.1.3  mrg     range.
     52  1.1.1.3  mrg     
     53  1.1.1.3  mrg     Signed-off-by: Guillem Jover <guillem (a] hadrons.org>
     54  1.1.1.3  mrg     Reviewed-by: Adam Jackson <ajax (a] redhat.com>
     55  1.1.1.3  mrg 
     56  1.1.1.3  mrg commit 828c151064083e4488a4cb3854f8dcb23265e5cb
     57  1.1.1.3  mrg Author: Guillem Jover <guillem (a] hadrons.org>
     58  1.1.1.3  mrg Date:   Wed Oct 2 21:22:33 2013 +0200
     59  1.1.1.3  mrg 
     60  1.1.1.3  mrg     Use the PCI ID macros instead of hardcoded values
     61  1.1.1.3  mrg     
     62  1.1.1.3  mrg     Signed-off-by: Guillem Jover <guillem (a] hadrons.org>
     63  1.1.1.3  mrg     Reviewed-by: Adam Jackson <ajax (a] redhat.com>
     64  1.1.1.3  mrg 
     65  1.1.1.3  mrg commit 58b2ac6dd1487580f49869f582a8852b003a34fa
     66  1.1.1.3  mrg Author: Guillem Jover <guillem (a] hadrons.org>
     67  1.1.1.3  mrg Date:   Tue Oct 1 05:36:34 2013 +0200
     68  1.1.1.3  mrg 
     69  1.1.1.3  mrg     Remove unreachable breaks after return statements
     70  1.1.1.3  mrg     
     71  1.1.1.3  mrg     Signed-off-by: Guillem Jover <guillem (a] hadrons.org>
     72  1.1.1.3  mrg     Reviewed-by: Adam Jackson <ajax (a] redhat.com>
     73  1.1.1.3  mrg 
     74  1.1.1.3  mrg commit 774461a4ac92c39c3b3ec975a887540dfa791eae
     75  1.1.1.3  mrg Author: Guillem Jover <guillem (a] hadrons.org>
     76  1.1.1.3  mrg Date:   Fri Sep 27 19:20:11 2013 +0200
     77  1.1.1.3  mrg 
     78  1.1.1.3  mrg     Use new pci_device_(un)map_range functions instead of deprecated ones
     79  1.1.1.3  mrg     
     80  1.1.1.3  mrg     Signed-off-by: Guillem Jover <guillem (a] hadrons.org>
     81  1.1.1.3  mrg     Reviewed-by: Adam Jackson <ajax (a] redhat.com>
     82  1.1.1.3  mrg 
     83  1.1.1.3  mrg commit 646137de571a9df950d3a3edb454803268fd5f98
     84  1.1.1.3  mrg Author: Guillem Jover <guillem (a] hadrons.org>
     85  1.1.1.3  mrg Date:   Fri Sep 27 19:06:31 2013 +0200
     86  1.1.1.3  mrg 
     87  1.1.1.3  mrg     Rename XSERVER_PCIACCESS to XSERVER_LIBPCIACCESS
     88  1.1.1.3  mrg     
     89  1.1.1.3  mrg     Using the wrong macro name means that the code uses an obsolete typedef
     90  1.1.1.3  mrg     that issues warnings.
     91  1.1.1.3  mrg     
     92  1.1.1.3  mrg     Signed-off-by: Guillem Jover <guillem (a] hadrons.org>
     93  1.1.1.3  mrg     Reviewed-by: Adam Jackson <ajax (a] redhat.com>
     94  1.1.1.3  mrg 
     95  1.1.1.3  mrg commit 457bd576a4895f0d3a65e550dbe2470177bf650d
     96  1.1.1.3  mrg Author: Guillem Jover <guillem (a] hadrons.org>
     97  1.1.1.3  mrg Date:   Fri Sep 27 18:52:01 2013 +0200
     98  1.1.1.3  mrg 
     99  1.1.1.3  mrg     Define local PCI IDs instead of using xf86PciInfo.h
    100  1.1.1.3  mrg     
    101  1.1.1.3  mrg     The header file is deprecated and issues a warning now. Stop using
    102  1.1.1.3  mrg     it, and move the definitions to the local tree as recommended by the
    103  1.1.1.3  mrg     warning.
    104  1.1.1.3  mrg     
    105  1.1.1.3  mrg     Signed-off-by: Guillem Jover <guillem (a] hadrons.org>
    106  1.1.1.3  mrg     Reviewed-by: Adam Jackson <ajax (a] redhat.com>
    107  1.1.1.3  mrg 
    108  1.1.1.3  mrg commit 10498d2730c651eb7a1890eb9e728269732e9dad
    109  1.1.1.3  mrg Author: Adam Jackson <ajax (a] redhat.com>
    110  1.1.1.3  mrg Date:   Tue Sep 25 08:54:59 2012 -0400
    111  1.1.1.3  mrg 
    112  1.1.1.3  mrg     Remove mibstore.h
    113  1.1.1.3  mrg     
    114  1.1.1.3  mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
    115  1.1.1.3  mrg 
    116  1.1.1.2  mrg commit a1037f73cf5da0ee3fec1867a5f20305d9267e63
    117  1.1.1.2  mrg Author: Dave Airlie <airlied (a] redhat.com>
    118  1.1.1.2  mrg Date:   Tue Jul 17 16:05:09 2012 +1000
    119      1.1  mrg 
    120  1.1.1.2  mrg     xf86-video-tdfx: bump to version 1.4.5
    121  1.1.1.2  mrg     
    122  1.1.1.2  mrg     Signed-off-by: Dave Airlie <airlied (a] redhat.com>
    123      1.1  mrg 
    124  1.1.1.2  mrg commit 42706433782656adcf831588cf9dde203e50402b
    125  1.1.1.2  mrg Author: Dave Airlie <airlied (a] gmail.com>
    126  1.1.1.2  mrg Date:   Mon Jul 16 19:01:23 2012 +1000
    127      1.1  mrg 
    128  1.1.1.2  mrg     tdfx: fix build against XAA-less server.
    129  1.1.1.2  mrg     
    130  1.1.1.2  mrg     Signed-off-by: Dave Airlie <airlied (a] redhat.com>
    131      1.1  mrg 
    132  1.1.1.2  mrg commit abeb6ba8edac356b510ae6e8427c3cb8a0cf6e7a
    133  1.1.1.2  mrg Author: Dave Airlie <airlied (a] redhat.com>
    134  1.1.1.2  mrg Date:   Wed Jun 6 19:34:08 2012 +0100
    135      1.1  mrg 
    136  1.1.1.2  mrg     tdfx: port to new compat API
    137  1.1.1.2  mrg     
    138  1.1.1.2  mrg     Signed-off-by: Dave Airlie <airlied (a] redhat.com>
    139      1.1  mrg 
    140  1.1.1.2  mrg commit 98d24dd99052322c71d1676e6d66c2c724f6066a
    141  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] oracle.com>
    142  1.1.1.2  mrg Date:   Fri Mar 23 19:59:33 2012 -0700
    143      1.1  mrg 
    144  1.1.1.2  mrg     xf86-video-tdfx 1.4.4
    145  1.1.1.2  mrg     
    146  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
    147      1.1  mrg 
    148  1.1.1.2  mrg commit a985b54c8559d7ff8f5481004d54989ed7499237
    149  1.1.1.2  mrg Author: Peter Hutterer <peter.hutterer (a] who-t.net>
    150  1.1.1.2  mrg Date:   Wed Jan 4 14:57:56 2012 +1000
    151      1.1  mrg 
    152  1.1.1.2  mrg     Untangle XF86DRI from the driver-specific DRI define
    153  1.1.1.2  mrg     
    154  1.1.1.2  mrg     XF86DRI is defined by xorg-server.h, so --disable-dri in the driver
    155  1.1.1.2  mrg     itself does exactly nothing other than not fill in the CFLAGS and thus stop
    156  1.1.1.2  mrg     the driver from compiling.
    157  1.1.1.2  mrg     
    158  1.1.1.2  mrg     Signed-off-by: Peter Hutterer <peter.hutterer (a] who-t.net>
    159      1.1  mrg 
    160  1.1.1.2  mrg commit 4d56f3a6a69717b04f46f3e22c3a0834050c1a46
    161  1.1.1.2  mrg Author: Stefan Dirsch <sndirsch (a] novell.com>
    162  1.1.1.2  mrg Date:   Thu Jul 30 11:28:28 2009 +0200
    163      1.1  mrg 
    164  1.1.1.2  mrg     Fix RPMLINT warning "64bit-portability-issue".
    165  1.1.1.2  mrg     
    166  1.1.1.2  mrg     Signed-off-by: Johannes Obermayr <johannesobermayr (a] gmx.de>
    167  1.1.1.2  mrg     Reviewed-by: Tormod Volden <debian.tormod (a] gmail.com>
    168      1.1  mrg 
    169  1.1.1.2  mrg commit fe60f0ed2a0647937cc46a45d497bdf7da4061a4
    170  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    171  1.1.1.2  mrg Date:   Mon Dec 19 17:33:17 2011 -0500
    172      1.1  mrg 
    173  1.1.1.2  mrg     Stop uselessly including xf86Priv.h
    174  1.1.1.2  mrg     
    175  1.1.1.2  mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
    176      1.1  mrg 
    177  1.1.1.2  mrg commit 5b5d3c8b23865724d4f6d71610760e80e4b032e6
    178  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    179  1.1.1.2  mrg Date:   Mon Dec 19 17:32:27 2011 -0500
    180      1.1  mrg 
    181  1.1.1.2  mrg     Fix for new vgaHW ABI
    182  1.1.1.2  mrg     
    183  1.1.1.2  mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
    184      1.1  mrg 
    185  1.1.1.2  mrg commit 92cb819839a2f37c3e3db4831aa45e5bb9b00651
    186  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    187  1.1.1.2  mrg Date:   Mon Dec 19 17:31:45 2011 -0500
    188      1.1  mrg 
    189  1.1.1.2  mrg     Make failure to XAA non-fatal
    190  1.1.1.2  mrg     
    191  1.1.1.2  mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
    192      1.1  mrg 
    193  1.1.1.2  mrg commit 4ea96c222ad0900ad53f506e485588e2a49a22f4
    194  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    195  1.1.1.2  mrg Date:   Thu Nov 17 15:54:27 2011 -0500
    196      1.1  mrg 
    197  1.1.1.2  mrg     Check ABI major not encoded ABI
    198  1.1.1.2  mrg     
    199  1.1.1.2  mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
    200      1.1  mrg 
    201  1.1.1.2  mrg commit 32cd2dfa1214ed3260bf2e40bad06927b18f7f7b
    202  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    203  1.1.1.2  mrg Date:   Wed Nov 16 14:44:02 2011 -0500
    204      1.1  mrg 
    205  1.1.1.2  mrg     Adapt to missing PIOOffset in vgahw
    206  1.1.1.2  mrg     
    207  1.1.1.2  mrg     This is actually pretty lame, and I should probably extend vgahw to make
    208  1.1.1.2  mrg     it easier to do this kind of trick.
    209  1.1.1.2  mrg     
    210  1.1.1.2  mrg     Signed-off-by: Adam Jackson <ajax (a] redhat.com>
    211      1.1  mrg 
    212  1.1.1.2  mrg commit d7be4a953859f12083c1743c73712f9f510d7fda
    213  1.1.1.2  mrg Author: Jeremy Huddleston <jeremyhu (a] apple.com>
    214  1.1.1.2  mrg Date:   Wed Oct 19 00:41:56 2011 -0700
    215      1.1  mrg 
    216  1.1.1.2  mrg     Use unsigned long rather than deprecated IOADDRESS
    217  1.1.1.2  mrg     
    218  1.1.1.2  mrg     Signed-off-by: Jeremy Huddleston <jeremyhu (a] apple.com>
    219      1.1  mrg 
    220  1.1.1.2  mrg commit 3a97ecb50f326dbe0e1a3b3656806a8a2d2a1c3d
    221  1.1.1.2  mrg Author: Jeremy Huddleston <jeremyhu (a] apple.com>
    222  1.1.1.2  mrg Date:   Sun Oct 9 18:46:10 2011 -0700
    223      1.1  mrg 
    224  1.1.1.2  mrg     Fix compiler warnings about signedness
    225  1.1.1.2  mrg     
    226  1.1.1.2  mrg     tdfx_sli.c:23:7: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    227  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    228  1.1.1.2  mrg     tdfx_sli.c:31:7: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    229  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    230  1.1.1.2  mrg     tdfx_sli.c:40:7: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    231  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    232  1.1.1.2  mrg     tdfx_sli.c:45:7: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    233  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    234  1.1.1.2  mrg     tdfx_sli.c: In function TDFXSetupSLI:
    235  1.1.1.2  mrg     tdfx_sli.c:155:2: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    236  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    237  1.1.1.2  mrg     tdfx_sli.c:161:4: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    238  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    239  1.1.1.2  mrg     tdfx_sli.c:163:4: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    240  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    241  1.1.1.2  mrg     tdfx_sli.c:165:4: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    242  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    243  1.1.1.2  mrg     tdfx_sli.c:175:4: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    244  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    245  1.1.1.2  mrg     tdfx_sli.c:275:7: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    246  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    247  1.1.1.2  mrg     tdfx_sli.c:764:2: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    248  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    249  1.1.1.2  mrg     tdfx_sli.c:768:2: warning: pointer targets in passing argument 2 of pci_device_cfg_read_u32 differ in signedness
    250  1.1.1.2  mrg     /var/tmp/jhbuild/include/pciaccess.h:153:5: note: expected uint32_t * but argument is of type int *
    251  1.1.1.2  mrg     
    252  1.1.1.2  mrg     Signed-off-by: Jeremy Huddleston <jeremyhu (a] apple.com>
    253  1.1.1.2  mrg 
    254  1.1.1.2  mrg commit 3cdf7e280c5be1bc72e38460d6c46f4ae04efc37
    255  1.1.1.2  mrg Author: Jeremy Huddleston <jeremyhu (a] apple.com>
    256  1.1.1.2  mrg Date:   Sun Oct 9 18:48:15 2011 -0700
    257  1.1.1.2  mrg 
    258  1.1.1.2  mrg     gettimeofday is in <sys/time.h>
    259  1.1.1.2  mrg     
    260  1.1.1.2  mrg     tdfx_priv.c:116:3: warning: implicit declaration of function gettimeofday
    261  1.1.1.2  mrg     
    262  1.1.1.2  mrg     Signed-off-by: Jeremy Huddleston <jeremyhu (a] apple.com>
    263  1.1.1.2  mrg 
    264  1.1.1.2  mrg commit f53f5a192025bec5547c2db16741e2a4eda20d74
    265  1.1.1.2  mrg Author: Jeremy Huddleston <jeremyhu (a] apple.com>
    266  1.1.1.2  mrg Date:   Sun Oct 9 18:47:27 2011 -0700
    267  1.1.1.2  mrg 
    268  1.1.1.2  mrg     Use malloc/calloc/realloc/free directly
    269  1.1.1.2  mrg     
    270  1.1.1.2  mrg     Signed-off-by: Jeremy Huddleston <jeremyhu (a] apple.com>
    271  1.1.1.2  mrg 
    272  1.1.1.2  mrg commit 0c4ffbec23de9a2b0da9310f1dfca50dcc1f7132
    273  1.1.1.2  mrg Author: Jesse Adkins <jesserayadkins (a] gmail.com>
    274  1.1.1.2  mrg Date:   Tue Sep 28 13:29:52 2010 -0700
    275  1.1.1.2  mrg 
    276  1.1.1.2  mrg     Purge cvs tags.
    277  1.1.1.2  mrg     
    278  1.1.1.2  mrg     Signed-off-by: Jesse Adkins <jesserayadkins (a] gmail.com>
    279  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] oracle.com>
    280  1.1.1.2  mrg 
    281  1.1.1.2  mrg commit fb533c0d378e9e4909b46b7d164111c2fe8af942
    282  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    283  1.1.1.2  mrg Date:   Wed Jul 21 16:49:04 2010 -0400
    284  1.1.1.2  mrg 
    285  1.1.1.2  mrg     config: add comments for main statements
    286  1.1.1.2  mrg 
    287  1.1.1.2  mrg commit 92c127023eb3cff5064978c482fc30dd266761f2
    288  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    289  1.1.1.2  mrg Date:   Wed Jul 21 16:07:00 2010 -0400
    290  1.1.1.2  mrg 
    291  1.1.1.2  mrg     config: replace deprecated use of AC_OUTPUT with AC_CONFIG_FILES
    292  1.1.1.2  mrg     
    293  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    294  1.1.1.2  mrg 
    295  1.1.1.2  mrg commit 43b1b085c9ed4592e42f586fe720881ca0ed570d
    296  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    297  1.1.1.2  mrg Date:   Wed Jul 21 14:37:42 2010 -0400
    298  1.1.1.2  mrg 
    299  1.1.1.2  mrg     config: replace deprecated AC_HELP_STRING with AS_HELP_STRING
    300  1.1.1.2  mrg     
    301  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    302  1.1.1.2  mrg 
    303  1.1.1.2  mrg commit 6b82567be23fb09f51c57c4c23f5235c5610ba2c
    304  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    305  1.1.1.2  mrg Date:   Wed Jul 21 14:05:23 2010 -0400
    306  1.1.1.2  mrg 
    307  1.1.1.2  mrg     config: replace deprecated AM_CONFIG_HEADER with AC_CONFIG_HEADERS
    308  1.1.1.2  mrg     
    309  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    310  1.1.1.2  mrg 
    311  1.1.1.2  mrg commit 88c8af1c7874882733b5fc423dadc7541bf88f99
    312  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    313  1.1.1.2  mrg Date:   Wed Jul 21 09:27:42 2010 -0400
    314  1.1.1.2  mrg 
    315  1.1.1.2  mrg     config: complete AC_INIT m4 quoting
    316  1.1.1.2  mrg     
    317  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    318  1.1.1.2  mrg 
    319  1.1.1.2  mrg commit f5bba1f1f33967578df85a3b10b9a58f81831678
    320  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    321  1.1.1.2  mrg Date:   Tue Jul 20 21:54:12 2010 -0400
    322  1.1.1.2  mrg 
    323  1.1.1.2  mrg     config: remove unrequired AC_SUBST([DRI_CFLAGS])
    324  1.1.1.2  mrg     
    325  1.1.1.2  mrg     This macro is called by PKG_CHECK_MODULES
    326  1.1.1.2  mrg     
    327  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    328  1.1.1.2  mrg 
    329  1.1.1.2  mrg commit 96cf989952e5d01a44560caa799d7addd2f1b5d2
    330  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    331  1.1.1.2  mrg Date:   Tue Jul 20 21:44:58 2010 -0400
    332  1.1.1.2  mrg 
    333  1.1.1.2  mrg     config: remove unrequired AC_SUBST([XORG_CFLAGS])
    334  1.1.1.2  mrg     
    335  1.1.1.2  mrg     This macro is called by PKG_CHECK_MODULES
    336  1.1.1.2  mrg     
    337  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    338  1.1.1.2  mrg 
    339  1.1.1.2  mrg commit 094f38c3cffc71497abf9769cc4d20536657fd37
    340  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    341  1.1.1.2  mrg Date:   Tue Jul 20 20:24:42 2010 -0400
    342  1.1.1.2  mrg 
    343  1.1.1.2  mrg     config: remove unrequired AC_HEADER_STDC
    344  1.1.1.2  mrg     
    345  1.1.1.2  mrg     Autoconf says:
    346  1.1.1.2  mrg     "This macro is obsolescent, as current systems have conforming
    347  1.1.1.2  mrg     header files. New programs need not use this macro".
    348  1.1.1.2  mrg     
    349  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    350  1.1.1.2  mrg 
    351  1.1.1.2  mrg commit 51a5af924866d14b868c20a8abdabfaa2a7d7359
    352  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    353  1.1.1.2  mrg Date:   Tue Jul 20 19:41:31 2010 -0400
    354  1.1.1.2  mrg 
    355  1.1.1.2  mrg     config: remove AC_PROG_CC as it overrides AC_PROG_C_C99
    356  1.1.1.2  mrg     
    357  1.1.1.2  mrg     XORG_STRICT_OPTION from XORG_DEFAULT_OPTIONS calls
    358  1.1.1.2  mrg     AC_PROG_C_C99. This sets gcc with -std=gnu99.
    359  1.1.1.2  mrg     If AC_PROG_CC macro is called afterwards, it resets CC to gcc.
    360  1.1.1.2  mrg     
    361  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    362  1.1.1.2  mrg 
    363  1.1.1.2  mrg commit b33d5ea736cad6da7de5c89183774ddeca5f885e
    364  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    365  1.1.1.2  mrg Date:   Tue Jul 20 18:45:19 2010 -0400
    366  1.1.1.2  mrg 
    367  1.1.1.2  mrg     config: update AC_PREREQ statement to 2.60
    368  1.1.1.2  mrg     
    369  1.1.1.2  mrg     Unrelated to the previous patches, the new value simply reflects
    370  1.1.1.2  mrg     the reality that the minimum level for autoconf to configure
    371  1.1.1.2  mrg     all x.org modules is 2.60 dated June 2006.
    372  1.1.1.2  mrg     
    373  1.1.1.2  mrg     ftp://ftp.gnu.org/gnu/autoconf/autoconf-2.60.tar.gz
    374  1.1.1.2  mrg     
    375  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    376  1.1.1.2  mrg 
    377  1.1.1.2  mrg commit cd1209abe30038f3c46bb51568733f795f17f5a5
    378  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    379  1.1.1.2  mrg Date:   Tue Jul 20 16:15:30 2010 -0400
    380  1.1.1.2  mrg 
    381  1.1.1.2  mrg     config: upgrade to util-macros 1.8 for additional man page support
    382  1.1.1.2  mrg     
    383  1.1.1.2  mrg     Use MAN_SUBST now supplied in XORG_MANPAGE_SECTIONS
    384  1.1.1.2  mrg     The value of MAN_SUBST is the same for all X.Org packages.
    385  1.1.1.2  mrg 
    386  1.1.1.2  mrg commit 83661e56c332c9e10d1cd0aa7b464dbabedaab4c
    387  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    388  1.1.1.2  mrg Date:   Sun Jun 13 11:30:39 2010 -0400
    389  1.1.1.2  mrg 
    390  1.1.1.2  mrg     COPYING: replace stub file with actual Copyright notices.
    391  1.1.1.2  mrg     
    392  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    393  1.1.1.2  mrg 
    394  1.1.1.2  mrg commit 5e06e326b2a48e1ae5da352339ee6c77904ebfbe
    395  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    396  1.1.1.2  mrg Date:   Fri Jan 15 15:14:13 2010 -0800
    397  1.1.1.2  mrg 
    398  1.1.1.2  mrg     Update Sun license notices to current X.Org standard form
    399  1.1.1.2  mrg     
    400  1.1.1.2  mrg     Signed-off-by: Alan Coopersmith <alan.coopersmith (a] sun.com>
    401  1.1.1.2  mrg 
    402  1.1.1.2  mrg commit 0fec5b777bb21012046ec05abf0f92767d43e5fc
    403  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    404  1.1.1.2  mrg Date:   Tue Dec 15 21:47:43 2009 -0500
    405  1.1.1.2  mrg 
    406  1.1.1.2  mrg     configure.ac: use backticks rather than $() for cmd subs
    407  1.1.1.2  mrg     
    408  1.1.1.2  mrg     Use "$PKG_CONFIG" rather than hard coded "pkg-config"
    409  1.1.1.2  mrg     
    410  1.1.1.2  mrg     Acked-by: Dan Nicholson <dbn.lists (a] gmail.com>
    411  1.1.1.2  mrg     Acked-by: Daniel Stone <daniel (a] fooishbar.org>
    412  1.1.1.2  mrg     
    413  1.1.1.2  mrg     Signed-off-by: Gaetan Nadon <memsize (a] videotron.ca>
    414  1.1.1.2  mrg 
    415  1.1.1.2  mrg commit 0ba31dcaab005862e8bdcf2800ae54e3c0eff99a
    416  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    417  1.1.1.2  mrg Date:   Mon Nov 23 09:25:06 2009 -0500
    418  1.1.1.2  mrg 
    419  1.1.1.2  mrg     Makefile.am: add ChangeLog and INSTALL on MAINTAINERCLEANFILES
    420  1.1.1.2  mrg     
    421  1.1.1.2  mrg     Now that the INSTALL file is generated.
    422  1.1.1.2  mrg     Allows running make maintainer-clean.
    423  1.1.1.2  mrg 
    424  1.1.1.2  mrg commit 7ddfff90b91c6bc8dbe64eff0efdcbb6fea39cab
    425  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    426  1.1.1.2  mrg Date:   Wed Oct 28 14:41:41 2009 -0400
    427  1.1.1.2  mrg 
    428  1.1.1.2  mrg     INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
    429  1.1.1.2  mrg     
    430  1.1.1.2  mrg     Automake 'foreign' option is specified in configure.ac.
    431  1.1.1.2  mrg     Remove from Makefile.am
    432  1.1.1.2  mrg 
    433  1.1.1.2  mrg commit f7e316031e6cc1475dc6707bdb464cd228cfc460
    434  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    435  1.1.1.2  mrg Date:   Wed Oct 28 14:09:10 2009 -0400
    436  1.1.1.2  mrg 
    437  1.1.1.2  mrg     INSTALL, NEWS, README or AUTHORS files are missing/incorrect #24206
    438  1.1.1.2  mrg     
    439  1.1.1.2  mrg     Add missing INSTALL file. Use standard GNU file on building tarball
    440  1.1.1.2  mrg     README may have been updated
    441  1.1.1.2  mrg     Remove AUTHORS file as it is empty and no content available yet.
    442  1.1.1.2  mrg     Remove NEWS file as it is empty and no content available yet.
    443  1.1.1.2  mrg 
    444  1.1.1.2  mrg commit dbe081091ba868782c1d979f5e588415f05fb861
    445  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    446  1.1.1.2  mrg Date:   Mon Oct 26 12:54:22 2009 -0400
    447  1.1.1.2  mrg 
    448  1.1.1.2  mrg     Several driver modules do not have a ChangeLog target in Makefile.am #23814
    449  1.1.1.2  mrg     
    450  1.1.1.2  mrg     The git generated ChangeLog replaces the hand written one.
    451  1.1.1.2  mrg     Update configure.ac to xorg-macros level 1.3.
    452  1.1.1.2  mrg     Use XORG_DEFAULT_OPTIONS which replaces four XORG_* macros
    453  1.1.1.2  mrg     Update Makefile.am to add ChangeLog target if missing
    454  1.1.1.2  mrg     Remove ChangeLog from EXTRA_DIST or *CLEAN variables
    455  1.1.1.2  mrg     This is a pre-req for the INSTALL_CMD
    456  1.1.1.2  mrg 
    457  1.1.1.2  mrg commit 57449ae05c5f256950c1b2215069c28e4cd7c13f
    458  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    459  1.1.1.2  mrg Date:   Thu Oct 22 13:04:56 2009 -0400
    460  1.1.1.2  mrg 
    461  1.1.1.2  mrg     .gitignore: use common defaults with custom section # 24239
    462  1.1.1.2  mrg     
    463  1.1.1.2  mrg     Using common defaults will reduce errors and maintenance.
    464  1.1.1.2  mrg     Only the very small or inexistent custom section need periodic maintenance
    465  1.1.1.2  mrg     when the structure of the component changes. Do not edit defaults.
    466  1.1.1.2  mrg 
    467  1.1.1.2  mrg commit c062e25f39c90f8484791df2f7f330d556fcc995
    468  1.1.1.2  mrg Author: Gaetan Nadon <memsize (a] videotron.ca>
    469  1.1.1.2  mrg Date:   Thu Oct 22 12:34:18 2009 -0400
    470  1.1.1.2  mrg 
    471  1.1.1.2  mrg     .gitignore: use common defaults with custom section # 24239
    472  1.1.1.2  mrg     
    473  1.1.1.2  mrg     Using common defaults will reduce errors and maintenance.
    474  1.1.1.2  mrg     Only the very small or inexistent custom section need periodic maintenance
    475  1.1.1.2  mrg     when the structure of the component changes. Do not edit defaults.
    476  1.1.1.2  mrg 
    477  1.1.1.2  mrg commit 96ad72682ca7925918e8cb7298a2241dc096bd6f
    478  1.1.1.2  mrg Author: Dave Airlie <airlied (a] redhat.com>
    479  1.1.1.2  mrg Date:   Thu Jul 30 12:04:30 2009 +1000
    480  1.1.1.2  mrg 
    481  1.1.1.2  mrg     tdfx: bump for release 1.4.3
    482  1.1.1.2  mrg 
    483  1.1.1.2  mrg commit 690aaaedb3cf6e8241cad802651a640277094f22
    484  1.1.1.2  mrg Author: Dave Airlie <airlied (a] redhat.com>
    485  1.1.1.2  mrg Date:   Tue Jul 28 15:22:41 2009 +1000
    486  1.1.1.2  mrg 
    487  1.1.1.2  mrg     tdfx: change to using ABI version check
    488  1.1.1.2  mrg 
    489  1.1.1.2  mrg commit 7149d16ed17c064cc91cb1473f10e8e80055347c
    490  1.1.1.2  mrg Author: Dave Airlie <airlied (a] redhat.com>
    491  1.1.1.2  mrg Date:   Tue Jul 28 13:32:38 2009 +1000
    492  1.1.1.2  mrg 
    493  1.1.1.2  mrg     tdfx: update for resources/RAC API removal
    494  1.1.1.2  mrg 
    495  1.1.1.2  mrg commit b656f6522f287efb8595509c678ce6ec60843944
    496  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    497  1.1.1.2  mrg Date:   Thu Jul 2 11:48:35 2009 -0400
    498  1.1.1.2  mrg 
    499  1.1.1.2  mrg     tdfx 1.4.2
    500  1.1.1.2  mrg 
    501  1.1.1.2  mrg commit 871db4476dedf77e440a4ef121643bb2eb897254
    502  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    503  1.1.1.2  mrg Date:   Thu May 28 15:21:22 2009 -0400
    504  1.1.1.2  mrg 
    505  1.1.1.2  mrg     Remove useless loader symbol lists.
    506  1.1.1.2  mrg 
    507  1.1.1.2  mrg commit 5fd80e29b10b9e9b6c5ad4a2ecdf5d9b4013a9e4
    508  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    509  1.1.1.2  mrg Date:   Fri Jan 30 21:04:39 2009 -0800
    510  1.1.1.2  mrg 
    511  1.1.1.2  mrg     Add README with pointers to mailing list, bugzilla & git repos
    512  1.1.1.2  mrg 
    513  1.1.1.2  mrg commit 86c9439917cab56c2b0eef6cd5fd6d8fad886c33
    514  1.1.1.2  mrg Author: Alan Coopersmith <alan.coopersmith (a] sun.com>
    515  1.1.1.2  mrg Date:   Fri Jan 9 16:36:56 2009 -0800
    516  1.1.1.2  mrg 
    517  1.1.1.2  mrg     Remove xorgconfig & xorgcfg from See Also list in man page
    518  1.1.1.2  mrg 
    519  1.1.1.2  mrg commit e30873010523a8cde8d23ed473343b2c60794cb6
    520  1.1.1.2  mrg Author: Dave Airlie <airlied (a] redhat.com>
    521  1.1.1.2  mrg Date:   Mon Dec 22 15:20:26 2008 +1000
    522  1.1.1.2  mrg 
    523  1.1.1.2  mrg     tdfx 1.4.1
    524  1.1.1.2  mrg 
    525  1.1.1.2  mrg commit 6379b129119ed77b9a45cb0207dedd68c32f73a1
    526  1.1.1.2  mrg Author: Jakub Bogusz <qboosh (a] pld-linux.org>
    527  1.1.1.2  mrg Date:   Fri Oct 17 17:25:39 2008 -0400
    528  1.1.1.2  mrg 
    529  1.1.1.2  mrg     Bug #17557: Fix device initialization.
    530  1.1.1.2  mrg 
    531  1.1.1.2  mrg commit fe77fea533068f5698cf4d8e9bc076a6e06d2cd2
    532  1.1.1.2  mrg Author: Tiago Vignatti <vignatti (a] c3sl.ufpr.br>
    533  1.1.1.2  mrg Date:   Mon Jul 7 14:31:32 2008 -0300
    534  1.1.1.2  mrg 
    535  1.1.1.2  mrg     Fix my bad typo in last commit.
    536  1.1.1.2  mrg     
    537  1.1.1.2  mrg     Switch inexistent getsecs() function to gettimeofday().
    538  1.1.1.2  mrg 
    539  1.1.1.2  mrg commit 2de0dcfff822e2a8e5b993936bbad771bf9420b1
    540  1.1.1.2  mrg Author: Tiago Vignatti <vignatti (a] c3sl.ufpr.br>
    541  1.1.1.2  mrg Date:   Fri Jul 4 04:13:05 2008 -0300
    542  1.1.1.2  mrg 
    543  1.1.1.2  mrg     Remove libc wrapper functions.
    544  1.1.1.2  mrg 
    545  1.1.1.2  mrg commit fdff22e2372635f47587f5cdaf888e26d913ee41
    546  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    547  1.1.1.2  mrg Date:   Wed Mar 19 15:39:11 2008 -0400
    548  1.1.1.2  mrg 
    549  1.1.1.2  mrg     tdfx 1.4.0
    550  1.1.1.2  mrg 
    551  1.1.1.2  mrg commit e270c5baeb00f45abacba2b2f4e82505c339e984
    552  1.1.1.2  mrg Author: Adam Jackson <ajax (a] redhat.com>
    553  1.1.1.2  mrg Date:   Wed Mar 19 15:37:46 2008 -0400
    554  1.1.1.2  mrg 
    555  1.1.1.2  mrg     Death to RCS tags.
    556  1.1.1.2  mrg 
    557  1.1.1.2  mrg commit b838b854e96c388081c0ae52320a849645f547c5
    558  1.1.1.2  mrg Author: Matthieu Herrb <matthieu.herrb (a] laas.fr>
    559  1.1.1.2  mrg Date:   Sun Mar 9 00:00:33 2008 +0100
    560  1.1.1.2  mrg 
    561  1.1.1.2  mrg     Makefile.am: nuke RCS Id
    562  1.1.1.2  mrg 
    563  1.1.1.2  mrg commit 8bbace5deb7b86c481ea3b0f764e8a6b879c5f7f
    564  1.1.1.2  mrg Author: Dave Airlie <airlied (a] redhat.com>
    565  1.1.1.2  mrg Date:   Wed Feb 27 10:13:01 2008 +1000
    566  1.1.1.2  mrg 
    567  1.1.1.2  mrg     update tdfx to use proper pciaccess detection
    568  1.1.1.2  mrg 
    569  1.1.1.2  mrg commit 463f0590fdce3cfa0e74a6769ccf5f32dad33cbc
    570  1.1.1.2  mrg Author: James Cloos <cloos (a] jhcloos.com>
    571  1.1.1.2  mrg Date:   Mon Sep 3 05:52:46 2007 -0400
    572  1.1.1.2  mrg 
    573  1.1.1.2  mrg     Add *~ to .gitignore to skip patch/emacs droppings
    574  1.1.1.2  mrg 
    575  1.1.1.2  mrg commit 36ee971310cd4536291829a1021ab8853cf62e9c
    576  1.1.1.2  mrg Author: James Cloos <cloos (a] jhcloos.com>
    577  1.1.1.2  mrg Date:   Thu Aug 23 19:25:59 2007 -0400
    578  1.1.1.2  mrg 
    579  1.1.1.2  mrg     Rename .cvsignore to .gitignore
    580  1.1.1.2  mrg 
    581  1.1.1.2  mrg commit 7f733531e54e455f9c27555c7552184f9da81f41
    582  1.1.1.2  mrg Author: Brice Goglin <bgoglin (a] debian.org>
    583  1.1.1.2  mrg Date:   Tue Aug 7 11:57:02 2007 +0200
    584  1.1.1.2  mrg 
    585  1.1.1.2  mrg     TDFX_*_VERSION using PACKAGE_VERSION_*
    586  1.1.1.2  mrg 
    587  1.1.1.2  mrg commit 673c665c02f02e13d57303f817702177a170e80d
    588  1.1.1.2  mrg Author: Ian Romanick <idr (a] us.ibm.com>
    589  1.1.1.2  mrg Date:   Fri Mar 30 08:00:12 2007 -0700
    590  1.1.1.2  mrg 
    591  1.1.1.2  mrg     Initial pass at porting driver to pci-rework.  DOES NOT WORK.
    592  1.1.1.2  mrg     
    593  1.1.1.2  mrg     This is my initial pass at porting xf86-video-tdfx to the pci-rework
    594  1.1.1.2  mrg     interfaces.  For reasons that I'm not able to understand, it doesn't quite
    595  1.1.1.2  mrg     work.  It's clear that some piece of the hardware isn't being initialized
    596  1.1.1.2  mrg     properly, but, by comparing the old code to the new, it's not clear why.
    597  1.1.1.2  mrg     
    598  1.1.1.2  mrg     Does not impact the functionality of non-pci-rework builds.
    599  1.1.1.2  mrg 
    600  1.1.1.2  mrg commit 347b27bc79838d17cbbae2afb36ce968c1eba620
    601  1.1.1.2  mrg Author: Ian Romanick <idr (a] us.ibm.com>
    602  1.1.1.2  mrg Date:   Wed Mar 14 15:27:05 2007 -0700
    603  1.1.1.2  mrg 
    604  1.1.1.2  mrg     White-space police in TDFXInitChips.
    605  1.1.1.2  mrg 
    606  1.1.1.2  mrg commit daccdfe1957752dd3215281c4f35ff271d2cc17a
    607  1.1.1.2  mrg Author: Ian Romanick <idr (a] us.ibm.com>
    608  1.1.1.2  mrg Date:   Wed Mar 14 15:18:56 2007 -0700
    609  1.1.1.2  mrg 
    610  1.1.1.2  mrg     Minor code cleaning in TDFXMapMem.
    611  1.1.1.2  mrg 
    612  1.1.1.2  mrg commit 3c886166d5cc9c44ccf701e02b56392b3ac26db3
    613  1.1.1.2  mrg Author: Ian Romanick <idr (a] us.ibm.com>
    614  1.1.1.2  mrg Date:   Wed Mar 14 15:16:06 2007 -0700
    615  1.1.1.2  mrg 
    616  1.1.1.2  mrg     Make TDFXGetRec return the pointer instead of a bool.
    617  1.1.1.2  mrg 
    618  1.1.1.2  mrg commit 229a8f64abd685c7efd9cf7baf66fac5ab71b131
    619  1.1.1.2  mrg Author: Ian Romanick <idr (a] us.ibm.com>
    620  1.1.1.2  mrg Date:   Wed Mar 14 15:09:31 2007 -0700
    621  1.1.1.2  mrg 
    622  1.1.1.2  mrg     Wrap pciReadLong / pciWriteLong with macros.
    623  1.1.1.2  mrg     
    624  1.1.1.2  mrg     The pciReadLong and pciWriteLong function calls are wrapped with macros for
    625  1.1.1.2  mrg     a couple reasons.  First, this will reduce the "noise" when support for
    626  1.1.1.2  mrg     pci-rework is added to tdfx.  Second, by having them wrapped in macros it is
    627  1.1.1.2  mrg     easier to support both pci-rework and the "classic" interfaces in the same
    628  1.1.1.2  mrg     code base.
    629  1.1.1.2  mrg 
    630  1.1.1.2  mrg commit ed38e9fd300e8ab989017dea276a2720b9423191
    631  1.1.1.2  mrg Author: Ian Romanick <idr (a] us.ibm.com>
    632  1.1.1.2  mrg Date:   Fri Mar 9 11:09:46 2007 -0800
    633  1.1.1.2  mrg 
    634  1.1.1.2  mrg     Supply NULL driverFunc pointer in DriverRec.
    635  1.1.1.2  mrg 
    636  1.1.1.2  mrg commit 220cc642c2d6b131f47d2c9769cb521bc6fe8c09
    637  1.1.1.2  mrg Author: Michael Lorenz <macallan (a] netbsd.org>
    638  1.1.1.2  mrg Date:   Tue Feb 27 21:31:51 2007 -0500
    639  1.1.1.2  mrg 
    640  1.1.1.2  mrg     Add DDC2/I2C support to the tdfx driver
    641  1.1.1.2  mrg     
    642  1.1.1.2  mrg     Based on Michael Lorenz's code in bug 4246
    643  1.1.1.2  mrg     cleaned up and modified slightly by me.
    644  1.1.1.2  mrg 
    645  1.1.1.2  mrg commit c5b95a8d219dd4ef25c6aa14f44b70865d1a8be7
    646  1.1.1.2  mrg Author: Alex Deucher <alex@t41p.(none)>
    647  1.1.1.2  mrg Date:   Wed Nov 22 12:15:48 2006 -0500
    648  1.1.1.2  mrg 
    649  1.1.1.2  mrg     bump to 1.3.0 for release
    650  1.1.1.2  mrg 
    651  1.1.1.2  mrg commit 4f76e63ac4f7beb802561807554b64386a22b6e1
    652  1.1.1.2  mrg Author: Alex Deucher <alex@t41p.(none)>
    653  1.1.1.2  mrg Date:   Wed Nov 22 12:12:06 2006 -0500
    654  1.1.1.2  mrg 
    655  1.1.1.2  mrg     bump to 1.3.0 for release.
    656  1.1.1.2  mrg 
    657  1.1.1.2  mrg commit cd0808bd2dc6c77557e0691579a6119f8901adf6
    658  1.1.1.2  mrg Author: Alex Deucher <alex@t41p.(none)>
    659  1.1.1.2  mrg Date:   Wed Nov 22 11:44:48 2006 -0500
    660  1.1.1.2  mrg 
    661  1.1.1.2  mrg     Fix locking in tdfx driver.  Fixes bug 9032.
    662  1.1.1.2  mrg 
    663  1.1.1.2  mrg commit 867f0a956a3240466347e0ee17d7518740835048
    664  1.1.1.2  mrg Author: Adam Jackson <ajax (a] benzedrine.nwnk.net>
    665  1.1.1.2  mrg Date:   Fri Oct 13 18:45:16 2006 -0400
    666  1.1.1.2  mrg 
    667  1.1.1.2  mrg     Bump to 1.2.2
    668  1.1.1.2  mrg 
    669  1.1.1.2  mrg commit de5adbae146a4db8ee491a9387f65284ea919ff9
    670  1.1.1.2  mrg Author: Donnie Berkholz <spyderous (a] gentoo.org>
    671  1.1.1.2  mrg Date:   Sat Jun 17 16:35:04 2006 +0000
    672  1.1.1.2  mrg 
    673  1.1.1.2  mrg     Bug #7149 <https://bugs.freedesktop.org/show_bug.cgi?id=7149> Change use of
    674  1.1.1.2  mrg         getsecs to xf86getsecs (Gustavo Pichorim Boiko).
    675  1.1.1.2  mrg 
    676  1.1.1.2  mrg commit acee015839a798546a9d17fdc31e443b10630c76
    677  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    678  1.1.1.2  mrg Date:   Sat Apr 8 01:50:08 2006 +0000
    679  1.1.1.2  mrg 
    680  1.1.1.2  mrg     Bump to 1.2.1 for Xv changes.
    681  1.1.1.2  mrg 
    682  1.1.1.2  mrg commit 55954625ff815b932d365422864745b31c4eadb4
    683  1.1.1.2  mrg Author: Aaron Plattner <aplattner (a] nvidia.com>
    684  1.1.1.2  mrg Date:   Fri Apr 7 23:15:56 2006 +0000
    685  1.1.1.2  mrg 
    686  1.1.1.2  mrg     Add a DrawablePtr argument to the XV functions to pave the way for
    687  1.1.1.2  mrg         redirected video.
    688  1.1.1.2  mrg 
    689  1.1.1.2  mrg commit e8c71c95ea67e5db17eeabaac9907924099e164f
    690  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    691  1.1.1.2  mrg Date:   Fri Apr 7 21:37:49 2006 +0000
    692  1.1.1.2  mrg 
    693  1.1.1.2  mrg     Unlibcwrap. Bump server version requirement. Bump to 1.2.0.
    694  1.1.1.2  mrg 
    695  1.1.1.2  mrg commit 8cfc6971a58e03894040c4f4f74da4734897df16
    696  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    697  1.1.1.2  mrg Date:   Wed Dec 21 02:30:03 2005 +0000
    698  1.1.1.2  mrg 
    699  1.1.1.2  mrg     Update package version for X11R7 release.
    700  1.1.1.2  mrg 
    701  1.1.1.2  mrg commit 5300267cfe87b18139a95ec555f8d43cc1465669
    702  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    703  1.1.1.2  mrg Date:   Mon Dec 19 16:25:55 2005 +0000
    704  1.1.1.2  mrg 
    705  1.1.1.2  mrg     Stub COPYING files
    706  1.1.1.2  mrg 
    707  1.1.1.2  mrg commit c3882fb9c050d4a4b3d8bb6bff712cb9143ae97c
    708  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    709  1.1.1.2  mrg Date:   Thu Dec 15 00:24:20 2005 +0000
    710  1.1.1.2  mrg 
    711  1.1.1.2  mrg     Update package version number for final X11R7 release candidate.
    712  1.1.1.2  mrg 
    713  1.1.1.2  mrg commit d214866d794e5125196c53ff96921debfb50ae74
    714  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    715  1.1.1.2  mrg Date:   Tue Dec 6 22:48:39 2005 +0000
    716  1.1.1.2  mrg 
    717  1.1.1.2  mrg     Change *man_SOURCES ==> *man_PRE to fix autotools warnings.
    718  1.1.1.2  mrg 
    719  1.1.1.2  mrg commit c8db07f0b1574a9cde265505552d318e5a1f21b1
    720  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    721  1.1.1.2  mrg Date:   Sat Dec 3 05:49:36 2005 +0000
    722  1.1.1.2  mrg 
    723  1.1.1.2  mrg     Update package version number for X11R7 RC3 release.
    724  1.1.1.2  mrg 
    725  1.1.1.2  mrg commit 32e28c8f5c3b5c51fc46778d6c346cadec6ba440
    726  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    727  1.1.1.2  mrg Date:   Fri Dec 2 02:16:11 2005 +0000
    728  1.1.1.2  mrg 
    729  1.1.1.2  mrg     Remove extraneous AC_MSG_RESULT.
    730  1.1.1.2  mrg 
    731  1.1.1.2  mrg commit 0d640f8ed56da1782faac5c590efa3bc6ff76f7f
    732  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    733  1.1.1.2  mrg Date:   Wed Nov 30 18:51:58 2005 +0000
    734  1.1.1.2  mrg 
    735  1.1.1.2  mrg     Bump libdrm dep to 2.0.
    736  1.1.1.2  mrg 
    737  1.1.1.2  mrg commit 84a6bfdd3ab8307071376c81349b6701242c82f5
    738  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    739  1.1.1.2  mrg Date:   Tue Nov 29 23:30:05 2005 +0000
    740  1.1.1.2  mrg 
    741  1.1.1.2  mrg     Only build dlloader modules by default.
    742  1.1.1.2  mrg 
    743  1.1.1.2  mrg commit e9d4eaa5c966e1c062a8585bc3a2e74795c6434f
    744  1.1.1.2  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    745  1.1.1.2  mrg Date:   Mon Nov 28 22:04:14 2005 +0000
    746  1.1.1.2  mrg 
    747  1.1.1.2  mrg     Change *mandir targets to use new *_MAN_DIR variables set by xorg-macros.m4
    748  1.1.1.2  mrg         update to fix bug #5167 (Linux prefers *.1x man pages in man1 subdir)
    749  1.1.1.2  mrg 
    750  1.1.1.2  mrg commit 44af3f869cb0c401fe064f5ba16e77c3fcdd3524
    751  1.1.1.2  mrg Author: Eric Anholt <anholt (a] freebsd.org>
    752  1.1.1.2  mrg Date:   Mon Nov 21 10:49:20 2005 +0000
    753  1.1.1.2  mrg 
    754  1.1.1.2  mrg     Add .cvsignores for drivers.
    755  1.1.1.2  mrg 
    756  1.1.1.2  mrg commit a2427c29767471615c4a257dfc3b1d7db4e091c9
    757  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    758  1.1.1.2  mrg Date:   Wed Nov 9 21:31:21 2005 +0000
    759  1.1.1.2  mrg 
    760  1.1.1.2  mrg     Bump version numbers for X11R6.9/X11R7 RC2.
    761  1.1.1.2  mrg 
    762  1.1.1.2  mrg commit 906f1bd3d4365e45dcdc5c40ea5d4940add79703
    763  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    764  1.1.1.2  mrg Date:   Wed Nov 9 21:15:22 2005 +0000
    765  1.1.1.2  mrg 
    766  1.1.1.2  mrg     Update package version number for X11R7 RC2 release.
    767  1.1.1.2  mrg 
    768  1.1.1.2  mrg commit 9558a7b9448b2a906abe52ec31fd76f141c54ca4
    769  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    770  1.1.1.2  mrg Date:   Tue Nov 1 15:08:55 2005 +0000
    771  1.1.1.2  mrg 
    772  1.1.1.2  mrg     Update pkgcheck depedencies to work with separate build roots.
    773  1.1.1.2  mrg 
    774  1.1.1.2  mrg commit 1a194e47f962da387af7d8682ef49deade787964
    775  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    776  1.1.1.2  mrg Date:   Sun Oct 23 18:30:19 2005 +0000
    777  1.1.1.2  mrg 
    778  1.1.1.2  mrg     Bug #4829: Remove some useless DRI symbol checks.
    779  1.1.1.2  mrg 
    780  1.1.1.2  mrg commit 0cf2b66e13412f1a07d002eb6bd2097debc91a20
    781  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    782  1.1.1.2  mrg Date:   Wed Oct 19 02:48:05 2005 +0000
    783  1.1.1.2  mrg 
    784  1.1.1.2  mrg     Update package version number for RC1 release.
    785  1.1.1.2  mrg 
    786  1.1.1.2  mrg commit 99a441cb4e56066d1eca600a20eee8213dd55bcb
    787  1.1.1.2  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    788  1.1.1.2  mrg Date:   Tue Oct 18 00:01:55 2005 +0000
    789  1.1.1.2  mrg 
    790  1.1.1.2  mrg     Use @DRIVER_MAN_SUFFIX@ instead of $(DRIVER_MAN_SUFFIX) in macro
    791  1.1.1.2  mrg         substitutions to work better with BSD make
    792  1.1.1.2  mrg 
    793  1.1.1.2  mrg commit 74f86678173470b5413cd138565a0a102151e785
    794  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    795  1.1.1.2  mrg Date:   Mon Oct 17 22:57:37 2005 +0000
    796  1.1.1.2  mrg 
    797  1.1.1.2  mrg     More 1.7 braindamage: define EXTRA_DIST in terms of @DRIVER_NAME@ instead
    798  1.1.1.2  mrg         of indirectly
    799  1.1.1.2  mrg 
    800  1.1.1.2  mrg commit e3e08b9a2dacd40da3e5ef57b0cbc5ed9b20f58a
    801  1.1.1.2  mrg Author: Alan Coopersmith <Alan.Coopersmith (a] sun.com>
    802  1.1.1.2  mrg Date:   Mon Oct 17 00:09:07 2005 +0000
    803  1.1.1.2  mrg 
    804  1.1.1.2  mrg     Use sed & cpp to substitute variables in driver man pages
    805  1.1.1.2  mrg 
    806  1.1.1.2  mrg commit 0f8e96a0d81303acd705be15c666cb775a1ae52b
    807  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    808  1.1.1.2  mrg Date:   Sat Sep 24 18:45:46 2005 +0000
    809  1.1.1.2  mrg 
    810  1.1.1.2  mrg     Disable the {Open,Close}FullScreen DRI protocol. Remove empty FullScreen
    811  1.1.1.2  mrg         stubs from drivers, comment the non-empty ones.
    812  1.1.1.2  mrg 
    813  1.1.1.2  mrg commit efe1280e8f9c1d4ce06b9c11b5f8a64e6ecc9640
    814  1.1.1.2  mrg Author: Daniel Stone <daniel (a] fooishbar.org>
    815  1.1.1.2  mrg Date:   Mon Aug 22 04:24:32 2005 +0000
    816  1.1.1.2  mrg 
    817  1.1.1.2  mrg     Fix test for DRI headers, bump to 1.0.1.
    818  1.1.1.2  mrg 
    819  1.1.1.2  mrg commit 436871d3174f56c8bf7acc8e132a81f5e6fe603a
    820  1.1.1.2  mrg Author: Daniel Stone <daniel (a] fooishbar.org>
    821  1.1.1.2  mrg Date:   Thu Aug 18 09:03:52 2005 +0000
    822  1.1.1.2  mrg 
    823  1.1.1.2  mrg     Update autogen.sh to one that does objdir != srcdir.
    824  1.1.1.2  mrg 
    825  1.1.1.2  mrg commit 5d98e054f44c5cf1e51bb7b4646b07192cb6cb7a
    826  1.1.1.2  mrg Author: Alan Hourihane <alanh (a] fairlite.demon.co.uk>
    827  1.1.1.2  mrg Date:   Mon Aug 15 07:30:06 2005 +0000
    828  1.1.1.2  mrg 
    829  1.1.1.2  mrg     Egbert's 64bit fixes for mixed 32/64bit clients
    830  1.1.1.2  mrg 
    831  1.1.1.2  mrg commit 1c68da251e1bf3828ca2c728a4d7b93bb59659a9
    832  1.1.1.2  mrg Author: Ian Romanick <idr (a] us.ibm.com>
    833  1.1.1.2  mrg Date:   Fri Aug 5 23:04:33 2005 +0000
    834  1.1.1.2  mrg 
    835  1.1.1.2  mrg     I have resolved this by making all the "Direct rendering disabled" messages
    836  1.1.1.2  mrg         X_WARNING and all the "Direct rendering enabled" messages X_INFO.
    837  1.1.1.2  mrg         Ideally, we need to factor some of this stuff out to common code. There
    838  1.1.1.2  mrg         is a *LOT* of duplication among the *_dri.c files under
    839  1.1.1.2  mrg         programs/Xserver/hw/xfree86/drivers.
    840  1.1.1.2  mrg     I'm trying to clean up as much low hanging fruit as I can and got tired of
    841  1.1.1.2  mrg         waiting for ajax. :P
    842  1.1.1.2  mrg 
    843  1.1.1.2  mrg commit 341cd708a7511dac3e728e260166b4b790df733f
    844  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    845  1.1.1.2  mrg Date:   Sun Jul 31 17:19:29 2005 +0000
    846  1.1.1.2  mrg 
    847  1.1.1.2  mrg     Post-merge fixups:
    848  1.1.1.2  mrg     - Disable building the gamma driver
    849  1.1.1.2  mrg     - Fix numerous Imakefiles to get header paths and subdirs right
    850  1.1.1.2  mrg     - Symlink client-side GLX lib source from Mesa
    851  1.1.1.2  mrg     - Add new shader subdirs to the Mesa core build
    852  1.1.1.2  mrg     - Tweak the DDX drivers to not ask for "xf86dri.h"; they don't need it,
    853  1.1.1.2  mrg         since they don't generate protocol, and it was breaking the build.
    854  1.1.1.2  mrg 
    855  1.1.1.2  mrg commit 397246d1d1b55227456dd9092581871da7d17323
    856  1.1.1.2  mrg Author: Kevin E Martin <kem (a] kem.org>
    857  1.1.1.2  mrg Date:   Fri Jul 29 21:22:45 2005 +0000
    858  1.1.1.2  mrg 
    859  1.1.1.2  mrg     Various changes preparing packages for RC0:
    860  1.1.1.2  mrg     - Verify and update package version numbers as needed
    861  1.1.1.2  mrg     - Implement versioning scheme
    862  1.1.1.2  mrg     - Change bug address to point to bugzilla bug entry form
    863  1.1.1.2  mrg     - Disable loadable i18n in libX11 by default (use --enable-loadable-i18n to
    864  1.1.1.2  mrg         reenable it)
    865  1.1.1.2  mrg     - Fix makedepend to use pkgconfig and pass distcheck
    866  1.1.1.2  mrg     - Update build script to build macros first
    867  1.1.1.2  mrg     - Update modular Xorg version
    868  1.1.1.2  mrg 
    869  1.1.1.2  mrg commit 535a7c83e000a3410b11ffa6769127eae1464b3b
    870  1.1.1.2  mrg Author: Sren Sandmann Pedersen <sandmann (a] daimi.au.dk>
    871  1.1.1.2  mrg Date:   Wed Jul 27 21:23:29 2005 +0000
    872  1.1.1.2  mrg 
    873  1.1.1.2  mrg     Add xf86driproto to dependencies for drivers with DRI support. Patch from
    874  1.1.1.2  mrg         Donnie Berkholz
    875  1.1.1.2  mrg 
    876  1.1.1.2  mrg commit 38a86d5b1897427147543b933a1991a780f9b103
    877  1.1.1.2  mrg Author: Sren Sandmann Pedersen <sandmann (a] daimi.au.dk>
    878  1.1.1.2  mrg Date:   Tue Jul 26 23:47:49 2005 +0000
    879  1.1.1.2  mrg 
    880  1.1.1.2  mrg     Build system for tdfx
    881  1.1.1.2  mrg 
    882  1.1.1.2  mrg commit 4cb0dd1252ed112a2e3be6de417d2ce8d849c5fe
    883  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    884  1.1.1.2  mrg Date:   Mon Jul 11 02:30:02 2005 +0000
    885  1.1.1.2  mrg 
    886  1.1.1.2  mrg     Prep for modular builds by adding guarded #include "config.h" everywhere.
    887  1.1.1.2  mrg 
    888  1.1.1.2  mrg commit d254bed4315a09eca7c41ce26efd575b60db2526
    889  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    890  1.1.1.2  mrg Date:   Mon Jul 11 01:06:22 2005 +0000
    891  1.1.1.2  mrg 
    892  1.1.1.2  mrg     Fix the build with DRI enabled. Still at least one runtime issue...
    893  1.1.1.2  mrg 
    894  1.1.1.2  mrg commit cd1894c3df1ab667a755852085143fcc261eb985
    895  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    896  1.1.1.2  mrg Date:   Sun Jul 10 21:36:32 2005 +0000
    897  1.1.1.2  mrg 
    898  1.1.1.2  mrg     First cut at driver build skeleton.
    899  1.1.1.2  mrg 
    900  1.1.1.2  mrg commit 2c5f2e65f81699c619854b183d9f7825f350e118
    901  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    902  1.1.1.2  mrg Date:   Sat Jun 25 21:16:57 2005 +0000
    903  1.1.1.2  mrg 
    904  1.1.1.2  mrg     Bug #3626: _X_EXPORT tags for video and input drivers.
    905  1.1.1.2  mrg 
    906  1.1.1.2  mrg commit 2f8fb13b9c14ff9bc24f6737658d79ea647befc7
    907  1.1.1.2  mrg Author: Adam Jackson <ajax (a] nwnk.net>
    908  1.1.1.2  mrg Date:   Wed May 18 17:47:36 2005 +0000
    909  1.1.1.2  mrg 
    910  1.1.1.2  mrg     Bug #3163: Create new DRIINFO_*_VERSION macros to indicate the version
    911  1.1.1.2  mrg         number of the DRIInfoRec, disambiguating it from the XF86DRI protocol
    912  1.1.1.2  mrg         version number. Modify DRIQueryVersion to return the libdri version
    913  1.1.1.2  mrg         number, which all DDXes were requesting implicitly. Fix the DDXes to
    914  1.1.1.2  mrg         check for the DRIINFO version they were compiled against.
    915  1.1.1.2  mrg 
    916  1.1.1.2  mrg commit 4db50246111e420ad5e6ae9ac8c7e03ec0d5d704
    917  1.1.1.2  mrg Author: Daniel Stone <daniel (a] fooishbar.org>
    918  1.1.1.2  mrg Date:   Wed Apr 20 12:25:30 2005 +0000
    919  1.1.1.2  mrg 
    920  1.1.1.2  mrg     Fix includes right throughout the Xserver tree:
    921  1.1.1.2  mrg     change "foo.h" to <X11/foo.h> for core headers, e.g. X.h, Xpoll.h;
    922  1.1.1.2  mrg     change "foo.h", "extensions/foo.h" and "X11/foo.h" to
    923  1.1.1.2  mrg         <X11/extensions/foo.h> for extension headers, e.g. Xv.h;
    924  1.1.1.2  mrg     change "foo.[ch]" to <X11/Xtrans/foo.[ch]> for Xtrans files.
    925  1.1.1.2  mrg 
    926  1.1.1.2  mrg commit 9b0caee37f7ee99831735e819d97f9ccf155562a
    927  1.1.1.2  mrg Author: Matthieu Herrb <matthieu.herrb (a] laas.fr>
    928  1.1.1.2  mrg Date:   Mon Oct 4 21:14:44 2004 +0000
    929  1.1.1.2  mrg 
    930  1.1.1.2  mrg     Manual pages fixes (XFree86 bugzilla #1487, Nicolas Joly).
    931  1.1.1.2  mrg 
    932  1.1.1.2  mrg commit a490c1eec95ec111bdc3555d29b77192bf8caf90
    933  1.1.1.2  mrg Author: Eric Anholt <anholt (a] freebsd.org>
    934  1.1.1.2  mrg Date:   Wed Jun 16 09:44:00 2004 +0000
    935  1.1.1.2  mrg 
    936  1.1.1.2  mrg     Merge DRI-trunk-20040613 changes in programs/Xserver/hw/xfree86/drivers,
    937  1.1.1.2  mrg         with the following notes:
    938  1.1.1.2  mrg     - Savage and Mach64 (= ati/ati*.[ch] changes) DRI not merged due to
    939  1.1.1.2  mrg         insecurity.
    940  1.1.1.2  mrg     - VIA driver converted to new drmContext and drmHandle names.
    941  1.1.1.2  mrg     - Radeon driver merge conflicted in many places, and MergedFB at least
    942  1.1.1.2  mrg         could probably use some checking at this point.
    943  1.1.1.2  mrg 
    944  1.1.1.2  mrg commit 5172fd205abbbe649205b21fc24f47df5cc5ac8a
    945  1.1.1.2  mrg Author: Eric Anholt <anholt (a] freebsd.org>
    946  1.1.1.2  mrg Date:   Wed Jun 16 09:27:19 2004 +0000
    947  1.1.1.2  mrg 
    948  1.1.1.2  mrg     DRI trunk-20040613 import
    949  1.1.1.2  mrg 
    950  1.1.1.2  mrg commit 982a12c6ae9d15e4d22d579de4f2c8fac1a2dcee
    951  1.1.1.2  mrg Author: Eric Anholt <anholt (a] freebsd.org>
    952  1.1.1.2  mrg Date:   Wed Jun 16 09:24:02 2004 +0000
    953  1.1.1.2  mrg 
    954  1.1.1.2  mrg     DRI XFree86-4_3_99_12-merge import
    955  1.1.1.2  mrg 
    956  1.1.1.2  mrg commit 6f6d502351b3c7da0585791375b0102aa65e48be
    957  1.1.1.2  mrg Author: Egbert Eich <eich (a] suse.de>
    958  1.1.1.2  mrg Date:   Fri Apr 23 19:49:53 2004 +0000
    959  1.1.1.2  mrg 
    960  1.1.1.2  mrg     Merging XORG-CURRENT into trunk
    961  1.1.1.2  mrg 
    962  1.1.1.2  mrg commit 38f39f7f4a75693866227156a7ef3673b587e3de
    963  1.1.1.2  mrg Author: Egbert Eich <eich (a] suse.de>
    964  1.1.1.2  mrg Date:   Sun Mar 14 08:33:37 2004 +0000
    965  1.1.1.2  mrg 
    966  1.1.1.2  mrg     Importing vendor version xf86-4_4_99_1 on Sun Mar 14 00:26:39 PST 2004
    967  1.1.1.2  mrg 
    968  1.1.1.2  mrg commit e91530f65fe7ef236459c97c06f2203cac507736
    969  1.1.1.2  mrg Author: Egbert Eich <eich (a] suse.de>
    970  1.1.1.2  mrg Date:   Wed Mar 3 12:12:27 2004 +0000
    971  1.1.1.2  mrg 
    972  1.1.1.2  mrg     Importing vendor version xf86-4_4_0 on Wed Mar 3 04:09:24 PST 2004
    973  1.1.1.2  mrg 
    974  1.1.1.2  mrg commit 3cef3b10af1d67b237bde8a71ffddcef6bc7ba65
    975  1.1.1.2  mrg Author: Egbert Eich <eich (a] suse.de>
    976  1.1.1.2  mrg Date:   Thu Feb 26 13:35:55 2004 +0000
    977  1.1.1.2  mrg 
    978  1.1.1.2  mrg     readding XFree86's cvs IDs
    979  1.1.1.2  mrg 
    980  1.1.1.2  mrg commit d97a6f7a36b93bbd12e9d878cddfe1625f87e21d
    981  1.1.1.2  mrg Author: Egbert Eich <eich (a] suse.de>
    982  1.1.1.2  mrg Date:   Thu Feb 26 09:23:27 2004 +0000
    983  1.1.1.2  mrg 
    984  1.1.1.2  mrg     Importing vendor version xf86-4_3_99_903 on Wed Feb 26 01:21:00 PST 2004
    985  1.1.1.2  mrg 
    986  1.1.1.2  mrg commit 7aa6b58d626657e97cc5e72d43a2bd4c1b8611ce
    987  1.1.1.2  mrg Author: Egbert Eich <eich (a] suse.de>
    988  1.1.1.2  mrg Date:   Thu Jan 29 08:08:37 2004 +0000
    989  1.1.1.2  mrg 
    990  1.1.1.2  mrg     Importing vendor version xf86-012804-2330 on Thu Jan 29 00:06:33 PST 2004
    991  1.1.1.2  mrg 
    992  1.1.1.2  mrg commit a5301d652c98dbf07869a62c4198bae2d3f83571
    993  1.1.1.2  mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
    994  1.1.1.2  mrg Date:   Tue Nov 25 19:28:43 2003 +0000
    995  1.1.1.2  mrg 
    996  1.1.1.2  mrg     XFree86 4.3.99.16 Bring the tree up to date for the Cygwin folks
    997  1.1.1.2  mrg 
    998  1.1.1.2  mrg commit d95aec56ffcf85524ee04d34caeb07d9b95ab463
    999  1.1.1.2  mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
   1000  1.1.1.2  mrg Date:   Fri Nov 14 16:48:55 2003 +0000
   1001  1.1.1.2  mrg 
   1002  1.1.1.2  mrg     XFree86 4.3.0.1
   1003  1.1.1.2  mrg 
   1004  1.1.1.2  mrg commit c4dd1bf20f2bae6d34db059ae47f053012d8a822
   1005  1.1.1.2  mrg Author: Kaleb Keithley <kaleb (a] freedesktop.org>
   1006  1.1.1.2  mrg Date:   Fri Nov 14 16:48:55 2003 +0000
   1007  1.1.1.2  mrg 
   1008  1.1.1.2  mrg     Initial revision
   1009