Bump changelogs

2 files changed, 155 insertions, 0 deletions

diff --git a/ChangeLog b/ChangeLog
index b215bfb5f26..b082bfe79b1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,157 @@
+commit 8ba378d9698be4fe24585beb10cadb95746f2a94
+Author: José Fonseca <jfonseca@vmware.com>
+Date:   Tue May 4 10:09:49 2010 +0100
+
+    mesa/st: Fill in native program limits.
+    
+    In the lack of more fine grained capabilities in Gallium, assume that if
+    the pipe driver supports GLSL then native limits match Mesa software
+    limits.
+    (cherry picked from commit 40a90cd11234a09c2477f5c9984dd6d9fac3f52c)
+
+commit 942ec8722d4d903820a5c9b0720f9aff0f938888
+Author: Ian Romanick <ian.d.romanick@intel.com>
+Date:   Fri Apr 23 11:53:50 2010 -0700
+
+    Fix __glXInitializeVisualConfigFromTags's handling of unrecognized fbconfig
+    
+    __glXInitializeVisualConfigFromTags doesn't skip the payload of
+    unrecognized tags.  Instead, it treats the value as if it were the
+    next tag, which can happen if the server's GLX extension is not
+    Mesa's.  For example, this falls down when NVIDIA sends a
+    GLX_FLOAT_COMPONENTS_NV = 0 pair, causing
+    __glXInitializeVisualConfigFromTags to bail out early.
+    
+    Signed-off-by: Aaron Plattner <aplattner@nvidia.com>
+    Signed-off-by: Ian Romanick <ian.d.romanick@intel.com>
+
+commit 45affda4bf056ac07a1db2c2d973ad51d9135ea7
+Author: Tormod Volden <debian.tormod@gmail.com>
+Date:   Thu Apr 22 21:52:15 2010 +0200
+
+    radeon: 9800 SE has only one quadpipe
+    
+    Although these cards have 2 pipelines on the silicon only
+    the first passed the QA and the other should be disabled.
+    
+    http://www.digital-daily.com/video/ati-radeon9800se/
+    http://www.rojakpot.com/showarticle.aspx?artno=101&pgno=1
+    
+    Signed-off-by: Tormod Volden <debian.tormod@gmail.com>
+
+commit 593f7cc315082c1b8da207477fb6b7051c5afd58
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Thu Apr 22 02:16:41 2010 -0400
+
+    r300: fix vertex unit setup
+    
+    RV3xx is 2, RV560,RV570 is 8
+    
+    Noticed by Tormod Volden.
+
+commit 6d18fd675628440a326bf4c3482937f36d56f8bd
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Apr 19 10:13:40 2010 -0600
+
+    st/mesa: invert scissor rect depending on FB orientation
+    
+    Fixes fd.o bug 27715
+    
+    (cherry picked from commit c060265bdb953f0c9d73e60f08c53a2e3b1a1176)
+
+commit 51d4d0a12e296b5a96a62bf47c98e9bd0756fc82
+Author: Alex Deucher <alexdeucher@gmail.com>
+Date:   Fri Apr 9 20:20:42 2010 -0400
+
+    r600: add new r7xx pci ids
+
+commit a5489649593427e47b039ad0d4a98cbb4e547f69
+Author: Maciej Cencora <m.cencora@gmail.com>
+Date:   Fri Apr 9 21:14:15 2010 +0200
+
+    r300: set proper vertex index limits also in non indexed mode
+    
+    Fixes #27521, broken menus in UT2004 and broken water refraction in Sauerbraten.
+
+commit 08b98fac6243ff2f0c26dedc374d7cefff51fd38
+Author: Brian Paul <brianp@vmware.com>
+Date:   Fri Apr 9 10:12:02 2010 -0600
+
+    mesa: fix instruction indexing bugs
+    
+    We were looping over instructions but only looking at the 0th instruction's
+    opcode.
+    
+    Fixes fd.o bug 27566.
+    (cherry picked from commit b22a00bff4aadd390dd8af6b5b05bd2833ec7f85)
+
+commit 65c337e29be884680e380b34b7542dca93824e00
+Author: Jeremy Huddleston <jeremyhu@apple.com>
+Date:   Thu Apr 1 18:14:04 2010 -0700
+
+    Revert accidental commits from the xquartz tree
+    
+    This reverts commit 5726f2f1b8c613cf1b4a282684f4acd880ca0716.
+    This reverts commit 2d5c596ca45b03605294f56367e8126b9e27e15a.
+    This reverts commit 48ea93eb88e9fde246734490523cd6cd54244407.
+    This reverts commit 3e6d5aedf0e1edbc6b38a54a8fa87ad4d228d3d0.
+    This reverts commit cfb4f95bd5be6d5621c98be5e891e455eb40915c.
+    This reverts commit d57aa45dac3026b27e2da530e98cf50bdd0b9eab.
+
+commit 5726f2f1b8c613cf1b4a282684f4acd880ca0716
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sat Jan 2 00:03:53 2010 -0500
+
+    apple: Use mesa gl.h rather than generating one.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 2d5c596ca45b03605294f56367e8126b9e27e15a
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Dec 24 10:13:48 2009 -0800
+
+    apple: Integrate our libGL into the existing build system better
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 48ea93eb88e9fde246734490523cd6cd54244407
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Dec 24 10:11:33 2009 -0800
+
+    apple: Change ifdefs for DRI to be DRI && !APPLE
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit 3e6d5aedf0e1edbc6b38a54a8fa87ad4d228d3d0
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Thu Dec 24 09:51:17 2009 -0800
+
+    apple: Remove duplicate headers that already exist in mesa.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit cfb4f95bd5be6d5621c98be5e891e455eb40915c
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Sun Jan 3 09:13:37 2010 -0500
+
+    apple: Adding .gitignore for src/glx/x11/apple
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit d57aa45dac3026b27e2da530e98cf50bdd0b9eab
+Author: Jeremy Huddleston <jeremyhu@freedesktop.org>
+Date:   Wed Dec 23 19:10:23 2009 -0800
+
+    apple: Initial import of libGL for OSX from AppleSGLX svn repository.
+    
+    Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
+
+commit e6f5ca0fa3bff975f2acb3a825d77f095bc9f43e
+Author: Brian Paul <brianp@vmware.com>
+Date:   Mon Mar 29 10:57:48 2010 -0600
+
+    docs: fix 7.7.1 release date
+
 commit 0c88e340499c961cc7a06107a727710a67e280ed
 Author: Ian Romanick <ian.d.romanick@intel.com>
 Date:   Sun Mar 28 16:25:47 2010 -0700
diff --git a/debian/changelog b/debian/changelog
index 891f299ccff..d9e522ff073 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ mesa (7.7.1-2) UNRELEASED; urgency=low
   * debian/rules: use DEB_HOST_ARCH_CPU instead of DEB_HOST_GNU_CPU.  Prompted
     by Ubuntu which changed the latter to i686, breaking their packages on
     i386.
+  * Pull from mesa_7_7_branch (commit 8ba378d).
 
  -- Julien Cristau <jcristau@debian.org>  Thu, 20 May 2010 10:59:05 +0200